From 7fb7158b6c087fd31502f9f687c34fe6fbb4f1d9 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 18 Oct 2024 13:07:23 -0700 Subject: [PATCH 001/328] Add back and edit buttons to package install (#2) --- src/common/localize.ts | 1 + src/common/pickers.ts | 216 ++++++++++++++++------ src/common/window.apis.ts | 92 ++++++++- src/managers/conda/condaEnvManager.ts | 3 +- src/managers/conda/condaPackageManager.ts | 12 +- src/managers/conda/condaUtils.ts | 2 +- src/managers/sysPython/venvUtils.ts | 2 +- 7 files changed, 244 insertions(+), 84 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index c6fb817..ce64431 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -19,4 +19,5 @@ export namespace PackageManagement { export const workspacePackages = l10n.t('Workspace packages'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); + export const editArguments = l10n.t('Edit arguments'); } diff --git a/src/common/pickers.ts b/src/common/pickers.ts index b305322..b70f2ec 100644 --- a/src/common/pickers.ts +++ b/src/common/pickers.ts @@ -1,4 +1,12 @@ -import { QuickPickItem, QuickPickItemButtonEvent, QuickPickItemKind, ThemeIcon, Uri, window } from 'vscode'; +import { + QuickInputButtons, + QuickPickItem, + QuickPickItemButtonEvent, + QuickPickItemKind, + ThemeIcon, + Uri, + window, +} from 'vscode'; import { GetEnvironmentsScope, IconPath, @@ -13,7 +21,7 @@ import * as path from 'path'; import { InternalEnvironmentManager, InternalPackageManager } from '../internal.api'; import { Common, PackageManagement } from './localize'; import { EXTENSION_ROOT_DIR } from './constants'; -import { showQuickPickWithButtons, showTextDocument } from './window.apis'; +import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from './window.apis'; import { launchBrowser } from './env.apis'; import { traceWarn } from './logging'; @@ -205,10 +213,11 @@ export async function pickPackageOptions(): Promise { } export async function enterPackageManually(filler?: string): Promise { - const input = await window.showInputBox({ + const input = await showInputBoxWithButtons({ placeHolder: PackageManagement.enterPackagesPlaceHolder, value: filler, ignoreFocusOut: true, + showBackButton: true, }); return input?.split(' '); } @@ -237,7 +246,12 @@ export const OPEN_EDITOR_BUTTON = { tooltip: Common.openInBrowser, }; -function handleButton(uri?: Uri) { +export const EDIT_ARGUMENTS_BUTTON = { + iconPath: new ThemeIcon('wrench'), + tooltip: PackageManagement.editArguments, +}; + +function handleItemButton(uri?: Uri) { if (uri) { if (uri.scheme.toLowerCase().startsWith('http')) { launchBrowser(uri); @@ -347,13 +361,9 @@ function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { async function getWorkspacePackages( packageManager: InternalPackageManager, environment: PythonEnvironment, + preSelected?: PackageQuickPickItem[] | undefined, ): Promise { - const items: PackageQuickPickItem[] = [ - { - label: PackageManagement.enterPackageNames, - alwaysShow: true, - }, - ]; + const items: PackageQuickPickItem[] = []; let installable = await packageManager?.getInstallable(environment); if (installable && installable.length > 0) { @@ -370,18 +380,42 @@ async function getWorkspacePackages( ); } - const selected = await showQuickPickWithButtons( - items, - { - placeHolder: PackageManagement.selectPackagesToInstall, - ignoreFocusOut: true, - canPickMany: true, - }, - undefined, - async (e: QuickPickItemButtonEvent) => { - handleButton(e.item.uri); - }, - ); + let preSelectedItems = items + .filter((i) => i.kind !== QuickPickItemKind.Separator) + .filter((i) => + preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), + ); + let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; + try { + selected = await showQuickPickWithButtons( + items, + { + placeHolder: PackageManagement.selectPackagesToInstall, + ignoreFocusOut: true, + canPickMany: true, + showBackButton: true, + buttons: [EDIT_ARGUMENTS_BUTTON], + selected: preSelectedItems, + }, + undefined, + (e: QuickPickItemButtonEvent) => { + handleItemButton(e.item.uri); + }, + ); + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + throw ex; + } else if (ex.button === EDIT_ARGUMENTS_BUTTON && ex.item) { + const parts: PackageQuickPickItem[] = Array.isArray(ex.item) ? ex.item : [ex.item]; + selected = [ + { + label: PackageManagement.enterPackageNames, + alwaysShow: true, + }, + ...parts, + ]; + } + } if (selected && Array.isArray(selected)) { if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { @@ -389,13 +423,86 @@ async function getWorkspacePackages( .filter((s) => s.label !== PackageManagement.enterPackageNames) .flatMap((s) => s.args ?? []) .join(' '); - return enterPackageManually(filler); + try { + const result = await enterPackageManually(filler); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return getWorkspacePackages(packageManager, environment, selected); + } + return undefined; + } } else { return selected.flatMap((s) => s.args ?? []); } } } +export async function getCommonPackagesToInstall( + preSelected?: PackageQuickPickItem[] | undefined, +): Promise { + const common = await getCommonPackages(); + + const items: PackageQuickPickItem[] = common.map(installableToQuickPickItem); + const preSelectedItems = items + .filter((i) => i.kind !== QuickPickItemKind.Separator) + .filter((i) => + preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), + ); + + let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; + try { + selected = await showQuickPickWithButtons( + items, + { + placeHolder: PackageManagement.selectPackagesToInstall, + ignoreFocusOut: true, + canPickMany: true, + showBackButton: true, + buttons: [EDIT_ARGUMENTS_BUTTON], + selected: preSelectedItems, + }, + undefined, + (e: QuickPickItemButtonEvent) => { + handleItemButton(e.item.uri); + }, + ); + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + throw ex; + } else if (ex.button === EDIT_ARGUMENTS_BUTTON && ex.item) { + const parts: PackageQuickPickItem[] = Array.isArray(ex.item) ? ex.item : [ex.item]; + selected = [ + { + label: PackageManagement.enterPackageNames, + alwaysShow: true, + }, + ...parts, + ]; + } + } + + if (selected && Array.isArray(selected)) { + if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { + const filler = selected + .filter((s) => s.label !== PackageManagement.enterPackageNames) + .map((s) => s.label) + .join(' '); + try { + const result = await enterPackageManually(filler); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return getCommonPackagesToInstall(selected); + } + return undefined; + } + } else { + return selected.map((s) => s.label); + } + } +} + export async function getPackagesToInstall( packageManager: InternalPackageManager, environment: PythonEnvironment, @@ -407,48 +514,35 @@ export async function getPackagesToInstall( } if (packageType === PackageManagement.enterPackageNames) { - return enterPackageManually(); + try { + const result = await enterPackageManually(); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return getPackagesToInstall(packageManager, environment); + } + return undefined; + } } else if (packageType === PackageManagement.workspacePackages) { - return getWorkspacePackages(packageManager, environment); + try { + const result = await getWorkspacePackages(packageManager, environment); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return getPackagesToInstall(packageManager, environment); + } + return undefined; + } } - const common = await getCommonPackages(); - const items: PackageQuickPickItem[] = [ - { - label: PackageManagement.enterPackageNames, - alwaysShow: true, - }, - { - label: PackageManagement.commonPackages, - kind: QuickPickItemKind.Separator, - }, - ]; - - items.push(...common.map(installableToQuickPickItem)); - - const selected = await showQuickPickWithButtons( - items, - { - placeHolder: PackageManagement.selectPackagesToInstall, - ignoreFocusOut: true, - canPickMany: true, - }, - undefined, - async (e: QuickPickItemButtonEvent) => { - handleButton(e.item.uri); - }, - ); - - if (selected && Array.isArray(selected)) { - if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { - const filler = selected - .filter((s) => s.label !== PackageManagement.enterPackageNames) - .map((s) => s.label) - .join(' '); - return enterPackageManually(filler); - } else { - return selected.map((s) => s.label); + try { + const result = await getCommonPackagesToInstall(); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return getPackagesToInstall(packageManager, environment); } + return undefined; } } diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index f2da347..598d87f 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -2,6 +2,9 @@ import { CancellationToken, Disposable, ExtensionTerminalOptions, + InputBox, + InputBoxOptions, + QuickInputButton, QuickInputButtons, QuickPick, QuickPickItem, @@ -71,34 +74,46 @@ export function showTextDocument(uri: Uri): Thenable { return window.showTextDocument(uri); } +export interface QuickPickButtonEvent { + readonly item: T | readonly T[] | undefined; + readonly button: QuickInputButton; +} + export async function showQuickPickWithButtons( items: readonly T[], - options?: QuickPickOptions & { showBackButton?: boolean }, + options?: QuickPickOptions & { showBackButton?: boolean; buttons?: QuickInputButton[]; selected?: T[] }, token?: CancellationToken, itemButtonHandler?: (e: QuickPickItemButtonEvent) => void, ): Promise { const quickPick: QuickPick = window.createQuickPick(); const disposables: Disposable[] = [quickPick]; + const deferred = createDeferred(); quickPick.items = items; - if (options?.showBackButton) { - quickPick.buttons = [QuickInputButtons.Back]; - } quickPick.canSelectMany = options?.canPickMany ?? false; quickPick.ignoreFocusOut = options?.ignoreFocusOut ?? false; quickPick.matchOnDescription = options?.matchOnDescription ?? false; quickPick.matchOnDetail = options?.matchOnDetail ?? false; quickPick.placeholder = options?.placeHolder; quickPick.title = options?.title; + quickPick.selectedItems = options?.selected ?? []; - const deferred = createDeferred(); + if (options?.showBackButton) { + quickPick.buttons = [QuickInputButtons.Back]; + } + + if (options?.buttons) { + quickPick.buttons = [...quickPick.buttons, ...options.buttons]; + } disposables.push( - quickPick, - quickPick.onDidTriggerButton((item) => { - if (item === QuickInputButtons.Back) { + quickPick.onDidTriggerButton((button) => { + if (button === QuickInputButtons.Back) { deferred.reject(QuickInputButtons.Back); quickPick.hide(); + } else if (options?.buttons?.includes(button)) { + deferred.reject({ item: quickPick.selectedItems, button }); + quickPick.hide(); } }), quickPick.onDidAccept(() => { @@ -138,3 +153,64 @@ export async function showQuickPickWithButtons( disposables.forEach((d) => d.dispose()); } } + +export async function showInputBoxWithButtons( + options?: InputBoxOptions & { showBackButton?: boolean }, +): Promise { + const inputBox: InputBox = window.createInputBox(); + const disposables: Disposable[] = [inputBox]; + const deferred = createDeferred(); + + inputBox.placeholder = options?.placeHolder; + inputBox.title = options?.title; + inputBox.value = options?.value ?? ''; + inputBox.ignoreFocusOut = options?.ignoreFocusOut ?? false; + inputBox.password = options?.password ?? false; + inputBox.prompt = options?.prompt; + + if (options?.valueSelection) { + inputBox.valueSelection = options?.valueSelection; + } + + if (options?.showBackButton) { + inputBox.buttons = [QuickInputButtons.Back]; + } + + disposables.push( + inputBox.onDidTriggerButton((button) => { + if (button === QuickInputButtons.Back) { + deferred.reject(QuickInputButtons.Back); + inputBox.hide(); + } + }), + inputBox.onDidAccept(() => { + if (!deferred.completed) { + deferred.resolve(inputBox.value); + inputBox.hide(); + } + }), + inputBox.onDidHide(() => { + if (!deferred.completed) { + deferred.resolve(undefined); + } + }), + inputBox.onDidChangeValue(async (value) => { + if (options?.validateInput) { + const validation = await options?.validateInput(value); + if (validation === null || validation === undefined) { + inputBox.validationMessage = undefined; + } else { + inputBox.validationMessage = validation; + } + } + }), + ); + + inputBox.show(); + + try { + return await deferred.promise; + } finally { + disposables.forEach((d) => d.dispose()); + } +} diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index d00ef02..8257763 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -27,7 +27,6 @@ import { setCondaForGlobal, setCondaForWorkspace, } from './condaUtils'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; @@ -60,7 +59,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { preferredPackageManagerId: string = 'ms-python.python:conda'; description: string; tooltip: string | MarkdownString; - iconPath: IconPath; + iconPath?: IconPath; public dispose() { this.disposablesMap.forEach((d) => d.dispose()); diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 7894e5a..11221ea 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -1,14 +1,4 @@ -import * as path from 'path'; -import { - Disposable, - Event, - EventEmitter, - LogOutputChannel, - MarkdownString, - ProgressLocation, - Uri, - window, -} from 'vscode'; +import { Disposable, Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, window } from 'vscode'; import { DidChangePackagesEventArgs, IconPath, diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 5fac042..b00454a 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -13,7 +13,7 @@ import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; import { LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; -import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; import { pickProject } from '../../common/pickers'; import { diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index df1ed97..5efb614 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -295,7 +295,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] if (isPipInstallableToml(toml)) { extras.push({ - displayName: 'Editable', + displayName: path.basename(tomlPath.fsPath), description: 'Install project as editable', group: 'Toml', args: ['-e', path.dirname(tomlPath.fsPath)], From e40ab842ab6d36c1410a4601a26fbe75d594bce7 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 21 Oct 2024 11:55:54 -0700 Subject: [PATCH 002/328] Improve flow of package install steps (#3) --- package.json | 10 +++--- src/common/localize.ts | 4 ++- src/common/pickers.ts | 65 +++++++++++++++++-------------------- src/features/envCommands.ts | 10 ++++-- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index 4cd05cb..c378e8e 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "vscode-python-envs", "displayName": "Python Environment Manager", "description": "Provides a unified python environment experience", - "version": "0.0.1", + "version": "0.0.0", "publisher": "ms-python", "engines": { - "vscode": "^1.93.0-20240910" + "vscode": "^1.93.0" }, "categories": [ "Other" @@ -13,13 +13,13 @@ "activationEvents": [ "onLanguage:python" ], - "homepage": "https://github.com/karthiknadig/vscode-python-envs", + "homepage": "https://github.com/microsoft/vscode-python-environments", "repository": { "type": "git", - "url": "https://github.com/karthiknadig/vscode-python-envs.git" + "url": "https://github.com/microsoft/vscode-python-environments.git" }, "bugs": { - "url": "https://github.com/karthiknadig/vscode-python-envs/issues" + "url": "https://github.com/microsoft/vscode-python-environments/issues" }, "extensionDependencies": [ "ms-python.python" diff --git a/src/common/localize.ts b/src/common/localize.ts index ce64431..de3a2ea 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -16,7 +16,9 @@ export namespace PackageManagement { export const selectPackagesToInstall = l10n.t('Select packages to install'); export const enterPackageNames = l10n.t('Enter package names'); export const commonPackages = l10n.t('Common packages'); - export const workspacePackages = l10n.t('Workspace packages'); + export const commonPackagesDescription = l10n.t('Search and Install common packages'); + export const workspaceDependencies = l10n.t('Workspace dependencies'); + export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); export const editArguments = l10n.t('Edit arguments'); diff --git a/src/common/pickers.ts b/src/common/pickers.ts index b70f2ec..816ff55 100644 --- a/src/common/pickers.ts +++ b/src/common/pickers.ts @@ -243,11 +243,11 @@ export const OPEN_BROWSER_BUTTON = { export const OPEN_EDITOR_BUTTON = { iconPath: new ThemeIcon('go-to-file'), - tooltip: Common.openInBrowser, + tooltip: Common.openInEditor, }; export const EDIT_ARGUMENTS_BUTTON = { - iconPath: new ThemeIcon('wrench'), + iconPath: new ThemeIcon('pencil'), tooltip: PackageManagement.editArguments, }; @@ -294,29 +294,24 @@ function installableToQuickPickItem(i: Installable): PackageQuickPickItem { }; } -async function getPackageType(packageManager: InternalPackageManager): Promise { - if (!packageManager.supportsGetInstallable) { - return PackageManagement.commonPackages; - } - +async function getPackageType(): Promise { const items: QuickPickItem[] = [ { - label: PackageManagement.enterPackageNames, + label: `$(folder) ${PackageManagement.workspaceDependencies}`, + description: PackageManagement.workspaceDependenciesDescription, alwaysShow: true, }, { - label: PackageManagement.workspacePackages, - alwaysShow: true, - }, - { - label: PackageManagement.commonPackages, + label: `$(search) ${PackageManagement.commonPackages}`, + description: PackageManagement.commonPackagesDescription, alwaysShow: true, }, ]; - const selected = await window.showQuickPick(items, { + const selected = (await showQuickPickWithButtons(items, { placeHolder: PackageManagement.selectPackagesToInstall, + showBackButton: true, ignoreFocusOut: true, - }); + })) as QuickPickItem; return selected?.label; } @@ -349,7 +344,7 @@ function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { if (workspaceInstallable.length > 0) { result.push({ - label: PackageManagement.workspacePackages, + label: PackageManagement.workspaceDependencies, kind: QuickPickItemKind.Separator, }); result.push(...workspaceInstallable.map(installableToQuickPickItem)); @@ -507,43 +502,41 @@ export async function getPackagesToInstall( packageManager: InternalPackageManager, environment: PythonEnvironment, ): Promise { - const packageType = await getPackageType(packageManager); + const packageType = packageManager.supportsGetInstallable + ? await getPackageType() + : PackageManagement.commonPackages; - if (!packageType) { - return; - } - - if (packageType === PackageManagement.enterPackageNames) { + if (packageType === PackageManagement.workspaceDependencies) { try { - const result = await enterPackageManually(); + const result = await getWorkspacePackages(packageManager, environment); return result; } catch (ex) { - if (ex === QuickInputButtons.Back) { + if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { return getPackagesToInstall(packageManager, environment); } + if (ex === QuickInputButtons.Back) { + throw ex; + } return undefined; } - } else if (packageType === PackageManagement.workspacePackages) { + } + + if (packageType === PackageManagement.commonPackages) { try { - const result = await getWorkspacePackages(packageManager, environment); + const result = await getCommonPackagesToInstall(); return result; } catch (ex) { - if (ex === QuickInputButtons.Back) { + if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { return getPackagesToInstall(packageManager, environment); } + if (ex === QuickInputButtons.Back) { + throw ex; + } return undefined; } } - try { - const result = await getCommonPackagesToInstall(); - return result; - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return getPackagesToInstall(packageManager, environment); - } - return undefined; - } + return undefined; } export async function getPackagesToUninstall(packages: Package[]): Promise { diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 927109c..79c2693 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,4 +1,4 @@ -import { TaskExecution, TaskRevealKind, Terminal, Uri, window } from 'vscode'; +import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, window } from 'vscode'; import { EnvironmentManagers, InternalPackageManager, @@ -129,7 +129,13 @@ export async function handlePackagesCommand( if (action === Common.install) { if (!packages || packages.length === 0) { - packages = await getPackagesToInstall(packageManager, environment); + try { + packages = await getPackagesToInstall(packageManager, environment); + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + return handlePackagesCommand(packageManager, environment, packages); + } + } } if (packages && packages.length > 0) { return packageManager.install(environment, packages, { upgrade: false }); From ad610b2f2a5da7e23fa783167c96c64f8ada0e80 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 21 Oct 2024 13:23:29 -0700 Subject: [PATCH 003/328] Clean up install flow and address rendering bug (#4) --- src/common/localize.ts | 4 ++-- src/common/pickers.ts | 6 ++++-- src/features/views/envManagersView.ts | 10 +++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index de3a2ea..ba2e692 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -15,9 +15,9 @@ export namespace Interpreter { export namespace PackageManagement { export const selectPackagesToInstall = l10n.t('Select packages to install'); export const enterPackageNames = l10n.t('Enter package names'); - export const commonPackages = l10n.t('Common packages'); + export const commonPackages = l10n.t('Search common packages'); export const commonPackagesDescription = l10n.t('Search and Install common packages'); - export const workspaceDependencies = l10n.t('Workspace dependencies'); + export const workspaceDependencies = l10n.t('Install workspace dependencies'); export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); diff --git a/src/common/pickers.ts b/src/common/pickers.ts index 816ff55..76d91bf 100644 --- a/src/common/pickers.ts +++ b/src/common/pickers.ts @@ -297,14 +297,16 @@ function installableToQuickPickItem(i: Installable): PackageQuickPickItem { async function getPackageType(): Promise { const items: QuickPickItem[] = [ { - label: `$(folder) ${PackageManagement.workspaceDependencies}`, + label: PackageManagement.workspaceDependencies, description: PackageManagement.workspaceDependenciesDescription, alwaysShow: true, + iconPath: new ThemeIcon('folder'), }, { - label: `$(search) ${PackageManagement.commonPackages}`, + label: PackageManagement.commonPackages, description: PackageManagement.commonPackagesDescription, alwaysShow: true, + iconPath: new ThemeIcon('search'), }, ]; const selected = (await showQuickPickWithButtons(items, { diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index 90112b5..0a58848 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -9,7 +9,7 @@ import { InternalEnvironmentManager, InternalPackageManager, } from '../../internal.api'; -import { traceError, traceVerbose } from '../../common/logging'; +import { traceError } from '../../common/logging'; import { EnvTreeItem, EnvManagerTreeItem, @@ -201,13 +201,9 @@ export class EnvManagerView implements TreeDataProvider, Disposable private onDidChangePackages(args: InternalDidChangePackagesEventArgs) { const pkgRoot = this._viewsPackageRoots.get(args.environment.envId.id); - if (!pkgRoot) { - traceVerbose(`Add Package Error: No environment view found for: ${args.environment.envId.id}`); - traceVerbose(`Environment views: ${Array.from(this._viewsEnvironments.keys()).join(', ')}`); - return; + if (pkgRoot) { + this.fireDataChanged(pkgRoot); } - - this.fireDataChanged(pkgRoot); } private onDidChangePackageManager(args: DidChangePackageManagerEventArgs) { From 91d64782d482aaca636d078b2dd6382760e54808 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 23 Oct 2024 11:22:14 -0700 Subject: [PATCH 004/328] Handle bulk setting edits (#7) --- files/common_packages.txt | 2902 ++++++++++++++++++++--- src/common/pickers.ts | 24 + src/extension.ts | 18 +- src/features/envCommands.ts | 56 +- src/features/settings/settingHelpers.ts | 333 ++- src/managers/sysPython/pipManager.ts | 16 +- src/managers/sysPython/venvManager.ts | 4 +- src/managers/sysPython/venvUtils.ts | 73 +- 8 files changed, 2897 insertions(+), 529 deletions(-) diff --git a/files/common_packages.txt b/files/common_packages.txt index 46de877..82d30a9 100644 --- a/files/common_packages.txt +++ b/files/common_packages.txt @@ -1,883 +1,3013 @@ +about-time +absl-py accelerate -accounts -actions +accesscontrol +accessible-pygments +acme +acquisition +acryl-datahub +acryl-datahub-airflow-plugin +adagio +adal addict -agent -agents -ai +adlfs +aenum +affine +agate +aio-pika aioboto3 aiobotocore +aiodns aiofiles aiogram +aiohappyeyeballs aiohttp +aiohttp-cors +aiohttp-retry +aioitertools aiokafka -aiomysql +aiomqtt +aiomultiprocess aioredis +aioresponses +aiormq +aiosignal aiosqlite -akshare +ajsonrpc +alabaster +albucore albumentations alembic -algorithms +algoliasearch +alive-progress +aliyun-python-sdk-core +aliyun-python-sdk-kms +allure-pytest +allure-python-commons altair -analysis -analytics -anndata +altgraph +amazon-ion +amqp +amqpstorm +analytics-python +aniso8601 +annotated-types +annoy +ansi2html ansible +ansible-compat +ansible-core +ansible-lint +ansicolors +ansiwrap anthropic +antlr4-python3-runtime +antlr4-tools +anyascii +anybadge anyio -apex -api -apiclient +anytree +apache-airflow +apache-airflow-providers-amazon +apache-airflow-providers-apache-spark +apache-airflow-providers-atlassian-jira +apache-airflow-providers-celery +apache-airflow-providers-cncf-kubernetes +apache-airflow-providers-common-compat +apache-airflow-providers-common-io +apache-airflow-providers-common-sql +apache-airflow-providers-databricks +apache-airflow-providers-datadog +apache-airflow-providers-dbt-cloud +apache-airflow-providers-docker +apache-airflow-providers-fab +apache-airflow-providers-ftp +apache-airflow-providers-google +apache-airflow-providers-http +apache-airflow-providers-imap +apache-airflow-providers-jdbc +apache-airflow-providers-microsoft-azure +apache-airflow-providers-microsoft-mssql +apache-airflow-providers-mongo +apache-airflow-providers-mysql +apache-airflow-providers-odbc +apache-airflow-providers-oracle +apache-airflow-providers-pagerduty +apache-airflow-providers-postgres +apache-airflow-providers-salesforce +apache-airflow-providers-sftp +apache-airflow-providers-slack +apache-airflow-providers-smtp +apache-airflow-providers-snowflake +apache-airflow-providers-sqlite +apache-airflow-providers-ssh +apache-airflow-providers-tableau +apache-beam +apache-sedona +apispec appdirs -AppKit -application -arcgis -args -arguments +appium-python-client +applicationinsights +appnope +apprise +apscheduler +apsw +arabic-reshaper +aresponses +argcomplete +argh +argon2-cffi +argon2-cffi-bindings +argparse +argparse-addons +arnparse +arpeggio +array-record arrow -art -ase +artifacts-keyring +arviz +asana +asciitree +asgi-correlation-id +asgi-lifespan asgiref +asn1crypto +asteroid-filterbanks +asteval +astor +astral +astroid +astronomer-cosmos astropy +astropy-iers-data +asttokens +astunparse +async-generator +async-lru +async-property +async-timeout +asyncio asyncpg -attr +asyncssh +asynctest +atlassian-python-api +atomicwrites +atomlite +atpublic +attrdict attrs -audio -auditlog -auth -authentication -autogen +audioread +auth0-python +authencoding +authlib +autobahn +autocommand +autofaker +autoflake +autograd +autograd-gamma +automat +autopage +autopep8 av -aws +avro +avro-gen +avro-gen3 +avro-python3 +awacs +awesomeversion +awkward +awkward-cpp +aws-cdk-asset-awscli-v1 +aws-cdk-asset-kubectl-v20 +aws-cdk-asset-node-proxy-agent-v6 +aws-cdk-aws-lambda-python-alpha +aws-cdk-cloud-assembly-schema +aws-cdk-integ-tests-alpha +aws-cdk-lib +aws-encryption-sdk +aws-lambda-builders +aws-lambda-powertools +aws-psycopg2 +aws-requests-auth +aws-sam-cli +aws-sam-translator +aws-secretsmanager-caching +aws-xray-sdk +awscli +awscliv2 +awscrt awswrangler azure -azureml +azure-ai-formrecognizer +azure-ai-ml +azure-appconfiguration +azure-applicationinsights +azure-batch +azure-cli +azure-cli-core +azure-cli-telemetry +azure-common +azure-core +azure-core-tracing-opentelemetry +azure-cosmos +azure-cosmosdb-nspkg +azure-cosmosdb-table +azure-data-tables +azure-datalake-store +azure-devops +azure-eventgrid +azure-eventhub +azure-functions +azure-graphrbac +azure-identity +azure-keyvault +azure-keyvault-administration +azure-keyvault-certificates +azure-keyvault-keys +azure-keyvault-secrets +azure-kusto-data +azure-kusto-ingest +azure-loganalytics +azure-mgmt +azure-mgmt-advisor +azure-mgmt-apimanagement +azure-mgmt-appconfiguration +azure-mgmt-appcontainers +azure-mgmt-applicationinsights +azure-mgmt-authorization +azure-mgmt-batch +azure-mgmt-batchai +azure-mgmt-billing +azure-mgmt-botservice +azure-mgmt-cdn +azure-mgmt-cognitiveservices +azure-mgmt-commerce +azure-mgmt-compute +azure-mgmt-consumption +azure-mgmt-containerinstance +azure-mgmt-containerregistry +azure-mgmt-containerservice +azure-mgmt-core +azure-mgmt-cosmosdb +azure-mgmt-databoxedge +azure-mgmt-datafactory +azure-mgmt-datalake-analytics +azure-mgmt-datalake-nspkg +azure-mgmt-datalake-store +azure-mgmt-datamigration +azure-mgmt-deploymentmanager +azure-mgmt-devspaces +azure-mgmt-devtestlabs +azure-mgmt-dns +azure-mgmt-eventgrid +azure-mgmt-eventhub +azure-mgmt-extendedlocation +azure-mgmt-hanaonazure +azure-mgmt-hdinsight +azure-mgmt-imagebuilder +azure-mgmt-iotcentral +azure-mgmt-iothub +azure-mgmt-iothubprovisioningservices +azure-mgmt-keyvault +azure-mgmt-kusto +azure-mgmt-loganalytics +azure-mgmt-logic +azure-mgmt-machinelearningcompute +azure-mgmt-managedservices +azure-mgmt-managementgroups +azure-mgmt-managementpartner +azure-mgmt-maps +azure-mgmt-marketplaceordering +azure-mgmt-media +azure-mgmt-monitor +azure-mgmt-msi +azure-mgmt-netapp +azure-mgmt-network +azure-mgmt-notificationhubs +azure-mgmt-nspkg +azure-mgmt-policyinsights +azure-mgmt-powerbiembedded +azure-mgmt-privatedns +azure-mgmt-rdbms +azure-mgmt-recoveryservices +azure-mgmt-recoveryservicesbackup +azure-mgmt-redhatopenshift +azure-mgmt-redis +azure-mgmt-relay +azure-mgmt-reservations +azure-mgmt-resource +azure-mgmt-resourcegraph +azure-mgmt-scheduler +azure-mgmt-search +azure-mgmt-security +azure-mgmt-servicebus +azure-mgmt-servicefabric +azure-mgmt-servicefabricmanagedclusters +azure-mgmt-servicelinker +azure-mgmt-signalr +azure-mgmt-sql +azure-mgmt-sqlvirtualmachine +azure-mgmt-storage +azure-mgmt-subscription +azure-mgmt-synapse +azure-mgmt-trafficmanager +azure-mgmt-web +azure-monitor-opentelemetry +azure-monitor-opentelemetry-exporter +azure-monitor-query +azure-multiapi-storage +azure-nspkg +azure-search-documents +azure-servicebus +azure-servicefabric +azure-servicemanagement-legacy +azure-storage +azure-storage-blob +azure-storage-common +azure-storage-file +azure-storage-file-datalake +azure-storage-file-share +azure-storage-nspkg +azure-storage-queue +azure-synapse-accesscontrol +azure-synapse-artifacts +azure-synapse-managedprivateendpoints +azure-synapse-spark +azureml-core +azureml-dataprep +azureml-dataprep-native +azureml-dataprep-rslex +azureml-dataset-runtime +azureml-mlflow +azureml-telemetry babel -backend +backcall backoff -backports -backtrader -barcode +backports-abc +backports-cached-property +backports-csv +backports-datetime-fromisoformat +backports-entry-points-selectable +backports-functools-lru-cache +backports-shutil-get-terminal-size +backports-tarfile +backports-tempfile +backports-weakref +backports-zoneinfo +bandit base58 -basicsr +bashlex +bazel-runfiles +bc-detect-secrets +bc-jsonpath-ng +bc-python-hcl2 bcrypt -beanie +beartype +beautifulsoup +beautifulsoup4 behave +bellows +betterproto +bidict billiard -binance +binaryornot +bio +biopython +biothings-client +bitarray bitsandbytes +bitstring +bitstruct black +blackduck bleach bleak +blendmodes +blessed +blessings blinker -blog -board +blis +blobfile +blosc2 +boa-str bokeh +boltons +boolean-py boto boto3 +boto3-stubs +boto3-stubs-lite +boto3-type-annotations botocore +botocore-stubs bottle -bpy +bottleneck +boxsdk +braceexpand +bracex branca +breathe +brotli bs4 bson -c -cache +btrees +build +bump2version +bumpversion +bytecode +bz2file +c7n +c7n-org +cachecontrol +cached-property +cachelib cachetools -caffe2 -callbacks -camera -cantools -captcha -carla +cachy +cairocffi +cairosvg +casadi +case-conversion +cassandra-driver +catalogue catboost +category-encoders +cattrs +cbor +cbor2 +cchardet ccxt +cdk-nag celery +cerberus +cerberus-python-client +certbot +certbot-dns-cloudflare certifi cffi +cfgv +cfile +cfn-flip +cfn-lint cftime -chainlit +chameleon channels +channels-redis chardet -chat -chatbot -chess +charset-normalizer +checkdigit +checkov +checksumdir +cheroot +cherrypy +chevron +chex +chispa +chroma-hnswlib chromadb -classes -clearml +cibuildwheel +cinemagoer +circuitbreaker +ciso8601 +ckzg +clang +clang-format +clarabel +clean-fid +cleanco +cleo click -clients -clip -cloudinary +click-default-group +click-didyoumean +click-help-colors +click-log +click-man +click-option-group +click-plugins +click-repl +click-spinner +clickclick +clickhouse-connect +clickhouse-driver +cliff +cligj +clikit +clipboard +cloud-sql-python-connector +cloudevents +cloudflare +cloudpathlib cloudpickle cloudscraper +cloudsplaining +cmaes +cmake +cmd2 +cmdstanpy +cmudict +cobble +codecov +codeowners +codespell +cog cohere +collections-extended colorama +colorcet +colorclass +colored coloredlogs +colorful colorlog -common -commons -company +colorzero +colour +comm +commentjson +commonmark comtypes conan -conf +concurrent-log-handler +confection config -configs -configuration -connection -connections -connectors +configargparse +configobj +configparser +configupdater +confluent-kafka connexion -constant -constants +constantly +construct constructs -control -controller -coremltools +contextlib2 +contextvars +contourpy +convertdate +cookiecutter +coolname +core-universal +coreapi +coreschema +corner +country-converter +courlan coverage +coveralls +cramjam +crashtest +crayons +crc32c +crccheck crcmod -credentials -crewai +credstash +crispy-bootstrap5 +cron-descriptor croniter +crypto cryptography -cs50 -cupy +cssselect +cssselect2 +cssutils +ctranslate2 +cuda-python +curl-cffi +curlify +cursor +custom-inherit customtkinter -cv +cvdupdate +cvxopt cvxpy -cvzone +cx-oracle cycler -Cython +cyclonedx-python-lib +cymem +cython +cytoolz dacite -dags +daff dagster -dao +dagster-aws +dagster-graphql +dagster-pipes +dagster-postgres +dagster-webserver +daphne +darkdetect dash -dashboard -dashscope +dash-bootstrap-components +dash-core-components +dash-html-components +dash-table dask -data +dask-expr databases +databend-driver +databend-py databricks +databricks-api +databricks-cli +databricks-connect +databricks-feature-store +databricks-pypi1 +databricks-pypi2 +databricks-sdk +databricks-sql-connector +dataclasses +dataclasses-json +datacompy datadog -dataloader -dataset +datadog-api-client +datadog-logger +datamodel-code-generator +dataproperty datasets +datasketch +datefinder +dateformat dateparser -db -ddddocr +datetime +dateutils +db-contrib-tool +db-dtypes +dbfread +dbl-tempo +dbt-adapters +dbt-bigquery +dbt-common +dbt-core +dbt-databricks +dbt-extractor +dbt-postgres +dbt-redshift +dbt-semantic-interfaces +dbt-snowflake +dbt-spark +dbus-fast +dbutils +ddsketch +ddt ddtrace -deap +debtcollector debugpy +decopatch decorator -decorators -decord -decouple deepdiff -deepface -deepspeed +deepmerge defusedxml delta +delta-spark deltalake -dependencies +dep-logic +dependency-injector +deprecated deprecation -dgl +descartes +detect-secrets +dict2xml +dictdiffer +dicttoxml +diff-cover +diff-match-patch diffusers dill +dirtyjson discord +discord-py diskcache +distlib +distribute distributed distro -dlib +dj-database-url +django +django-allauth +django-anymail +django-appconf +django-celery-beat +django-celery-results +django-compressor +django-cors-headers +django-countries +django-crispy-forms +django-csp +django-debug-toolbar +django-environ +django-extensions +django-filter +django-health-check +django-import-export +django-ipware +django-js-asset +django-model-utils +django-mptt +django-oauth-toolkit +django-otp +django-phonenumber-field +django-picklefield +django-redis +django-reversion +django-ses +django-silk +django-simple-history +django-storages +django-stubs +django-stubs-ext +django-taggit +django-timezone-field +django-waffle +djangorestframework +djangorestframework-simplejwt +djangorestframework-stubs +dm-tree +dnslib +dnspython docker +docker-compose +docker-pycreds +dockerfile-parse +dockerpty docopt +docstring-parser +documenttemplate docutils -docx -docx2pdf docx2txt -docxtpl -domain +dogpile-cache +dohq-artifactory +doit +domdf-python-tools +dominate dotenv -DrissionPage +dotmap +dparse +dpath +dpkt +drf-nested-routers +drf-spectacular +drf-yasg dropbox duckdb +dulwich +dunamai +durationpy +dvclive dynaconf +dynamodb-json easydict -easygui -easyocr +easyprocess +ebcdic +ec2-metadata ecdsa -ee +ecos +ecs-logging +edgegrid-python +editables +editdistance +editor +editorconfig einops +elastic-apm +elastic-transport elasticsearch -elevenlabs -emails +elasticsearch-dbapi +elasticsearch-dsl +elasticsearch7 +elementary-data +elementpath +elyra +email-validator +emcee emoji -enums -env -environment +enchant +enrich +entrypoints +enum-compat +enum34 +envier environs -envs -eval +envyaml +ephem +eradicate +et-xmlfile +eth-abi +eth-account +eth-hash +eth-keyfile +eth-keys +eth-rlp +eth-typing +eth-utils +etils +eval-type-backport evaluate -evaluation -event eventlet -examples +events +evergreen-py +evidently exceptiongroup -export -extensions -ezdxf +exchange-calendars +exchangelib +execnet +executing +executor +expandvars +expiringdict +extensionclass +extract-msg +extras +eyes-common +eyes-selenium +f90nml fabric -fairseq +face +facebook-business +facexlib +factory-boy +fairscale +faiss-cpu +fake-useragent +faker fakeredis falcon +farama-notifications fastapi +fastapi-cli +fastapi-utils +fastavro fastcluster +fastcore +fasteners +faster-whisper +fastjsonschema +fastparquet +fastprogress +fastrlock fasttext -features +fasttext-langdetect +fasttext-wheel +fcm-django feedparser -ffmpeg +ffmpeg-python +ffmpy +fido2 filelock -files filetype filterpy -filters +find-libpython +findpython +findspark fiona fire -fitz -FlagEmbedding +firebase-admin +fixedint +fixit +fixtures +flake8 +flake8-black +flake8-bugbear +flake8-builtins +flake8-comprehensions +flake8-docstrings +flake8-eradicate +flake8-import-order +flake8-isort +flake8-polyfill +flake8-print +flake8-pyproject +flake8-quotes +flaky +flaml flasgger +flashtext +flask +flask-admin +flask-appbuilder +flask-babel +flask-bcrypt +flask-caching +flask-compress +flask-cors +flask-httpauth +flask-jwt-extended +flask-limiter +flask-login +flask-mail +flask-marshmallow +flask-migrate +flask-oidc +flask-openid +flask-restful +flask-restx +flask-session +flask-socketio +flask-sqlalchemy +flask-swagger-ui +flask-talisman +flask-testing +flask-wtf +flatbuffers +flatdict +flatten-dict +flatten-json flax -flet +flexcache +flexparser +flit-core +flower +fluent-logger folium +fonttools +formencode +formic2 +formulaic fpdf +fpdf2 +fqdn +freetype-py freezegun -frontend +frictionless +frozendict +frozenlist +fs fsspec ftfy -function -functions +fugue +func-timeout +funcsigs +functions-framework +functools32 +funcy +furl +furo +fusepy future +future-fstrings +futures fuzzywuzzy fvcore -game +galvani +gast +gcloud-aio-auth +gcloud-aio-bigquery +gcloud-aio-storage +gcovr +gcs-oauth2-boto-plugin gcsfs gdown -genpy +gender-guesser gensim +genson +geoalchemy2 geocoder +geographiclib +geoip2 geojson +geomet geopandas geopy gevent -github -gitlab -globals -gnupg +gevent-websocket +geventhttpclient +ghapi +ghp-import +git-remote-codecommit +gitdb +gitdb2 +github-heatmap +github3-py +gitpython +giturlparse +glob2 +glom +gluonts +gmpy2 +gnureadline google +google-ads +google-ai-generativelanguage +google-analytics-admin +google-analytics-data +google-api-core +google-api-python-client +google-apitools +google-auth +google-auth-httplib2 +google-auth-oauthlib +google-cloud +google-cloud-access-context-manager +google-cloud-aiplatform +google-cloud-appengine-logging +google-cloud-audit-log +google-cloud-automl +google-cloud-batch +google-cloud-bigquery +google-cloud-bigquery-biglake +google-cloud-bigquery-datatransfer +google-cloud-bigquery-storage +google-cloud-bigtable +google-cloud-build +google-cloud-compute +google-cloud-container +google-cloud-core +google-cloud-datacatalog +google-cloud-dataflow-client +google-cloud-dataform +google-cloud-dataplex +google-cloud-dataproc +google-cloud-dataproc-metastore +google-cloud-datastore +google-cloud-discoveryengine +google-cloud-dlp +google-cloud-dns +google-cloud-error-reporting +google-cloud-firestore +google-cloud-kms +google-cloud-language +google-cloud-logging +google-cloud-memcache +google-cloud-monitoring +google-cloud-orchestration-airflow +google-cloud-org-policy +google-cloud-os-config +google-cloud-os-login +google-cloud-pipeline-components +google-cloud-pubsub +google-cloud-pubsublite +google-cloud-recommendations-ai +google-cloud-redis +google-cloud-resource-manager +google-cloud-run +google-cloud-secret-manager +google-cloud-spanner +google-cloud-speech +google-cloud-storage +google-cloud-storage-transfer +google-cloud-tasks +google-cloud-texttospeech +google-cloud-trace +google-cloud-translate +google-cloud-videointelligence +google-cloud-vision +google-cloud-workflows +google-crc32c +google-generativeai +google-pasta +google-re2 +google-reauth +google-resumable-media +googleapis-common-protos googlemaps -googletrans +gotrue gpiozero -GPUtil +gprof2dot +gprofiler-official +gpustat +gpxpy gql gradio -graph +gradio-client +grapheme graphene -graphlib -graphql +graphframes +graphlib-backport +graphql-core +graphql-relay graphviz +graypy +great-expectations greenlet -groq -grpc +gremlinpython +griffe +grimp +grpc-google-iam-v1 +grpc-interceptor +grpc-stubs +grpcio +grpcio-gcp +grpcio-health-checking +grpcio-reflection +grpcio-status +grpcio-tools +grpclib +gs-quant gspread -guardian +gspread-dataframe +gsutil +gtts gunicorn -gurobipy gym +gym-notices gymnasium +h11 +h2 +h3 +h5netcdf h5py -handler +halo +hashids +hatch +hatch-fancy-pypi-readme +hatch-requirements-txt +hatch-vcs +hatchling haversine -haystack -hdbscan -helper -helper_functions -helpers +hdbcli +hdfs +healpy +hexbytes +hijri-converter +hiredis +hishel +hjson +hmmlearn +hnswlib holidays -home +hologram +honeybee-core +honeybee-schema +honeybee-standards +hpack +hstspreload +html-testrunner +html-text html2text html5lib +htmldate +htmldocx +htmlmin +httmock httpcore httplib2 +httpretty +httptools httpx +httpx-sse +hubspot-api-client +huggingface-hub +humanfriendly humanize +hupper hvac -hvplot +hydra-core +hypercorn +hyperframe +hyperlink hyperopt +hyperpyyaml hypothesis +ibm-cloud-sdk-core +ibm-db +ibm-platform-services +icalendar +icdiff icecream +identify idna +idna-ssl +ifaddr +igraph ijson -image +imagecodecs +imagehash imageio -img2pdf +imageio-ffmpeg +imagesize +imapclient +imath +imbalanced-learn +imblearn +imdbpy +immutabledict +immutables +import-linter +importlib +importlib-metadata +importlib-resources +impyla imutils -inference +incremental +inexactsearch +inflate64 inflect inflection influxdb -infrastructure +influxdb-client +iniconfig +inject injector inquirer -insightface -instaloader -instructor -InstructorEmbedding -interfaces -inventory +inquirerpy +insight-cli +install-jdk +installer +intelhex +interegular +interface-meta +intervaltree invoke +iopath +ipaddress ipdb ipykernel +ipython +ipython-genutils ipywidgets +isbnlib +iso3166 +iso8601 isodate +isoduration +isort +isoweek itemadapter +itemloaders +iterative-telemetry itsdangerous +itypes +j2cli +jaconv +janus +jaraco-classes +jaraco-collections +jaraco-context +jaraco-functools +jaraco-text +java-access-bridge-wrapper +java-manifest +javaproperties jax +jaxlib jaxtyping +jaydebeapi +jdcal +jedi +jeepney +jellyfish +jenkinsapi +jetblack-iso8601 jieba +jinja2 +jinja2-humanize-extension +jinja2-pluralize +jinja2-simple-tags +jinja2-time +jinjasql jira +jiter +jiwer jmespath joblib -jose +josepy +joserfc +jplephem +jproperties +jpype1 +jq +js2py +jsbeautifier +jschema-to-python jsii +jsmin +json-delta +json-log-formatter +json-logging +json-merge-patch +json2html json5 -jsonfield +jsonargparse +jsonconversion +jsondiff jsonlines +jsonmerge +jsonpatch +jsonpath-ng +jsonpath-python +jsonpath-rw jsonpickle +jsonpointer +jsonref +jsons jsonschema +jsonschema-path +jsonschema-spec +jsonschema-specifications +jstyleson +junit-xml +junitparser +jupyter +jupyter-client +jupyter-console +jupyter-core +jupyter-events +jupyter-lsp +jupyter-packaging +jupyter-server +jupyter-server-fileid +jupyter-server-terminals +jupyter-server-ydoc +jupyter-ydoc +jupyterlab +jupyterlab-pygments +jupyterlab-server +jupyterlab-widgets +jupytext +justext +jwcrypto jwt -kafka +kafka-python +kaitaistruct +kaleido +kazoo +kconfiglib keras -keyboard -keycloak +keras-applications +keras-preprocessing keyring +keyrings-alt +keyrings-google-artifactregistry-auth +keystoneauth1 kfp -kivymd +kfp-pipeline-spec +kfp-server-api +kivy +kiwisolver +knack +koalas kombu +korean-lunar-calendar kornia +kornia-rs kubernetes +kubernetes-asyncio +ladybug-core +ladybug-display +ladybug-geometry +ladybug-geometry-polyskel +lagom langchain +langchain-anthropic +langchain-aws +langchain-community +langchain-core +langchain-experimental +langchain-google-vertexai +langchain-openai +langchain-text-splitters +langcodes langdetect -langfuse langgraph -langserve langsmith -launch -layers -layout -ldap +language-data +language-tags +language-tool-python +lark +lark-parser +lasio +latexcodec +launchdarkly-server-sdk +lazy-loader +lazy-object-proxy ldap3 -ldm -Levenshtein -lib +leather +levenshtein +libclang +libcst +libretranslatepy librosa -libs +libsass +license-expression +lifelines lightgbm lightning +lightning-utilities +limits +line-profiler +linecache2 +linkify-it-py +lit litellm -llm +livereload +livy +lizard +llama-cloud +llama-index +llama-index-agent-openai +llama-index-cli +llama-index-core +llama-index-embeddings-openai +llama-index-indices-managed-llama-cloud +llama-index-legacy +llama-index-llms-openai +llama-index-multi-modal-llms-openai +llama-index-program-openai +llama-index-question-gen-openai +llama-index-readers-file +llama-index-readers-llama-parse +llama-parse +llvmlite +lm-format-enforcer lmdb lmfit -loader +locket +lockfile locust -logger -logic -login +log-symbols +logbook +logging-azure-rest loguru -loss +logz +logzero +looker-sdk +looseversion lpips +lru-dict +lunarcalendar +lunardate lxml -ma +lxml-html-clean +lz4 +macholib +magicattr +makefun +mako +mammoth +mando mangum -mariadb +mapbox-earcut +marisa-trie +markdown +markdown-it-py markdown2 markdownify +markupsafe marshmallow -mat -mathutils +marshmallow-dataclass +marshmallow-enum +marshmallow-oneofschema +marshmallow-sqlalchemy +mashumaro matplotlib -maya +matplotlib-inline +maturin +maxminddb +mbstrdecoder +mccabe +mchammer +mdit-py-plugins +mdurl +mdx-truly-sane-lists +mecab-python3 mediapipe -messages -MetaTrader5 -metrics -middleware +megatron-core +memoization +memory-profiler +memray +mercantile +mergedeep +meson +meson-python +methodtools +mf2py +microsoft-kiota-abstractions +microsoft-kiota-authentication-azure +microsoft-kiota-http +microsoft-kiota-serialization-json +microsoft-kiota-serialization-text +mimesis +minidump +minimal-snowplow-tracker minio -mistralai -mkl +mistune +mixpanel +mizani +mkdocs +mkdocs-autorefs +mkdocs-get-deps +mkdocs-material +mkdocs-material-extensions +mkdocstrings +mkdocstrings-python +ml-dtypes +mleap mlflow +mlflow-skinny +mlserver +mltable mlxtend -mmcv -mmdet -mmdet3d -mmengine -mmseg -mne +mmcif +mmcif-pdbx +mmh3 mock -models -modelscope -monai +mockito +model-bakery +modin +molecule mongoengine -monitoring +mongomock +monotonic +more-itertools +moreorless +morse3 moto motor -mouse +mouseinfo moviepy -mpi4py -mplcursors -mplfinance mpmath msal +msal-extensions msgpack +msgpack-numpy +msgpack-python +msgraph-core +msgraph-sdk msgspec +msoffcrypto-tool msrest +msrestazure mss -mujoco +multi-key-dict multidict +multimapping +multimethod multipart +multipledispatch multiprocess multitasking +multivolumefile munch -mupdf +munkres +murmurhash mutagen +mxnet +mygene +mypy +mypy-boto3-apigateway +mypy-boto3-appconfig +mypy-boto3-appflow +mypy-boto3-athena +mypy-boto3-cloudformation +mypy-boto3-dataexchange +mypy-boto3-dynamodb +mypy-boto3-ec2 +mypy-boto3-ecr +mypy-boto3-events +mypy-boto3-glue +mypy-boto3-iam +mypy-boto3-kinesis +mypy-boto3-lambda +mypy-boto3-rds +mypy-boto3-redshift-data +mypy-boto3-s3 +mypy-boto3-schemas +mypy-boto3-secretsmanager +mypy-boto3-signer +mypy-boto3-sqs +mypy-boto3-ssm +mypy-boto3-stepfunctions +mypy-boto3-sts +mypy-boto3-xray +mypy-extensions +mypy-protobuf mysql +mysql-connector +mysql-connector-python +mysqlclient +myst-parser +naked +nameparser +namex +nanoid +narwhals natsort +natto-py +nbclassic +nbclient +nbconvert nbformat +nbsphinx +ndg-httpsclient +ndindex +ndjson neo4j +nest-asyncio netaddr -netCDF4 +netcdf4 netifaces -netmiko -nets -networks +netsuitesdk networkx -newspaper +newrelic +newrelic-telemetry-sdk +nh3 nibabel -nicegui ninja nltk -notification -notifications -nu +node-semver +nodeenv +nose +nose2 +notebook +notebook-shim +notifiers +notion-client +nox +nptyping +ntlm-auth +ntplib +nulltype num2words numba +numcodecs +numdifftools +numexpr numpy -numpypy -o +numpy-financial +numpy-quaternion +numpydoc +nvidia-cublas-cu11 +nvidia-cublas-cu12 +nvidia-cuda-cupti-cu11 +nvidia-cuda-cupti-cu12 +nvidia-cuda-nvrtc-cu11 +nvidia-cuda-nvrtc-cu12 +nvidia-cuda-runtime-cu11 +nvidia-cuda-runtime-cu12 +nvidia-cudnn-cu11 +nvidia-cudnn-cu12 +nvidia-cufft-cu11 +nvidia-cufft-cu12 +nvidia-curand-cu11 +nvidia-curand-cu12 +nvidia-cusolver-cu11 +nvidia-cusolver-cu12 +nvidia-cusparse-cu11 +nvidia-cusparse-cu12 +nvidia-ml-py +nvidia-nccl-cu11 +nvidia-nccl-cu12 +nvidia-nvjitlink-cu12 +nvidia-nvtx-cu11 +nvidia-nvtx-cu12 +o365 oauth2client oauthlib +objsize oci -office365 -ollama +odfpy +office365-rest-python-client +okta +oldest-supported-numpy +olefile omegaconf onnx +onnxconverter-common onnxruntime -onnxsim +onnxruntime-gpu +open-clip-torch open3d openai +openapi-schema-pydantic +openapi-schema-validator +openapi-spec-validator opencensus +opencensus-context +opencensus-ext-azure +opencensus-ext-logging +opencv-contrib-python +opencv-contrib-python-headless +opencv-python +opencv-python-headless +openinference-instrumentation +openinference-semantic-conventions +openlineage-airflow +openlineage-integration-common +openlineage-python +openlineage-sql openpyxl +opensearch-py +openstacksdk +opentelemetry-api +opentelemetry-distro +opentelemetry-exporter-gcp-trace +opentelemetry-exporter-otlp +opentelemetry-exporter-otlp-proto-common +opentelemetry-exporter-otlp-proto-grpc +opentelemetry-exporter-otlp-proto-http +opentelemetry-instrumentation +opentelemetry-instrumentation-aiohttp-client +opentelemetry-instrumentation-asgi +opentelemetry-instrumentation-aws-lambda +opentelemetry-instrumentation-botocore +opentelemetry-instrumentation-dbapi +opentelemetry-instrumentation-django +opentelemetry-instrumentation-fastapi +opentelemetry-instrumentation-flask +opentelemetry-instrumentation-grpc +opentelemetry-instrumentation-httpx +opentelemetry-instrumentation-jinja2 +opentelemetry-instrumentation-logging +opentelemetry-instrumentation-psycopg2 +opentelemetry-instrumentation-redis +opentelemetry-instrumentation-requests +opentelemetry-instrumentation-sqlalchemy +opentelemetry-instrumentation-sqlite3 +opentelemetry-instrumentation-urllib +opentelemetry-instrumentation-urllib3 +opentelemetry-instrumentation-wsgi +opentelemetry-propagator-aws-xray +opentelemetry-propagator-b3 +opentelemetry-proto +opentelemetry-resource-detector-azure +opentelemetry-resourcedetector-gcp +opentelemetry-sdk +opentelemetry-sdk-extension-aws +opentelemetry-semantic-conventions +opentelemetry-util-http +opentracing +openturns openvino -operators +openvino-telemetry +openxlab +opsgenie-sdk +opt-einsum optax optimum -options +optree optuna oracledb -order +orbax-checkpoint +ordered-set +orderedmultidict +orderly-set orjson ortools -osmnx +os-service-types +oscrypto +oslo-config +oslo-i18n +oslo-serialization +oslo-utils +osmium +osqp oss2 +outcome +outlines overrides -p -pa -packages +oyaml +p4python +packageurl-python packaging -paddle paddleocr -pafy -pages -panda +paginate +paho-mqtt +palettable +pamqp pandas +pandas-gbq +pandas-stubs pandasql pandera +pandocfilters panel +pantab +papermill +param parameterized -parameters paramiko -params parse +parse-type +parsedatetime parsel +parsimonious +parsley +parso +partd +parver passlib +paste +pastedeploy +pastel +patch-ng +patchelf path +path-dict +pathable +pathlib +pathlib-abc +pathlib-mate pathlib2 +pathos pathspec -payment -payments -pdf2docx +pathtools +pathvalidate +pathy +patool +patsy +pbr +pbs-installer +pdb2pqr pdf2image pdfkit -pdfminer +pdfminer-six pdfplumber +pdm +pdpyras peewee +pefile peft pendulum +pentapy +pep517 +pep8 +pep8-naming +peppercorn +persistence +persistent +pex pexpect +pfzy pg8000 +pgpy pgvector +phik phonenumbers -picamera2 +phonenumberslite +pickleshare piexif pika pikepdf -PIL -pinecone -ping3 +pillow +pillow-avif-plugin +pillow-heif +pinecone-client +pint pip -pipeline -pipelines +pip-api +pip-requirements-parser +pip-tools +pipdeptree +pipelinewise-singer-python +pipenv +pipreqs +pipx +pkce +pkgconfig +pkginfo +pkgutil-resolve-name +plac +plaster +plaster-pastedeploy platformdirs -player -playsound playwright -plot plotly +plotnine pluggy -plyer -plyfile +pluginbase +plumbum +ply pmdarima -pocketsphinx +poetry +poetry-core +poetry-dynamic-versioning +poetry-plugin-export +poetry-plugin-pypi-mirror polars -praw +polib +policy-sentry +polling +polling2 +polyline +pony +pooch +port-for +portalocker +portend +portpicker +posthog +pox +ppft +pprintpp +prance +pre-commit +pre-commit-hooks prefect -preprocess -preprocessing +prefect-aws +prefect-gcp +premailer +preshed +presto-python-client +pretend +pretty-html-table prettytable -processing -processor -product -products +primepy +priority +prisma +prison +probableparsing +proglog progress -progressbar -projects -prompt +progressbar2 +prometheus-client +prometheus-fastapi-instrumentator +prometheus-flask-exporter +promise +prompt-toolkit +pronouncing +property-manager prophet +propka +prospector +protego +proto-plus +protobuf +protobuf3-to-dict psutil psycopg +psycopg-binary +psycopg-pool psycopg2 +psycopg2-binary +ptpython +ptyprocess publication +publicsuffix2 +publish-event-sns +pulp +pulsar-client pulumi +pure-eval +pure-sasl +pusher +pvlib py +py-cpuinfo +py-models-parser +py-partiql-parser +py-serializable +py-spy py4j py7zr +pyaes +pyahocorasick +pyairports +pyairtable +pyaml +pyannote-audio +pyannote-core +pyannote-database +pyannote-metrics +pyannote-pipeline +pyapacheatlas pyarrow -pybullet +pyarrow-hotfix +pyasn1 +pyasn1-modules +pyathena +pyautogui +pyawscron +pybase64 +pybcj +pybind11 +pybloom-live +pybtex +pybytebuffer +pycairo +pycares +pycep-parser +pyclipper +pyclothoids pycocotools +pycodestyle +pycomposefile pycountry +pycparser +pycrypto +pycryptodome +pycryptodomex pycurl pydantic +pydantic-core +pydantic-extra-types +pydantic-openapi-helper +pydantic-settings pydash +pydata-google-auth +pydata-sphinx-theme +pydeck +pydeequ +pydevd pydicom +pydispatcher +pydocstyle +pydot +pydriller +pydruid pydub -pyecharts +pydyf +pyee +pyelftools +pyerfa +pyfakefs pyfiglet +pyflakes +pyformance pygame +pygeohash +pygetwindow +pygit2 +pygithub pyglet +pygments +pygobject pygsheets -pyjokes -pymavlink +pygtrie +pyhamcrest +pyhanko +pyhanko-certvalidator +pyhcl +pyhive +pyhocon +pyhumps +pyiceberg +pyinstaller +pyinstaller-hooks-contrib +pyinstrument +pyjarowinkler +pyjsparser +pyjwt +pykakasi +pykwalify +pylev +pylint +pylint-django +pylint-plugin-utils +pylru +pyluach +pymatting +pymdown-extensions +pymeeus +pymemcache pymilvus -pymodbus +pyminizip +pymisp pymongo +pymongo-auth-aws +pympler +pymsgbox pymssql pymsteams +pymupdf +pymupdfb +pymysql +pynacl pynamodb -pynput +pynetbox +pynndescent +pynput-robocorp-fork +pynvim pynvml +pyod pyodbc pyogrio +pyopengl +pyopenssl +pyorc pyotp pypandoc pyparsing pypdf -PyPDF2 +pypdf2 +pypdfium2 pyperclip +pyphen +pypika pypinyin +pypiwin32 +pypng pyppeteer +pyppmd pyproj -PyQt5 -PyQt6 -pyqtgraph +pyproject-api +pyproject-hooks +pyproject-metadata +pypyp +pyqt5 +pyqt5-qt5 +pyqt5-sip +pyqt6 +pyqt6-qt6 +pyqt6-sip pyquaternion -pyrealsense2 -pysam +pyquery +pyramid +pyrate-limiter +pyreadline3 +pyrect +pyrfc3339 +pyright +pyroaring +pyrsistent +pyrtf3 +pysaml2 +pysbd +pyscaffold +pyscreeze +pyserial +pyserial-asyncio pysftp -pyshark -PySide2 -PySide6 -PySimpleGUI +pyshp +pyside6 +pyside6-addons +pyside6-essentials +pysmb +pysmi +pysnmp +pysocks pyspark -pystray -pystyle +pyspark-dist-explore +pyspellchecker +pyspnego +pystache +pystan +pyston +pyston-autoload +pytablewriter +pytd +pytelegrambotapi pytesseract pytest -pytorch3d -pyttsx3 +pytest-aiohttp +pytest-alembic +pytest-ansible +pytest-assume +pytest-asyncio +pytest-azurepipelines +pytest-base-url +pytest-bdd +pytest-benchmark +pytest-check +pytest-cov +pytest-custom-exit-code +pytest-dependency +pytest-django +pytest-dotenv +pytest-env +pytest-flask +pytest-forked +pytest-freezegun +pytest-html +pytest-httpserver +pytest-httpx +pytest-icdiff +pytest-instafail +pytest-json-report +pytest-localserver +pytest-messenger +pytest-metadata +pytest-mock +pytest-mypy +pytest-order +pytest-ordering +pytest-parallel +pytest-playwright +pytest-random-order +pytest-randomly +pytest-repeat +pytest-rerunfailures +pytest-runner +pytest-socket +pytest-split +pytest-subtests +pytest-sugar +pytest-timeout +pytest-xdist +python-arango +python-bidi +python-box +python-can +python-certifi-win32 +python-consul +python-crfsuite +python-crontab +python-daemon +python-dateutil +python-decouple +python-docx +python-dotenv +python-editor +python-engineio +python-gettext +python-gitlab +python-gnupg +python-hcl2 +python-http-client +python-igraph +python-ipware +python-iso639 +python-jenkins +python-jose +python-json-logger +python-keycloak +python-keystoneclient +python-ldap +python-levenshtein +python-logging-loki +python-lsp-jsonrpc +python-magic +python-memcached +python-miio +python-multipart +python-nvd3 +python-on-whales +python-pam +python-pptx +python-rapidjson +python-slugify +python-snappy +python-socketio +python-stdnum +python-string-utils +python-telegram-bot +python-ulid +python-utils +python-xlib +python3-logstash +python3-openid +python3-saml +pythonnet +pythran-openblas +pytimeparse +pytimeparse2 +pytoolconfig +pytorch-lightning +pytorch-metric-learning pytube -pytubefix +pytweening pytz +pytz-deprecation-shim +pytzdata +pyu2f +pyudev +pyunormalize +pyusb +pyvinecopulib +pyvirtualdisplay pyvis -pyvista -pywhatkit +pyvisa +pyviz-comms +pyvmomi +pywavelets +pywin32 +pywin32-ctypes pywinauto -pyzbar +pywinpty +pywinrm +pyxdg +pyxlsb +pyyaml +pyyaml-env-tag +pyzipper +pyzmq +pyzstd +qdldl +qdrant-client qiskit qrcode -queries -query -rag -ragas +qtconsole +qtpy +quantlib +quart +qudida +querystring-parser +questionary +queuelib +quinn +radon +random-password-generator +rangehttpserver +rapidfuzz rasterio +ratelim ratelimit +ratelimiter +raven ray -razorpay +rcssmin rdflib rdkit -re2 +reactivex +readchar +readme-renderer +readthedocs-sphinx-ext +realtime +recommonmark +recordlinkage +red-discordbot redis +redis-py-cluster +redshift-connector +referencing regex +regress rembg -replicate reportlab -reports +repoze-lru requests +requests-auth-aws-sigv4 +requests-aws-sign +requests-aws4auth +requests-cache +requests-file +requests-futures +requests-html +requests-mock +requests-ntlm +requests-oauthlib +requests-pkcs12 +requests-sigv4 +requests-toolbelt +requests-unixsocket +requestsexceptions +requirements-parser +resampy +resize-right +resolvelib responses +respx +restrictedpython +result retry +retry-decorator +retry2 retrying -reversion +rfc3339 +rfc3339-validator +rfc3986 +rfc3986-validator +rfc3987 rich -rioxarray -rospkg -routers +rich-argparse +rich-click +riot +rjsmin +rlp +rmsd +robocorp-storage +robotframework +robotframework-pythonlibcore +robotframework-requests +robotframework-seleniumlibrary +robotframework-seleniumtestability +rollbar +roman +rope +rouge-score +routes +rpaframework +rpaframework-core +rpaframework-pdf +rpds-py +rply +rpyc rq rsa -run +rstr +rtree +ruamel-yaml +ruamel-yaml-clib +ruff +runs +ruptures +rustworkx +ruyaml +rx +s3cmd s3fs +s3path +s3transfer +sacrebleu +sacremoses safetensors +safety +safety-schemas sagemaker -sam2 +sagemaker-core +sagemaker-mlflow +salesforce-bulk +sampleproject sanic -scanpy +sanic-routing +sarif-om +sasl +scandir scapy schedule -scheduler schema -schemas +schematics +schemdraw +scikit-build +scikit-build-core +scikit-image +scikit-learn +scikit-optimize scipy +scons scp -screeninfo -script -scripts +scramp +scrapy +scrypt +scs seaborn -secret -security +secretstorage +segment-analytics-python +segment-anything selenium +selenium-wire seleniumbase +semantic-version +semgrep semver +send2trash sendgrid +sentence-transformers sentencepiece +sentinels +sentry-sdk +seqio-nightly serial -serpapi -service -services +service-identity setproctitle -sets setuptools +setuptools-git +setuptools-git-versioning +setuptools-rust +setuptools-scm +setuptools-scm-git-archive +sgmllib3k +sgp4 +sgqlc +sh shap shapely -shared +shareplum +sharepy +shellescape +shellingham shiboken6 shortuuid -SimpleITK +shtab +shyaml +signalfx +signxml +silpa-common +simple-ddl-parser +simple-parsing +simple-salesforce +simple-term-menu +simple-websocket +simpleeval +simplegeneric simplejson -simulation -sip +simpy +singer-python +singer-sdk +singledispatch +singleton-decorator six +skl2onnx sklearn -slack -slowapi -smbus +sktime +skyfield +slack-bolt +slack-sdk +slackclient +slacker +slicer +slotted +smart-open +smartsheet-python-sdk +smbprotocol +smdebug-rulesconfig +smmap +smmap2 sniffio +snowballstemmer snowflake -socketio -solver +snowflake-connector-python +snowflake-core +snowflake-legacy +snowflake-snowpark-python +snowflake-sqlalchemy +snuggs +social-auth-app-django +social-auth-core +socksio +soda-core +soda-core-spark +soda-core-spark-df +sodapy sortedcontainers sounddevice +soundex soundfile -source +soupsieve +soxr spacy -spotipy -sql +spacy-legacy +spacy-loggers +spacy-transformers +spacy-wordnet +spandrel +spark-nlp +spark-sklearn +sparkorm +sparqlwrapper +spdx-tools +speechbrain +speechrecognition +spellchecker +sphinx +sphinx-argparse +sphinx-autobuild +sphinx-autodoc-typehints +sphinx-basic-ng +sphinx-book-theme +sphinx-copybutton +sphinx-design +sphinx-rtd-theme +sphinx-tabs +sphinxcontrib-applehelp +sphinxcontrib-bibtex +sphinxcontrib-devhelp +sphinxcontrib-htmlhelp +sphinxcontrib-jquery +sphinxcontrib-jsmath +sphinxcontrib-mermaid +sphinxcontrib-qthelp +sphinxcontrib-serializinghtml +sphinxcontrib-websupport +spindry +spinners +splunk-handler +splunk-sdk +spotinst-agent +sql-metadata +sqlalchemy +sqlalchemy-bigquery +sqlalchemy-jsonfield +sqlalchemy-migrate +sqlalchemy-redshift +sqlalchemy-spanner +sqlalchemy-utils +sqlalchemy2-stubs +sqlfluff +sqlfluff-templater-dbt sqlglot +sqlglotrs +sqlite-utils +sqlitedict +sqllineage sqlmodel +sqlparams sqlparse -src -srt +srsly +sse-starlette +sseclient-py +sshpubkeys sshtunnel +stack-data +stanio +starkbank-ecdsa starlette -state -stats +starlette-exporter +statsd +statsforecast statsmodels -storage -store +std-uritemplate +stdlib-list +stdlibs +stepfunctions +stevedore +stk +stko +stomp-py +stone +strawberry-graphql +streamerate streamlit +strenum +strict-rfc3339 +strictyaml +stringcase +strip-hints stripe +striprtf structlog -suds +subprocess-tee +subprocess32 +sudachidict-core +sudachipy +suds-community +suds-jurko +suds-py3 supabase +supafunc supervision -support +supervisor +svglib +svgwrite +swagger-spec-validator +swagger-ui-bundle +swebench +swifter +symengine sympy -ta +table-meta +tableau-api-lib +tableauhyperapi +tableauserverclient +tabledata tables tablib -tabula tabulate -task -tasks -telebot -telegram -templates +tangled-up-in-unicode +tb-nightly +tbats +tblib +tcolorpy +tdqm +tecton +tempita +tempora temporalio tenacity tensorboard -tensorboardX +tensorboard-data-server +tensorboard-plugin-wit +tensorboardx tensorflow -tensorflowjs -tensorrt +tensorflow-addons +tensorflow-cpu +tensorflow-datasets +tensorflow-estimator +tensorflow-hub +tensorflow-intel +tensorflow-io +tensorflow-io-gcs-filesystem +tensorflow-metadata +tensorflow-model-optimization +tensorflow-probability +tensorflow-serving-api +tensorflow-text +tensorflowonspark +tensorstore +teradatasql +teradatasqlalchemy termcolor +terminado +terminaltables +testcontainers +testfixtures +testpath +testtools +text-unidecode textblob +textdistance +textparser +texttable +textual +textwrap3 +tf-keras +tfx-bsl thefuzz +thinc thop -thread threadpoolctl +thrift +thrift-sasl +throttlex tifffile tiktoken +time-machine +timeout-decorator timezonefinder timm +tink +tinycss2 tinydb -tkcalendar -tkinterdnd2 +tippo +tk +tld tldextract +tlparse +tokenize-rt tokenizers +tomesd toml tomli -tool -tools +tomli-w +tomlkit toolz +toposort torch +torch-audiomentations +torch-model-archiver +torch-pitch-shift torchaudio -torchinfo +torchdiffeq torchmetrics -torchsummary +torchsde +torchtext torchvision tornado -tortoise +tox tqdm -tracker -train -trainer +traceback2 +trafilatura +trailrunner traitlets -transform +traittypes +trampoline +transaction transformers -transforms -transforms3d +transitions translate +translationstring +tree-sitter +tree-sitter-python +treelib +triad trimesh trino trio +trio-websocket triton +tritonclient trl -ttkbootstrap -ttkthemes -TTS -tushare +troposphere +trove-classifiers +truststore +tsx tweepy twilio +twine +twisted +txaio +typed-ast +typedload typeguard +typeid-python +typepy typer +types-aiobotocore +types-aiobotocore-s3 +types-awscrt +types-beautifulsoup4 +types-cachetools +types-cffi +types-colorama +types-cryptography +types-dataclasses +types-decorator +types-deprecated +types-docutils +types-html5lib +types-jinja2 +types-jsonschema +types-markdown +types-markupsafe +types-mock +types-paramiko +types-pillow +types-protobuf +types-psutil +types-psycopg2 +types-pygments +types-pyopenssl +types-pyserial +types-python-dateutil +types-pytz +types-pyyaml +types-redis +types-requests +types-retry +types-s3transfer +types-setuptools +types-simplejson +types-six +types-tabulate +types-toml +types-ujson +types-urllib3 +typing +typing-extensions +typing-inspect +typing-utils +typish tyro +tzdata +tzfpy tzlocal +ua-parser +uamqp +uc-micro-py +ufmt +uhashring ujson -ulid ultralytics -umap -unsloth +ultralytics-thop +umap-learn +uncertainties +undetected-chromedriver +unearth +unicodecsv +unidecode +unidiff +unittest-xml-reporting +unittest2 +universal-pathlib unstructured +unstructured-client +update-checker +uplink +uproot +uptime-kuma-api +uri-template uritemplate +uritools +url-normalize urllib3 -utils -utime -utm +urllib3-secure-extra +urwid +usaddress +user-agents +userpath +usort +utilsforecast +uuid +uuid6 +uv uvicorn uvloop -validation +uwsgi +validate-email validators -version +vcrpy +venusian +verboselogs +versioneer +versioneer-518 vertexai vine -visualization +virtualenv +virtualenv-clone +visions vllm -vosk +voluptuous vtk +vulture w3lib -wagtail waitress +wand wandb +wasabi +wasmtime watchdog +watchfiles +watchgod +watchtower +wcmatch +wcwidth +weasel weasyprint -web +weaviate-client web3 +webargs +webcolors webdataset -website -websocket +webdriver-manager +webencodings +webhelpers2 +webob +webrtcvad-wheels +websocket-client websockets -webview +webtest +werkzeug +west wget -whisper -whois -wikipedia -win32gui +wheel +whitenoise +widgetsnbextension +wikitextparser +wirerope +wmi +wmill wordcloud -worker -workflow -workflows +workalendar wrapt +ws4py +wsgiproxy2 +wsproto +wtforms +wurlitzer xarray +xarray-einstats +xatlas +xattr xformers xgboost xhtml2pdf xlrd -xlwings +xlsxwriter +xlutils xlwt +xmlschema +xmlsec xmltodict +xmod +xmodem xxhash +xyzservices +y-py yacs +yamale +yamllint +yapf +yappi +yarg yarl +yarn-api-client +yaspin +ydata-profiling yfinance -youtube_dl +youtube-dl +youtube-transcript-api +ypy-websocket +yq +yt-dlp +z3-solver +z3c-pt zarr +zc-lockfile +zconfig zeep -zhipuai -zstandard \ No newline at end of file +zenpy +zeroconf +zexceptions +zha-quirks +zict +zigpy +zigpy-deconz +zigpy-xbee +zigpy-znp +zipfile-deflate64 +zipfile36 +zipp +zodb +zodbpickle +zope +zope-annotation +zope-browser +zope-browsermenu +zope-browserpage +zope-browserresource +zope-cachedescriptors +zope-component +zope-configuration +zope-container +zope-contentprovider +zope-contenttype +zope-datetime +zope-deferredimport +zope-deprecation +zope-dottedname +zope-event +zope-exceptions +zope-filerepresentation +zope-globalrequest +zope-hookable +zope-i18n +zope-i18nmessageid +zope-interface +zope-lifecycleevent +zope-location +zope-pagetemplate +zope-processlifetime +zope-proxy +zope-ptresource +zope-publisher +zope-schema +zope-security +zope-sequencesort +zope-site +zope-size +zope-structuredtext +zope-tal +zope-tales +zope-testbrowser +zope-testing +zope-traversing +zope-viewlet +zopfli +zstandard +zstd +zthreading \ No newline at end of file diff --git a/src/common/pickers.ts b/src/common/pickers.ts index 76d91bf..314037e 100644 --- a/src/common/pickers.ts +++ b/src/common/pickers.ts @@ -45,6 +45,30 @@ export async function pickProject(pws: ReadonlyArray): Promise): Promise { + if (projects.length > 1) { + const items: ProjectQuickPickItem[] = projects.map((pw) => ({ + label: path.basename(pw.uri.fsPath), + description: pw.uri.fsPath, + project: pw, + })); + const item: ProjectQuickPickItem[] | undefined = await window.showQuickPick(items, { + placeHolder: 'Select a project, folder or script', + ignoreFocusOut: true, + canPickMany: true, + }); + if (item) { + return item.map((p) => p.project); + } + } else if (projects.length === 1) { + return [...projects]; + } + return undefined; +} + export async function pickEnvironmentManager( managers: InternalEnvironmentManager[], defaultMgr?: InternalEnvironmentManager, diff --git a/src/extension.ts b/src/extension.ts index fce9638..01c22fa 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -29,7 +29,7 @@ import { getPythonApi, setPythonApi } from './features/pythonApi'; import { setPersistentState } from './common/persistentState'; import { isPythonProjectFile } from './common/utils/fileNameUtils'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; -import { PythonEnvironmentApi } from './api'; +import { PythonEnvironmentApi, PythonProject } from './api'; import { ProjectCreatorsImpl, registerAutoProjectProvider, @@ -102,13 +102,25 @@ export async function activate(context: ExtensionContext): Promise { const result = await setEnvironmentCommand(item, envManagers, projectManager); if (result) { - workspaceView.updateProject(result.workspace); + const projects: PythonProject[] = []; + result.forEach((r) => { + if (r.project) { + projects.push(r.project); + } + }); + workspaceView.updateProject(projects); } }), commands.registerCommand('python-envs.setEnv', async (item) => { const result = await setEnvironmentCommand(item, envManagers, projectManager); if (result) { - workspaceView.updateProject(result.workspace); + const projects: PythonProject[] = []; + result.forEach((r) => { + if (r.project) { + projects.push(r.project); + } + }); + workspaceView.updateProject(projects); } }), commands.registerCommand('python-envs.reset', async (item) => { diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 79c2693..35af037 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -17,6 +17,7 @@ import { pickPackageManager, pickPackageOptions, pickProject, + pickProjectMany, } from '../common/pickers'; import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonProjectCreator } from '../api'; import * as path from 'path'; @@ -27,6 +28,8 @@ import { removePythonProjectSetting, getDefaultEnvManagerSetting, getDefaultPkgManagerSetting, + EditProjectSettings, + setAllManagerSettings, } from './settings/settingHelpers'; import { getAbsolutePath } from '../common/utils/fileNameUtils'; @@ -157,7 +160,7 @@ export async function handlePackagesCommand( } export interface EnvironmentSetResult { - workspace?: PythonProject; + project?: PythonProject; environment: PythonEnvironment; } @@ -165,16 +168,21 @@ export async function setEnvironmentCommand( context: unknown, em: EnvironmentManagers, wm: PythonProjectManager, -): Promise { +): Promise { if (context instanceof PythonEnvTreeItem) { const view = context as PythonEnvTreeItem; const manager = view.parent.manager; - const pw = await pickProject(wm.getProjects()); - if (pw) { - await setEnvironmentManager(pw.uri, manager.id, wm); - await setPackageManager(pw.uri, manager.preferredPackageManagerId, wm); - manager.set(pw.uri, view.environment); - return { workspace: pw, environment: view.environment }; + const projects = await pickProjectMany(wm.getProjects()); + if (projects) { + await Promise.all(projects.map((p) => manager.set(p.uri, view.environment))); + await setAllManagerSettings( + projects.map((p) => ({ + project: p, + envManager: manager.id, + packageManager: manager.preferredPackageManagerId, + })), + ); + return projects.map((p) => ({ project: p, environment: view.environment })); } return; } else if (context instanceof ProjectItem) { @@ -192,10 +200,15 @@ export async function setEnvironmentCommand( if (result) { result.manager.set(uri, result.selected); if (result.manager.id !== manager?.id) { - await setEnvironmentManager(uri, result.manager.id, wm); - await setPackageManager(uri, result.manager.preferredPackageManagerId, wm); + await setAllManagerSettings([ + { + project: wm.get(uri), + envManager: result.manager.id, + packageManager: result.manager.preferredPackageManagerId, + }, + ]); } - return { workspace: wm.get(uri), environment: result.selected }; + return [{ project: wm.get(uri), environment: result.selected }]; } return; } else if (context === undefined) { @@ -239,21 +252,21 @@ export async function resetEnvironmentCommand( } export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { - const pw = await pickProject(wm.getProjects()); - if (pw) { + const projects = await pickProjectMany(wm.getProjects()); + if (projects) { const manager = await pickEnvironmentManager(em.managers); if (manager) { - await setEnvironmentManager(pw.uri, manager, wm); + await setEnvironmentManager(projects.map((p) => ({ project: p, envManager: manager }))); } } } export async function setPkgManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { - const pw = await pickProject(wm.getProjects()); - if (pw) { + const projects = await pickProjectMany(wm.getProjects()); + if (projects) { const manager = await pickPackageManager(em.packageManagers); if (manager) { - await setPackageManager(pw.uri, manager, wm); + await setPackageManager(projects.map((p) => ({ project: p, packageManager: manager }))); } } } @@ -278,8 +291,7 @@ export async function addPythonProject( em.getEnvironmentManager(envManagerId)?.preferredPackageManagerId, ); const pw = wm.create(path.basename(uri.fsPath), uri); - await addPythonProjectSetting(pw, envManagerId, pkgManagerId); - wm.add(pw); + await addPythonProjectSetting([{ project: pw, envManager: envManagerId, packageManager: pkgManagerId }]); return pw; } @@ -305,6 +317,7 @@ export async function addPythonProject( } const projects: PythonProject[] = []; + const edits: EditProjectSettings[] = []; for (const result of results) { const uri = await getAbsolutePath(result.uri.fsPath); @@ -320,15 +333,16 @@ export async function addPythonProject( em.getEnvironmentManager(envManagerId)?.preferredPackageManagerId, ); const pw = wm.create(path.basename(uri.fsPath), uri); - await addPythonProjectSetting(pw, envManagerId, pkgManagerId); projects.push(pw); + edits.push({ project: pw, envManager: envManagerId, packageManager: pkgManagerId }); } + await addPythonProjectSetting(edits); return projects; } } export async function removePythonProject(item: ProjectItem, wm: PythonProjectManager): Promise { - await removePythonProjectSetting(item.project); + await removePythonProjectSetting([{ project: item.project }]); wm.remove(item.project); } diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index 8e23a38..fd18d06 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -1,5 +1,12 @@ import * as path from 'path'; -import { ConfigurationScope, ConfigurationTarget, Uri, workspace, WorkspaceConfiguration } from 'vscode'; +import { + ConfigurationScope, + ConfigurationTarget, + Uri, + workspace, + WorkspaceConfiguration, + WorkspaceFolder, +} from 'vscode'; import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; import { traceError, traceInfo } from '../../common/logging'; import { PythonProject } from '../../api'; @@ -63,81 +70,283 @@ export function getDefaultPkgManagerSetting( return defaultManager; } -export async function setEnvironmentManager(context: Uri, managerId: string, wm: PythonProjectManager): Promise { - const pw = wm.get(context); - const w = workspace.getWorkspaceFolder(context); - if (pw && w) { - const config = workspace.getConfiguration('python-envs', pw.uri); +export interface EditAllManagerSettings { + // undefined means global + project?: PythonProject; + envManager: string; + packageManager: string; +} +interface EditAllManagerSettingsInternal { + project: PythonProject; + envManager: string; + packageManager: string; +} +export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Promise { + const noWorkspace: EditAllManagerSettingsInternal[] = []; + const workspaces = new Map(); + edits + .filter((e) => !!e.project) + .map((e) => e as EditAllManagerSettingsInternal) + .forEach((e) => { + const w = workspace.getWorkspaceFolder(e.project.uri); + if (w) { + workspaces.set(w, [ + ...(workspaces.get(w) || []), + { project: e.project, envManager: e.envManager, packageManager: e.packageManager }, + ]); + } else { + noWorkspace.push({ project: e.project, envManager: e.envManager, packageManager: e.packageManager }); + } + }); + + noWorkspace.forEach((e) => { + if (e.project) { + traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); + } + }); + + const promises: Thenable[] = []; + + workspaces.forEach((es, w) => { + const config = workspace.getConfiguration('python-envs', w); const overrides = config.get('pythonProjects', []); - const pwPath = path.normalize(pw.uri.fsPath); - const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); - if (index >= 0) { - overrides[index].envManager = managerId; - await config.update('pythonProjects', overrides, ConfigurationTarget.Workspace); - } else { - await config.update('defaultEnvManager', managerId, ConfigurationTarget.Workspace); + es.forEach((e) => { + const pwPath = path.normalize(e.project.uri.fsPath); + const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + if (index >= 0) { + overrides[index].envManager = e.envManager; + overrides[index].packageManager = e.packageManager; + } else { + if (config.get('defaultEnvManager') !== e.envManager) { + promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Workspace)); + } + if (config.get('defaultPackageManager') !== e.packageManager) { + promises.push( + config.update('defaultPackageManager', e.packageManager, ConfigurationTarget.Workspace), + ); + } + } + }); + promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); + }); + + const config = workspace.getConfiguration('python-envs', undefined); + edits + .filter((e) => !e.project) + .forEach((e) => { + if (config.get('defaultEnvManager') !== e.envManager) { + promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Global)); + } + if (config.get('defaultPackageManager') !== e.packageManager) { + promises.push(config.update('defaultPackageManager', e.packageManager, ConfigurationTarget.Global)); + } + }); + + await Promise.all(promises); +} + +export interface EditEnvManagerSettings { + // undefined means global + project?: PythonProject; + envManager: string; +} +interface EditEnvManagerSettingsInternal { + project: PythonProject; + envManager: string; +} +export async function setEnvironmentManager(edits: EditEnvManagerSettings[]): Promise { + const noWorkspace: EditEnvManagerSettingsInternal[] = []; + const workspaces = new Map(); + edits + .filter((e) => !!e.project) + .map((e) => e as EditEnvManagerSettingsInternal) + .forEach((e) => { + const w = workspace.getWorkspaceFolder(e.project.uri); + if (w) { + workspaces.set(w, [...(workspaces.get(w) || []), { project: e.project, envManager: e.envManager }]); + } else { + noWorkspace.push({ project: e.project, envManager: e.envManager }); + } + }); + + noWorkspace.forEach((e) => { + if (e.project) { + traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); } - } else { - const config = workspace.getConfiguration('python-envs', undefined); - await config.update('defaultEnvManager', managerId, ConfigurationTarget.Global); - } + }); + + const promises: Thenable[] = []; + + workspaces.forEach((es, w) => { + const config = workspace.getConfiguration('python-envs', w.uri); + const overrides = config.get('pythonProjects', []); + es.forEach((e) => { + const pwPath = path.normalize(e.project.uri.fsPath); + const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + if (index >= 0) { + overrides[index].envManager = e.envManager; + } else if (config.get('defaultEnvManager') !== e.envManager) { + promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Workspace)); + } + }); + promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); + }); + + const config = workspace.getConfiguration('python-envs', undefined); + edits + .filter((e) => !e.project) + .forEach((e) => { + if (config.get('defaultEnvManager') !== e.envManager) { + promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Global)); + } + }); + + await Promise.all(promises); } -export async function setPackageManager(context: Uri, managerId: string, wm: PythonProjectManager): Promise { - const pw = wm.get(context); - const w = workspace.getWorkspaceFolder(context); - if (pw && w) { - const config = workspace.getConfiguration('python-envs', pw.uri); +export interface EditPackageManagerSettings { + // undefined means global + project?: PythonProject; + packageManager: string; +} +interface EditPackageManagerSettingsInternal { + project: PythonProject; + packageManager: string; +} +export async function setPackageManager(edits: EditPackageManagerSettings[]): Promise { + const noWorkspace: EditPackageManagerSettingsInternal[] = []; + const workspaces = new Map(); + edits + .filter((e) => !!e.project) + .map((e) => e as EditPackageManagerSettingsInternal) + .forEach((e) => { + const w = workspace.getWorkspaceFolder(e.project.uri); + if (w) { + workspaces.set(w, [ + ...(workspaces.get(w) || []), + { project: e.project, packageManager: e.packageManager }, + ]); + } else { + noWorkspace.push({ project: e.project, packageManager: e.packageManager }); + } + }); + + noWorkspace.forEach((e) => { + if (e.project) { + traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); + } + }); + + const promises: Thenable[] = []; + + workspaces.forEach((es, w) => { + const config = workspace.getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); - const pwPath = path.normalize(pw.uri.fsPath); - const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); - if (index >= 0) { - overrides[index].packageManager = managerId; - await config.update('pythonProjects', overrides, ConfigurationTarget.Workspace); + es.forEach((e) => { + const pwPath = path.normalize(e.project.uri.fsPath); + const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + if (index >= 0) { + overrides[index].packageManager = e.packageManager; + } else if (config.get('defaultPackageManager') !== e.packageManager) { + promises.push(config.update('defaultPackageManager', e.packageManager, ConfigurationTarget.Workspace)); + } + }); + promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); + }); + + const config = workspace.getConfiguration('python-envs', undefined); + edits + .filter((e) => !e.project) + .forEach((e) => { + if (config.get('defaultPackageManager') !== e.packageManager) { + promises.push(config.update('defaultPackageManager', e.packageManager, ConfigurationTarget.Global)); + } + }); + + await Promise.all(promises); +} + +export interface EditProjectSettings { + project: PythonProject; + envManager?: string; + packageManager?: string; +} + +export async function addPythonProjectSetting(edits: EditProjectSettings[]): Promise { + const noWorkspace: EditProjectSettings[] = []; + const workspaces = new Map(); + const globalConfig = workspace.getConfiguration('python-envs', undefined); + const envManager = globalConfig.get('defaultEnvManager', DEFAULT_ENV_MANAGER_ID); + const pkgManager = globalConfig.get('defaultPackageManager', DEFAULT_PACKAGE_MANAGER_ID); + + edits.forEach((e) => { + const w = workspace.getWorkspaceFolder(e.project.uri); + if (w) { + workspaces.set(w, [...(workspaces.get(w) || []), e]); } else { - await config.update('defaultPackageManager', managerId, ConfigurationTarget.Workspace); + noWorkspace.push(e); } - } else { - const config = workspace.getConfiguration('python-envs', undefined); - await config.update('defaultPackageManager', managerId, ConfigurationTarget.Global); - } -} + }); -export async function addPythonProjectSetting( - pw: PythonProject, - envManager: string, - pkgManager: string, -): Promise { - const w = workspace.getWorkspaceFolder(pw.uri); - if (w) { + noWorkspace.forEach((e) => { + traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); + }); + + const promises: Thenable[] = []; + workspaces.forEach((es, w) => { const config = workspace.getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); - const pwPath = path.normalize(pw.uri.fsPath); - const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); - if (index >= 0) { - overrides[index].envManager = envManager; - overrides[index].packageManager = pkgManager; + es.forEach((e) => { + const pwPath = path.normalize(e.project.uri.fsPath); + const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + if (index >= 0) { + overrides[index].envManager = e.envManager ?? envManager; + overrides[index].packageManager = e.packageManager ?? pkgManager; + } else { + overrides.push({ + path: path.relative(w.uri.fsPath, pwPath).replace(/\\/g, '/'), + envManager, + packageManager: pkgManager, + }); + } + }); + promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); + }); + await Promise.all(promises); +} + +export async function removePythonProjectSetting(edits: EditProjectSettings[]): Promise { + const noWorkspace: EditProjectSettings[] = []; + const workspaces = new Map(); + edits.forEach((e) => { + const w = workspace.getWorkspaceFolder(e.project.uri); + if (w) { + workspaces.set(w, [...(workspaces.get(w) || []), e]); } else { - overrides.push({ path: path.relative(w.uri.fsPath, pwPath), envManager, packageManager: pkgManager }); + noWorkspace.push(e); } - await config.update('pythonProjects', overrides, ConfigurationTarget.Workspace); - } else { - traceError(`Unable to find workspace for ${pw.uri.fsPath}`); - } -} + }); + + noWorkspace.forEach((e) => { + traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); + }); -export async function removePythonProjectSetting(pw: PythonProject): Promise { - const w = workspace.getWorkspaceFolder(pw.uri); - if (w) { + const promises: Thenable[] = []; + workspaces.forEach((es, w) => { const config = workspace.getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); - const pwPath = path.normalize(pw.uri.fsPath); - const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); - if (index >= 0) { - overrides.splice(index, 1); - await config.update('pythonProjects', overrides, ConfigurationTarget.Workspace); + es.forEach((e) => { + const pwPath = path.normalize(e.project.uri.fsPath); + const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + if (index >= 0) { + overrides.splice(index, 1); + } + }); + if (overrides.length === 0) { + promises.push(config.update('pythonProjects', undefined, ConfigurationTarget.Workspace)); + } else { + promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); } - } else { - traceError(`Unable to find workspace for ${pw.uri.fsPath}`); - } + }); + await Promise.all(promises); } diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 0ed884b..6ee8d9b 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -15,7 +15,6 @@ import { installPackages, refreshPackages, uninstallPackages } from './utils'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { Disposable } from 'vscode-jsonrpc'; import { getProjectInstallable } from './venvUtils'; -import { pickProject } from '../../common/pickers'; import { VenvManager } from './venvManager'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { @@ -123,20 +122,7 @@ export class PipPackageManager implements PackageManager, Disposable { } async getInstallable(environment: PythonEnvironment): Promise { const projects = this.venv.getProjectsByEnvironment(environment); - if (projects.length === 0) { - return []; - } - - if (projects.length === 1) { - return getProjectInstallable(this.api, projects[0]); - } - - const project = await pickProject(projects); - if (!project) { - return []; - } - - return getProjectInstallable(this.api, project); + return getProjectInstallable(this.api, projects); } dispose(): void { this._onDidChangePackages.dispose(); diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 386f368..fc246f8 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -183,12 +183,12 @@ export class VenvManager implements EnvironmentManager { return this.globalEnv; } - let env = this.fsPathToEnv.get(project.uri.fsPath) ?? this.globalEnv; + let env = this.fsPathToEnv.get(project.uri.fsPath); if (!env) { env = this.findEnvironmentByPath(project.uri.fsPath); } - return env; + return env ?? this.globalEnv; } async set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 5efb614..23d2ac6 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -1,4 +1,4 @@ -import { LogOutputChannel, ProgressLocation, RelativePattern, Uri, window } from 'vscode'; +import { LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; import { EnvironmentManager, Installable, @@ -297,7 +297,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] extras.push({ displayName: path.basename(tomlPath.fsPath), description: 'Install project as editable', - group: 'Toml', + group: 'TOML', args: ['-e', path.dirname(tomlPath.fsPath)], uri: tomlPath, }); @@ -308,7 +308,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] for (const key of Object.keys(deps)) { extras.push({ displayName: key, - group: 'Toml', + group: 'TOML', args: ['-e', `.[${key}]`], uri: tomlPath, }); @@ -319,9 +319,9 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] export async function getProjectInstallable( api: PythonEnvironmentApi, - project?: PythonProject, + projects?: PythonProject[], ): Promise { - if (!project) { + if (!projects) { return []; } const exclude = '**/{.venv*,.git,.nox,.tox,.conda,site-packages,__pypackages__}/**'; @@ -332,43 +332,36 @@ export async function getProjectInstallable( title: 'Searching dependencies', }, async (progress, token) => { - progress.report({ message: 'Searching for requirements files' }); - const results1 = await findFiles( - new RelativePattern(project.uri, '**/*requirements*.txt'), - exclude, - undefined, - token, - ); - const results2 = await findFiles( - new RelativePattern(project.uri, '**/requirements/*.txt'), - exclude, - undefined, - token, - ); - [...results1, ...results2].forEach((uri) => { - const p = api.getPythonProject(uri); - if (p?.uri.fsPath === project.uri.fsPath) { - installable.push({ - uri, - displayName: path.basename(uri.fsPath), - group: 'requirements', - args: ['-r', uri.fsPath], - }); - } - }); + progress.report({ message: 'Searching for Requirements and TOML files' }); + const results: Uri[] = ( + await Promise.all([ + findFiles('**/requirements*.txt', exclude, undefined, token), + findFiles('**/requirements/*.txt', exclude, undefined, token), + findFiles('**/pyproject.toml', exclude, undefined, token), + ]) + ).flat(); + + const fsPaths = projects.map((p) => p.uri.fsPath); + const filtered = results + .filter((uri) => { + const p = api.getPythonProject(uri)?.uri.fsPath; + return p && fsPaths.includes(p); + }) + .sort(); - progress.report({ message: 'Searching for `pyproject.toml` file' }); - const results3 = await findFiles( - new RelativePattern(project.uri, '**/pyproject.toml'), - exclude, - undefined, - token, - ); - results3.filter((uri) => api.getPythonProject(uri)?.uri.fsPath === project.uri.fsPath); await Promise.all( - results3.map(async (uri) => { - const toml = tomlParse(await fsapi.readFile(uri.fsPath, 'utf-8')); - installable.push(...getTomlInstallable(toml, uri)); + filtered.map(async (uri) => { + if (uri.fsPath.endsWith('.toml')) { + const toml = tomlParse(await fsapi.readFile(uri.fsPath, 'utf-8')); + installable.push(...getTomlInstallable(toml, uri)); + } else { + installable.push({ + uri, + displayName: path.basename(uri.fsPath), + group: 'Requirements', + args: ['-r', uri.fsPath], + }); + } }), ); }, From bc82c6a9cf433f12a70cc70f2d8ca7a66714b797 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 25 Oct 2024 12:25:56 -0700 Subject: [PATCH 005/328] Allow entering interpreter path (#9) Alos fixes https://github.com/microsoft/vscode-python-environments/issues/6 --- src/api.ts | 4 +- src/common/errors/utils.ts | 11 + src/common/localize.ts | 4 +- src/common/pickers/environments.ts | 190 ++++++++++++++ src/common/pickers/managers.ts | 118 +++++++++ .../{pickers.ts => pickers/packages.ts} | 233 +---------------- src/common/pickers/projects.ts | 49 ++++ src/common/utils/pythonPath.ts | 80 ++++++ src/common/window.apis.ts | 36 +++ src/extension.ts | 12 +- src/features/envCommands.ts | 130 ++++++---- src/features/execution/terminal.ts | 24 +- src/features/projectCreators.ts | 3 +- src/features/pythonApi.ts | 91 +++++-- src/features/views/treeViewItems.ts | 41 ++- src/internal.api.ts | 4 +- src/managers/conda/condaPackageManager.ts | 8 +- src/managers/conda/condaUtils.ts | 102 +++++--- src/managers/sysPython/pipManager.ts | 2 +- src/managers/sysPython/sysPythonManager.ts | 12 +- src/managers/sysPython/utils.ts | 8 +- src/managers/sysPython/uvProjectCreator.ts | 2 +- src/managers/sysPython/venvManager.ts | 41 ++- src/managers/sysPython/venvUtils.ts | 238 +++++++++++++----- 24 files changed, 1010 insertions(+), 433 deletions(-) create mode 100644 src/common/pickers/environments.ts create mode 100644 src/common/pickers/managers.ts rename src/common/{pickers.ts => pickers/packages.ts} (63%) create mode 100644 src/common/pickers/projects.ts create mode 100644 src/common/utils/pythonPath.ts diff --git a/src/api.ts b/src/api.ts index 4ea6283..58fc990 100644 --- a/src/api.ts +++ b/src/api.ts @@ -217,7 +217,7 @@ export type GetEnvironmentScope = undefined | Uri; * Type representing the scope for creating a Python environment. * Can be a Python project or 'global'. */ -export type CreateEnvironmentScope = PythonProject | 'global'; +export type CreateEnvironmentScope = Uri | Uri[] | 'global'; /** * The scope for which environments are to be refreshed. * - `undefined`: Search for environments globally and workspaces. @@ -828,7 +828,7 @@ export interface PythonEnvironmentManagerApi { * @param scope - The scope within which to set the environment. * @param environment - The Python environment to set. If undefined, the environment is unset. */ - setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): void; + setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; /** * Retrieves the current Python environment within the specified scope. diff --git a/src/common/errors/utils.ts b/src/common/errors/utils.ts index d917f74..d04f61e 100644 --- a/src/common/errors/utils.ts +++ b/src/common/errors/utils.ts @@ -19,3 +19,14 @@ export async function showErrorMessage(message: string, log?: LogOutputChannel) } } } + +export async function showWarningMessage(message: string, log?: LogOutputChannel) { + const result = await window.showWarningMessage(message, 'View Logs'); + if (result === 'View Logs') { + if (log) { + log.show(); + } else { + commands.executeCommand('python-envs.viewLogs'); + } + } +} diff --git a/src/common/localize.ts b/src/common/localize.ts index ba2e692..17632a8 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -1,7 +1,7 @@ import { l10n } from 'vscode'; export namespace Common { - export const recommended = l10n.t('recommended'); + export const recommended = l10n.t('Recommended'); export const install = l10n.t('Install'); export const uninstall = l10n.t('Uninstall'); export const openInBrowser = l10n.t('Open in Browser'); @@ -10,6 +10,8 @@ export namespace Common { export namespace Interpreter { export const statusBarSelect = l10n.t('Select Interpreter'); + export const browsePath = l10n.t('Browse...'); + export const createVirtualEnvironment = l10n.t('Create Virtual Environment...'); } export namespace PackageManagement { diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts new file mode 100644 index 0000000..3d03e69 --- /dev/null +++ b/src/common/pickers/environments.ts @@ -0,0 +1,190 @@ +import { Uri, ThemeIcon, QuickPickItem, QuickPickItemKind, ProgressLocation, QuickInputButtons } from 'vscode'; +import { IconPath, PythonEnvironment, PythonProject } from '../../api'; +import { InternalEnvironmentManager } from '../../internal.api'; +import { Common, Interpreter } from '../localize'; +import { showQuickPickWithButtons, showQuickPick, showOpenDialog, withProgress } from '../window.apis'; +import { isWindows } from '../../managers/common/utils'; +import { traceError } from '../logging'; +import { pickEnvironmentManager } from './managers'; +import { handlePythonPath } from '../utils/pythonPath'; + +type QuickPickIcon = + | Uri + | { + light: Uri; + dark: Uri; + } + | ThemeIcon + | undefined; + +function getIconPath(i: IconPath | undefined): QuickPickIcon { + if (i === undefined || i instanceof ThemeIcon) { + return i; + } + + if (i instanceof Uri) { + return i.fsPath.endsWith('__icon__.py') ? undefined : i; + } + + if (typeof i === 'string') { + return Uri.file(i); + } + + return { + light: i.light instanceof Uri ? i.light : Uri.file(i.light), + dark: i.dark instanceof Uri ? i.dark : Uri.file(i.dark), + }; +} + +interface EnvironmentPickOptions { + recommended?: PythonEnvironment; + showBackButton?: boolean; + projects: PythonProject[]; +} +async function browseForPython( + managers: InternalEnvironmentManager[], + projectEnvManagers: InternalEnvironmentManager[], +): Promise { + const filters = isWindows() ? { python: ['exe'] } : undefined; + const uris = await showOpenDialog({ + canSelectFiles: true, + canSelectFolders: false, + canSelectMany: false, + filters, + title: 'Select Python executable', + }); + if (!uris || uris.length === 0) { + return; + } + const uri = uris[0]; + + const environment = await withProgress( + { + location: ProgressLocation.Notification, + cancellable: false, + }, + async (reporter, token) => { + const env = await handlePythonPath(uri, managers, projectEnvManagers, reporter, token); + return env; + }, + ); + return environment; +} + +async function createEnvironment( + managers: InternalEnvironmentManager[], + projectEnvManagers: InternalEnvironmentManager[], + options: EnvironmentPickOptions, +): Promise { + const managerId = await pickEnvironmentManager( + managers.filter((m) => m.supportsCreate), + projectEnvManagers.filter((m) => m.supportsCreate), + ); + + const manager = managers.find((m) => m.id === managerId); + if (manager) { + try { + const env = await manager.create(options.projects.map((p) => p.uri)); + return env; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return createEnvironment(managers, projectEnvManagers, options); + } + traceError(`Failed to create environment using ${manager.id}`, ex); + throw ex; + } + } +} + +async function pickEnvironmentImpl( + items: (QuickPickItem | (QuickPickItem & { result: PythonEnvironment }))[], + managers: InternalEnvironmentManager[], + projectEnvManagers: InternalEnvironmentManager[], + options: EnvironmentPickOptions, +): Promise { + const selected = await showQuickPickWithButtons(items, { + placeHolder: `Select a Python Environment`, + ignoreFocusOut: true, + showBackButton: options?.showBackButton, + }); + + if (selected && !Array.isArray(selected)) { + if (selected.label === Interpreter.browsePath) { + return browseForPython(managers, projectEnvManagers); + } else if (selected.label === Interpreter.createVirtualEnvironment) { + return createEnvironment(managers, projectEnvManagers, options); + } + return (selected as { result: PythonEnvironment })?.result; + } + return undefined; +} + +export async function pickEnvironment( + managers: InternalEnvironmentManager[], + projectEnvManagers: InternalEnvironmentManager[], + options: EnvironmentPickOptions, +): Promise { + const items: (QuickPickItem | (QuickPickItem & { result: PythonEnvironment }))[] = [ + { + label: Interpreter.browsePath, + iconPath: new ThemeIcon('folder'), + }, + { + label: '', + kind: QuickPickItemKind.Separator, + }, + { + label: Interpreter.createVirtualEnvironment, + iconPath: new ThemeIcon('add'), + }, + ]; + + if (options?.recommended) { + items.push( + { + label: Common.recommended, + kind: QuickPickItemKind.Separator, + }, + { + label: options.recommended.displayName, + description: options.recommended.description, + result: options.recommended, + iconPath: getIconPath(options.recommended.iconPath), + }, + ); + } + + for (const manager of managers) { + items.push({ + label: manager.displayName, + kind: QuickPickItemKind.Separator, + }); + const envs = await manager.getEnvironments('all'); + items.push( + ...envs.map((e) => { + return { + label: e.displayName ?? e.name, + description: e.description, + e: { selected: e, manager: manager }, + iconPath: getIconPath(e.iconPath), + }; + }), + ); + } + + return pickEnvironmentImpl(items, managers, projectEnvManagers, options); +} + +export async function pickEnvironmentFrom(environments: PythonEnvironment[]): Promise { + const items = environments.map((e) => ({ + label: e.displayName ?? e.name, + description: e.description, + e: e, + iconPath: getIconPath(e.iconPath), + })); + const selected = await showQuickPick(items, { + placeHolder: 'Select Python Environment', + ignoreFocusOut: true, + }); + return (selected as { e: PythonEnvironment })?.e; +} diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts new file mode 100644 index 0000000..ed19b38 --- /dev/null +++ b/src/common/pickers/managers.ts @@ -0,0 +1,118 @@ +import { QuickPickItem, QuickPickItemKind } from 'vscode'; +import { PythonProjectCreator } from '../../api'; +import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; +import { Common } from '../localize'; +import { showQuickPickWithButtons, showQuickPick } from '../window.apis'; + +export async function pickEnvironmentManager( + managers: InternalEnvironmentManager[], + defaultManagers?: InternalEnvironmentManager[], +): Promise { + if (managers.length === 0) { + return; + } + + if (managers.length === 1) { + return managers[0].id; + } + + const items: (QuickPickItem | (QuickPickItem & { id: string }))[] = []; + if (defaultManagers && defaultManagers.length > 0) { + items.push( + { + label: Common.recommended, + kind: QuickPickItemKind.Separator, + }, + ...defaultManagers.map((defaultMgr) => ({ + label: defaultMgr.displayName, + description: defaultMgr.description, + id: defaultMgr.id, + })), + { + label: '', + kind: QuickPickItemKind.Separator, + }, + ); + } + items.push( + ...managers + .filter((m) => !defaultManagers?.includes(m)) + .map((m) => ({ + label: m.displayName, + description: m.description, + id: m.id, + })), + ); + const item = await showQuickPickWithButtons(items, { + placeHolder: 'Select an environment manager', + ignoreFocusOut: true, + }); + return (item as QuickPickItem & { id: string })?.id; +} + +export async function pickPackageManager( + managers: InternalPackageManager[], + defaultManagers?: InternalPackageManager[], +): Promise { + if (managers.length === 0) { + return; + } + + if (managers.length === 1) { + return managers[0].id; + } + + const items: (QuickPickItem | (QuickPickItem & { id: string }))[] = []; + if (defaultManagers && defaultManagers.length > 0) { + items.push( + { + label: Common.recommended, + kind: QuickPickItemKind.Separator, + }, + ...defaultManagers.map((defaultMgr) => ({ + label: defaultMgr.displayName, + description: defaultMgr.description, + id: defaultMgr.id, + })), + { + label: '', + kind: QuickPickItemKind.Separator, + }, + ); + } + items.push( + ...managers + .filter((m) => !defaultManagers?.includes(m)) + .map((m) => ({ + label: m.displayName, + description: m.description, + id: m.id, + })), + ); + const item = await showQuickPickWithButtons(items, { + placeHolder: 'Select an package manager', + ignoreFocusOut: true, + }); + return (item as QuickPickItem & { id: string })?.id; +} + +export async function pickCreator(creators: PythonProjectCreator[]): Promise { + if (creators.length === 0) { + return; + } + + if (creators.length === 1) { + return creators[0]; + } + + const items: (QuickPickItem & { c: PythonProjectCreator })[] = creators.map((c) => ({ + label: c.displayName ?? c.name, + description: c.description, + c: c, + })); + const selected = await showQuickPick(items, { + placeHolder: 'Select a project creator', + ignoreFocusOut: true, + }); + return (selected as { c: PythonProjectCreator })?.c; +} diff --git a/src/common/pickers.ts b/src/common/pickers/packages.ts similarity index 63% rename from src/common/pickers.ts rename to src/common/pickers/packages.ts index 314037e..3dde73b 100644 --- a/src/common/pickers.ts +++ b/src/common/pickers/packages.ts @@ -1,222 +1,13 @@ -import { - QuickInputButtons, - QuickPickItem, - QuickPickItemButtonEvent, - QuickPickItemKind, - ThemeIcon, - Uri, - window, -} from 'vscode'; -import { - GetEnvironmentsScope, - IconPath, - Installable, - Package, - PythonEnvironment, - PythonProject, - PythonProjectCreator, -} from '../api'; -import * as fs from 'fs-extra'; import * as path from 'path'; -import { InternalEnvironmentManager, InternalPackageManager } from '../internal.api'; -import { Common, PackageManagement } from './localize'; -import { EXTENSION_ROOT_DIR } from './constants'; -import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from './window.apis'; -import { launchBrowser } from './env.apis'; -import { traceWarn } from './logging'; - -export async function pickProject(pws: ReadonlyArray): Promise { - if (pws.length > 1) { - const items = pws.map((pw) => ({ - label: path.basename(pw.uri.fsPath), - description: pw.uri.fsPath, - pw: pw, - })); - const item = await window.showQuickPick(items, { - placeHolder: 'Select a project, folder or script', - ignoreFocusOut: true, - }); - if (item) { - return item.pw; - } - } else if (pws.length === 1) { - return pws[0]; - } - return undefined; -} - -interface ProjectQuickPickItem extends QuickPickItem { - project: PythonProject; -} -export async function pickProjectMany(projects: ReadonlyArray): Promise { - if (projects.length > 1) { - const items: ProjectQuickPickItem[] = projects.map((pw) => ({ - label: path.basename(pw.uri.fsPath), - description: pw.uri.fsPath, - project: pw, - })); - const item: ProjectQuickPickItem[] | undefined = await window.showQuickPick(items, { - placeHolder: 'Select a project, folder or script', - ignoreFocusOut: true, - canPickMany: true, - }); - if (item) { - return item.map((p) => p.project); - } - } else if (projects.length === 1) { - return [...projects]; - } - return undefined; -} - -export async function pickEnvironmentManager( - managers: InternalEnvironmentManager[], - defaultMgr?: InternalEnvironmentManager, -): Promise { - const items = managers.map((m) => ({ - label: defaultMgr?.id === m.id ? `${m.displayName} (${Common.recommended})` : m.displayName, - description: m.description, - id: m.id, - })); - const item = await window.showQuickPick(items, { - placeHolder: 'Select an environment manager', - ignoreFocusOut: true, - }); - return item?.id; -} - -export async function pickPackageManager( - managers: InternalPackageManager[], - defaultMgr?: InternalPackageManager, -): Promise { - const items = managers.map((m) => ({ - label: defaultMgr?.id === m.id ? `${m.displayName} (${Common.recommended})` : m.displayName, - description: m.description, - id: m.id, - })); - - const item = await window.showQuickPick(items, { - placeHolder: 'Select a package manager', - ignoreFocusOut: true, - }); - return item?.id; -} - -type QuickPickIcon = - | Uri - | { - /** - * The icon path for the light theme. - */ - light: Uri; - /** - * The icon path for the dark theme. - */ - dark: Uri; - } - | ThemeIcon - | undefined; - -function getIconPath(i: IconPath | undefined): QuickPickIcon { - if (i === undefined || i instanceof Uri || i instanceof ThemeIcon) { - return i; - } - - if (typeof i === 'string') { - return Uri.file(i); - } - - return { - light: i.light instanceof Uri ? i.light : Uri.file(i.light), - dark: i.dark instanceof Uri ? i.dark : Uri.file(i.dark), - }; -} - -export interface SelectionResult { - selected: PythonEnvironment; - manager: InternalEnvironmentManager; -} - -export async function pickEnvironment( - managers: InternalEnvironmentManager[], - scope: GetEnvironmentsScope, - recommended?: SelectionResult, -): Promise { - const items: (QuickPickItem | (QuickPickItem & { e: SelectionResult }))[] = []; - - if (recommended) { - items.push( - { - label: Common.recommended, - kind: QuickPickItemKind.Separator, - }, - { - label: recommended.selected.displayName, - description: recommended.selected.description, - e: recommended, - iconPath: getIconPath(recommended.selected.iconPath), - }, - ); - } - - for (const manager of managers) { - items.push({ - label: manager.displayName, - kind: QuickPickItemKind.Separator, - }); - const envs = await manager.getEnvironments(scope); - items.push( - ...envs.map((e) => { - return { - label: e.displayName ?? e.name, - description: e.description, - e: { selected: e, manager: manager }, - iconPath: getIconPath(e.iconPath), - }; - }), - ); - } - const selected = await window.showQuickPick(items, { - placeHolder: `Select a Python Environment`, - ignoreFocusOut: true, - }); - return (selected as { e: SelectionResult })?.e; -} - -export async function pickEnvironmentFrom(environments: PythonEnvironment[]): Promise { - const items = environments.map((e) => ({ - label: e.displayName ?? e.name, - description: e.description, - e: e, - iconPath: getIconPath(e.iconPath), - })); - const selected = await window.showQuickPick(items, { - placeHolder: 'Select Python Environment', - ignoreFocusOut: true, - }); - return (selected as { e: PythonEnvironment })?.e; -} - -export async function pickCreator(creators: PythonProjectCreator[]): Promise { - if (creators.length === 0) { - return; - } - - if (creators.length === 1) { - return creators[0]; - } - - const items: (QuickPickItem & { c: PythonProjectCreator })[] = creators.map((c) => ({ - label: c.displayName ?? c.name, - description: c.description, - c: c, - })); - const selected = await window.showQuickPick(items, { - placeHolder: 'Select a project creator', - ignoreFocusOut: true, - }); - return (selected as { c: PythonProjectCreator })?.c; -} +import * as fs from 'fs-extra'; +import { Uri, ThemeIcon, QuickPickItem, QuickPickItemKind, QuickPickItemButtonEvent, QuickInputButtons } from 'vscode'; +import { Installable, PythonEnvironment, Package } from '../../api'; +import { InternalPackageManager } from '../../internal.api'; +import { EXTENSION_ROOT_DIR } from '../constants'; +import { launchBrowser } from '../env.apis'; +import { Common, PackageManagement } from '../localize'; +import { traceWarn } from '../logging'; +import { showQuickPick, showInputBoxWithButtons, showTextDocument, showQuickPickWithButtons } from '../window.apis'; export async function pickPackageOptions(): Promise { const items = [ @@ -229,7 +20,7 @@ export async function pickPackageOptions(): Promise { description: 'Uninstall packages', }, ]; - const selected = await window.showQuickPick(items, { + const selected = await showQuickPick(items, { placeHolder: 'Select an option', ignoreFocusOut: true, }); @@ -571,10 +362,10 @@ export async function getPackagesToUninstall(packages: Package[]): Promise s.p); + return Array.isArray(selected) ? selected?.map((s) => s.p) : undefined; } diff --git a/src/common/pickers/projects.ts b/src/common/pickers/projects.ts new file mode 100644 index 0000000..3be4db8 --- /dev/null +++ b/src/common/pickers/projects.ts @@ -0,0 +1,49 @@ +import path from 'path'; +import { QuickPickItem } from 'vscode'; +import { PythonProject } from '../../api'; +import { showQuickPick } from '../window.apis'; + +interface ProjectQuickPickItem extends QuickPickItem { + project: PythonProject; +} + +export async function pickProject(projects: ReadonlyArray): Promise { + if (projects.length > 1) { + const items: ProjectQuickPickItem[] = projects.map((pw) => ({ + label: path.basename(pw.uri.fsPath), + description: pw.uri.fsPath, + project: pw, + })); + const item = await showQuickPick(items, { + placeHolder: 'Select a project, folder or script', + ignoreFocusOut: true, + }); + if (item) { + return item.project; + } + } else if (projects.length === 1) { + return projects[0]; + } + return undefined; +} + +export async function pickProjectMany(projects: ReadonlyArray): Promise { + if (projects.length > 1) { + const items: ProjectQuickPickItem[] = projects.map((pw) => ({ + label: path.basename(pw.uri.fsPath), + description: pw.uri.fsPath, + project: pw, + })); + const item = await showQuickPick(items, { + placeHolder: 'Select a project, folder or script', + ignoreFocusOut: true, + canPickMany: true, + }); + if (Array.isArray(item)) { + return item.map((p) => p.project); + } + } else if (projects.length === 1) { + return [...projects]; + } + return undefined; +} diff --git a/src/common/utils/pythonPath.ts b/src/common/utils/pythonPath.ts new file mode 100644 index 0000000..df3cfb2 --- /dev/null +++ b/src/common/utils/pythonPath.ts @@ -0,0 +1,80 @@ +import { Uri, Progress, CancellationToken } from 'vscode'; +import { PythonEnvironment } from '../../api'; +import { InternalEnvironmentManager } from '../../internal.api'; +import { showErrorMessage } from '../errors/utils'; +import { traceInfo, traceVerbose, traceError } from '../logging'; +import { PYTHON_EXTENSION_ID } from '../constants'; + +const priorityOrder = [ + `${PYTHON_EXTENSION_ID}:pyenv`, + `${PYTHON_EXTENSION_ID}:pixi`, + `${PYTHON_EXTENSION_ID}:conda`, + `${PYTHON_EXTENSION_ID}:pipenv`, + `${PYTHON_EXTENSION_ID}:poetry`, + `${PYTHON_EXTENSION_ID}:activestate`, + `${PYTHON_EXTENSION_ID}:hatch`, + `${PYTHON_EXTENSION_ID}:venv`, + `${PYTHON_EXTENSION_ID}:system`, +]; +function sortManagersByPriority(managers: InternalEnvironmentManager[]): InternalEnvironmentManager[] { + return managers.sort((a, b) => { + const aIndex = priorityOrder.indexOf(a.id); + const bIndex = priorityOrder.indexOf(b.id); + if (aIndex === -1 && bIndex === -1) { + return 0; + } + if (aIndex === -1) { + return 1; + } + if (bIndex === -1) { + return -1; + } + return aIndex - bIndex; + }); +} + +export async function handlePythonPath( + interpreterUri: Uri, + managers: InternalEnvironmentManager[], + projectEnvManagers: InternalEnvironmentManager[], + reporter?: Progress<{ message?: string; increment?: number }>, + token?: CancellationToken, +): Promise { + for (const manager of sortManagersByPriority(projectEnvManagers)) { + if (token?.isCancellationRequested) { + return; + } + reporter?.report({ message: `Checking ${manager.displayName}` }); + traceInfo(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); + const env = await manager.resolve(interpreterUri); + if (env) { + traceInfo(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); + return env; + } + traceVerbose(`Manager ${manager.displayName} (${manager.id}) cannot handle ${interpreterUri.fsPath}`); + } + + const checkedIds = projectEnvManagers.map((m) => m.id); + const filtered = managers.filter((m) => !checkedIds.includes(m.id)); + + for (const manager of sortManagersByPriority(filtered)) { + if (token?.isCancellationRequested) { + return; + } + reporter?.report({ message: `Checking ${manager.displayName}` }); + traceInfo(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); + const env = await manager.resolve(interpreterUri); + if (env) { + traceInfo(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); + return env; + } + } + + if (token?.isCancellationRequested) { + return; + } + + traceError(`Unable to handle ${interpreterUri.fsPath}`); + showErrorMessage(`Unable to handle ${interpreterUri.fsPath}`); + return undefined; +} diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 598d87f..55961bf 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -4,6 +4,9 @@ import { ExtensionTerminalOptions, InputBox, InputBoxOptions, + OpenDialogOptions, + Progress, + ProgressOptions, QuickInputButton, QuickInputButtons, QuickPick, @@ -38,6 +41,10 @@ export function onDidChangeTerminalShellIntegration( return window.onDidChangeTerminalShellIntegration(listener, thisArgs, disposables); } +export function showOpenDialog(options?: OpenDialogOptions): Thenable { + return window.showOpenDialog(options); +} + export function terminals(): readonly Terminal[] { return window.terminals; } @@ -79,6 +86,27 @@ export interface QuickPickButtonEvent { readonly button: QuickInputButton; } +export function showQuickPick( + items: readonly T[] | Thenable, + options?: QuickPickOptions, + token?: CancellationToken, +): Thenable { + return window.showQuickPick(items, options, token); +} + +export function withProgress( + options: ProgressOptions, + task: ( + progress: Progress<{ + message?: string; + increment?: number; + }>, + token: CancellationToken, + ) => Thenable, +): Thenable { + return window.withProgress(options, task); +} + export async function showQuickPickWithButtons( items: readonly T[], options?: QuickPickOptions & { showBackButton?: boolean; buttons?: QuickInputButton[]; selected?: T[] }, @@ -214,3 +242,11 @@ export async function showInputBoxWithButtons( disposables.forEach((d) => d.dispose()); } } + +export function showWarningMessage(message: string, ...items: string[]): Thenable { + return window.showWarningMessage(message, ...items); +} + +export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable { + return window.showInputBox(options, token); +} diff --git a/src/extension.ts b/src/extension.ts index 01c22fa..fb2f6d9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,7 +16,7 @@ import { runInTerminalCommand, setEnvManagerCommand, setEnvironmentCommand, - setPkgManagerCommand, + setPackageManagerCommand, resetEnvironmentCommand, refreshPackagesCommand, createAnyEnvironmentCommand, @@ -104,8 +104,8 @@ export async function activate(context: ExtensionContext): Promise { - if (r.project) { - projects.push(r.project); + if (r.projects) { + projects.push(r.projects); } }); workspaceView.updateProject(projects); @@ -116,8 +116,8 @@ export async function activate(context: ExtensionContext): Promise { - if (r.project) { - projects.push(r.project); + if (r.projects) { + projects.push(r.projects); } }); workspaceView.updateProject(projects); @@ -130,7 +130,7 @@ export async function activate(context: ExtensionContext): Promise { - await setPkgManagerCommand(envManagers, projectManager); + await setPackageManagerCommand(envManagers, projectManager); }), commands.registerCommand('python-envs.addPythonProject', async (resource) => { await addPythonProject(resource, projectManager, envManagers, projectCreators); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 35af037..60063d9 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,6 +1,7 @@ import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, window } from 'vscode'; import { EnvironmentManagers, + InternalEnvironmentManager, InternalPackageManager, ProjectCreators, PythonProjectManager, @@ -8,17 +9,6 @@ import { PythonTerminalExecutionOptions, } from '../internal.api'; import { traceError, traceVerbose } from '../common/logging'; -import { - getPackagesToInstall, - getPackagesToUninstall, - pickCreator, - pickEnvironment, - pickEnvironmentManager, - pickPackageManager, - pickPackageOptions, - pickProject, - pickProjectMany, -} from '../common/pickers'; import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonProjectCreator } from '../api'; import * as path from 'path'; import { @@ -30,6 +20,7 @@ import { getDefaultPkgManagerSetting, EditProjectSettings, setAllManagerSettings, + EditAllManagerSettings, } from './settings/settingHelpers'; import { getAbsolutePath } from '../common/utils/fileNameUtils'; @@ -45,6 +36,10 @@ import { ProjectPackageRootTreeItem, } from './views/treeViewItems'; import { Common } from '../common/localize'; +import { pickEnvironment } from '../common/pickers/environments'; +import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; +import { pickPackageOptions, getPackagesToInstall, getPackagesToUninstall } from '../common/pickers/packages'; +import { pickProject, pickProjectMany } from '../common/pickers/projects'; export async function refreshManagerCommand(context: unknown): Promise { if (context instanceof EnvManagerTreeItem) { @@ -81,28 +76,31 @@ export async function createEnvironmentCommand( const manager = managers.getEnvironmentManager(context as Uri); const project = projects.get(context as Uri); if (project) { - await manager?.create(project); + await manager?.create(project.uri); } } else { traceError(`Invalid context for create command: ${context}`); } } -export async function createAnyEnvironmentCommand( - managers: EnvironmentManagers, - projects: PythonProjectManager, -): Promise { - const pw = await pickProject(projects.getProjects()); - if (pw) { - const defaultManager = managers.getEnvironmentManager(pw.uri); +export async function createAnyEnvironmentCommand(em: EnvironmentManagers, pm: PythonProjectManager): Promise { + const projects = await pickProjectMany(pm.getProjects()); + if (projects && projects.length > 0) { + const defaultManagers: InternalEnvironmentManager[] = []; + projects.forEach((p) => { + const manager = em.getEnvironmentManager(p.uri); + if (manager && manager.supportsCreate && !defaultManagers.includes(manager)) { + defaultManagers.push(manager); + } + }); const managerId = await pickEnvironmentManager( - managers.managers.filter((m) => m.supportsCreate), - defaultManager?.supportsCreate ? defaultManager : undefined, + em.managers.filter((m) => m.supportsCreate), + defaultManagers, ); - const manager = managers.managers.find((m) => m.id === managerId); + const manager = em.managers.find((m) => m.id === managerId); if (manager) { - await manager.create(pw); + await manager.create(projects.map((p) => p.uri)); } } } @@ -160,7 +158,7 @@ export async function handlePackagesCommand( } export interface EnvironmentSetResult { - project?: PythonProject; + projects?: PythonProject; environment: PythonEnvironment; } @@ -173,7 +171,7 @@ export async function setEnvironmentCommand( const view = context as PythonEnvTreeItem; const manager = view.parent.manager; const projects = await pickProjectMany(wm.getProjects()); - if (projects) { + if (projects && projects.length > 0) { await Promise.all(projects.map((p) => manager.set(p.uri, view.environment))); await setAllManagerSettings( projects.map((p) => ({ @@ -182,39 +180,67 @@ export async function setEnvironmentCommand( packageManager: manager.preferredPackageManagerId, })), ); - return projects.map((p) => ({ project: p, environment: view.environment })); + return projects.map((p) => ({ project: [p], environment: view.environment })); } return; } else if (context instanceof ProjectItem) { const view = context as ProjectItem; return setEnvironmentCommand(view.project.uri, em, wm); } else if (context instanceof Uri) { - const uri = context as Uri; - const manager = em.getEnvironmentManager(uri); - const recommended = await manager?.get(uri); - const result = await pickEnvironment( - em.managers, - 'all', - manager && recommended ? { selected: recommended, manager: manager } : undefined, - ); - if (result) { - result.manager.set(uri, result.selected); - if (result.manager.id !== manager?.id) { - await setAllManagerSettings([ - { - project: wm.get(uri), - envManager: result.manager.id, - packageManager: result.manager.preferredPackageManagerId, - }, - ]); + return setEnvironmentCommand([context], em, wm); + } else if (context === undefined) { + const project = await pickProjectMany(wm.getProjects()); + if (project && project.length > 0) { + try { + const result = setEnvironmentCommand(project, em, wm); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return setEnvironmentCommand(context, em, wm); + } } - return [{ project: wm.get(uri), environment: result.selected }]; } return; - } else if (context === undefined) { - const project = await pickProject(wm.getProjects()); - if (project) { - return setEnvironmentCommand(project.uri, em, wm); + } else if (Array.isArray(context) && context.length > 0 && context.every((c) => c instanceof Uri)) { + const uris = context as Uri[]; + const projects: PythonProject[] = []; + const projectEnvManagers: InternalEnvironmentManager[] = []; + uris.forEach((uri) => { + const project = wm.get(uri); + if (project) { + projects.push(project); + const manager = em.getEnvironmentManager(uri); + if (manager && !projectEnvManagers.includes(manager)) { + projectEnvManagers.push(manager); + } + } + }); + + const recommended = + projectEnvManagers.length === 1 && uris.length === 1 ? await projectEnvManagers[0].get(uris[0]) : undefined; + const selected = await pickEnvironment(em.managers, projectEnvManagers, { + projects, + recommended, + showBackButton: uris.length > 1, + }); + const manager = em.managers.find((m) => m.id === selected?.envId.managerId); + if (selected && manager) { + const promises: Thenable[] = []; + const settings: EditAllManagerSettings[] = []; + uris.forEach((uri) => { + const m = em.getEnvironmentManager(uri); + if (manager.id !== m?.id) { + promises.push(manager.set(uri, selected)); + settings.push({ + project: wm.get(uri), + envManager: manager.id, + packageManager: manager.preferredPackageManagerId, + }); + } + }); + await Promise.all(promises); + await setAllManagerSettings(settings); + return [...projects.map((p) => ({ project: p, environment: selected }))]; } return; } @@ -253,7 +279,7 @@ export async function resetEnvironmentCommand( export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { const projects = await pickProjectMany(wm.getProjects()); - if (projects) { + if (projects && projects.length > 0) { const manager = await pickEnvironmentManager(em.managers); if (manager) { await setEnvironmentManager(projects.map((p) => ({ project: p, envManager: manager }))); @@ -261,9 +287,9 @@ export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonPr } } -export async function setPkgManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { +export async function setPackageManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { const projects = await pickProjectMany(wm.getProjects()); - if (projects) { + if (projects && projects.length > 0) { const manager = await pickPackageManager(em.packageManagers); if (manager) { await setPackageManager(projects.map((p) => ({ project: p, packageManager: manager }))); diff --git a/src/features/execution/terminal.ts b/src/features/execution/terminal.ts index 310f624..ad1dbeb 100644 --- a/src/features/execution/terminal.ts +++ b/src/features/execution/terminal.ts @@ -8,8 +8,9 @@ import { Uri, window, } from 'vscode'; -import { PythonEnvironment, PythonProject } from '../../api'; +import { IconPath, PythonEnvironment, PythonProject } from '../../api'; import * as path from 'path'; +import * as fsapi from 'fs-extra'; import { createTerminal, onDidChangeTerminalShellIntegration, @@ -134,11 +135,18 @@ async function activateEnvironmentOnCreation( } } +function getIconPath(i: IconPath | undefined): IconPath | undefined { + if (i instanceof Uri) { + return i.fsPath.endsWith('__icon__.py') ? undefined : i; + } + return i; +} + export async function createPythonTerminal(environment: PythonEnvironment, cwd?: string | Uri): Promise { const activatable = isActivatableEnvironment(environment); const newTerminal = createTerminal({ // name: `Python: ${environment.displayName}`, - iconPath: environment.iconPath, + iconPath: getIconPath(environment.iconPath), cwd, }); @@ -177,7 +185,12 @@ export async function getDedicatedTerminal( } const config = getConfiguration('python', uri); - const cwd = config.get('terminal.executeInFileDir', false) ? path.dirname(uri.fsPath) : project.uri; + const projectStat = await fsapi.stat(project.uri.fsPath); + const projectDir = projectStat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + + const uriStat = await fsapi.stat(uri.fsPath); + const uriDir = uriStat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); + const cwd = config.get('terminal.executeInFileDir', false) ? uriDir : projectDir; const newTerminal = await createPythonTerminal(environment, cwd); dedicatedTerminals.set(key, newTerminal); @@ -205,8 +218,9 @@ export async function getProjectTerminal( return terminal; } } - - const newTerminal = await createPythonTerminal(environment, project.uri); + const stat = await fsapi.stat(project.uri.fsPath); + const cwd = stat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + const newTerminal = await createPythonTerminal(environment, cwd); projectTerminals.set(key, newTerminal); const disable = onDidCloseTerminal((terminal) => { diff --git a/src/features/projectCreators.ts b/src/features/projectCreators.ts index 0c34de3..8963485 100644 --- a/src/features/projectCreators.ts +++ b/src/features/projectCreators.ts @@ -4,6 +4,7 @@ import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from import { ProjectCreators } from '../internal.api'; import { showErrorMessage } from '../common/errors/utils'; import { findFiles } from '../common/workspace.apis'; +import { showOpenDialog } from '../common/window.apis'; export class ProjectCreatorsImpl implements ProjectCreators { private _creators: PythonProjectCreator[] = []; @@ -29,7 +30,7 @@ export function registerExistingProjectProvider(pc: ProjectCreators): Disposable displayName: 'Add Existing Projects', async create(_options?: PythonProjectCreatorOptions): Promise { - const results = await window.showOpenDialog({ + const results = await showOpenDialog({ canSelectFiles: true, canSelectFolders: true, canSelectMany: true, diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index f3250de..c3dffe5 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -25,6 +25,7 @@ import { } from '../api'; import { EnvironmentManagers, + InternalEnvironmentManager, ProjectCreators, PythonEnvironmentImpl, PythonPackageImpl, @@ -33,6 +34,8 @@ import { import { createDeferred } from '../common/utils/deferred'; import { traceError } from '../common/logging'; import { showErrorMessage } from '../common/errors/utils'; +import { pickEnvironmentManager } from '../common/pickers/managers'; +import { handlePythonPath } from '../common/utils/pythonPath'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); @@ -80,12 +83,38 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { }; return new PythonEnvironmentImpl(envId, info); } - createEnvironment(scope: CreateEnvironmentScope): Promise { - const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope.uri); - if (!manager) { - return Promise.reject(new Error('No environment manager found')); + async createEnvironment(scope: CreateEnvironmentScope): Promise { + if (scope === 'global' || (!Array.isArray(scope) && scope instanceof Uri)) { + const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope); + if (!manager) { + return Promise.reject(new Error('No environment manager found')); + } + return manager.create(scope); + } else if (Array.isArray(scope) && scope.length === 1 && scope[0] instanceof Uri) { + const manager = this.envManagers.getEnvironmentManager(scope[0]); + if (!manager) { + return Promise.reject(new Error('No environment manager found')); + } + return manager.create(scope); + } else if (Array.isArray(scope) && scope.length > 0 && scope.every((s) => s instanceof Uri)) { + const managers: InternalEnvironmentManager[] = []; + scope.forEach((s) => { + const manager = this.envManagers.getEnvironmentManager(s); + if (manager && !managers.includes(manager)) { + managers.push(manager); + } + }); + + if (managers.length === 0) { + return Promise.reject(new Error('No environment managers found')); + } + const managerId = await pickEnvironmentManager(managers); + if (!managerId) { + return Promise.reject(new Error('No environment manager selected')); + } + const result = await managers.find((m) => m.id === managerId)?.create(scope); + return result; } - return manager.create(scope); } removeEnvironment(environment: PythonEnvironment): Promise { const manager = this.envManagers.getEnvironmentManager(environment); @@ -120,12 +149,12 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return items; } onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; - setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): void { + async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { const manager = this.envManagers.getEnvironmentManager(scope); if (!manager) { throw new Error('No environment manager found'); } - manager.set(scope, environment); + await manager.set(scope, environment); } async getEnvironment(context: GetEnvironmentScope): Promise { const manager = this.envManagers.getEnvironmentManager(context); @@ -136,24 +165,38 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { - const manager = this.envManagers.getEnvironmentManager(context); - if (!manager) { - const data = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; - traceError(`No environment manager found: ${data}`); - traceError(`Know environment managers: ${this.envManagers.managers.map((m) => m.name).join(', ')}`); - showErrorMessage('No environment manager found'); - return undefined; - } - const env = await manager.resolve(context); - if (env && !env.execInfo) { - traceError(`Environment wasn't resolved correctly, missing execution info: ${env.name}`); - traceError(`Environment: ${JSON.stringify(env)}`); - traceError(`Resolved by: ${manager.id}`); - showErrorMessage("Environment wasn't resolved correctly, missing execution info"); - return undefined; - } + if (context instanceof Uri) { + const projects = this.projectManager.getProjects(); + const projectEnvManagers: InternalEnvironmentManager[] = []; + projects.forEach((p) => { + const manager = this.envManagers.getEnvironmentManager(p.uri); + if (manager && !projectEnvManagers.includes(manager)) { + projectEnvManagers.push(manager); + } + }); - return env; + return await handlePythonPath(context, this.envManagers.managers, projectEnvManagers); + } else if ('envId' in context) { + const manager = this.envManagers.getEnvironmentManager(context); + if (!manager) { + const data = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; + traceError(`No environment manager found: ${data}`); + traceError(`Know environment managers: ${this.envManagers.managers.map((m) => m.name).join(', ')}`); + showErrorMessage('No environment manager found'); + return undefined; + } + const env = await manager.resolve(context); + if (env && !env.execInfo) { + traceError(`Environment wasn't resolved correctly, missing execution info: ${env.name}`); + traceError(`Environment: ${JSON.stringify(env)}`); + traceError(`Resolved by: ${manager.id}`); + showErrorMessage("Environment wasn't resolved correctly, missing execution info"); + return undefined; + } + + return env; + } + return undefined; } registerPackageManager(manager: PackageManager): Disposable { diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index ebffacc..01881f8 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -1,4 +1,4 @@ -import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon } from 'vscode'; +import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon, Uri } from 'vscode'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { PythonEnvironment, IconPath, Package, PythonProject } from '../../api'; @@ -26,10 +26,10 @@ export class EnvManagerTreeItem implements EnvTreeItem { public readonly parent: undefined; constructor(public readonly manager: InternalEnvironmentManager) { const item = new TreeItem(manager.displayName, TreeItemCollapsibleState.Collapsed); - item.iconPath = manager.iconPath; item.contextValue = this.getContextValue(); item.description = manager.description; item.tooltip = manager.tooltip; + this.setIcon(item); this.treeItem = item; } @@ -37,6 +37,16 @@ export class EnvManagerTreeItem implements EnvTreeItem { const create = this.manager.supportsCreate ? '-create' : ''; return `pythonEnvManager${create}`; } + + private setIcon(item: TreeItem) { + const iconPath = this.manager.iconPath; + if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { + item.resourceUri = iconPath; + item.iconPath = ThemeIcon.File; + } else { + item.iconPath = iconPath; + } + } } export class PythonEnvTreeItem implements EnvTreeItem { @@ -44,10 +54,10 @@ export class PythonEnvTreeItem implements EnvTreeItem { public readonly treeItem: TreeItem; constructor(public readonly environment: PythonEnvironment, public readonly parent: EnvManagerTreeItem) { const item = new TreeItem(environment.displayName ?? environment.name, TreeItemCollapsibleState.Collapsed); - item.iconPath = environment.iconPath; item.contextValue = this.getContextValue(); item.description = environment.description; item.tooltip = environment.tooltip; + this.setIcon(item); this.treeItem = item; } @@ -55,6 +65,16 @@ export class PythonEnvTreeItem implements EnvTreeItem { const remove = this.parent.manager.supportsRemove ? '-remove' : ''; return `pythonEnvironment${remove}`; } + + private setIcon(item: TreeItem) { + const iconPath = this.environment.iconPath; + if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { + item.resourceUri = iconPath; + item.iconPath = ThemeIcon.File; + } else { + item.iconPath = iconPath; + } + } } export class NoPythonEnvTreeItem implements EnvTreeItem { @@ -190,7 +210,8 @@ export class ProjectItem implements ProjectTreeItem { item.contextValue = 'python-workspace'; item.description = this.project.description; item.tooltip = this.project.tooltip; - item.iconPath = this.project.iconPath; + item.resourceUri = project.uri.fsPath.endsWith('.py') ? this.project.uri : undefined; + item.iconPath = this.project.iconPath ?? (project.uri.fsPath.endsWith('.py') ? ThemeIcon.File : undefined); this.treeItem = item; } @@ -212,13 +233,23 @@ export class ProjectEnvironment implements ProjectTreeItem { item.contextValue = 'python-env'; item.description = this.environment.description; item.tooltip = this.environment.tooltip; - item.iconPath = this.environment.iconPath; + this.setIcon(item); this.treeItem = item; } static getId(workspace: ProjectItem, environment: PythonEnvironment): string { return `${workspace.id}>>>${environment.envId}`; } + + private setIcon(item: TreeItem) { + const iconPath = this.environment.iconPath; + if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { + item.resourceUri = iconPath; + item.iconPath = ThemeIcon.File; + } else { + item.iconPath = iconPath; + } + } } export class NoProjectEnvironment implements ProjectTreeItem { diff --git a/src/internal.api.ts b/src/internal.api.ts index d43e3bf..af0af4a 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -1,4 +1,4 @@ -import { Disposable, Event, LogOutputChannel, MarkdownString, ThemeIcon, Uri } from 'vscode'; +import { Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode'; import { PythonEnvironment, EnvironmentManager, @@ -313,7 +313,7 @@ export class PythonProjectsImpl implements PythonProject { this.uri = uri; this.description = options?.description ?? uri.fsPath; this.tooltip = options?.tooltip ?? uri.fsPath; - this.iconPath = options?.iconPath ?? ThemeIcon.Folder; + this.iconPath = options?.iconPath; } } diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 11221ea..ab26a6c 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -35,10 +35,10 @@ export class CondaPackageManager implements PackageManager, Disposable { this.tooltip = 'Conda package manager'; } name: string; - displayName?: string | undefined; - description?: string | undefined; - tooltip?: string | MarkdownString | undefined; - iconPath?: IconPath | undefined; + displayName?: string; + description?: string; + tooltip?: string | MarkdownString; + iconPath?: IconPath; async install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { await window.withProgress( diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index b00454a..029fba5 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -15,7 +15,6 @@ import * as fsapi from 'fs-extra'; import { LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; -import { pickProject } from '../../common/pickers'; import { isNativeEnvInfo, NativeEnvInfo, @@ -27,6 +26,7 @@ import { getConfiguration } from '../../common/workspace.apis'; import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; import which from 'which'; import { shortVersion, sortEnvironments } from '../common/utils'; +import { pickProject } from '../../common/pickers/projects'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -352,28 +352,62 @@ export async function refreshCondaEnvs( return []; } +function getName(api: PythonEnvironmentApi, uris?: Uri | Uri[]): string | undefined { + if (!uris) { + return undefined; + } + if (Array.isArray(uris) && uris.length !== 1) { + return undefined; + } + return api.getPythonProject(Array.isArray(uris) ? uris[0] : uris)?.name; +} + +async function getLocation(api: PythonEnvironmentApi, uris: Uri | Uri[]): Promise { + if (!uris || (Array.isArray(uris) && (uris.length === 0 || uris.length > 1))) { + const projects: PythonProject[] = []; + if (Array.isArray(uris)) { + for (let uri of uris) { + const project = api.getPythonProject(uri); + if (project && !projects.includes(project)) { + projects.push(project); + } + } + } else { + api.getPythonProjects().forEach((p) => projects.push(p)); + } + const project = await pickProject(projects); + return project?.uri.fsPath; + } + return api.getPythonProject(Array.isArray(uris) ? uris[0] : uris)?.uri.fsPath; +} + export async function createCondaEnvironment( api: PythonEnvironmentApi, log: LogOutputChannel, manager: EnvironmentManager, - project?: PythonProject, + uris?: Uri | Uri[], ): Promise { // step1 ask user for named or prefix environment - const envType = await window.showQuickPick( - [ - { label: 'Named', description: 'Create a named conda environment' }, - { label: 'Prefix', description: 'Create environment in your workspace' }, - ], - { - placeHolder: 'Select the type of conda environment to create', - ignoreFocusOut: true, - }, - ); + const envType = + Array.isArray(uris) && uris.length > 1 + ? 'Named' + : ( + await window.showQuickPick( + [ + { label: 'Named', description: 'Create a named conda environment' }, + { label: 'Prefix', description: 'Create environment in your workspace' }, + ], + { + placeHolder: 'Select the type of conda environment to create', + ignoreFocusOut: true, + }, + ) + )?.label; if (envType) { - return envType.label === 'Named' - ? await createNamedCondaEnvironment(api, log, manager, project) - : await createPrefixCondaEnvironment(api, log, manager, project); + return envType === 'Named' + ? await createNamedCondaEnvironment(api, log, manager, getName(api, uris ?? [])) + : await createPrefixCondaEnvironment(api, log, manager, await getLocation(api, uris ?? [])); } return undefined; } @@ -382,33 +416,35 @@ async function createNamedCondaEnvironment( api: PythonEnvironmentApi, log: LogOutputChannel, manager: EnvironmentManager, - project?: PythonProject, + name?: string, ): Promise { - const name = await window.showInputBox({ + name = await window.showInputBox({ prompt: 'Enter the name of the conda environment to create', - value: project?.name, + value: name, ignoreFocusOut: true, }); if (!name) { return; } + const envName: string = name; + return await window.withProgress( { location: ProgressLocation.Notification, - title: `Creating conda environment: ${name}`, + title: `Creating conda environment: ${envName}`, }, async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runConda(['create', '--yes', '--name', name, 'python']); + const output = await runConda(['create', '--yes', '--name', envName, 'python']); log.info(output); const prefixes = await getPrefixes(); let envPath = ''; for (let prefix of prefixes) { - if (await fsapi.pathExists(path.join(prefix, name))) { - envPath = path.join(prefix, name); + if (await fsapi.pathExists(path.join(prefix, envName))) { + envPath = path.join(prefix, envName); break; } } @@ -416,15 +452,18 @@ async function createNamedCondaEnvironment( const environment = api.createPythonEnvironmentItem( { - name, + name: envName, environmentPath: Uri.file(envPath), - displayName: `${version} (${name})`, + displayName: `${version} (${envName})`, displayPath: envPath, description: envPath, version, execInfo: { - activatedRun: { executable: 'conda', args: ['run', '--live-stream', '-n', name, 'python'] }, - activation: [{ executable: 'conda', args: ['activate', name] }], + activatedRun: { + executable: 'conda', + args: ['run', '--live-stream', '-n', envName, 'python'], + }, + activation: [{ executable: 'conda', args: ['activate', envName] }], deactivation: [{ executable: 'conda', args: ['deactivate'] }], run: { executable: path.join(envPath, bin) }, }, @@ -445,16 +484,15 @@ async function createPrefixCondaEnvironment( api: PythonEnvironmentApi, log: LogOutputChannel, manager: EnvironmentManager, - project?: PythonProject, + fsPath?: string, ): Promise { - const picked = project?.uri.fsPath ?? (await pickProject(api.getPythonProjects()))?.uri.fsPath; - if (!picked) { + if (!fsPath) { return; } let name = `./.conda`; - if (await fsapi.pathExists(path.join(picked, '.conda'))) { - log.warn(`Environment "${path.join(picked, '.conda')}" already exists`); + if (await fsapi.pathExists(path.join(fsPath, '.conda'))) { + log.warn(`Environment "${path.join(fsPath, '.conda')}" already exists`); const newName = await window.showInputBox({ prompt: `Environment "${name}" already exists. Enter a different name`, ignoreFocusOut: true, @@ -471,7 +509,7 @@ async function createPrefixCondaEnvironment( name = newName; } - const prefix: string = path.isAbsolute(name) ? name : path.join(picked, name); + const prefix: string = path.isAbsolute(name) ? name : path.join(fsPath, name); return await window.withProgress( { diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 6ee8d9b..1511fda 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -43,7 +43,7 @@ export class PipPackageManager implements PackageManager, Disposable { this.displayName = 'Pip'; this.description = 'This package manager for python installs using pip.'; this.tooltip = new MarkdownString('This package manager for python installs using `pip`.'); - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')); + this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); } readonly name: string; readonly displayName?: string; diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index c0367ca..4344172 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -18,8 +18,8 @@ import { getSystemEnvForGlobal, getSystemEnvForWorkspace, refreshPythons, - resolvePythonEnvironment, - resolvePythonEnvironmentPath, + resolveSystemPythonEnvironment, + resolveSystemPythonEnvironmentPath, setSystemEnvForGlobal, setSystemEnvForWorkspace, } from './utils'; @@ -56,7 +56,7 @@ export class SysPythonManager implements EnvironmentManager { this.preferredPackageManagerId = 'ms-python.python:pip'; this.description = 'Manages Global python installs'; this.tooltip = new MarkdownString('$(globe) Python Environment Manager', true); - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')); + this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); } private _initialized: Deferred | undefined; @@ -178,7 +178,7 @@ export class SysPythonManager implements EnvironmentManager { } // This environment is unknown. Resolve it. - const resolved = await resolvePythonEnvironment(context, this.nativeFinder, this.api, this); + const resolved = await resolveSystemPythonEnvironment(context, this.nativeFinder, this.api, this); if (resolved) { // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. @@ -225,7 +225,7 @@ export class SysPythonManager implements EnvironmentManager { // If the environment is not found, resolve the fsPath. if (!this.globalEnv) { - this.globalEnv = await resolvePythonEnvironmentPath(fsPath, this.nativeFinder, this.api, this); + this.globalEnv = await resolveSystemPythonEnvironmentPath(fsPath, this.nativeFinder, this.api, this); // If the environment is resolved, add it to the collection if (this.globalEnv) { @@ -253,7 +253,7 @@ export class SysPythonManager implements EnvironmentManager { this.fsPathToEnv.set(p, found); } else { // If not found, resolve the path. - const resolved = await resolvePythonEnvironmentPath(env, this.nativeFinder, this.api, this); + const resolved = await resolveSystemPythonEnvironmentPath(env, this.nativeFinder, this.api, this); if (resolved) { // If resolved add it to the collection diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index aaa6ec3..a7793b7 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -196,7 +196,7 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { version: env.version, description: env.executable, environmentPath: Uri.file(env.executable), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')), + iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), sysPrefix: env.prefix, execInfo: { run: { @@ -391,7 +391,7 @@ export async function uninstallPackages( throw new Error(`No executable found for python: ${environment.environmentPath.fsPath}`); } -export async function resolvePythonEnvironment( +export async function resolveSystemPythonEnvironment( context: ResolveEnvironmentContext, nativeFinder: NativePythonFinder, @@ -399,11 +399,11 @@ export async function resolvePythonEnvironment( manager: EnvironmentManager, ): Promise { const fsPath = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; - const resolved = await resolvePythonEnvironmentPath(fsPath, nativeFinder, api, manager); + const resolved = await resolveSystemPythonEnvironmentPath(fsPath, nativeFinder, api, manager); return resolved; } -export async function resolvePythonEnvironmentPath( +export async function resolveSystemPythonEnvironmentPath( fsPath: string, nativeFinder: NativePythonFinder, api: PythonEnvironmentApi, diff --git a/src/managers/sysPython/uvProjectCreator.ts b/src/managers/sysPython/uvProjectCreator.ts index 328d302..c57127a 100644 --- a/src/managers/sysPython/uvProjectCreator.ts +++ b/src/managers/sysPython/uvProjectCreator.ts @@ -6,8 +6,8 @@ import { PythonProjectCreator, PythonProjectCreatorOptions, } from '../../api'; -import { pickProject } from '../../common/pickers'; import { runUV } from './utils'; +import { pickProject } from '../../common/pickers/projects'; export class UvProjectCreator implements PythonProjectCreator { constructor(private readonly api: PythonEnvironmentApi, private log: LogOutputChannel) { diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index fc246f8..cad6f3c 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -18,17 +18,18 @@ import { import { createPythonVenv, findVirtualEnvironments, + getGlobalVenvLocation, getVenvForGlobal, getVenvForWorkspace, removeVenv, + resolveVenvPythonEnvironment, + resolveVenvPythonEnvironmentPath, setVenvForGlobal, setVenvForWorkspace, } from './venvUtils'; import * as path from 'path'; -import { resolvePythonEnvironment, resolvePythonEnvironmentPath } from './utils'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; -import { pickProject } from '../../common/pickers'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; @@ -61,7 +62,7 @@ export class VenvManager implements EnvironmentManager { this.description = 'Manages virtual environments created using venv'; this.tooltip = new MarkdownString('Manages virtual environments created using `venv`', true); this.preferredPackageManagerId = 'ms-python.python:pip'; - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')); + this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); } private _initialized: Deferred | undefined; @@ -80,13 +81,17 @@ export class VenvManager implements EnvironmentManager { } async create(scope: CreateEnvironmentScope): Promise { - const project = scope === 'global' ? await pickProject(this.api.getPythonProjects()) : scope; - if (!project) { + let isGlobal = scope === 'global'; + if (Array.isArray(scope) && scope.length > 1) { + isGlobal = true; + } + const uri = !isGlobal && scope instanceof Uri ? scope : await getGlobalVenvLocation(); + if (!uri) { return; } const globals = await this.baseManager.getEnvironments('global'); - const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, project); + const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, uri); if (environment) { this.collection.push(environment); this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.add }]); @@ -243,7 +248,13 @@ export class VenvManager implements EnvironmentManager { } } - const resolved = await resolvePythonEnvironment(context, this.nativeFinder, this.api, this); + const resolved = await resolveVenvPythonEnvironment( + context, + this.nativeFinder, + this.api, + this, + this.baseManager, + ); if (resolved) { // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. @@ -267,7 +278,13 @@ export class VenvManager implements EnvironmentManager { // If the environment is not found, resolve the fsPath. Could be portable conda. if (!this.globalEnv) { - this.globalEnv = await resolvePythonEnvironmentPath(fsPath, this.nativeFinder, this.api, this); + this.globalEnv = await resolveVenvPythonEnvironmentPath( + fsPath, + this.nativeFinder, + this.api, + this, + this.baseManager, + ); // If the environment is resolved, add it to the collection if (this.globalEnv) { @@ -296,7 +313,13 @@ export class VenvManager implements EnvironmentManager { this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: found }); } } else { - const resolved = await resolvePythonEnvironmentPath(env, this.nativeFinder, this.api, this); + const resolved = await resolveVenvPythonEnvironmentPath( + env, + this.nativeFinder, + this.api, + this, + this.baseManager, + ); if (resolved) { // If resolved add it to the collection this.fsPathToEnv.set(p, resolved); diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 23d2ac6..ed923b6 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -1,18 +1,20 @@ -import { LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; +import { LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, Uri } from 'vscode'; import { EnvironmentManager, Installable, PythonCommandRunConfiguration, PythonEnvironment, PythonEnvironmentApi, + PythonEnvironmentInfo, PythonProject, + ResolveEnvironmentContext, TerminalShellType, } from '../../api'; import * as tomljs from '@iarna/toml'; import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; -import { isUvInstalled, runPython, runUV } from './utils'; +import { isUvInstalled, resolveSystemPythonEnvironmentPath, runPython, runUV } from './utils'; import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { isNativeEnvInfo, @@ -20,10 +22,18 @@ import { NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { pickEnvironmentFrom } from '../../common/pickers'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; -import { findFiles } from '../../common/workspace.apis'; +import { findFiles, getConfiguration } from '../../common/workspace.apis'; +import { pickEnvironmentFrom } from '../../common/pickers/environments'; +import { + showQuickPick, + withProgress, + showWarningMessage, + showInputBox, + showOpenDialog, +} from '../../common/window.apis'; +import { showErrorMessage } from '../../common/errors/utils'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -35,6 +45,10 @@ export async function clearVenvCache(): Promise { } export async function getVenvForWorkspace(fsPath: string): Promise { + if (process.env.VIRTUAL_ENV) { + return process.env.VIRTUAL_ENV; + } + const state = await getWorkspacePersistentState(); const data: { [key: string]: string } | undefined = await state.get(VENV_WORKSPACE_KEY); if (data) { @@ -76,6 +90,52 @@ function getName(binPath: string): string { return path.basename(dir1); } +function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { + if (env.executable && env.version && env.prefix) { + const venvName = env.name ?? getName(env.executable); + const sv = shortVersion(env.version); + const name = `${venvName} (${sv})`; + + const binDir = path.dirname(env.executable); + + const shellActivation: Map = new Map(); + shellActivation.set(TerminalShellType.bash, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); + shellActivation.set(TerminalShellType.powershell, [{ executable: path.join(binDir, 'Activate.ps1') }]); + shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); + shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); + + const shellDeactivation = new Map(); + shellDeactivation.set(TerminalShellType.bash, [{ executable: 'deactivate' }]); + shellDeactivation.set(TerminalShellType.powershell, [{ executable: 'deactivate' }]); + shellDeactivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'deactivate.bat') }]); + shellActivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); + + return { + name: name, + displayName: name, + shortDisplayName: `${sv} (${venvName})`, + displayPath: env.executable, + version: env.version, + description: env.executable, + environmentPath: Uri.file(env.executable), + iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), + sysPrefix: env.prefix, + execInfo: { + run: { + executable: env.executable, + }, + activatedRun: { + executable: env.executable, + }, + shellActivation, + shellDeactivation, + }, + }; + } else { + throw new Error(`Invalid python info: ${JSON.stringify(env)}`); + } +} + export async function findVirtualEnvironments( hardRefresh: boolean, nativeFinder: NativePythonFinder, @@ -97,52 +157,79 @@ export async function findVirtualEnvironments( return; } - const venvName = e.name ?? getName(e.executable); - const sv = shortVersion(e.version); - const name = `${venvName} (${sv})`; + const env = api.createPythonEnvironmentItem(getPythonInfo(e), manager); + collection.push(env); + log.info(`Found venv environment: ${env.name}`); + }); + return collection; +} - const binDir = path.dirname(e.executable); +function getVenvFoldersSetting(): string[] { + const settings = getConfiguration('python'); + return settings.get('venvFolders', []); +} - const shellActivation: Map = new Map(); - shellActivation.set(TerminalShellType.bash, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); - shellActivation.set(TerminalShellType.powershell, [{ executable: path.join(binDir, 'Activate.ps1') }]); - shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); - shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); +interface FolderQuickPickItem extends QuickPickItem { + uri?: Uri; +} +export async function getGlobalVenvLocation(): Promise { + const items: FolderQuickPickItem[] = [ + { + label: 'Browse', + description: 'Select a folder to create a global virtual environment', + }, + ]; - const shellDeactivation = new Map(); - shellDeactivation.set(TerminalShellType.bash, [{ executable: 'deactivate' }]); - shellDeactivation.set(TerminalShellType.powershell, [{ executable: 'deactivate' }]); - shellDeactivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'deactivate.bat') }]); - shellActivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); + const venvPaths = getVenvFoldersSetting(); + if (venvPaths.length > 0) { + items.push( + { + label: 'Venv Folders Setting', + kind: QuickPickItemKind.Separator, + }, + ...venvPaths.map((p) => ({ + label: path.basename(p), + description: path.resolve(p), + uri: Uri.file(path.resolve(p)), + })), + ); + } - const env = api.createPythonEnvironmentItem( + if (process.env.WORKON_HOME) { + items.push( { - name: name, - displayName: name, - shortDisplayName: `${sv} (${venvName})`, - displayPath: e.executable, - version: e.version, - description: e.executable, - environmentPath: Uri.file(e.executable), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')), - sysPrefix: e.prefix, - execInfo: { - run: { - executable: e.executable, - }, - activatedRun: { - executable: e.executable, - }, - shellActivation, - shellDeactivation, - }, + label: 'Virtualenvwrapper', + kind: QuickPickItemKind.Separator, + }, + { + label: 'WORKON_HOME', + description: process.env.WORKON_HOME, + uri: Uri.file(process.env.WORKON_HOME), }, - manager, ); - collection.push(env); - log.info(`Found venv environment: ${name}`); + } + + const selected = await showQuickPick(items, { + placeHolder: 'Select a folder to create a global virtual environment', + ignoreFocusOut: true, }); - return collection; + + if (selected) { + if (selected.label === 'Browse') { + const result = await showOpenDialog({ + canSelectFiles: false, + canSelectFolders: true, + canSelectMany: false, + openLabel: 'Select Folder', + }); + if (result && result.length > 0) { + return result[0]; + } + } else if (selected.uri) { + return selected.uri; + } + } + return undefined; } export async function createPythonVenv( @@ -151,38 +238,46 @@ export async function createPythonVenv( log: LogOutputChannel, manager: EnvironmentManager, basePythons: PythonEnvironment[], - project: PythonProject, + venvRoot: Uri, ): Promise { const filtered = basePythons.filter((e) => e.execInfo); if (filtered.length === 0) { log.error('No base python found'); - window.showErrorMessage('No base python found'); + showErrorMessage('No base python found'); return; } const basePython = await pickEnvironmentFrom(sortEnvironments(filtered)); if (!basePython || !basePython.execInfo) { log.error('No base python selected, cannot create virtual environment.'); - window.showErrorMessage('No base python selected, cannot create virtual environment.'); + showErrorMessage('No base python selected, cannot create virtual environment.'); return; } - const name = await window.showInputBox({ + const name = await showInputBox({ prompt: 'Enter name for virtual environment', value: '.venv', ignoreFocusOut: true, + validateInput: async (value) => { + if (!value) { + return 'Name cannot be empty'; + } + if (await fsapi.pathExists(path.join(venvRoot.fsPath, value))) { + return 'Virtual environment already exists'; + } + }, }); if (!name) { log.error('No name entered, cannot create virtual environment.'); - window.showErrorMessage('No name entered, cannot create virtual environment.'); + showErrorMessage('No name entered, cannot create virtual environment.'); return; } - const envPath = path.join(project.uri.fsPath, name); + const envPath = path.join(venvRoot.fsPath, name); const pythonPath = os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); - return await window.withProgress( + return await withProgress( { location: ProgressLocation.Notification, title: 'Creating virtual environment', @@ -193,15 +288,15 @@ export async function createPythonVenv( if (basePython.execInfo?.run.executable) { if (useUv) { await runUV( - ['venv', '--verbose', '--seed', '--python', basePython.execInfo?.run.executable, name], - project.uri.fsPath, + ['venv', '--verbose', '--seed', '--python', basePython.execInfo?.run.executable, envPath], + venvRoot.fsPath, log, ); } else { await runPython( basePython.execInfo.run.executable, - ['-m', 'venv', name], - project.uri.fsPath, + ['-m', 'venv', envPath], + venvRoot.fsPath, manager.log, ); } @@ -241,7 +336,7 @@ export async function createPythonVenv( } } catch (e) { log.error(`Failed to create virtual environment: ${e}`); - window.showErrorMessage(`Failed to create virtual environment`); + showErrorMessage(`Failed to create virtual environment`); return; } }, @@ -255,9 +350,9 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC ? path.dirname(path.dirname(environment.environmentPath.fsPath)) : environment.environmentPath.fsPath; - const confirm = await window.showWarningMessage(`Are you sure you want to remove ${envPath}?`, 'Yes', 'No'); + const confirm = await showWarningMessage(`Are you sure you want to remove ${envPath}?`, 'Yes', 'No'); if (confirm === 'Yes') { - await window.withProgress( + await withProgress( { location: ProgressLocation.Notification, title: 'Removing virtual environment', @@ -326,7 +421,7 @@ export async function getProjectInstallable( } const exclude = '**/{.venv*,.git,.nox,.tox,.conda,site-packages,__pypackages__}/**'; const installable: Installable[] = []; - await window.withProgress( + await withProgress( { location: ProgressLocation.Window, title: 'Searching dependencies', @@ -368,3 +463,32 @@ export async function getProjectInstallable( ); return installable; } + +export async function resolveVenvPythonEnvironment( + context: ResolveEnvironmentContext, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, + baseManager: EnvironmentManager, +): Promise { + const fsPath = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; + const resolved = await resolveVenvPythonEnvironmentPath(fsPath, nativeFinder, api, manager, baseManager); + return resolved; +} + +export async function resolveVenvPythonEnvironmentPath( + fsPath: string, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, + baseManager: EnvironmentManager, +): Promise { + const resolved = await nativeFinder.resolve(fsPath); + + if (resolved.kind === NativePythonEnvironmentKind.venv) { + const envInfo = getPythonInfo(resolved); + return api.createPythonEnvironmentItem(envInfo, manager); + } + + return resolveSystemPythonEnvironmentPath(fsPath, nativeFinder, api, baseManager); +} From 44096b45e714f933b3977fd6e0df14513ae3cb56 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 5 Nov 2024 14:57:26 -0800 Subject: [PATCH 006/328] Terminal and Execution APIs (#10) --- .vscode/settings.json | 6 +- package.json | 40 ++ src/api.ts | 70 ++- src/common/command.api.ts | 5 + src/common/window.apis.ts | 29 + src/extension.ts | 56 +- .../{execution => common}/activation.ts | 21 + .../{execution => common}/shellDetector.ts | 0 src/features/envCommands.ts | 60 ++- src/features/execution/runInTerminal.ts | 53 +- src/features/execution/terminal.ts | 234 -------- src/features/terminal/activateMenuButton.ts | 64 +++ src/features/terminal/terminalManager.ts | 503 ++++++++++++++++++ src/internal.api.ts | 2 +- 14 files changed, 856 insertions(+), 287 deletions(-) create mode 100644 src/common/command.api.ts rename src/features/{execution => common}/activation.ts (63%) rename src/features/{execution => common}/shellDetector.ts (100%) delete mode 100644 src/features/execution/terminal.ts create mode 100644 src/features/terminal/activateMenuButton.ts create mode 100644 src/features/terminal/terminalManager.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 8d4822a..43d5bdc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,9 +10,9 @@ }, // Turn off tsc task auto detection since we have the necessary tasks as npm scripts "typescript.tsc.autoDetect": "off", + "editor.formatOnSave": true, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "prettier.tabWidth": 4 -} \ No newline at end of file +} diff --git a/package.json b/package.json index c378e8e..422b159 100644 --- a/package.json +++ b/package.json @@ -179,6 +179,18 @@ "title": "Run as Task", "category": "Python Envs", "icon": "$(play)" + }, + { + "command": "python-envs.terminal.activate", + "title": "Activate Environment in Current Terminal", + "category": "Python Envs", + "icon": "$(zap)" + }, + { + "command": "python-envs.terminal.deactivate", + "title": "Deactivate Environment in Current Terminal", + "category": "Python Envs", + "icon": "$(circle-slash)" } ], "menus": { @@ -234,6 +246,14 @@ { "command": "python-envs.runAsTask", "when": "true" + }, + { + "command": "python-envs.terminal.activate", + "when": "false" + }, + { + "command": "python-envs.terminal.deactivate", + "when": "false" } ], "view/item/context": [ @@ -315,6 +335,16 @@ "command": "python-envs.refreshAllManagers", "group": "navigation", "when": "view == env-managers" + }, + { + "command": "python-envs.terminal.activate", + "group": "navigation", + "when": "view == terminal && pythonTerminalActivation && !pythonTerminalActivated" + }, + { + "command": "python-envs.terminal.deactivate", + "group": "navigation", + "when": "view == terminal && pythonTerminalActivation && pythonTerminalActivated" } ], "explorer/context": [ @@ -335,6 +365,16 @@ "group": "Python", "when": "editorLangId == python" } + ], + "terminal/title/context": [ + { + "command": "python-envs.terminal.activate", + "when": "pythonTerminalActivation && !pythonTerminalActivated" + }, + { + "command": "python-envs.terminal.deactivate", + "when": "pythonTerminalActivation && pythonTerminalActivated" + } ] }, "viewsContainers": { diff --git a/src/api.ts b/src/api.ts index 58fc990..5038a1d 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1,4 +1,4 @@ -import { Uri, Disposable, MarkdownString, Event, LogOutputChannel, ThemeIcon } from 'vscode'; +import { Uri, Disposable, MarkdownString, Event, LogOutputChannel, ThemeIcon, Terminal } from 'vscode'; /** * The path to an icon, or a theme-specific configuration of icons. @@ -767,6 +767,40 @@ export interface Installable { readonly uri?: Uri; } +export interface PythonTaskResult {} + +export interface PythonProcess { + /** + * The process ID of the Python process. + */ + readonly pid: number; + + /** + * The standard input of the Python process. + */ + readonly stdin: NodeJS.WritableStream; + + /** + * The standard output of the Python process. + */ + readonly stdout: NodeJS.ReadableStream; + + /** + * The standard error of the Python process. + */ + readonly stderr: NodeJS.ReadableStream; + + /** + * Kills the Python process. + */ + kill(): void; + + /** + * Event that is fired when the Python process exits. + */ + onExit: Event; +} + export interface PythonEnvironmentManagerApi { /** * Register an environment manager implementation. @@ -963,6 +997,40 @@ export interface PythonProjectApi { registerPythonProjectCreator(creator: PythonProjectCreator): Disposable; } +export interface PythonExecutionApi { + createTerminal( + cwd: string | Uri | PythonProject, + environment?: PythonEnvironment, + envVars?: { [key: string]: string }, + ): Promise; + runInTerminal( + environment: PythonEnvironment, + cwd: string | Uri | PythonProject, + command: string, + args?: string[], + ): Promise; + runInDedicatedTerminal( + terminalKey: string | Uri, + environment: PythonEnvironment, + cwd: string | Uri | PythonProject, + command: string, + args?: string[], + ): Promise; + runAsTask( + environment: PythonEnvironment, + cwd: string | Uri | PythonProject, + command: string, + args?: string[], + envVars?: { [key: string]: string }, + ): Promise; + runInBackground( + environment: PythonEnvironment, + cwd: string | Uri | PythonProject, + command: string, + args?: string[], + envVars?: { [key: string]: string }, + ): Promise; +} /** * The API for interacting with Python environments, package managers, and projects. */ diff --git a/src/common/command.api.ts b/src/common/command.api.ts new file mode 100644 index 0000000..375cc00 --- /dev/null +++ b/src/common/command.api.ts @@ -0,0 +1,5 @@ +import { commands } from 'vscode'; + +export function executeCommand(command: string, ...rest: any[]): Thenable { + return commands.executeCommand(command, ...rest); +} diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 55961bf..1f706de 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -18,6 +18,7 @@ import { Terminal, TerminalOptions, TerminalShellExecutionEndEvent, + TerminalShellExecutionStartEvent, TerminalShellIntegrationChangeEvent, TextEditor, Uri, @@ -53,6 +54,34 @@ export function activeTerminal(): Terminal | undefined { return window.activeTerminal; } +export function activeTextEditor(): TextEditor | undefined { + return window.activeTextEditor; +} + +export function onDidChangeActiveTerminal( + listener: (e: Terminal | undefined) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return window.onDidChangeActiveTerminal(listener, thisArgs, disposables); +} + +export function onDidChangeActiveTextEditor( + listener: (e: TextEditor | undefined) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return window.onDidChangeActiveTextEditor(listener, thisArgs, disposables); +} + +export function onDidStartTerminalShellExecution( + listener: (e: TerminalShellExecutionStartEvent) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return window.onDidStartTerminalShellExecution(listener, thisArgs, disposables); +} + export function onDidEndTerminalShellExecution( listener: (e: TerminalShellExecutionEndEvent) => any, thisArgs?: any, diff --git a/src/extension.ts b/src/extension.ts index fb2f6d9..41456d2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -20,6 +20,7 @@ import { resetEnvironmentCommand, refreshPackagesCommand, createAnyEnvironmentCommand, + runInDedicatedTerminalCommand, } from './features/envCommands'; import { registerCondaFeatures } from './managers/conda/main'; import { registerSystemPythonFeatures } from './managers/sysPython/main'; @@ -37,6 +38,13 @@ import { } from './features/projectCreators'; import { WorkspaceView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; +import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; +import { activeTerminal, onDidChangeActiveTerminal, onDidChangeActiveTextEditor } from './common/window.apis'; +import { + getEnvironmentForTerminal, + setActivateMenuButtonContext, + updateActivateMenuButtonContext, +} from './features/terminal/activateMenuButton'; export async function activate(context: ExtensionContext): Promise { // Logging should be set up before anything else. @@ -46,6 +54,9 @@ export async function activate(context: ExtensionContext): Promise { - if (r.projects) { - projects.push(r.projects); + if (r.project) { + projects.push(r.project); } }); workspaceView.updateProject(projects); + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); } }), commands.registerCommand('python-envs.setEnv', async (item) => { @@ -116,11 +128,12 @@ export async function activate(context: ExtensionContext): Promise { - if (r.projects) { - projects.push(r.projects); + if (r.project) { + projects.push(r.project); } }); workspaceView.updateProject(projects); + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); } }), commands.registerCommand('python-envs.reset', async (item) => { @@ -143,15 +156,44 @@ export async function activate(context: ExtensionContext): Promise { - return runInTerminalCommand(item, api); + return runInTerminalCommand(item, api, terminalManager); + }), + commands.registerCommand('python-envs.runInDedicatedTerminal', (item) => { + return runInDedicatedTerminalCommand(item, api, terminalManager); }), commands.registerCommand('python-envs.runAsTask', (item) => { return runAsTaskCommand(item, api); }), commands.registerCommand('python-envs.createTerminal', (item) => { - return createTerminalCommand(item, api); + return createTerminalCommand(item, api, terminalManager); + }), + commands.registerCommand('python-envs.terminal.activate', async () => { + const terminal = activeTerminal(); + if (terminal) { + const env = await getEnvironmentForTerminal(terminalManager, projectManager, envManagers, terminal); + if (env) { + await terminalManager.activate(terminal, env); + await setActivateMenuButtonContext(terminalManager, terminal, env); + } + } + }), + commands.registerCommand('python-envs.terminal.deactivate', async () => { + const terminal = activeTerminal(); + if (terminal) { + await terminalManager.deactivate(terminal); + const env = await getEnvironmentForTerminal(terminalManager, projectManager, envManagers, terminal); + if (env) { + await setActivateMenuButtonContext(terminalManager, terminal, env); + } + } + }), + envManagers.onDidChangeEnvironmentManager(async () => { + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); + }), + onDidChangeActiveTerminal(async (t) => { + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers, t); }), - window.onDidChangeActiveTextEditor(async (e: TextEditor | undefined) => { + onDidChangeActiveTextEditor(async (e: TextEditor | undefined) => { if (e && !e.document.isUntitled && e.document.uri.scheme === 'file') { if ( e.document.languageId === 'python' || diff --git a/src/features/execution/activation.ts b/src/features/common/activation.ts similarity index 63% rename from src/features/execution/activation.ts rename to src/features/common/activation.ts index b141ee5..34d359a 100644 --- a/src/features/execution/activation.ts +++ b/src/features/common/activation.ts @@ -30,3 +30,24 @@ export function getActivationCommand( return activation; } + +export function getDeactivationCommand( + terminal: Terminal, + environment: PythonEnvironment, +): PythonCommandRunConfiguration[] | undefined { + const shell = identifyTerminalShell(terminal); + + let deactivation: PythonCommandRunConfiguration[] | undefined; + if (environment.execInfo?.shellDeactivation) { + deactivation = environment.execInfo.shellDeactivation.get(shell); + if (!deactivation) { + deactivation = environment.execInfo.shellDeactivation.get(TerminalShellType.unknown); + } + } + + if (!deactivation) { + deactivation = environment.execInfo?.deactivation; + } + + return deactivation; +} diff --git a/src/features/execution/shellDetector.ts b/src/features/common/shellDetector.ts similarity index 100% rename from src/features/execution/shellDetector.ts rename to src/features/common/shellDetector.ts diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 60063d9..8692193 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -24,7 +24,6 @@ import { } from './settings/settingHelpers'; import { getAbsolutePath } from '../common/utils/fileNameUtils'; -import { createPythonTerminal } from './execution/terminal'; import { runInTerminal } from './execution/runInTerminal'; import { runAsTask } from './execution/runAsTask'; import { @@ -40,6 +39,7 @@ import { pickEnvironment } from '../common/pickers/environments'; import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; import { pickPackageOptions, getPackagesToInstall, getPackagesToUninstall } from '../common/pickers/packages'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; +import { TerminalManager } from './terminal/terminalManager'; export async function refreshManagerCommand(context: unknown): Promise { if (context instanceof EnvManagerTreeItem) { @@ -158,7 +158,7 @@ export async function handlePackagesCommand( } export interface EnvironmentSetResult { - projects?: PythonProject; + project?: PythonProject; environment: PythonEnvironment; } @@ -180,7 +180,7 @@ export async function setEnvironmentCommand( packageManager: manager.preferredPackageManagerId, })), ); - return projects.map((p) => ({ project: [p], environment: view.environment })); + return projects.map((p) => ({ project: p, environment: view.environment })); } return; } else if (context instanceof ProjectItem) { @@ -240,7 +240,7 @@ export async function setEnvironmentCommand( }); await Promise.all(promises); await setAllManagerSettings(settings); - return [...projects.map((p) => ({ project: p, environment: selected }))]; + return projects.map((p) => ({ project: p, environment: selected })); } return; } @@ -417,19 +417,20 @@ export async function getPackageCommandOptions( export async function createTerminalCommand( context: unknown, api: PythonEnvironmentApi, + tm: TerminalManager, ): Promise { if (context instanceof Uri) { const uri = context as Uri; const env = await api.getEnvironment(uri); const pw = api.getPythonProject(uri); if (env && pw) { - return await createPythonTerminal(env, pw.uri); + return await tm.create(env, pw.uri); } } else if (context instanceof ProjectItem) { const view = context as ProjectItem; const env = await api.getEnvironment(view.project.uri); if (env) { - const terminal = await createPythonTerminal(env, view.project.uri); + const terminal = await tm.create(env, view.project.uri); terminal.show(); return terminal; } @@ -437,26 +438,32 @@ export async function createTerminalCommand( const view = context as PythonEnvTreeItem; const pw = await pickProject(api.getPythonProjects()); if (pw) { - const terminal = await createPythonTerminal(view.environment, pw.uri); + const terminal = await tm.create(view.environment, pw.uri); terminal.show(); return terminal; } } } -export async function runInTerminalCommand(item: unknown, api: PythonEnvironmentApi): Promise { +export async function runInTerminalCommand( + item: unknown, + api: PythonEnvironmentApi, + tm: TerminalManager, +): Promise { const keys = Object.keys(item ?? {}); if (item instanceof Uri) { const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment && project) { + const terminal = await tm.getProjectTerminal(project, environment); await runInTerminal( + environment, + terminal, { project, args: [item.fsPath], }, - environment, { show: true }, ); } @@ -464,7 +471,40 @@ export async function runInTerminalCommand(item: unknown, api: PythonEnvironment const options = item as PythonTerminalExecutionOptions; const environment = await api.getEnvironment(options.project.uri); if (environment) { - await runInTerminal(options, environment, { show: true }); + const terminal = await tm.getProjectTerminal(options.project, environment); + await runInTerminal(environment, terminal, options, { show: true }); + } + } +} + +export async function runInDedicatedTerminalCommand( + item: unknown, + api: PythonEnvironmentApi, + tm: TerminalManager, +): Promise { + const keys = Object.keys(item ?? {}); + if (item instanceof Uri) { + const uri = item as Uri; + const project = api.getPythonProject(uri); + const environment = await api.getEnvironment(uri); + if (environment && project) { + const terminal = await tm.getDedicatedTerminal(item, project, environment); + await runInTerminal( + environment, + terminal, + { + project, + args: [item.fsPath], + }, + { show: true }, + ); + } + } else if (keys.includes('project') && keys.includes('args')) { + const options = item as PythonTerminalExecutionOptions; + const environment = await api.getEnvironment(options.project.uri); + if (environment && options.uri) { + const terminal = await tm.getDedicatedTerminal(options.uri, options.project, environment); + await runInTerminal(environment, terminal, options, { show: true }); } } } diff --git a/src/features/execution/runInTerminal.ts b/src/features/execution/runInTerminal.ts index 7f247d9..a29edc2 100644 --- a/src/features/execution/runInTerminal.ts +++ b/src/features/execution/runInTerminal.ts @@ -1,47 +1,38 @@ import { Terminal, TerminalShellExecution } from 'vscode'; import { PythonEnvironment } from '../../api'; import { PythonTerminalExecutionOptions } from '../../internal.api'; -import { getDedicatedTerminal, getProjectTerminal } from './terminal'; import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createDeferred } from '../../common/utils/deferred'; import { quoteArgs } from './execUtils'; export async function runInTerminal( - options: PythonTerminalExecutionOptions, environment: PythonEnvironment, + terminal: Terminal, + options: PythonTerminalExecutionOptions, extra?: { show?: boolean }, ): Promise { - let terminal: Terminal | undefined; - if (options.useDedicatedTerminal) { - terminal = await getDedicatedTerminal(options.useDedicatedTerminal, environment, options.project); - } else { - terminal = await getProjectTerminal(options.project, environment); + if (extra?.show) { + terminal.show(); } - if (terminal) { - if (extra?.show) { - terminal.show(); - } + const executable = + environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; + const allArgs = [...args, ...options.args]; - const executable = - environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; - const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; - const allArgs = [...args, ...options.args]; - - if (terminal.shellIntegration) { - let execution: TerminalShellExecution | undefined; - const deferred = createDeferred(); - const disposable = onDidEndTerminalShellExecution((e) => { - if (e.execution === execution) { - disposable.dispose(); - deferred.resolve(); - } - }); - execution = terminal.shellIntegration.executeCommand(executable, allArgs); - return deferred.promise; - } else { - const text = quoteArgs([executable, ...allArgs]).join(' '); - terminal.sendText(`${text}\n`); - } + if (terminal.shellIntegration) { + let execution: TerminalShellExecution | undefined; + const deferred = createDeferred(); + const disposable = onDidEndTerminalShellExecution((e) => { + if (e.execution === execution) { + disposable.dispose(); + deferred.resolve(); + } + }); + execution = terminal.shellIntegration.executeCommand(executable, allArgs); + return deferred.promise; + } else { + const text = quoteArgs([executable, ...allArgs]).join(' '); + terminal.sendText(`${text}\n`); } } diff --git a/src/features/execution/terminal.ts b/src/features/execution/terminal.ts deleted file mode 100644 index ad1dbeb..0000000 --- a/src/features/execution/terminal.ts +++ /dev/null @@ -1,234 +0,0 @@ -import { - Disposable, - Progress, - ProgressLocation, - Terminal, - TerminalShellExecutionEndEvent, - TerminalShellIntegration, - Uri, - window, -} from 'vscode'; -import { IconPath, PythonEnvironment, PythonProject } from '../../api'; -import * as path from 'path'; -import * as fsapi from 'fs-extra'; -import { - createTerminal, - onDidChangeTerminalShellIntegration, - onDidCloseTerminal, - onDidEndTerminalShellExecution, - onDidOpenTerminal, -} from '../../common/window.apis'; -import { getActivationCommand, isActivatableEnvironment } from './activation'; -import { createDeferred } from '../../common/utils/deferred'; -import { getConfiguration } from '../../common/workspace.apis'; -import { quoteArgs } from './execUtils'; - -const SHELL_INTEGRATION_TIMEOUT = 5; - -async function runActivationCommands( - shellIntegration: TerminalShellIntegration, - terminal: Terminal, - environment: PythonEnvironment, - progress: Progress<{ - message?: string; - increment?: number; - }>, -) { - const activationCommands = getActivationCommand(terminal, environment); - if (activationCommands) { - for (const command of activationCommands) { - const text = command.args ? `${command.executable} ${command.args.join(' ')}` : command.executable; - progress.report({ message: `Activating ${environment.displayName}: running ${text}` }); - const execPromise = createDeferred(); - const execution = command.args - ? shellIntegration.executeCommand(command.executable, command.args) - : shellIntegration.executeCommand(command.executable); - - const disposable = onDidEndTerminalShellExecution((e: TerminalShellExecutionEndEvent) => { - if (e.execution === execution) { - execPromise.resolve(); - disposable.dispose(); - } - }); - - await execPromise.promise; - } - } -} - -function runActivationCommandsLegacy(terminal: Terminal, environment: PythonEnvironment) { - const activationCommands = getActivationCommand(terminal, environment); - if (activationCommands) { - for (const command of activationCommands) { - const args = command.args ?? []; - const text = quoteArgs([command.executable, ...args]).join(' '); - terminal.sendText(text); - } - } -} - -async function activateEnvironmentOnCreation( - newTerminal: Terminal, - environment: PythonEnvironment, - progress: Progress<{ - message?: string; - increment?: number; - }>, -) { - const deferred = createDeferred(); - const disposables: Disposable[] = []; - let disposeTimer: Disposable | undefined; - - try { - let activated = false; - progress.report({ message: `Activating ${environment.displayName}: waiting for Shell Integration` }); - disposables.push( - onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => { - if (terminal === newTerminal && !activated) { - disposeTimer?.dispose(); - activated = true; - await runActivationCommands(shellIntegration, terminal, environment, progress); - deferred.resolve(); - } - }), - onDidOpenTerminal((terminal) => { - if (terminal === newTerminal) { - let seconds = 0; - const timer = setInterval(() => { - if (newTerminal.shellIntegration || activated) { - return; - } - if (seconds >= SHELL_INTEGRATION_TIMEOUT) { - disposeTimer?.dispose(); - activated = true; - progress.report({ message: `Activating ${environment.displayName}: using legacy method` }); - runActivationCommandsLegacy(terminal, environment); - deferred.resolve(); - } else { - progress.report({ - message: `Activating ${environment.displayName}: waiting for Shell Integration ${ - SHELL_INTEGRATION_TIMEOUT - seconds - }s`, - }); - } - seconds++; - }, 1000); - - disposeTimer = new Disposable(() => { - clearInterval(timer); - disposeTimer = undefined; - }); - } - }), - onDidCloseTerminal((terminal) => { - if (terminal === newTerminal && !deferred.completed) { - deferred.reject(new Error('Terminal closed before activation')); - } - }), - new Disposable(() => { - disposeTimer?.dispose(); - }), - ); - await deferred.promise; - } finally { - disposables.forEach((d) => d.dispose()); - } -} - -function getIconPath(i: IconPath | undefined): IconPath | undefined { - if (i instanceof Uri) { - return i.fsPath.endsWith('__icon__.py') ? undefined : i; - } - return i; -} - -export async function createPythonTerminal(environment: PythonEnvironment, cwd?: string | Uri): Promise { - const activatable = isActivatableEnvironment(environment); - const newTerminal = createTerminal({ - // name: `Python: ${environment.displayName}`, - iconPath: getIconPath(environment.iconPath), - cwd, - }); - - if (activatable) { - try { - await window.withProgress( - { - location: ProgressLocation.Window, - title: `Activating ${environment.displayName}`, - }, - async (progress) => { - await activateEnvironmentOnCreation(newTerminal, environment, progress); - }, - ); - } catch (e) { - window.showErrorMessage(`Failed to activate ${environment.displayName}`); - } - } - - return newTerminal; -} - -const dedicatedTerminals = new Map(); -export async function getDedicatedTerminal( - uri: Uri, - environment: PythonEnvironment, - project: PythonProject, - createNew: boolean = false, -): Promise { - const key = `${environment.envId.id}:${path.normalize(uri.fsPath)}`; - if (!createNew) { - const terminal = dedicatedTerminals.get(key); - if (terminal) { - return terminal; - } - } - - const config = getConfiguration('python', uri); - const projectStat = await fsapi.stat(project.uri.fsPath); - const projectDir = projectStat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); - - const uriStat = await fsapi.stat(uri.fsPath); - const uriDir = uriStat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); - const cwd = config.get('terminal.executeInFileDir', false) ? uriDir : projectDir; - - const newTerminal = await createPythonTerminal(environment, cwd); - dedicatedTerminals.set(key, newTerminal); - - const disable = onDidCloseTerminal((terminal) => { - if (terminal === newTerminal) { - dedicatedTerminals.delete(key); - disable.dispose(); - } - }); - - return newTerminal; -} - -const projectTerminals = new Map(); -export async function getProjectTerminal( - project: PythonProject, - environment: PythonEnvironment, - createNew: boolean = false, -): Promise { - const key = `${environment.envId.id}:${path.normalize(project.uri.fsPath)}`; - if (!createNew) { - const terminal = projectTerminals.get(key); - if (terminal) { - return terminal; - } - } - const stat = await fsapi.stat(project.uri.fsPath); - const cwd = stat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); - const newTerminal = await createPythonTerminal(environment, cwd); - projectTerminals.set(key, newTerminal); - - const disable = onDidCloseTerminal((terminal) => { - if (terminal === newTerminal) { - projectTerminals.delete(key); - disable.dispose(); - } - }); - - return newTerminal; -} diff --git a/src/features/terminal/activateMenuButton.ts b/src/features/terminal/activateMenuButton.ts new file mode 100644 index 0000000..968269c --- /dev/null +++ b/src/features/terminal/activateMenuButton.ts @@ -0,0 +1,64 @@ +import { Terminal } from 'vscode'; +import { activeTerminal } from '../../common/window.apis'; +import { TerminalActivation, TerminalEnvironment } from './terminalManager'; +import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; +import { PythonEnvironment } from '../../api'; +import { isActivatableEnvironment } from '../common/activation'; +import { executeCommand } from '../../common/command.api'; + +export async function getEnvironmentForTerminal( + tm: TerminalEnvironment, + pm: PythonProjectManager, + em: EnvironmentManagers, + t: Terminal, +): Promise { + let env = await tm.getEnvironment(t); + + if (!env) { + const projects = pm.getProjects(); + if (projects.length === 0) { + const manager = em.getEnvironmentManager(undefined); + env = await manager?.get(undefined); + } else if (projects.length === 1) { + const manager = em.getEnvironmentManager(projects[0].uri); + env = await manager?.get(projects[0].uri); + } + } + + return env; +} + +export async function updateActivateMenuButtonContext( + tm: TerminalEnvironment & TerminalActivation, + pm: PythonProjectManager, + em: EnvironmentManagers, + terminal?: Terminal, +): Promise { + const selected = terminal ?? activeTerminal(); + + if (!selected) { + return; + } + + const env = await getEnvironmentForTerminal(tm, pm, em, selected); + if (!env) { + return; + } + + await setActivateMenuButtonContext(tm, selected, env); +} + +export async function setActivateMenuButtonContext( + tm: TerminalActivation, + terminal: Terminal, + env: PythonEnvironment, +): Promise { + const activatable = isActivatableEnvironment(env); + await executeCommand('setContext', 'pythonTerminalActivation', activatable); + + if (tm.isActivated(terminal)) { + await executeCommand('setContext', 'pythonTerminalActivated', true); + } else { + await executeCommand('setContext', 'pythonTerminalActivated', false); + } +} diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts new file mode 100644 index 0000000..8cdb9b1 --- /dev/null +++ b/src/features/terminal/terminalManager.ts @@ -0,0 +1,503 @@ +import * as path from 'path'; +import * as fsapi from 'fs-extra'; +import { + Disposable, + EventEmitter, + ProgressLocation, + TerminalShellIntegration, + Terminal, + TerminalShellExecutionEndEvent, + TerminalShellExecutionStartEvent, + TerminalShellIntegrationChangeEvent, + Uri, +} from 'vscode'; +import { + createTerminal, + onDidChangeTerminalShellIntegration, + onDidCloseTerminal, + onDidEndTerminalShellExecution, + onDidOpenTerminal, + onDidStartTerminalShellExecution, + terminals, + withProgress, +} from '../../common/window.apis'; +import { IconPath, PythonEnvironment, PythonProject } from '../../api'; +import { getActivationCommand, getDeactivationCommand, isActivatableEnvironment } from '../common/activation'; +import { showErrorMessage } from '../../common/errors/utils'; +import { quoteArgs } from '../execution/execUtils'; +import { createDeferred } from '../../common/utils/deferred'; +import { traceError, traceVerbose } from '../../common/logging'; +import { getConfiguration } from '../../common/workspace.apis'; +import { EnvironmentManagers } from '../../internal.api'; + +function getIconPath(i: IconPath | undefined): IconPath | undefined { + if (i instanceof Uri) { + return i.fsPath.endsWith('__icon__.py') ? undefined : i; + } + return i; +} + +const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds +const SHELL_INTEGRATION_POLL_INTERVAL = 100; // 0.1 seconds + +export interface TerminalActivation { + isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean; + activate(terminal: Terminal, environment: PythonEnvironment): Promise; + deactivate(terminal: Terminal): Promise; +} + +export interface TerminalCreation { + create( + environment: PythonEnvironment, + cwd?: string | Uri, + env?: { [key: string]: string | null | undefined }, + ): Promise; +} + +export interface TerminalGetters { + getProjectTerminal(project: PythonProject, environment: PythonEnvironment, createNew?: boolean): Promise; + getDedicatedTerminal( + uri: Uri, + project: PythonProject, + environment: PythonEnvironment, + createNew?: boolean, + ): Promise; +} + +export interface TerminalEnvironment { + getEnvironment(terminal: Terminal): Promise; +} + +export interface TerminalInit { + initialize(projects: PythonProject[], em: EnvironmentManagers): Promise; +} + +export interface TerminalManager + extends TerminalEnvironment, + TerminalInit, + TerminalActivation, + TerminalCreation, + TerminalGetters, + Disposable {} + +export class TerminalManagerImpl implements TerminalManager { + private disposables: Disposable[] = []; + private activatedTerminals = new Map(); + private activatingTerminals = new Map>(); + private deactivatingTerminals = new Map>(); + + private onTerminalOpenedEmitter = new EventEmitter(); + private onTerminalOpened = this.onTerminalOpenedEmitter.event; + + private onTerminalClosedEmitter = new EventEmitter(); + private onTerminalClosed = this.onTerminalClosedEmitter.event; + + private onTerminalShellIntegrationChangedEmitter = new EventEmitter(); + private onTerminalShellIntegrationChanged = this.onTerminalShellIntegrationChangedEmitter.event; + + private onTerminalShellExecutionStartEmitter = new EventEmitter(); + private onTerminalShellExecutionStart = this.onTerminalShellExecutionStartEmitter.event; + + private onTerminalShellExecutionEndEmitter = new EventEmitter(); + private onTerminalShellExecutionEnd = this.onTerminalShellExecutionEndEmitter.event; + + constructor() { + this.disposables.push( + onDidOpenTerminal((t: Terminal) => { + this.onTerminalOpenedEmitter.fire(t); + }), + onDidCloseTerminal((t: Terminal) => { + this.onTerminalClosedEmitter.fire(t); + }), + onDidChangeTerminalShellIntegration((e: TerminalShellIntegrationChangeEvent) => { + this.onTerminalShellIntegrationChangedEmitter.fire(e); + }), + onDidStartTerminalShellExecution((e: TerminalShellExecutionStartEvent) => { + this.onTerminalShellExecutionStartEmitter.fire(e); + }), + onDidEndTerminalShellExecution((e: TerminalShellExecutionEndEvent) => { + this.onTerminalShellExecutionEndEmitter.fire(e); + }), + this.onTerminalOpenedEmitter, + this.onTerminalClosedEmitter, + this.onTerminalShellIntegrationChangedEmitter, + this.onTerminalShellExecutionStartEmitter, + this.onTerminalShellExecutionEndEmitter, + ); + } + + private activateLegacy(terminal: Terminal, environment: PythonEnvironment) { + const activationCommands = getActivationCommand(terminal, environment); + if (activationCommands) { + for (const command of activationCommands) { + const args = command.args ?? []; + const text = quoteArgs([command.executable, ...args]).join(' '); + terminal.sendText(text); + } + this.activatedTerminals.set(terminal, environment); + } + } + + private deactivateLegacy(terminal: Terminal, environment: PythonEnvironment) { + const deactivationCommands = getDeactivationCommand(terminal, environment); + if (deactivationCommands) { + for (const command of deactivationCommands) { + const args = command.args ?? []; + const text = quoteArgs([command.executable, ...args]).join(' '); + terminal.sendText(text); + } + this.activatedTerminals.delete(terminal); + } + } + + private async activateUsingShellIntegration( + shellIntegration: TerminalShellIntegration, + terminal: Terminal, + environment: PythonEnvironment, + ): Promise { + const activationCommands = getActivationCommand(terminal, environment); + if (activationCommands) { + try { + for (const command of activationCommands) { + const execPromise = createDeferred(); + const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const disposables: Disposable[] = []; + disposables.push( + this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { + if (e.execution === execution) { + execPromise.resolve(); + } + }), + this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { + if (e.execution === execution) { + traceVerbose( + `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, + ); + } + }), + ); + await execPromise.promise; + } + } finally { + this.activatedTerminals.set(terminal, environment); + } + } + } + + private async deactivateUsingShellIntegration( + shellIntegration: TerminalShellIntegration, + terminal: Terminal, + environment: PythonEnvironment, + ): Promise { + const deactivationCommands = getDeactivationCommand(terminal, environment); + if (deactivationCommands) { + try { + for (const command of deactivationCommands) { + const execPromise = createDeferred(); + const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const disposables: Disposable[] = []; + disposables.push( + this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { + if (e.execution === execution) { + execPromise.resolve(); + } + }), + this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { + if (e.execution === execution) { + traceVerbose( + `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, + ); + } + }), + ); + + await execPromise.promise; + } + } finally { + this.activatedTerminals.delete(terminal); + } + } + } + + private async activateEnvironmentOnCreation(terminal: Terminal, environment: PythonEnvironment): Promise { + const deferred = createDeferred(); + const disposables: Disposable[] = []; + let disposeTimer: Disposable | undefined; + let activated = false; + this.activatingTerminals.set(terminal, deferred.promise); + + try { + disposables.push( + new Disposable(() => { + this.activatingTerminals.delete(terminal); + }), + this.onTerminalOpened(async (t: Terminal) => { + if (t === terminal) { + if (terminal.shellIntegration) { + // Shell integration is available when the terminal is opened. + activated = true; + await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); + deferred.resolve(); + } else { + let seconds = 0; + const timer = setInterval(() => { + seconds += SHELL_INTEGRATION_POLL_INTERVAL; + if (terminal.shellIntegration || activated) { + disposeTimer?.dispose(); + return; + } + + if (seconds >= SHELL_INTEGRATION_TIMEOUT) { + disposeTimer?.dispose(); + activated = true; + this.activateLegacy(terminal, environment); + deferred.resolve(); + } + }, 100); + + disposeTimer = new Disposable(() => { + clearInterval(timer); + disposeTimer = undefined; + }); + } + } + }), + this.onTerminalShellIntegrationChanged(async (e: TerminalShellIntegrationChangeEvent) => { + if (terminal === e.terminal && !activated) { + disposeTimer?.dispose(); + activated = true; + await this.activateUsingShellIntegration(e.shellIntegration, terminal, environment); + deferred.resolve(); + } + }), + this.onTerminalClosed((t) => { + if (terminal === t && !deferred.completed) { + deferred.reject(new Error('Terminal closed before activation')); + } + }), + new Disposable(() => { + disposeTimer?.dispose(); + }), + ); + await deferred.promise; + } catch (ex) { + traceError('Failed to activate environment:\r\n', ex); + } finally { + disposables.forEach((d) => d.dispose()); + } + } + + public async create( + environment: PythonEnvironment, + cwd?: string | Uri | undefined, + env?: { [key: string]: string | null | undefined }, + ): Promise { + const activatable = isActivatableEnvironment(environment); + const newTerminal = createTerminal({ + // name: `Python: ${environment.displayName}`, + iconPath: getIconPath(environment.iconPath), + cwd, + env, + }); + if (activatable) { + try { + await withProgress( + { + location: ProgressLocation.Window, + title: `Activating ${environment.displayName}`, + }, + async () => { + await this.activateEnvironmentOnCreation(newTerminal, environment); + }, + ); + } catch (e) { + showErrorMessage(`Failed to activate ${environment.displayName}`); + } + } + return newTerminal; + } + + private dedicatedTerminals = new Map(); + async getDedicatedTerminal( + uri: Uri, + project: PythonProject, + environment: PythonEnvironment, + createNew: boolean = false, + ): Promise { + const key = `${environment.envId.id}:${path.normalize(uri.fsPath)}`; + if (!createNew) { + const terminal = this.dedicatedTerminals.get(key); + if (terminal) { + return terminal; + } + } + + const config = getConfiguration('python', uri); + const projectStat = await fsapi.stat(project.uri.fsPath); + const projectDir = projectStat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + + const uriStat = await fsapi.stat(uri.fsPath); + const uriDir = uriStat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); + const cwd = config.get('terminal.executeInFileDir', false) ? uriDir : projectDir; + + const newTerminal = await this.create(environment, cwd); + this.dedicatedTerminals.set(key, newTerminal); + + const disable = onDidCloseTerminal((terminal) => { + if (terminal === newTerminal) { + this.dedicatedTerminals.delete(key); + disable.dispose(); + } + }); + + return newTerminal; + } + + private projectTerminals = new Map(); + async getProjectTerminal( + project: PythonProject, + environment: PythonEnvironment, + createNew: boolean = false, + ): Promise { + const key = `${environment.envId.id}:${path.normalize(project.uri.fsPath)}`; + if (!createNew) { + const terminal = this.projectTerminals.get(key); + if (terminal) { + return terminal; + } + } + const stat = await fsapi.stat(project.uri.fsPath); + const cwd = stat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + const newTerminal = await this.create(environment, cwd); + this.projectTerminals.set(key, newTerminal); + + const disable = onDidCloseTerminal((terminal) => { + if (terminal === newTerminal) { + this.projectTerminals.delete(key); + disable.dispose(); + } + }); + + return newTerminal; + } + + public isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean { + if (!environment) { + return this.activatedTerminals.has(terminal); + } + const env = this.activatedTerminals.get(terminal); + return env?.envId.id === environment?.envId.id; + } + + private async activateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (terminal.shellIntegration) { + await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); + } else { + this.activateLegacy(terminal, environment); + } + } + + public async activate(terminal: Terminal, environment: PythonEnvironment): Promise { + if (this.isActivated(terminal, environment)) { + return; + } + + if (this.deactivatingTerminals.has(terminal)) { + traceVerbose('Terminal is being deactivated, cannot activate. Waiting...'); + return this.deactivatingTerminals.get(terminal); + } + + if (this.activatingTerminals.has(terminal)) { + return this.activatingTerminals.get(terminal); + } + + try { + traceVerbose(`Activating terminal for environment: ${environment.displayName}`); + const promise = this.activateInternal(terminal, environment); + this.activatingTerminals.set(terminal, promise); + await promise; + } catch (ex) { + traceError('Failed to activate environment:\r\n', ex); + } finally { + this.activatingTerminals.delete(terminal); + } + } + + private async deactivateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (terminal.shellIntegration) { + await this.deactivateUsingShellIntegration(terminal.shellIntegration, terminal, environment); + } else { + this.deactivateLegacy(terminal, environment); + } + } + + public async deactivate(terminal: Terminal): Promise { + if (this.activatingTerminals.has(terminal)) { + traceVerbose('Terminal is being activated, cannot deactivate. Waiting...'); + await this.activatingTerminals.get(terminal); + } + + if (this.deactivatingTerminals.has(terminal)) { + return this.deactivatingTerminals.get(terminal); + } + + const environment = this.activatedTerminals.get(terminal); + if (!environment) { + return; + } + + try { + traceVerbose(`Deactivating terminal for environment: ${environment.displayName}`); + const promise = this.deactivateInternal(terminal, environment); + this.deactivatingTerminals.set(terminal, promise); + await promise; + } catch (ex) { + traceError('Failed to deactivate environment:\r\n', ex); + } finally { + this.deactivatingTerminals.delete(terminal); + } + } + + public async initialize(projects: PythonProject[], em: EnvironmentManagers): Promise { + const config = getConfiguration('python'); + if (config.get('terminal.activateEnvInCurrentTerminal', false)) { + await Promise.all( + terminals().map(async (t) => { + if (projects.length === 0) { + const manager = em.getEnvironmentManager(undefined); + const env = await manager?.get(undefined); + if (env) { + return this.activate(t, env); + } + } else if (projects.length === 1) { + const manager = em.getEnvironmentManager(projects[0].uri); + const env = await manager?.get(projects[0].uri); + if (env) { + return this.activate(t, env); + } + } else { + // TODO: handle multi project case + } + }), + ); + } + } + + public async getEnvironment(terminal: Terminal): Promise { + if (this.deactivatingTerminals.has(terminal)) { + return undefined; + } + + if (this.activatingTerminals.has(terminal)) { + await this.activatingTerminals.get(terminal); + } + + if (this.activatedTerminals.has(terminal)) { + return Promise.resolve(this.activatedTerminals.get(terminal)); + } + } + + dispose(): void { + this.disposables.forEach((d) => d.dispose()); + } +} diff --git a/src/internal.api.ts b/src/internal.api.ts index af0af4a..37f36a2 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -325,7 +325,7 @@ export interface ProjectCreators extends Disposable { export interface PythonTerminalExecutionOptions { project: PythonProject; args: string[]; - useDedicatedTerminal?: Uri; + uri?: Uri; } export interface PythonTaskExecutionOptions { From d896b088a501ad298f149f749d154e6c925b0fa0 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 6 Nov 2024 09:28:45 -0800 Subject: [PATCH 007/328] Handle `venv` creation better (#11) --- src/features/envCommands.ts | 19 ++++++++++++++----- src/managers/sysPython/venvManager.ts | 11 +++++++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 8692193..24f5e29 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -66,15 +66,18 @@ export async function refreshPackagesCommand(context: unknown) { export async function createEnvironmentCommand( context: unknown, - managers: EnvironmentManagers, - projects: PythonProjectManager, + em: EnvironmentManagers, + pm: PythonProjectManager, ): Promise { if (context instanceof EnvManagerTreeItem) { const manager = (context as EnvManagerTreeItem).manager; - await manager.create('global'); + const projects = await pickProjectMany(pm.getProjects()); + if (projects) { + await manager.create(projects.length === 0 ? 'global' : projects.map((p) => p.uri)); + } } else if (context instanceof Uri) { - const manager = managers.getEnvironmentManager(context as Uri); - const project = projects.get(context as Uri); + const manager = em.getEnvironmentManager(context as Uri); + const project = pm.get(context as Uri); if (project) { await manager?.create(project.uri); } @@ -102,6 +105,12 @@ export async function createAnyEnvironmentCommand(em: EnvironmentManagers, pm: P if (manager) { await manager.create(projects.map((p) => p.uri)); } + } else if (projects && projects.length === 0) { + const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); + const manager = em.managers.find((m) => m.id === managerId); + if (manager) { + await manager.create('global'); + } } } diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index cad6f3c..7472f6f 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -85,13 +85,20 @@ export class VenvManager implements EnvironmentManager { if (Array.isArray(scope) && scope.length > 1) { isGlobal = true; } - const uri = !isGlobal && scope instanceof Uri ? scope : await getGlobalVenvLocation(); + let uri: Uri | undefined = undefined; + if (isGlobal) { + uri = await getGlobalVenvLocation(); + } else { + uri = scope instanceof Uri ? scope : (scope as Uri[])[0]; + } + if (!uri) { return; } + const venvRoot: Uri = uri; const globals = await this.baseManager.getEnvironments('global'); - const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, uri); + const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot); if (environment) { this.collection.push(environment); this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.add }]); From f5628cd75daca9b97fcddc49d43180e4bab79a95 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 7 Nov 2024 08:50:07 -0800 Subject: [PATCH 008/328] Add telemetry (#12) --- README.md | 23 ++- package-lock.json | 263 +++++++++++++++++++++++++++++- package.json | 1 + src/common/telemetry/constants.ts | 4 + src/common/telemetry/reporter.ts | 24 +++ src/common/telemetry/sender.ts | 148 +++++++++++++++++ src/common/utils/testing.ts | 3 + 7 files changed, 458 insertions(+), 8 deletions(-) create mode 100644 src/common/telemetry/constants.ts create mode 100644 src/common/telemetry/reporter.ts create mode 100644 src/common/telemetry/sender.ts create mode 100644 src/common/utils/testing.ts diff --git a/README.md b/README.md index fe2e075..d8a4dd5 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,31 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. + +## Questions, issues, feature requests, and contributions + +- If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). +- If you come across a problem with the extension, please [file an issue](https://github.com/microsoft/vscode-python). +- Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) for more details. +- Any and all feedback is appreciated and welcome! + - If someone has already [filed an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue. + - Otherwise please start a [new discussion](https://github.com/microsoft/vscode-python/discussions/categories/ideas). +- If you're interested in the development of the extension, you can read about our [development process](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md#development-process). + +## Data and telemetry + +The Microsoft Python Extension for Visual Studio Code collects usage +data and sends it to Microsoft to help improve our products and +services. Read our +[privacy statement](https://privacy.microsoft.com/privacystatement) to +learn more. This extension respects the `telemetry.enableTelemetry` +setting which you can learn more about at +https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting. + ## Trademarks This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. -Any use of third-party trademarks or logos are subject to those third-party's policies. +Any use of third-party trademarks or logos are subject to those third-party's policies. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9218a5f..ebe4afb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { "name": "vscode-python-envs", - "version": "0.0.1", + "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "0.0.1", + "version": "0.0.0", "dependencies": { "@iarna/toml": "^2.2.5", + "@vscode/extension-telemetry": "^0.9.7", "@vscode/test-cli": "^0.0.10", "fs-extra": "^11.2.0", "stack-trace": "0.0.10", @@ -36,7 +37,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.93.0-20240910" + "vscode": "^1.93.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -309,6 +310,130 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@microsoft/1ds-core-js": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz", + "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==", + "license": "MIT", + "dependencies": { + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "node_modules/@microsoft/1ds-post-js": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz", + "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==", + "license": "MIT", + "dependencies": { + "@microsoft/1ds-core-js": "4.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "node_modules/@microsoft/applicationinsights-channel-js": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz", + "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==", + "license": "MIT", + "dependencies": { + "@microsoft/applicationinsights-common": "3.3.4", + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + }, + "peerDependencies": { + "tslib": ">= 1.0.0" + } + }, + "node_modules/@microsoft/applicationinsights-common": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz", + "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==", + "license": "MIT", + "dependencies": { + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + }, + "peerDependencies": { + "tslib": ">= 1.0.0" + } + }, + "node_modules/@microsoft/applicationinsights-core-js": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz", + "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==", + "license": "MIT", + "dependencies": { + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + }, + "peerDependencies": { + "tslib": ">= 1.0.0" + } + }, + "node_modules/@microsoft/applicationinsights-shims": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz", + "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==", + "license": "MIT", + "dependencies": { + "@nevware21/ts-utils": ">= 0.9.4 < 2.x" + } + }, + "node_modules/@microsoft/applicationinsights-web-basic": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz", + "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==", + "license": "MIT", + "dependencies": { + "@microsoft/applicationinsights-channel-js": "3.3.4", + "@microsoft/applicationinsights-common": "3.3.4", + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + }, + "peerDependencies": { + "tslib": ">= 1.0.0" + } + }, + "node_modules/@microsoft/dynamicproto-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz", + "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==", + "license": "MIT", + "dependencies": { + "@nevware21/ts-utils": ">= 0.10.4 < 2.x" + } + }, + "node_modules/@nevware21/ts-async": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.3.tgz", + "integrity": "sha512-UsF7eerLsVfid7iV1oXF80qXBwHNBeqSqfh/nPZgirRU1MACmSsj83EZKS2ViFHVfSGG6WIuXMGBP6KciXfYhA==", + "license": "MIT", + "dependencies": { + "@nevware21/ts-utils": ">= 0.11.5 < 2.x" + } + }, + "node_modules/@nevware21/ts-utils": { + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.5.tgz", + "integrity": "sha512-7nIzWKR50mf3htOg53kwPLqD5iJaRfVyBvb1NJhlIncyP1WzK8vAQbU9rqIsRtv7td1CnqspdP6IWNEjOjaeug==", + "license": "MIT" + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -643,6 +768,20 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, + "node_modules/@vscode/extension-telemetry": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.7.tgz", + "integrity": "sha512-2GQbcfDUTg0QC1v0HefkHNwYrE5LYKzS3Zb0+uA6Qn1MBDzgiSh23ddOZF/JRqhqBFOG0mE70XslKSGQ5v9KwQ==", + "license": "MIT", + "dependencies": { + "@microsoft/1ds-core-js": "^4.3.0", + "@microsoft/1ds-post-js": "^4.3.0", + "@microsoft/applicationinsights-web-basic": "^3.3.0" + }, + "engines": { + "vscode": "^1.75.0" + } + }, "node_modules/@vscode/test-cli": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.10.tgz", @@ -4625,8 +4764,7 @@ "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -5302,6 +5440,108 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "@microsoft/1ds-core-js": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz", + "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==", + "requires": { + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/1ds-post-js": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz", + "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==", + "requires": { + "@microsoft/1ds-core-js": "4.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/applicationinsights-channel-js": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz", + "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==", + "requires": { + "@microsoft/applicationinsights-common": "3.3.4", + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/applicationinsights-common": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz", + "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==", + "requires": { + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/applicationinsights-core-js": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz", + "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==", + "requires": { + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/applicationinsights-shims": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz", + "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==", + "requires": { + "@nevware21/ts-utils": ">= 0.9.4 < 2.x" + } + }, + "@microsoft/applicationinsights-web-basic": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz", + "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==", + "requires": { + "@microsoft/applicationinsights-channel-js": "3.3.4", + "@microsoft/applicationinsights-common": "3.3.4", + "@microsoft/applicationinsights-core-js": "3.3.4", + "@microsoft/applicationinsights-shims": "3.0.1", + "@microsoft/dynamicproto-js": "^2.0.3", + "@nevware21/ts-async": ">= 0.5.2 < 2.x", + "@nevware21/ts-utils": ">= 0.11.3 < 2.x" + } + }, + "@microsoft/dynamicproto-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz", + "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==", + "requires": { + "@nevware21/ts-utils": ">= 0.10.4 < 2.x" + } + }, + "@nevware21/ts-async": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.3.tgz", + "integrity": "sha512-UsF7eerLsVfid7iV1oXF80qXBwHNBeqSqfh/nPZgirRU1MACmSsj83EZKS2ViFHVfSGG6WIuXMGBP6KciXfYhA==", + "requires": { + "@nevware21/ts-utils": ">= 0.11.5 < 2.x" + } + }, + "@nevware21/ts-utils": { + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.5.tgz", + "integrity": "sha512-7nIzWKR50mf3htOg53kwPLqD5iJaRfVyBvb1NJhlIncyP1WzK8vAQbU9rqIsRtv7td1CnqspdP6IWNEjOjaeug==" + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5532,6 +5772,16 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, + "@vscode/extension-telemetry": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.7.tgz", + "integrity": "sha512-2GQbcfDUTg0QC1v0HefkHNwYrE5LYKzS3Zb0+uA6Qn1MBDzgiSh23ddOZF/JRqhqBFOG0mE70XslKSGQ5v9KwQ==", + "requires": { + "@microsoft/1ds-core-js": "^4.3.0", + "@microsoft/1ds-post-js": "^4.3.0", + "@microsoft/applicationinsights-web-basic": "^3.3.0" + } + }, "@vscode/test-cli": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.10.tgz", @@ -8468,8 +8718,7 @@ "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index 422b159..350565b 100644 --- a/package.json +++ b/package.json @@ -442,6 +442,7 @@ }, "dependencies": { "@iarna/toml": "^2.2.5", + "@vscode/extension-telemetry": "^0.9.7", "@vscode/test-cli": "^0.0.10", "fs-extra": "^11.2.0", "stack-trace": "0.0.10", diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts new file mode 100644 index 0000000..7c41696 --- /dev/null +++ b/src/common/telemetry/constants.ts @@ -0,0 +1,4 @@ +export enum EventNames {} + +// Map all events to their properties +export interface IEventNamePropertyMapping {} diff --git a/src/common/telemetry/reporter.ts b/src/common/telemetry/reporter.ts new file mode 100644 index 0000000..f1eec9b --- /dev/null +++ b/src/common/telemetry/reporter.ts @@ -0,0 +1,24 @@ +import type TelemetryReporter from '@vscode/extension-telemetry'; + +class ReporterImpl { + private static telemetryReporter: TelemetryReporter | undefined; + static getTelemetryReporter() { + const tel = require('@vscode/extension-telemetry'); + // eslint-disable-next-line @typescript-eslint/naming-convention + const Reporter = tel.default as typeof TelemetryReporter; + ReporterImpl.telemetryReporter = new Reporter( + '0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255', + [ + { + lookup: /(errorName|errorMessage|errorStack)/g, + }, + ], + ); + + return ReporterImpl.telemetryReporter; + } +} + +export function getTelemetryReporter() { + return ReporterImpl.getTelemetryReporter(); +} diff --git a/src/common/telemetry/sender.ts b/src/common/telemetry/sender.ts new file mode 100644 index 0000000..4a8d785 --- /dev/null +++ b/src/common/telemetry/sender.ts @@ -0,0 +1,148 @@ +import type { IEventNamePropertyMapping } from './constants'; +import { StopWatch } from '../stopWatch'; +import { isTestExecution } from '../utils/testing'; +import { getTelemetryReporter } from './reporter'; +import { isPromise } from 'util/types'; + +type FailedEventType = { failed: true }; + +function isTelemetrySupported(): boolean { + try { + const vsc = require('vscode'); + const reporter = require('@vscode/extension-telemetry'); + return !!vsc && !!reporter; + } catch { + return false; + } +} + +export function sendTelemetryEvent

( + eventName: E, + measuresOrDurationMs?: Record | number, + properties?: P[E], + ex?: Error, +): void { + if (isTestExecution() || !isTelemetrySupported()) { + return; + } + const reporter = getTelemetryReporter(); + const measures = + typeof measuresOrDurationMs === 'number' ? { duration: measuresOrDurationMs } : measuresOrDurationMs; + + const customProperties: Record = {}; + const eventNameSent = eventName as string; + + if (properties) { + const data = properties as Record; + Object.entries(data).forEach(([prop, value]) => { + if (value === null || value === undefined) { + return; + } + + try { + customProperties[prop] = typeof value === 'object' ? 'object' : String(value); + } catch (exception) { + console.error(`Failed to serialize ${prop} for ${String(eventName)}`, exception); + } + }); + } + + if (ex) { + const errorProps = { + errorName: ex.name, + errorStack: ex.stack ?? '', + }; + Object.assign(customProperties, errorProps); + reporter.sendTelemetryErrorEvent(eventNameSent, customProperties, measures); + } else { + reporter.sendTelemetryEvent(eventNameSent, customProperties, measures); + } + + if (process.env?.VSC_PYTHON_LOG_TELEMETRY) { + console.info( + `Telemetry Event : ${eventNameSent} Measures: ${JSON.stringify(measures)} Props: ${JSON.stringify( + customProperties, + )}`, + ); + } +} + +type TypedMethodDescriptor = ( + target: unknown, + propertyKey: string | symbol, + descriptor: TypedPropertyDescriptor, +) => TypedPropertyDescriptor | void; + +export function captureTelemetry( + eventName: E, + properties?: P[E], + captureDuration = true, + failureEventName?: E, + lazyProperties?: (obj: This, result?: unknown) => P[E], + lazyMeasures?: (obj: This, result?: unknown) => Record, +): TypedMethodDescriptor<(this: This, ...args: unknown[]) => unknown> { + return function ( + _target: unknown, + _propertyKey: string | symbol, + descriptor: TypedPropertyDescriptor<(this: This, ...args: unknown[]) => unknown>, + ) { + const originalMethod = descriptor.value!; + + descriptor.value = function (this: This, ...args: unknown[]) { + if (!captureDuration && !lazyProperties && !lazyMeasures) { + sendTelemetryEvent(eventName, undefined, properties); + return originalMethod.apply(this, args); + } + + const getProps = (result?: unknown) => + lazyProperties ? { ...properties, ...lazyProperties(this, result) } : properties; + const stopWatch = captureDuration ? new StopWatch() : undefined; + const getMeasures = (result?: unknown) => { + const measures = stopWatch ? { duration: stopWatch.elapsedTime } : undefined; + return lazyMeasures ? { ...measures, ...lazyMeasures(this, result) } : measures; + }; + + const result = originalMethod.apply(this, args); + + if (result && isPromise(result)) { + return result + .then((data) => { + sendTelemetryEvent(eventName, getMeasures(data), getProps(data)); + return data; + }) + .catch((ex) => { + const failedProps: P[E] = { ...getProps(), failed: true } as P[E] & FailedEventType; + sendTelemetryEvent(failureEventName || eventName, getMeasures(), failedProps, ex); + return Promise.reject(ex); + }); + } else { + sendTelemetryEvent(eventName, getMeasures(result), getProps(result)); + return result; + } + }; + + return descriptor; + }; +} + +export function sendTelemetryWhenDone

( + eventName: E, + promise: Promise | Thenable, + stopWatch: StopWatch = new StopWatch(), + properties?: P[E], +): void { + if (typeof promise.then === 'function') { + promise.then( + (data) => { + sendTelemetryEvent(eventName, stopWatch.elapsedTime, properties); + return data; + }, + (ex) => { + sendTelemetryEvent(eventName, stopWatch.elapsedTime, properties, ex); + return Promise.reject(ex); + }, + ); + } else { + throw new Error('Method is neither a Promise nor a Thenable'); + } +} diff --git a/src/common/utils/testing.ts b/src/common/utils/testing.ts new file mode 100644 index 0000000..dd24133 --- /dev/null +++ b/src/common/utils/testing.ts @@ -0,0 +1,3 @@ +export function isTestExecution(): boolean { + return !!process.env.VSC_PYTHON_CI_TEST; +} From 551397fa1b48e5c1bdab76515398c144cc1f99d6 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 7 Nov 2024 15:11:56 -0800 Subject: [PATCH 009/328] Add pipelines yml (#13) --- build/azure-pipeline.pre-release.yml | 123 ++++++++++++++++++++++ build/azure-pipeline.stable.yml | 88 ++++++++++++++++ build/test_update_ext_version.py | 104 ++++++++++++++++++ build/update_ext_version.py | 106 +++++++++++++++++++ build/update_package_json.py | 19 ++++ {builds => build}/validate_packages.py | 25 +++-- src/extension.ts | 8 +- src/managers/common/nativePythonFinder.ts | 29 ++--- 8 files changed, 473 insertions(+), 29 deletions(-) create mode 100644 build/azure-pipeline.pre-release.yml create mode 100644 build/azure-pipeline.stable.yml create mode 100644 build/test_update_ext_version.py create mode 100644 build/update_ext_version.py create mode 100644 build/update_package_json.py rename {builds => build}/validate_packages.py (59%) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml new file mode 100644 index 0000000..525d791 --- /dev/null +++ b/build/azure-pipeline.pre-release.yml @@ -0,0 +1,123 @@ +# Run on a schedule +trigger: none +pr: none + +schedules: + - cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT) + displayName: Nightly Pre-Release Schedule + always: false # only run if there are source code changes + branches: + include: + - main + +resources: + repositories: + - repository: templates + type: github + name: microsoft/vscode-engineering + ref: main + endpoint: Monaco + +parameters: + - name: publishExtension + displayName: 🚀 Publish Extension + type: boolean + default: false + +extends: + template: azure-pipelines/extension/pre-release.yml@templates + parameters: + publishExtension: ${{ parameters.publishExtension }} + ghCreateTag: false + standardizedVersioning: true + l10nSourcePaths: ./src + + buildPlatforms: + - name: Linux + vsceTarget: 'web' + - name: Linux + packageArch: arm64 + vsceTarget: linux-arm64 + - name: Linux + packageArch: arm + vsceTarget: linux-armhf + - name: Linux + packageArch: x64 + vsceTarget: linux-x64 + - name: Linux + packageArch: arm64 + vsceTarget: alpine-arm64 + - name: Linux + packageArch: x64 + vsceTarget: alpine-x64 + - name: MacOS + packageArch: arm64 + vsceTarget: darwin-arm64 + - name: MacOS + packageArch: x64 + vsceTarget: darwin-x64 + - name: Windows + packageArch: arm + vsceTarget: win32-arm64 + - name: Windows + packageArch: x64 + vsceTarget: win32-x64 + + buildSteps: + - task: NodeTool@0 + inputs: + versionSpec: '20.18.0' + displayName: Select Node version + + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' + addToPath: true + architecture: 'x64' + displayName: Select Python version + + - script: npm ci + displayName: Install NPM dependencies + + - script: python ./build/update_package_file.py + displayName: Update telemetry in package.json + + - script: python ./build/update_ext_version.py --for-publishing + displayName: Update build number + + - script: npx gulp prePublishBundle + displayName: Build + + - bash: | + mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin + chmod +x $(Build.SourcesDirectory)/python-env-tools/bin + displayName: Make Directory for python-env-tool binary + + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'specific' + project: 'Monaco' + definition: 591 + buildVersionToDownload: 'latest' + branchName: 'refs/heads/main' + targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' + artifactName: 'bin-$(vsceTarget)' + itemPattern: | + pet.exe + pet + ThirdPartyNotices.txt + + - bash: | + ls -lf ./python-env-tools/bin + chmod +x ./python-env-tools/bin/pet* + ls -lf ./python-env-tools/bin + displayName: Set chmod for pet binary + + - script: npm run package + displayName: Build extension + + tsa: + config: + areaPath: 'Visual Studio Code Python Extensions' + serviceTreeID: '6e6194bc-7baa-4486-86d0-9f5419626d46' + enabled: true diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml new file mode 100644 index 0000000..170d0e6 --- /dev/null +++ b/build/azure-pipeline.stable.yml @@ -0,0 +1,88 @@ +trigger: none +# branches: +# include: +# - release* +# tags: +# include: ['*'] +pr: none + +resources: + repositories: + - repository: templates + type: github + name: microsoft/vscode-engineering + ref: main + endpoint: Monaco + +parameters: + - name: publishExtension + displayName: 🚀 Publish Extension + type: boolean + default: false + +extends: + template: azure-pipelines/extension/stable.yml@templates + parameters: + l10nSourcePaths: ./src + publishExtension: ${{ parameters.publishExtension }} + ghCreateTag: true + buildSteps: + - task: NodeTool@0 + inputs: + versionSpec: '18.17.0' + displayName: Select Node version + + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' + addToPath: true + architecture: 'x64' + displayName: Select Python version + + - script: npm ci + displayName: Install NPM dependencies + + - script: python -m pip install -U pip + displayName: Upgrade pip + + - script: python -m pip install wheel + displayName: Install wheel + + - script: python -m pip install nox + displayName: Install wheel + + - script: python ./build/update_ext_version.py --release --for-publishing + displayName: Update build number + + - bash: | + mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin + chmod +x $(Build.SourcesDirectory)/python-env-tools/bin + displayName: Make Directory for python-env-tool binary + + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'specific' + project: 'Monaco' + definition: 593 + buildVersionToDownload: 'latestFromBranch' + branchName: 'refs/heads/release/2024.18' + targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' + artifactName: 'bin-$(vsceTarget)' + itemPattern: | + pet.exe + pet + ThirdPartyNotices.txt + + - bash: | + ls -lf ./python-env-tools/bin + chmod +x ./python-env-tools/bin/pet* + ls -lf ./python-env-tools/bin + displayName: Set chmod for pet binary + + - script: npm run package + displayName: Build extension + tsa: + config: + areaPath: 'Visual Studio Code Python Extensions' + serviceTreeID: '6e6194bc-7baa-4486-86d0-9f5419626d46' + enabled: true diff --git a/build/test_update_ext_version.py b/build/test_update_ext_version.py new file mode 100644 index 0000000..1a2fdb0 --- /dev/null +++ b/build/test_update_ext_version.py @@ -0,0 +1,104 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import json + +import freezegun +import pytest +import update_ext_version + +TEST_DATETIME = "2022-03-14 01:23:45" + +# The build ID is calculated via: +# "1" + datetime.datetime.strptime(TEST_DATETIME,"%Y-%m-%d %H:%M:%S").strftime('%j%H%M') +EXPECTED_BUILD_ID = "10730123" + + +def create_package_json(directory, version): + """Create `package.json` in `directory` with a specified version of `version`.""" + package_json = directory / "package.json" + package_json.write_text(json.dumps({"version": version}), encoding="utf-8") + return package_json + + +def run_test(tmp_path, version, args, expected): + package_json = create_package_json(tmp_path, version) + update_ext_version.main(package_json, args) + package = json.loads(package_json.read_text(encoding="utf-8")) + assert expected == update_ext_version.parse_version(package["version"]) + + +@pytest.mark.parametrize( + "version, args", + [ + ("1.0.0-rc", []), + ("1.1.0-rc", ["--release"]), + ("1.0.0-rc", ["--release", "--build-id", "-1"]), + ("1.0.0-rc", ["--release", "--for-publishing", "--build-id", "-1"]), + ("1.0.0-rc", ["--release", "--for-publishing", "--build-id", "999999999999"]), + ("1.1.0-rc", ["--build-id", "-1"]), + ("1.1.0-rc", ["--for-publishing", "--build-id", "-1"]), + ("1.1.0-rc", ["--for-publishing", "--build-id", "999999999999"]), + ], +) +def test_invalid_args(tmp_path, version, args): + with pytest.raises(ValueError): + run_test(tmp_path, version, args, None) + + +@pytest.mark.parametrize( + "version, args, expected", + [ + ("1.1.0-rc", ["--build-id", "12345"], ("1", "1", "12345", "rc")), + ("1.0.0-rc", ["--release", "--build-id", "12345"], ("1", "0", "12345", "")), + ( + "1.1.0-rc", + ["--for-publishing", "--build-id", "12345"], + ("1", "1", "12345", ""), + ), + ( + "1.0.0-rc", + ["--release", "--for-publishing", "--build-id", "12345"], + ("1", "0", "12345", ""), + ), + ( + "1.0.0-rc", + ["--release", "--build-id", "999999999999"], + ("1", "0", "999999999999", ""), + ), + ( + "1.1.0-rc", + ["--build-id", "999999999999"], + ("1", "1", "999999999999", "rc"), + ), + ("1.1.0-rc", [], ("1", "1", EXPECTED_BUILD_ID, "rc")), + ( + "1.0.0-rc", + ["--release"], + ("1", "0", "0", ""), + ), + ( + "1.1.0-rc", + ["--for-publishing"], + ("1", "1", EXPECTED_BUILD_ID, ""), + ), + ( + "1.0.0-rc", + ["--release", "--for-publishing"], + ("1", "0", "0", ""), + ), + ( + "1.0.0-rc", + ["--release"], + ("1", "0", "0", ""), + ), + ( + "1.1.0-rc", + [], + ("1", "1", EXPECTED_BUILD_ID, "rc"), + ), + ], +) +@freezegun.freeze_time("2022-03-14 01:23:45") +def test_update_ext_version(tmp_path, version, args, expected): + run_test(tmp_path, version, args, expected) diff --git a/build/update_ext_version.py b/build/update_ext_version.py new file mode 100644 index 0000000..b284163 --- /dev/null +++ b/build/update_ext_version.py @@ -0,0 +1,106 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import argparse +import datetime +import json +import pathlib +import sys +from typing import Sequence, Tuple, Union + +EXT_ROOT = pathlib.Path(__file__).parent.parent +PACKAGE_JSON_PATH = EXT_ROOT / "package.json" + + +def build_arg_parse() -> argparse.ArgumentParser: + """Builds the arguments parser.""" + parser = argparse.ArgumentParser( + description="This script updates the python extension micro version based on the release or pre-release channel." + ) + parser.add_argument( + "--release", + action="store_true", + help="Treats the current build as a release build.", + ) + parser.add_argument( + "--build-id", + action="store", + type=int, + default=None, + help="If present, will be used as a micro version.", + required=False, + ) + parser.add_argument( + "--for-publishing", + action="store_true", + help="Removes `-dev` or `-rc` suffix.", + ) + return parser + + +def is_even(v: Union[int, str]) -> bool: + """Returns True if `v` is even.""" + return not int(v) % 2 + + +def micro_build_number() -> str: + """Generates the micro build number. + The format is `1`. + """ + return f"1{datetime.datetime.now(tz=datetime.timezone.utc).strftime('%j%H%M')}" + + +def parse_version(version: str) -> Tuple[str, str, str, str]: + """Parse a version string into a tuple of version parts.""" + major, minor, parts = version.split(".", maxsplit=2) + try: + micro, suffix = parts.split("-", maxsplit=1) + except ValueError: + micro = parts + suffix = "" + return major, minor, micro, suffix + + +def main(package_json: pathlib.Path, argv: Sequence[str]) -> None: + parser = build_arg_parse() + args = parser.parse_args(argv) + + package = json.loads(package_json.read_text(encoding="utf-8")) + + major, minor, micro, suffix = parse_version(package["version"]) + + if args.release and not is_even(minor): + raise ValueError( + f"Release version should have EVEN numbered minor version: {package['version']}" + ) + elif not args.release and is_even(minor): + raise ValueError( + f"Pre-Release version should have ODD numbered minor version: {package['version']}" + ) + + print(f"Updating build FROM: {package['version']}") + if args.build_id: + # If build id is provided it should fall within the 0-INT32 max range + # that the max allowed value for publishing to the Marketplace. + if args.build_id < 0 or (args.for_publishing and args.build_id > ((2**32) - 1)): + raise ValueError(f"Build ID must be within [0, {(2**32) - 1}]") + + package["version"] = ".".join((major, minor, str(args.build_id))) + elif args.release: + package["version"] = ".".join((major, minor, micro)) + else: + # micro version only updated for pre-release. + package["version"] = ".".join((major, minor, micro_build_number())) + + if not args.for_publishing and not args.release and len(suffix): + package["version"] += "-" + suffix + print(f"Updating build TO: {package['version']}") + + # Overwrite package.json with new data add a new-line at the end of the file. + package_json.write_text( + json.dumps(package, indent=4, ensure_ascii=False) + "\n", encoding="utf-8" + ) + + +if __name__ == "__main__": + main(PACKAGE_JSON_PATH, sys.argv[1:]) diff --git a/build/update_package_json.py b/build/update_package_json.py new file mode 100644 index 0000000..d5b45dc --- /dev/null +++ b/build/update_package_json.py @@ -0,0 +1,19 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import json +import pathlib + + +def main(package_json: pathlib.Path) -> None: + package = json.loads(package_json.read_text(encoding="utf-8")) + package["enableTelemetry"] = True + + # Overwrite package.json with new data add a new-line at the end of the file. + package_json.write_text( + json.dumps(package, indent=4, ensure_ascii=False) + "\n", encoding="utf-8" + ) + + +if __name__ == "__main__": + main(pathlib.Path(__file__).parent.parent / "package.json") diff --git a/builds/validate_packages.py b/build/validate_packages.py similarity index 59% rename from builds/validate_packages.py rename to build/validate_packages.py index 9cef608..f3e252f 100644 --- a/builds/validate_packages.py +++ b/build/validate_packages.py @@ -1,8 +1,13 @@ +# Usage: +# Windows: type package_list.txt | python validate_packages.py > valid_packages.txt +# Linux/Mac: cat package_list.txt | python validate_packages.py > valid_packages.txt + import json -import pathlib +import sys import urllib import urllib.request as url_lib + def _get_pypi_package_data(package_name): json_uri = "https://pypi.org/pypi/{0}/json".format(package_name) # Response format: https://warehouse.readthedocs.io/api-reference/json/#project @@ -10,22 +15,20 @@ def _get_pypi_package_data(package_name): with url_lib.urlopen(json_uri) as response: return json.loads(response.read()) -packages = (pathlib.Path(__file__).parent.parent / "files" / "pip_packages.txt").read_text(encoding="utf-8").splitlines() -valid_packages = [] - def validate_package(package): try: data = _get_pypi_package_data(package) num_versions = len(data["releases"]) - return num_versions > 1 + return num_versions > 1 except urllib.error.HTTPError: return False -for pkg in packages: - if(validate_package(pkg)): - print(pkg) - valid_packages.append(pkg) - -(pathlib.Path(__file__).parent / "valid_pip_packages.txt").write_text('\n'.join(valid_packages), encoding="utf-8") \ No newline at end of file +if __name__ == "__main__": + packages = sys.stdin.read().splitlines() + valid_packages = [] + for pkg in packages: + if validate_package(pkg): + print(pkg) + valid_packages.append(pkg) diff --git a/src/extension.ts b/src/extension.ts index 41456d2..217e9e8 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -231,12 +231,10 @@ export async function activate(context: ExtensionContext): Promise { + // This is the finder that is used by all the built in environment managers + const nativeFinder: NativePythonFinder = await createNativePythonFinder(outputChannel, api, context); + context.subscriptions.push(nativeFinder); await Promise.all([ registerSystemPythonFeatures(nativeFinder, context.subscriptions, outputChannel), registerCondaFeatures(nativeFinder, context.subscriptions, outputChannel), diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index bf4bfe2..1d62080 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -2,7 +2,7 @@ import * as fs from 'fs-extra'; import * as path from 'path'; import * as rpc from 'vscode-jsonrpc/node'; import * as ch from 'child_process'; -import { PYTHON_EXTENSION_ID } from '../../common/constants'; +import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants'; import { getExtension } from '../../common/extension.apis'; import { getUserHomeDir, isWindows, noop, untildify } from './utils'; import { Disposable, ExtensionContext, LogOutputChannel, Uri } from 'vscode'; @@ -12,18 +12,21 @@ import { getConfiguration } from '../../common/workspace.apis'; import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; import { traceVerbose } from '../../common/logging'; -let PYTHON_EXTENSION_ROOT_DIR: string | undefined; -function getNativePythonToolsPath(): string { - if (!PYTHON_EXTENSION_ROOT_DIR) { - const python = getExtension(PYTHON_EXTENSION_ID); - PYTHON_EXTENSION_ROOT_DIR = python?.extensionPath; +async function getNativePythonToolsPath(): Promise { + const envsExt = getExtension(ENVS_EXTENSION_ID); + if (envsExt) { + const petPath = path.join(envsExt.extensionPath, 'python-env-tools', 'bin', isWindows() ? 'pet.exe' : 'pet'); + if (await fs.pathExists(petPath)) { + return petPath; + } } - if (!PYTHON_EXTENSION_ROOT_DIR) { + + const python = getExtension(PYTHON_EXTENSION_ID); + if (!python) { throw new Error('Python extension not found'); } - return isWindows() - ? path.join(PYTHON_EXTENSION_ROOT_DIR, 'python-env-tools', 'bin', 'pet.exe') - : path.join(PYTHON_EXTENSION_ROOT_DIR, 'python-env-tools', 'bin', 'pet'); + + return path.join(python.extensionPath, 'python-env-tools', 'bin', isWindows() ? 'pet.exe' : 'pet'); } export interface NativeEnvInfo { @@ -374,10 +377,10 @@ export async function clearCacheDirectory(context: ExtensionContext): Promise { + return new NativePythonFinderImpl(outputChannel, await getNativePythonToolsPath(), api, getCacheDirectory(context)); } From d105c30a66b712eed05f799b466caf86577f43d0 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 12 Nov 2024 09:40:02 -0800 Subject: [PATCH 010/328] Code execution APIs (#15) --- src/api.ts | 236 +++++++++++------- src/extension.ts | 2 +- src/features/envCommands.ts | 60 ++--- src/features/execution/runAsTask.ts | 27 +- src/features/execution/runInBackground.ts | 29 +++ src/features/pythonApi.ts | 48 +++- .../{execution => terminal}/runInTerminal.ts | 10 +- src/features/terminal/terminalManager.ts | 24 +- src/internal.api.ts | 14 -- 9 files changed, 281 insertions(+), 169 deletions(-) create mode 100644 src/features/execution/runInBackground.ts rename src/features/{execution => terminal}/runInTerminal.ts (82%) diff --git a/src/api.ts b/src/api.ts index 5038a1d..90c81cd 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1,4 +1,4 @@ -import { Uri, Disposable, MarkdownString, Event, LogOutputChannel, ThemeIcon, Terminal } from 'vscode'; +import { Uri, Disposable, MarkdownString, Event, LogOutputChannel, ThemeIcon, Terminal, TaskExecution } from 'vscode'; /** * The path to an icon, or a theme-specific configuration of icons. @@ -767,13 +767,11 @@ export interface Installable { readonly uri?: Uri; } -export interface PythonTaskResult {} - export interface PythonProcess { /** * The process ID of the Python process. */ - readonly pid: number; + readonly pid?: number; /** * The standard input of the Python process. @@ -798,10 +796,10 @@ export interface PythonProcess { /** * Event that is fired when the Python process exits. */ - onExit: Event; + onExit(listener: (code: number | null, signal: NodeJS.Signals | null) => void): void; } -export interface PythonEnvironmentManagerApi { +export interface PythonEnvironmentManagerRegistrationApi { /** * Register an environment manager implementation. * @@ -810,7 +808,9 @@ export interface PythonEnvironmentManagerApi { * @see {@link EnvironmentManager} */ registerEnvironmentManager(manager: EnvironmentManager): Disposable; +} +export interface PythonEnvironmentItemApi { /** * Create a Python environment item from the provided environment info. This item is used to interact * with the environment. @@ -820,7 +820,9 @@ export interface PythonEnvironmentManagerApi { * @returns The Python environment. */ createPythonEnvironmentItem(info: PythonEnvironmentInfo, manager: EnvironmentManager): PythonEnvironment; +} +export interface PythonEnvironmentManagementApi { /** * Create a Python environment using environment manager associated with the scope. * @@ -836,7 +838,9 @@ export interface PythonEnvironmentManagerApi { * @returns A promise that resolves when the environment has been removed. */ removeEnvironment(environment: PythonEnvironment): Promise; +} +export interface PythonEnvironmentsApi { /** * Initiates a refresh of Python environments within the specified scope. * @param scope - The scope within which to search for environments. @@ -857,6 +861,16 @@ export interface PythonEnvironmentManagerApi { */ onDidChangeEnvironments: Event; + /** + * This method is used to get the details missing from a PythonEnvironment. Like + * {@link PythonEnvironment.execInfo} and other details. + * + * @param context : The PythonEnvironment or Uri for which details are required. + */ + resolveEnvironment(context: ResolveEnvironmentContext): Promise; +} + +export interface PythonProjectEnvironmentApi { /** * Sets the current Python environment within the specified scope. * @param scope - The scope within which to set the environment. @@ -876,17 +890,16 @@ export interface PythonEnvironmentManagerApi { * @see {@link DidChangeEnvironmentEventArgs} */ onDidChangeEnvironment: Event; - - /** - * This method is used to get the details missing from a PythonEnvironment. Like - * {@link PythonEnvironment.execInfo} and other details. - * - * @param context : The PythonEnvironment or Uri for which details are required. - */ - resolveEnvironment(context: ResolveEnvironmentContext): Promise; } -export interface PythonPackageManagerApi { +export interface PythonEnvironmentManagerApi + extends PythonEnvironmentManagerRegistrationApi, + PythonEnvironmentItemApi, + PythonEnvironmentManagementApi, + PythonEnvironmentsApi, + PythonProjectEnvironmentApi {} + +export interface PythonPackageManagerRegistrationApi { /** * Register a package manager implementation. * @@ -895,24 +908,9 @@ export interface PythonPackageManagerApi { * @see {@link PackageManager} */ registerPackageManager(manager: PackageManager): Disposable; +} - /** - * Install packages into a Python Environment. - * - * @param environment The Python Environment into which packages are to be installed. - * @param packages The packages to install. - * @param options Options for installing packages. - */ - installPackages(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; - - /** - * Uninstall packages from a Python Environment. - * - * @param environment The Python Environment from which packages are to be uninstalled. - * @param packages The packages to uninstall. - */ - uninstallPackages(environment: PythonEnvironment, packages: PackageInfo[] | string[]): Promise; - +export interface PythonPackageGetterApi { /** * Refresh the list of packages in a Python Environment. * @@ -934,7 +932,9 @@ export interface PythonPackageManagerApi { * @see {@link DidChangePackagesEventArgs} */ onDidChangePackages: Event; +} +export interface PythonPackageItemApi { /** * Create a package item from the provided package info. * @@ -946,38 +946,46 @@ export interface PythonPackageManagerApi { createPackageItem(info: PackageInfo, environment: PythonEnvironment, manager: PackageManager): Package; } -/** - * The API for interacting with Python projects. A project in python is any folder or file that is a contained - * in some manner. For example, a PEP-723 compliant file can be treated as a project. A folder with a `pyproject.toml`, - * or just python files can be treated as a project. All this allows you to do is set a python environment for that project. - * - * By default all `vscode.workspace.workspaceFolders` are treated as projects. - */ -export interface PythonProjectApi { +export interface PythonPackageManagementApi { /** - * Add a python project or projects to the list of projects. + * Install packages into a Python Environment. * - * @param projects The project or projects to add. + * @param environment The Python Environment into which packages are to be installed. + * @param packages The packages to install. + * @param options Options for installing packages. */ - addPythonProject(projects: PythonProject | PythonProject[]): void; + installPackages(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; /** - * Remove a python project from the list of projects. + * Uninstall packages from a Python Environment. * - * @param project The project to remove. + * @param environment The Python Environment from which packages are to be uninstalled. + * @param packages The packages to uninstall. */ - removePythonProject(project: PythonProject): void; + uninstallPackages(environment: PythonEnvironment, packages: PackageInfo[] | string[]): Promise; +} +export interface PythonPackageManagerApi + extends PythonPackageManagerRegistrationApi, + PythonPackageGetterApi, + PythonEnvironmentManagerApi, + PythonPackageItemApi {} + +export interface PythonProjectCreationApi { /** - * Get all python projects. + * Register a Python project creator. + * + * @param creator The project creator to register. + * @returns A disposable that can be used to unregister the project creator. + * @see {@link PythonProjectCreator} */ - getPythonProjects(): readonly PythonProject[]; - + registerPythonProjectCreator(creator: PythonProjectCreator): Disposable; +} +export interface PythonProjectGetterApi { /** - * Event raised when python projects are added or removed. - * @see {@link DidChangePythonProjectsEventArgs} + * Get all python projects. */ - onDidChangePythonProjects: Event; + getPythonProjects(): readonly PythonProject[]; /** * Get the python project for a given URI. @@ -986,52 +994,110 @@ export interface PythonProjectApi { * @returns The project or `undefined` if not found. */ getPythonProject(uri: Uri): PythonProject | undefined; +} +export interface PythonProjectModifyApi { /** - * Register a Python project creator. + * Add a python project or projects to the list of projects. * - * @param creator The project creator to register. - * @returns A disposable that can be used to unregister the project creator. - * @see {@link PythonProjectCreator} + * @param projects The project or projects to add. */ - registerPythonProjectCreator(creator: PythonProjectCreator): Disposable; + addPythonProject(projects: PythonProject | PythonProject[]): void; + + /** + * Remove a python project from the list of projects. + * + * @param project The project to remove. + */ + removePythonProject(project: PythonProject): void; + + /** + * Event raised when python projects are added or removed. + * @see {@link DidChangePythonProjectsEventArgs} + */ + onDidChangePythonProjects: Event; } -export interface PythonExecutionApi { +/** + * The API for interacting with Python projects. A project in python is any folder or file that is a contained + * in some manner. For example, a PEP-723 compliant file can be treated as a project. A folder with a `pyproject.toml`, + * or just python files can be treated as a project. All this allows you to do is set a python environment for that project. + * + * By default all `vscode.workspace.workspaceFolders` are treated as projects. + */ +export interface PythonProjectApi extends PythonProjectCreationApi, PythonProjectGetterApi, PythonProjectModifyApi {} + +export interface PythonTerminalCreateApi { createTerminal( - cwd: string | Uri | PythonProject, - environment?: PythonEnvironment, - envVars?: { [key: string]: string }, - ): Promise; - runInTerminal( environment: PythonEnvironment, - cwd: string | Uri | PythonProject, - command: string, - args?: string[], + cwd: string | Uri, + envVars?: { [key: string]: string }, ): Promise; +} + +export interface PythonTerminalExecutionOptions { + cwd: string | Uri; + args?: string[]; + + show?: boolean; +} + +export interface PythonTerminalRunApi { + runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise; runInDedicatedTerminal( - terminalKey: string | Uri, + terminalKey: Uri, environment: PythonEnvironment, - cwd: string | Uri | PythonProject, - command: string, - args?: string[], + options: PythonTerminalExecutionOptions, ): Promise; - runAsTask( - environment: PythonEnvironment, - cwd: string | Uri | PythonProject, - command: string, - args?: string[], - envVars?: { [key: string]: string }, - ): Promise; - runInBackground( - environment: PythonEnvironment, - cwd: string | Uri | PythonProject, - command: string, - args?: string[], - envVars?: { [key: string]: string }, - ): Promise; } + +/** + * + * Example: + * * Running Script: `python myscript.py --arg1` + * ```typescript + * { + * args: ["myscript.py", "--arg1"] + * } + * ``` + * * Running a module: `python -m my_module --arg1` + * ```typescript + * { + * args: ["-m", "my_module", "--arg1"] + * } + * ``` + */ +export interface PythonTaskExecutionOptions { + project?: PythonProject; + args: string[]; + cwd?: string; + env?: { [key: string]: string }; + name: string; +} + +export interface PythonTaskRunApi { + runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise; +} + +export interface PythonBackgroundRunOptions { + args: string[]; + cwd?: string; + env?: { [key: string]: string }; +} +export interface PythonBackgroundRunApi { + runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise; +} + +export interface PythonExecutionApi + extends PythonTerminalCreateApi, + PythonTerminalRunApi, + PythonTaskRunApi, + PythonBackgroundRunApi {} /** * The API for interacting with Python environments, package managers, and projects. */ -export interface PythonEnvironmentApi extends PythonEnvironmentManagerApi, PythonPackageManagerApi, PythonProjectApi {} +export interface PythonEnvironmentApi + extends PythonEnvironmentManagerApi, + PythonPackageManagerApi, + PythonProjectApi, + PythonExecutionApi {} diff --git a/src/extension.ts b/src/extension.ts index 217e9e8..22c00b9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -70,7 +70,7 @@ export async function activate(context: ExtensionContext): Promise { if (context instanceof EnvManagerTreeItem) { @@ -459,31 +457,20 @@ export async function runInTerminalCommand( api: PythonEnvironmentApi, tm: TerminalManager, ): Promise { - const keys = Object.keys(item ?? {}); if (item instanceof Uri) { const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment && project) { const terminal = await tm.getProjectTerminal(project, environment); - await runInTerminal( - environment, - terminal, - { - project, - args: [item.fsPath], - }, - { show: true }, - ); - } - } else if (keys.includes('project') && keys.includes('args')) { - const options = item as PythonTerminalExecutionOptions; - const environment = await api.getEnvironment(options.project.uri); - if (environment) { - const terminal = await tm.getProjectTerminal(options.project, environment); - await runInTerminal(environment, terminal, options, { show: true }); + await runInTerminal(environment, terminal, { + cwd: project.uri, + args: [item.fsPath], + show: true, + }); } } + throw new Error(`Invalid context for run-in-terminal: ${item}`); } export async function runInDedicatedTerminalCommand( @@ -491,56 +478,39 @@ export async function runInDedicatedTerminalCommand( api: PythonEnvironmentApi, tm: TerminalManager, ): Promise { - const keys = Object.keys(item ?? {}); if (item instanceof Uri) { const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment && project) { const terminal = await tm.getDedicatedTerminal(item, project, environment); - await runInTerminal( - environment, - terminal, - { - project, - args: [item.fsPath], - }, - { show: true }, - ); - } - } else if (keys.includes('project') && keys.includes('args')) { - const options = item as PythonTerminalExecutionOptions; - const environment = await api.getEnvironment(options.project.uri); - if (environment && options.uri) { - const terminal = await tm.getDedicatedTerminal(options.uri, options.project, environment); - await runInTerminal(environment, terminal, options, { show: true }); + await runInTerminal(environment, terminal, { + cwd: project.uri, + args: [item.fsPath], + show: true, + }); } } + throw new Error(`Invalid context for run-in-terminal: ${item}`); } export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi): Promise { - const keys = Object.keys(item ?? {}); if (item instanceof Uri) { const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment && project) { return await runAsTask( + environment, { project, args: [item.fsPath], name: 'Python Run', }, - environment, + { reveal: TaskRevealKind.Always }, ); } - } else if (keys.includes('project') && keys.includes('args') && keys.includes('name')) { - const options = item as PythonTaskExecutionOptions; - const environment = await api.getEnvironment(options.project.uri); - if (environment) { - return await runAsTask(options, environment); - } } else if (item === undefined) { const uri = window.activeTextEditor?.document.uri; if (uri) { diff --git a/src/features/execution/runAsTask.ts b/src/features/execution/runAsTask.ts index 39d90ed..705c033 100644 --- a/src/features/execution/runAsTask.ts +++ b/src/features/execution/runAsTask.ts @@ -1,15 +1,29 @@ -import { ShellExecution, Task, TaskExecution, TaskPanelKind, TaskRevealKind, TaskScope, WorkspaceFolder } from 'vscode'; -import { PythonTaskExecutionOptions } from '../../internal.api'; +import { + ShellExecution, + Task, + TaskExecution, + TaskPanelKind, + TaskRevealKind, + TaskScope, + Uri, + WorkspaceFolder, +} from 'vscode'; +import { PythonTaskExecutionOptions } from '../../api'; import { getWorkspaceFolder } from '../../common/workspace.apis'; import { PythonEnvironment } from '../../api'; import { executeTask } from '../../common/tasks.apis'; +function getWorkspaceFolderOrDefault(uri?: Uri): WorkspaceFolder | TaskScope { + const workspace = uri ? getWorkspaceFolder(uri) : undefined; + return workspace ?? TaskScope.Global; +} + export async function runAsTask( - options: PythonTaskExecutionOptions, environment: PythonEnvironment, + options: PythonTaskExecutionOptions, extra?: { reveal?: TaskRevealKind }, ): Promise { - const workspace: WorkspaceFolder | TaskScope = getWorkspaceFolder(options.project.uri) ?? TaskScope.Global; + const workspace: WorkspaceFolder | TaskScope = getWorkspaceFolderOrDefault(options.project?.uri); const executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; @@ -30,9 +44,8 @@ export async function runAsTask( echo: true, panel: TaskPanelKind.Shared, close: false, - showReuseMessage: false, + showReuseMessage: true, }; - const execution = await executeTask(task); - return execution; + return executeTask(task); } diff --git a/src/features/execution/runInBackground.ts b/src/features/execution/runInBackground.ts new file mode 100644 index 0000000..39d0ce2 --- /dev/null +++ b/src/features/execution/runInBackground.ts @@ -0,0 +1,29 @@ +import * as cp from 'child_process'; +import { PythonEnvironment, PythonBackgroundRunOptions, PythonProcess } from '../../api'; + +export async function runInBackground( + environment: PythonEnvironment, + options: PythonBackgroundRunOptions, +): Promise { + const executable = + environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; + const allArgs = [...args, ...options.args]; + + const proc = cp.spawn(executable, allArgs, { stdio: 'pipe', cwd: options.cwd, env: options.env }); + + return { + pid: proc.pid, + stdin: proc.stdin, + stdout: proc.stdout, + stderr: proc.stderr, + kill: () => { + if (!proc.killed) { + proc.kill(); + } + }, + onExit: (listener: (code: number | null, signal: NodeJS.Signals | null) => void) => { + proc.on('exit', listener); + }, + }; +} diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index c3dffe5..e539508 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -1,4 +1,4 @@ -import { Uri, Disposable, Event, EventEmitter } from 'vscode'; +import { Uri, Disposable, Event, EventEmitter, Terminal, TaskExecution } from 'vscode'; import { PythonEnvironmentApi, PythonEnvironment, @@ -22,6 +22,10 @@ import { PythonProjectCreator, ResolveEnvironmentContext, PackageInstallOptions, + PythonProcess, + PythonTaskExecutionOptions, + PythonTerminalExecutionOptions, + PythonBackgroundRunOptions, } from '../api'; import { EnvironmentManagers, @@ -36,6 +40,10 @@ import { traceError } from '../common/logging'; import { showErrorMessage } from '../common/errors/utils'; import { pickEnvironmentManager } from '../common/pickers/managers'; import { handlePythonPath } from '../common/utils/pythonPath'; +import { TerminalManager } from './terminal/terminalManager'; +import { runAsTask } from './execution/runAsTask'; +import { runInTerminal } from './terminal/runInTerminal'; +import { runInBackground } from './execution/runInBackground'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); @@ -46,6 +54,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly envManagers: EnvironmentManagers, private readonly projectManager: PythonProjectManager, private readonly projectCreators: ProjectCreators, + private readonly terminalManager: TerminalManager, ) {} registerEnvironmentManager(manager: EnvironmentManager): Disposable { @@ -266,6 +275,40 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { registerPythonProjectCreator(creator: PythonProjectCreator): Disposable { return this.projectCreators.registerPythonProjectCreator(creator); } + async createTerminal( + environment: PythonEnvironment, + cwd: string | Uri, + envVars?: { [key: string]: string }, + ): Promise { + return this.terminalManager.create(environment, cwd, envVars); + } + async runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise { + const terminal = await this.terminalManager.getProjectTerminal( + options.cwd instanceof Uri ? options.cwd : Uri.file(options.cwd), + environment, + ); + await runInTerminal(environment, terminal, options); + return terminal; + } + async runInDedicatedTerminal( + terminalKey: Uri, + environment: PythonEnvironment, + options: PythonTerminalExecutionOptions, + ): Promise { + const terminal = await this.terminalManager.getDedicatedTerminal( + terminalKey, + options.cwd instanceof Uri ? options.cwd : Uri.file(options.cwd), + environment, + ); + await runInTerminal(environment, terminal, options); + return terminal; + } + runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise { + return runAsTask(environment, options); + } + runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise { + return runInBackground(environment, options); + } } let _deferred = createDeferred(); @@ -273,8 +316,9 @@ export function setPythonApi( envMgr: EnvironmentManagers, projectMgr: PythonProjectManager, projectCreators: ProjectCreators, + terminalManager: TerminalManager, ) { - _deferred.resolve(new PythonEnvironmentApiImpl(envMgr, projectMgr, projectCreators)); + _deferred.resolve(new PythonEnvironmentApiImpl(envMgr, projectMgr, projectCreators, terminalManager)); } export function getPythonApi(): Promise { diff --git a/src/features/execution/runInTerminal.ts b/src/features/terminal/runInTerminal.ts similarity index 82% rename from src/features/execution/runInTerminal.ts rename to src/features/terminal/runInTerminal.ts index a29edc2..5115b58 100644 --- a/src/features/execution/runInTerminal.ts +++ b/src/features/terminal/runInTerminal.ts @@ -1,24 +1,22 @@ import { Terminal, TerminalShellExecution } from 'vscode'; -import { PythonEnvironment } from '../../api'; -import { PythonTerminalExecutionOptions } from '../../internal.api'; +import { PythonEnvironment, PythonTerminalExecutionOptions } from '../../api'; import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createDeferred } from '../../common/utils/deferred'; -import { quoteArgs } from './execUtils'; +import { quoteArgs } from '../execution/execUtils'; export async function runInTerminal( environment: PythonEnvironment, terminal: Terminal, options: PythonTerminalExecutionOptions, - extra?: { show?: boolean }, ): Promise { - if (extra?.show) { + if (options.show) { terminal.show(); } const executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; - const allArgs = [...args, ...options.args]; + const allArgs = [...args, ...(options.args ?? [])]; if (terminal.shellIntegration) { let execution: TerminalShellExecution | undefined; diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 8cdb9b1..8c24e94 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -55,10 +55,14 @@ export interface TerminalCreation { } export interface TerminalGetters { - getProjectTerminal(project: PythonProject, environment: PythonEnvironment, createNew?: boolean): Promise; + getProjectTerminal( + project: Uri | PythonProject, + environment: PythonEnvironment, + createNew?: boolean, + ): Promise; getDedicatedTerminal( uri: Uri, - project: PythonProject, + project: Uri | PythonProject, environment: PythonEnvironment, createNew?: boolean, ): Promise; @@ -320,7 +324,7 @@ export class TerminalManagerImpl implements TerminalManager { private dedicatedTerminals = new Map(); async getDedicatedTerminal( uri: Uri, - project: PythonProject, + project: Uri | PythonProject, environment: PythonEnvironment, createNew: boolean = false, ): Promise { @@ -332,9 +336,10 @@ export class TerminalManagerImpl implements TerminalManager { } } + const puri = project instanceof Uri ? project : project.uri; const config = getConfiguration('python', uri); - const projectStat = await fsapi.stat(project.uri.fsPath); - const projectDir = projectStat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + const projectStat = await fsapi.stat(puri.fsPath); + const projectDir = projectStat.isDirectory() ? puri.fsPath : path.dirname(puri.fsPath); const uriStat = await fsapi.stat(uri.fsPath); const uriDir = uriStat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); @@ -355,19 +360,20 @@ export class TerminalManagerImpl implements TerminalManager { private projectTerminals = new Map(); async getProjectTerminal( - project: PythonProject, + project: Uri | PythonProject, environment: PythonEnvironment, createNew: boolean = false, ): Promise { - const key = `${environment.envId.id}:${path.normalize(project.uri.fsPath)}`; + const uri = project instanceof Uri ? project : project.uri; + const key = `${environment.envId.id}:${path.normalize(uri.fsPath)}`; if (!createNew) { const terminal = this.projectTerminals.get(key); if (terminal) { return terminal; } } - const stat = await fsapi.stat(project.uri.fsPath); - const cwd = stat.isDirectory() ? project.uri.fsPath : path.dirname(project.uri.fsPath); + const stat = await fsapi.stat(uri.fsPath); + const cwd = stat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); const newTerminal = await this.create(environment, cwd); this.projectTerminals.set(key, newTerminal); diff --git a/src/internal.api.ts b/src/internal.api.ts index 37f36a2..9dbdef5 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -321,17 +321,3 @@ export interface ProjectCreators extends Disposable { registerPythonProjectCreator(creator: PythonProjectCreator): Disposable; getProjectCreators(): PythonProjectCreator[]; } - -export interface PythonTerminalExecutionOptions { - project: PythonProject; - args: string[]; - uri?: Uri; -} - -export interface PythonTaskExecutionOptions { - project: PythonProject; - args: string[]; - cwd?: string; - env?: { [key: string]: string }; - name: string; -} From afe18203b4d566c7a31289b26b6900b998fa612a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 21 Nov 2024 21:08:01 +0530 Subject: [PATCH 011/328] Fix bugs with creation and selection of venv (#23) Fixes https://github.com/microsoft/vscode-python-environments/issues/22 Fixes https://github.com/microsoft/vscode-python-environments/issues/20 Fixes https://github.com/microsoft/vscode-python-environments/issues/18 --- package.json | 13 +- src/api.ts | 4 +- src/common/pickers/environments.ts | 3 +- src/common/pickers/packages.ts | 37 ++++-- src/common/utils/pythonPath.ts | 8 +- src/common/window.apis.ts | 10 ++ src/common/workspace.apis.ts | 19 +++ src/extension.ts | 73 ++++------- src/features/envCommands.ts | 12 +- src/features/pythonApi.ts | 39 +++++- src/features/statusBarPython.ts | 70 ---------- src/features/terminal/activateMenuButton.ts | 64 ++++++++-- src/features/views/envManagersView.ts | 108 ++++++---------- src/features/views/projectView.ts | 134 ++++++++++++-------- src/features/views/pythonStatusBar.ts | 35 +++++ src/features/views/revealHandler.ts | 39 ++++++ src/features/views/treeViewItems.ts | 3 +- src/managers/sysPython/main.ts | 19 +++ src/managers/sysPython/sysPythonManager.ts | 12 +- src/managers/sysPython/venvManager.ts | 58 +++++++-- src/managers/sysPython/venvUtils.ts | 33 ++++- 21 files changed, 492 insertions(+), 301 deletions(-) delete mode 100644 src/features/statusBarPython.ts create mode 100644 src/features/views/pythonStatusBar.ts create mode 100644 src/features/views/revealHandler.ts diff --git a/package.json b/package.json index 350565b..19ea498 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,16 @@ "categories": [ "Other" ], + "capabilities": { + "untrustedWorkspaces": { + "supported": false, + "description": "This extension doesn't support untrusted workspaces." + }, + "virtualWorkspaces": { + "supported": false, + "description": "This extension doesn't support virtual workspaces." + } + }, "activationEvents": [ "onLanguage:python" ], @@ -21,9 +31,6 @@ "bugs": { "url": "https://github.com/microsoft/vscode-python-environments/issues" }, - "extensionDependencies": [ - "ms-python.python" - ], "main": "./dist/extension.js", "icon": "icon.png", "contributes": { diff --git a/src/api.ts b/src/api.ts index 90c81cd..065a4ba 100644 --- a/src/api.ts +++ b/src/api.ts @@ -240,7 +240,7 @@ export type DidChangeEnvironmentEventArgs = { /** * The URI of the environment that changed. */ - readonly uri: Uri; + readonly uri: Uri | undefined; /** * The old Python environment before the change. @@ -968,7 +968,7 @@ export interface PythonPackageManagementApi { export interface PythonPackageManagerApi extends PythonPackageManagerRegistrationApi, PythonPackageGetterApi, - PythonEnvironmentManagerApi, + PythonPackageManagementApi, PythonPackageItemApi {} export interface PythonProjectCreationApi { diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 3d03e69..0cef6f2 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -165,7 +165,8 @@ export async function pickEnvironment( return { label: e.displayName ?? e.name, description: e.description, - e: { selected: e, manager: manager }, + result: e, + manager: manager, iconPath: getIconPath(e.iconPath), }; }), diff --git a/src/common/pickers/packages.ts b/src/common/pickers/packages.ts index 3dde73b..62e704a 100644 --- a/src/common/pickers/packages.ts +++ b/src/common/pickers/packages.ts @@ -170,25 +170,30 @@ function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { return result; } +async function getInstallables(packageManager: InternalPackageManager, environment: PythonEnvironment) { + const installable = await packageManager?.getInstallable(environment); + if (installable && installable.length === 0) { + traceWarn(`No installable packages found for ${packageManager.id}: ${environment.environmentPath.fsPath}`); + } + return installable; +} + async function getWorkspacePackages( - packageManager: InternalPackageManager, - environment: PythonEnvironment, + installable: Installable[] | undefined, preSelected?: PackageQuickPickItem[] | undefined, ): Promise { const items: PackageQuickPickItem[] = []; - let installable = await packageManager?.getInstallable(environment); if (installable && installable.length > 0) { items.push(...getGroupedItems(installable)); } else { - traceWarn(`No installable packages found for ${packageManager.id}: ${environment.environmentPath.fsPath}`); - installable = await getCommonPackages(); + const common = await getCommonPackages(); items.push( { label: PackageManagement.commonPackages, kind: QuickPickItemKind.Separator, }, - ...installable.map(installableToQuickPickItem), + ...common.map(installableToQuickPickItem), ); } @@ -240,7 +245,7 @@ async function getWorkspacePackages( return result; } catch (ex) { if (ex === QuickInputButtons.Back) { - return getWorkspacePackages(packageManager, environment, selected); + return getWorkspacePackages(installable, selected); } return undefined; } @@ -250,7 +255,7 @@ async function getWorkspacePackages( } } -export async function getCommonPackagesToInstall( +async function getCommonPackagesToInstall( preSelected?: PackageQuickPickItem[] | undefined, ): Promise { const common = await getCommonPackages(); @@ -315,7 +320,7 @@ export async function getCommonPackagesToInstall( } } -export async function getPackagesToInstall( +export async function getPackagesToInstallFromPackageManager( packageManager: InternalPackageManager, environment: PythonEnvironment, ): Promise { @@ -325,11 +330,12 @@ export async function getPackagesToInstall( if (packageType === PackageManagement.workspaceDependencies) { try { - const result = await getWorkspacePackages(packageManager, environment); + const installable = await getInstallables(packageManager, environment); + const result = await getWorkspacePackages(installable); return result; } catch (ex) { if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstall(packageManager, environment); + return getPackagesToInstallFromPackageManager(packageManager, environment); } if (ex === QuickInputButtons.Back) { throw ex; @@ -344,7 +350,7 @@ export async function getPackagesToInstall( return result; } catch (ex) { if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstall(packageManager, environment); + return getPackagesToInstallFromPackageManager(packageManager, environment); } if (ex === QuickInputButtons.Back) { throw ex; @@ -356,6 +362,13 @@ export async function getPackagesToInstall( return undefined; } +export async function getPackagesToInstallFromInstallable(installable: Installable[]): Promise { + if (installable.length === 0) { + return undefined; + } + return getWorkspacePackages(installable); +} + export async function getPackagesToUninstall(packages: Package[]): Promise { const items = packages.map((p) => ({ label: p.name, diff --git a/src/common/utils/pythonPath.ts b/src/common/utils/pythonPath.ts index df3cfb2..451da4b 100644 --- a/src/common/utils/pythonPath.ts +++ b/src/common/utils/pythonPath.ts @@ -40,6 +40,8 @@ export async function handlePythonPath( reporter?: Progress<{ message?: string; increment?: number }>, token?: CancellationToken, ): Promise { + // Use the managers user has set for the project first. Likely, these + // managers are the ones that should be used. for (const manager of sortManagersByPriority(projectEnvManagers)) { if (token?.isCancellationRequested) { return; @@ -54,6 +56,8 @@ export async function handlePythonPath( traceVerbose(`Manager ${manager.displayName} (${manager.id}) cannot handle ${interpreterUri.fsPath}`); } + // If the project managers cannot handle the interpreter, then try all the managers + // that user has installed. Excluding anything that is already checked. const checkedIds = projectEnvManagers.map((m) => m.id); const filtered = managers.filter((m) => !checkedIds.includes(m.id)); @@ -70,10 +74,6 @@ export async function handlePythonPath( } } - if (token?.isCancellationRequested) { - return; - } - traceError(`Unable to handle ${interpreterUri.fsPath}`); showErrorMessage(`Unable to handle ${interpreterUri.fsPath}`); return undefined; diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 1f706de..9d5da86 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -4,7 +4,9 @@ import { ExtensionTerminalOptions, InputBox, InputBoxOptions, + LogOutputChannel, OpenDialogOptions, + OutputChannel, Progress, ProgressOptions, QuickInputButton, @@ -279,3 +281,11 @@ export function showWarningMessage(message: string, ...items: string[]): Thenabl export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable { return window.showInputBox(options, token); } + +export function createOutputChannel(name: string, languageId?: string): OutputChannel { + return window.createOutputChannel(name, languageId); +} + +export function createLogOutputChannel(name: string): LogOutputChannel { + return window.createOutputChannel(name, { log: true }); +} diff --git a/src/common/workspace.apis.ts b/src/common/workspace.apis.ts index c4236d2..7e2c3ea 100644 --- a/src/common/workspace.apis.ts +++ b/src/common/workspace.apis.ts @@ -3,6 +3,8 @@ import { ConfigurationChangeEvent, ConfigurationScope, Disposable, + FileDeleteEvent, + FileSystemWatcher, GlobPattern, Uri, workspace, @@ -39,3 +41,20 @@ export function findFiles( ): Thenable { return workspace.findFiles(include, exclude, maxResults, token); } + +export function createFileSystemWatcher( + globPattern: GlobPattern, + ignoreCreateEvents?: boolean, + ignoreChangeEvents?: boolean, + ignoreDeleteEvents?: boolean, +): FileSystemWatcher { + return workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents); +} + +export function onDidDeleteFiles( + listener: (e: FileDeleteEvent) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return workspace.onDidDeleteFiles(listener, thisArgs, disposables); +} diff --git a/src/extension.ts b/src/extension.ts index 22c00b9..3f2330e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,4 +1,4 @@ -import { window, commands, ExtensionContext, LogOutputChannel, TextEditor } from 'vscode'; +import { commands, ExtensionContext, LogOutputChannel } from 'vscode'; import { PythonEnvironmentManagers } from './features/envManagers'; import { registerLogger } from './common/logging'; @@ -28,9 +28,8 @@ import { PythonProjectManagerImpl } from './features/projectManager'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { getPythonApi, setPythonApi } from './features/pythonApi'; import { setPersistentState } from './common/persistentState'; -import { isPythonProjectFile } from './common/utils/fileNameUtils'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; -import { PythonEnvironmentApi, PythonProject } from './api'; +import { PythonEnvironmentApi } from './api'; import { ProjectCreatorsImpl, registerAutoProjectProvider, @@ -39,21 +38,31 @@ import { import { WorkspaceView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; -import { activeTerminal, onDidChangeActiveTerminal, onDidChangeActiveTextEditor } from './common/window.apis'; +import { + activeTerminal, + createLogOutputChannel, + onDidChangeActiveTerminal, + onDidChangeActiveTextEditor, +} from './common/window.apis'; import { getEnvironmentForTerminal, setActivateMenuButtonContext, updateActivateMenuButtonContext, } from './features/terminal/activateMenuButton'; +import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; +import { updateViewsAndStatus } from './features/views/revealHandler'; export async function activate(context: ExtensionContext): Promise { // Logging should be set up before anything else. - const outputChannel: LogOutputChannel = window.createOutputChannel('Python Environments', { log: true }); + const outputChannel: LogOutputChannel = createLogOutputChannel('Python Environments'); context.subscriptions.push(outputChannel, registerLogger(outputChannel)); // Setup the persistent state for the extension. setPersistentState(context); + const statusBar = new PythonStatusBarImpl(); + context.subscriptions.push(statusBar); + const terminalManager: TerminalManager = new TerminalManagerImpl(); context.subscriptions.push(terminalManager); @@ -113,26 +122,14 @@ export async function activate(context: ExtensionContext): Promise { const result = await setEnvironmentCommand(item, envManagers, projectManager); if (result) { - const projects: PythonProject[] = []; - result.forEach((r) => { - if (r.project) { - projects.push(r.project); - } - }); - workspaceView.updateProject(projects); + workspaceView.updateProject(); await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); } }), commands.registerCommand('python-envs.setEnv', async (item) => { const result = await setEnvironmentCommand(item, envManagers, projectManager); if (result) { - const projects: PythonProject[] = []; - result.forEach((r) => { - if (r.project) { - projects.push(r.project); - } - }); - workspaceView.updateProject(projects); + workspaceView.updateProject(); await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); } }), @@ -193,38 +190,14 @@ export async function activate(context: ExtensionContext): Promise { await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers, t); }), - onDidChangeActiveTextEditor(async (e: TextEditor | undefined) => { - if (e && !e.document.isUntitled && e.document.uri.scheme === 'file') { - if ( - e.document.languageId === 'python' || - e.document.languageId === 'pip-requirements' || - isPythonProjectFile(e.document.uri.fsPath) - ) { - const env = await workspaceView.reveal(e.document.uri); - await managerView.reveal(env); - } - } + onDidChangeActiveTextEditor(async () => { + updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), - envManagers.onDidChangeEnvironment(async (e) => { - const activeDocument = window.activeTextEditor?.document; - if (!activeDocument || activeDocument.isUntitled || activeDocument.uri.scheme !== 'file') { - return; - } - - if ( - activeDocument.languageId !== 'python' && - activeDocument.languageId !== 'pip-requirements' && - !isPythonProjectFile(activeDocument.uri.fsPath) - ) { - return; - } - - const mgr1 = envManagers.getEnvironmentManager(e.uri); - const mgr2 = envManagers.getEnvironmentManager(activeDocument.uri); - if (mgr1 === mgr2 && e.new) { - const env = await workspaceView.reveal(activeDocument.uri); - await managerView.reveal(env); - } + envManagers.onDidChangeEnvironment(async () => { + updateViewsAndStatus(statusBar, workspaceView, managerView, api); + }), + envManagers.onDidChangeEnvironments(async () => { + updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), ); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 0a0166e..996b2f4 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -34,7 +34,11 @@ import { import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; -import { pickPackageOptions, getPackagesToInstall, getPackagesToUninstall } from '../common/pickers/packages'; +import { + pickPackageOptions, + getPackagesToInstallFromPackageManager, + getPackagesToUninstall, +} from '../common/pickers/packages'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { TerminalManager } from './terminal/terminalManager'; import { runInTerminal } from './terminal/runInTerminal'; @@ -138,7 +142,7 @@ export async function handlePackagesCommand( if (action === Common.install) { if (!packages || packages.length === 0) { try { - packages = await getPackagesToInstall(packageManager, environment); + packages = await getPackagesToInstallFromPackageManager(packageManager, environment); } catch (ex: any) { if (ex === QuickInputButtons.Back) { return handlePackagesCommand(packageManager, environment, packages); @@ -192,7 +196,7 @@ export async function setEnvironmentCommand( return; } else if (context instanceof ProjectItem) { const view = context as ProjectItem; - return setEnvironmentCommand(view.project.uri, em, wm); + return setEnvironmentCommand([view.project.uri], em, wm); } else if (context instanceof Uri) { return setEnvironmentCommand([context], em, wm); } else if (context === undefined) { @@ -236,8 +240,8 @@ export async function setEnvironmentCommand( const settings: EditAllManagerSettings[] = []; uris.forEach((uri) => { const m = em.getEnvironmentManager(uri); + promises.push(manager.set(uri, selected)); if (manager.id !== m?.id) { - promises.push(manager.set(uri, selected)); settings.push({ project: wm.get(uri), envManager: manager.id, diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index e539508..518f377 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -44,12 +44,15 @@ import { TerminalManager } from './terminal/terminalManager'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; import { runInBackground } from './execution/runInBackground'; +import { setAllManagerSettings } from './settings/settingHelpers'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); private readonly _onDidChangeEnvironment = new EventEmitter(); private readonly _onDidChangePythonProjects = new EventEmitter(); private readonly _onDidChangePackages = new EventEmitter(); + + private readonly _previousEnvironments = new Map(); constructor( private readonly envManagers: EnvironmentManagers, private readonly projectManager: PythonProjectManager, @@ -159,18 +162,46 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { - const manager = this.envManagers.getEnvironmentManager(scope); + const manager = environment + ? this.envManagers.getEnvironmentManager(environment.envId.managerId) + : this.envManagers.getEnvironmentManager(scope); + if (!manager) { throw new Error('No environment manager found'); } await manager.set(scope, environment); + if (scope) { + const project = this.projectManager.get(scope); + const packageManager = this.envManagers.getPackageManager(environment); + if (project && packageManager) { + await setAllManagerSettings([ + { + project, + envManager: manager.id, + packageManager: packageManager.id, + }, + ]); + } + } + + const oldEnv = this._previousEnvironments.get(scope?.toString() ?? 'global'); + if (oldEnv?.envId.id !== environment?.envId.id) { + this._previousEnvironments.set(scope?.toString() ?? 'global', environment); + this._onDidChangeEnvironment.fire({ uri: scope, new: environment, old: oldEnv }); + } } - async getEnvironment(context: GetEnvironmentScope): Promise { - const manager = this.envManagers.getEnvironmentManager(context); + async getEnvironment(scope: GetEnvironmentScope): Promise { + const manager = this.envManagers.getEnvironmentManager(scope); if (!manager) { return undefined; } - return await manager.get(context); + const oldEnv = this._previousEnvironments.get(scope?.toString() ?? 'global'); + const newEnv = await manager.get(scope); + if (oldEnv?.envId.id !== newEnv?.envId.id) { + this._previousEnvironments.set(scope?.toString() ?? 'global', newEnv); + this._onDidChangeEnvironment.fire({ uri: scope, new: newEnv, old: oldEnv }); + } + return newEnv; } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { diff --git a/src/features/statusBarPython.ts b/src/features/statusBarPython.ts deleted file mode 100644 index 2e5de93..0000000 --- a/src/features/statusBarPython.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { Disposable, StatusBarAlignment, StatusBarItem, ThemeColor, Uri } from 'vscode'; -import { createStatusBarItem } from '../common/window.apis'; -import { Interpreter } from '../common/localize'; -import { PythonProjectManager } from '../internal.api'; -import { PythonEnvironment } from '../api'; - -const STATUS_BAR_ITEM_PRIORITY = 100.09999; - -export interface PythonStatusBar extends Disposable { - update(uri: Uri | undefined, env?: PythonEnvironment): void; - show(uri: Uri): void; - hide(): void; -} - -export class PythonStatusBarImpl implements PythonStatusBar { - private _global: PythonEnvironment | undefined; - private _statusBarItem: StatusBarItem; - private _disposables: Disposable[] = []; - private _uriToEnv: Map = new Map(); - constructor(private readonly projectManager: PythonProjectManager) { - this._statusBarItem = createStatusBarItem( - 'python-envs.statusBarItem.selectedInterpreter', - StatusBarAlignment.Right, - STATUS_BAR_ITEM_PRIORITY, - ); - this._statusBarItem.command = 'python-envs.set'; - this._disposables.push(this._statusBarItem); - } - - public update(uri: Uri | undefined, env?: PythonEnvironment): void { - const project = uri ? this.projectManager.get(uri)?.uri : undefined; - if (!project) { - this._global = env; - } else { - if (env) { - this._uriToEnv.set(project.toString(), env); - } else { - this._uriToEnv.delete(project.toString()); - } - } - } - public show(uri: Uri | undefined) { - const project = uri ? this.projectManager.get(uri)?.uri : undefined; - const environment = project ? this._uriToEnv.get(project.toString()) : this._global; - if (environment) { - this._statusBarItem.text = environment.shortDisplayName ?? environment.displayName; - this._statusBarItem.tooltip = environment.environmentPath.fsPath; - this._statusBarItem.backgroundColor = undefined; - this._statusBarItem.show(); - return; - } else if (project) { - // Show alert only if it is a project file - this._statusBarItem.tooltip = ''; - this._statusBarItem.backgroundColor = new ThemeColor('statusBarItem.warningBackground'); - this._statusBarItem.text = `$(alert) ${Interpreter.statusBarSelect}`; - this._statusBarItem.show(); - return; - } - - this._statusBarItem.hide(); - } - - public hide() { - this._statusBarItem.hide(); - } - - dispose() { - this._disposables.forEach((d) => d.dispose()); - } -} diff --git a/src/features/terminal/activateMenuButton.ts b/src/features/terminal/activateMenuButton.ts index 968269c..ac85e60 100644 --- a/src/features/terminal/activateMenuButton.ts +++ b/src/features/terminal/activateMenuButton.ts @@ -1,10 +1,28 @@ -import { Terminal } from 'vscode'; +import { Terminal, TerminalOptions, Uri } from 'vscode'; import { activeTerminal } from '../../common/window.apis'; import { TerminalActivation, TerminalEnvironment } from './terminalManager'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; import { PythonEnvironment } from '../../api'; import { isActivatableEnvironment } from '../common/activation'; import { executeCommand } from '../../common/command.api'; +import { getWorkspaceFolders } from '../../common/workspace.apis'; + +async function getDistinctProjectEnvs(pm: PythonProjectManager, em: EnvironmentManagers): Promise { + const projects = pm.getProjects(); + const envs: PythonEnvironment[] = []; + const projectEnvs = await Promise.all( + projects.map(async (p) => { + const manager = em.getEnvironmentManager(p.uri); + return manager?.get(p.uri); + }), + ); + projectEnvs.forEach((e) => { + if (e && !envs.find((x) => x.envId.id === e.envId.id)) { + envs.push(e); + } + }); + return envs; +} export async function getEnvironmentForTerminal( tm: TerminalEnvironment, @@ -13,15 +31,43 @@ export async function getEnvironmentForTerminal( t: Terminal, ): Promise { let env = await tm.getEnvironment(t); + if (env) { + return env; + } - if (!env) { - const projects = pm.getProjects(); - if (projects.length === 0) { - const manager = em.getEnvironmentManager(undefined); - env = await manager?.get(undefined); - } else if (projects.length === 1) { - const manager = em.getEnvironmentManager(projects[0].uri); - env = await manager?.get(projects[0].uri); + const projects = pm.getProjects(); + if (projects.length === 0) { + const manager = em.getEnvironmentManager(undefined); + env = await manager?.get(undefined); + } else if (projects.length === 1) { + const manager = em.getEnvironmentManager(projects[0].uri); + env = await manager?.get(projects[0].uri); + } else { + const envs = await getDistinctProjectEnvs(pm, em); + if (envs.length === 1) { + // If we have only one distinct environment, then use that. + env = envs[0]; + } else { + // If we have multiple distinct environments, then we can't pick one + // So skip selecting so we can try heuristic approach + } + } + if (env) { + return env; + } + + // This is a heuristic approach to attempt to find the environment for this terminal. + // This is not guaranteed to work, but is better than nothing. + let tempCwd = (t.creationOptions as TerminalOptions)?.cwd; + let cwd = typeof tempCwd === 'string' ? Uri.file(tempCwd) : tempCwd; + if (cwd) { + const manager = em.getEnvironmentManager(cwd); + env = await manager?.get(cwd); + } else { + const workspaces = getWorkspaceFolders() ?? []; + if (workspaces.length === 1) { + const manager = em.getEnvironmentManager(workspaces[0].uri); + env = await manager?.get(workspaces[0].uri); } } diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index 0a58848..5983855 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -9,7 +9,6 @@ import { InternalEnvironmentManager, InternalPackageManager, } from '../../internal.api'; -import { traceError } from '../../common/logging'; import { EnvTreeItem, EnvManagerTreeItem, @@ -21,16 +20,16 @@ import { EnvInfoTreeItem, PackageRootInfoTreeItem, } from './treeViewItems'; +import { createSimpleDebounce } from '../../common/utils/debounce'; export class EnvManagerView implements TreeDataProvider, Disposable { private treeView: TreeView; - private _treeDataChanged: EventEmitter = new EventEmitter< + private treeDataChanged: EventEmitter = new EventEmitter< EnvTreeItem | EnvTreeItem[] | null | undefined >(); - private _viewsManagers = new Map(); - private _viewsEnvironments = new Map(); - private _viewsPackageRoots = new Map(); - private _viewsPackages = new Map(); + private revealMap = new Map(); + private managerViews = new Map(); + private packageRoots = new Map(); private disposables: Disposable[] = []; public constructor(public providers: EnvironmentManagers) { @@ -39,8 +38,13 @@ export class EnvManagerView implements TreeDataProvider, Disposable }); this.disposables.push( + new Disposable(() => { + this.packageRoots.clear(); + this.revealMap.clear(); + this.managerViews.clear(); + }), this.treeView, - this._treeDataChanged, + this.treeDataChanged, this.providers.onDidChangeEnvironments((e: InternalDidChangeEnvironmentsEventArgs) => { this.onDidChangeEnvironments(e); }), @@ -58,23 +62,19 @@ export class EnvManagerView implements TreeDataProvider, Disposable } dispose() { - this._viewsManagers.clear(); - this._viewsEnvironments.clear(); - this._viewsPackages.clear(); this.disposables.forEach((d) => d.dispose()); } + private debouncedFireDataChanged = createSimpleDebounce(500, () => this.treeDataChanged.fire(undefined)); private fireDataChanged(item: EnvTreeItem | EnvTreeItem[] | null | undefined) { - if (Array.isArray(item)) { - if (item.length > 0) { - this._treeDataChanged.fire(item); - } + if (item) { + this.treeDataChanged.fire(item); } else { - this._treeDataChanged.fire(item); + this.debouncedFireDataChanged.trigger(); } } - onDidChangeTreeData: Event = this._treeDataChanged.event; + onDidChangeTreeData: Event = this.treeDataChanged.event; getTreeItem(element: EnvTreeItem): TreeItem | Thenable { return element.treeItem; @@ -82,17 +82,24 @@ export class EnvManagerView implements TreeDataProvider, Disposable async getChildren(element?: EnvTreeItem | undefined): Promise { if (!element) { - return Array.from(this._viewsManagers.values()); + const views: EnvTreeItem[] = []; + this.managerViews.clear(); + this.providers.managers.forEach((m) => { + const view = new EnvManagerTreeItem(m); + views.push(view); + this.managerViews.set(m.id, view); + }); + return views; } + if (element.kind === EnvTreeItemKind.manager) { const manager = (element as EnvManagerTreeItem).manager; const views: EnvTreeItem[] = []; const envs = await manager.getEnvironments('all'); envs.forEach((env) => { - const view = this._viewsEnvironments.get(env.envId.id); - if (view) { - views.push(view); - } + const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem); + views.push(view); + this.revealMap.set(env.envId.id, view); }); if (views.length === 0) { @@ -110,7 +117,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable if (pkgManager) { const item = new PackageRootTreeItem(parent, pkgManager, environment); - this._viewsPackageRoots.set(environment.envId.id, item); + this.packageRoots.set(environment.envId.id, item); views.push(item); } else { views.push(new EnvInfoTreeItem(parent, 'No package manager found')); @@ -141,12 +148,12 @@ export class EnvManagerView implements TreeDataProvider, Disposable return element.parent; } - async reveal(environment?: PythonEnvironment) { - if (environment && this.treeView.visible) { - const view = this._viewsEnvironments.get(environment.envId.id); - if (view) { + reveal(environment?: PythonEnvironment) { + const view = environment ? this.revealMap.get(environment.envId.id) : undefined; + if (view && this.treeView.visible) { + setImmediate(async () => { await this.treeView.reveal(view); - } + }); } } @@ -154,60 +161,23 @@ export class EnvManagerView implements TreeDataProvider, Disposable return this.providers.getPackageManager(manager.preferredPackageManagerId); } - private onDidChangeEnvironmentManager(args: DidChangeEnvironmentManagerEventArgs) { - if (args.kind === 'registered') { - this._viewsManagers.set(args.manager.id, new EnvManagerTreeItem(args.manager)); - this.fireDataChanged(undefined); - } else { - if (this._viewsManagers.delete(args.manager.id)) { - this.fireDataChanged(undefined); - } - } + private onDidChangeEnvironmentManager(_args: DidChangeEnvironmentManagerEventArgs) { + this.fireDataChanged(undefined); } private onDidChangeEnvironments(args: InternalDidChangeEnvironmentsEventArgs) { - const managerView = this._viewsManagers.get(args.manager.id); - if (!managerView) { - traceError(`No manager found: ${args.manager.id}`); - traceError(`Managers: ${this.providers.managers.map((m) => m.id).join(', ')}`); - return; - } - - // All removes should happen first, then adds - const sorted = args.changes.sort((a, b) => { - if (a.kind === 'remove' && b.kind === 'add') { - return -1; - } - if (a.kind === 'add' && b.kind === 'remove') { - return 1; - } - return 0; - }); - - sorted.forEach((e) => { - if (managerView) { - if (e.kind === 'add') { - this._viewsEnvironments.set( - e.environment.envId.id, - new PythonEnvTreeItem(e.environment, managerView), - ); - } else if (e.kind === 'remove') { - this._viewsEnvironments.delete(e.environment.envId.id); - } - } - }); - this.fireDataChanged([managerView]); + this.fireDataChanged(this.managerViews.get(args.manager.id)); } private onDidChangePackages(args: InternalDidChangePackagesEventArgs) { - const pkgRoot = this._viewsPackageRoots.get(args.environment.envId.id); + const pkgRoot = this.packageRoots.get(args.environment.envId.id); if (pkgRoot) { this.fireDataChanged(pkgRoot); } } private onDidChangePackageManager(args: DidChangePackageManagerEventArgs) { - const roots = Array.from(this._viewsPackageRoots.values()).filter((r) => r.manager.id === args.manager.id); + const roots = Array.from(this.packageRoots.values()).filter((r) => r.manager.id === args.manager.id); this.fireDataChanged(roots); } } diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index 317ee71..7ea7a81 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -9,7 +9,7 @@ import { Uri, window, } from 'vscode'; -import { PythonProject, PythonEnvironment } from '../../api'; +import { PythonEnvironment } from '../../api'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; import { ProjectTreeItem, @@ -22,35 +22,52 @@ import { ProjectPackage, ProjectPackageRootInfoTreeItem, } from './treeViewItems'; +import { onDidChangeConfiguration } from '../../common/workspace.apis'; +import { createSimpleDebounce } from '../../common/utils/debounce'; export class WorkspaceView implements TreeDataProvider { private treeView: TreeView; private _treeDataChanged: EventEmitter = new EventEmitter< ProjectTreeItem | ProjectTreeItem[] | null | undefined >(); - private _projectViews: Map = new Map(); - private _environmentViews: Map = new Map(); - private _viewsPackageRoots: Map = new Map(); + private projectViews: Map = new Map(); + private revealMap: Map = new Map(); + private packageRoots: Map = new Map(); private disposables: Disposable[] = []; + private debouncedUpdateProject = createSimpleDebounce(500, () => this.updateProject()); public constructor(private envManagers: EnvironmentManagers, private projectManager: PythonProjectManager) { this.treeView = window.createTreeView('python-projects', { treeDataProvider: this, }); this.disposables.push( + new Disposable(() => { + this.packageRoots.clear(); + this.revealMap.clear(); + this.projectViews.clear(); + }), this.treeView, this._treeDataChanged, this.projectManager.onDidChangeProjects(() => { - this.updateProject(); + this.debouncedUpdateProject.trigger(); }), - this.envManagers.onDidChangeEnvironment((e) => { - this.updateProject(this.projectManager.get(e.uri)); + this.envManagers.onDidChangeEnvironment(() => { + this.debouncedUpdateProject.trigger(); }), this.envManagers.onDidChangeEnvironments(() => { - this.updateProject(); + this.debouncedUpdateProject.trigger(); }), this.envManagers.onDidChangePackages((e) => { this.updatePackagesForEnvironment(e.environment); }), + onDidChangeConfiguration(async (e) => { + if ( + e.affectsConfiguration('python-envs.defaultEnvManager') || + e.affectsConfiguration('python-envs.pythonProjects') || + e.affectsConfiguration('python-envs.defaultPackageManager') + ) { + this.debouncedUpdateProject.trigger(); + } + }), ); } @@ -58,33 +75,13 @@ export class WorkspaceView implements TreeDataProvider { this.projectManager.initialize(); } - updateProject(p?: PythonProject | PythonProject[]): void { - if (Array.isArray(p)) { - const views: ProjectItem[] = []; - p.forEach((w) => { - const view = this._projectViews.get(ProjectItem.getId(w)); - if (view) { - this._environmentViews.delete(view.id); - views.push(view); - } - }); - this._treeDataChanged.fire(views); - } else if (p) { - const view = this._projectViews.get(ProjectItem.getId(p)); - if (view) { - this._environmentViews.delete(view.id); - this._treeDataChanged.fire(view); - } - } else { - this._projectViews.clear(); - this._environmentViews.clear(); - this._treeDataChanged.fire(undefined); - } + updateProject(): void { + this._treeDataChanged.fire(undefined); } private updatePackagesForEnvironment(e: PythonEnvironment): void { const views: ProjectTreeItem[] = []; - this._viewsPackageRoots.forEach((v) => { + this.packageRoots.forEach((v) => { if (v.environment.envId.id === e.envId.id) { views.push(v); } @@ -92,18 +89,31 @@ export class WorkspaceView implements TreeDataProvider { this._treeDataChanged.fire(views); } - async reveal(uri: Uri): Promise { + private revealInternal(view: ProjectEnvironment): void { if (this.treeView.visible) { - const pw = this.projectManager.get(uri); + setImmediate(async () => { + await this.treeView.reveal(view); + }); + } + } + + reveal(context: Uri | PythonEnvironment): PythonEnvironment | undefined { + if (context instanceof Uri) { + const pw = this.projectManager.get(context); if (pw) { - const view = this._environmentViews.get(ProjectItem.getId(pw)); + const view = this.revealMap.get(pw.uri.fsPath); if (view) { - await this.treeView.reveal(view); + this.revealInternal(view); + return view.environment; } - return view?.environment; + } + } else { + const view = Array.from(this.revealMap.values()).find((v) => v.environment.envId.id === context.envId.id); + if (view) { + this.revealInternal(view); + return view.environment; } } - return undefined; } @@ -116,11 +126,11 @@ export class WorkspaceView implements TreeDataProvider { async getChildren(element?: ProjectTreeItem | undefined): Promise { if (element === undefined) { + this.projectViews.clear(); const views: ProjectTreeItem[] = []; this.projectManager.getProjects().forEach((w) => { - const id = ProjectItem.getId(w); - const view = this._projectViews.get(id) ?? new ProjectItem(w); - this._projectViews.set(ProjectItem.getId(w), view); + const view = new ProjectItem(w); + this.projectViews.set(w.uri.fsPath, view); views.push(view); }); @@ -129,23 +139,43 @@ export class WorkspaceView implements TreeDataProvider { if (element.kind === ProjectTreeItemKind.project) { const projectItem = element as ProjectItem; - const envView = this._environmentViews.get(projectItem.id); + if (this.envManagers.managers.length === 0) { + return [ + new NoProjectEnvironment( + projectItem.project, + projectItem, + 'Waiting for environment managers to load', + undefined, + undefined, + '$(loading~spin)', + ), + ]; + } const manager = this.envManagers.getEnvironmentManager(projectItem.project.uri); - const environment = await manager?.get(projectItem.project.uri); - if (!manager || !environment) { - this._environmentViews.delete(projectItem.id); - return [new NoProjectEnvironment(projectItem.project, projectItem)]; + if (!manager) { + return [ + new NoProjectEnvironment( + projectItem.project, + projectItem, + 'Environment manager not found', + 'Install an environment manager to get started. If you have installed then it might be loading.', + ), + ]; } - const envItemId = ProjectEnvironment.getId(projectItem, environment); - if (envView && envView.id === envItemId) { - return [envView]; + const environment = await manager?.get(projectItem.project.uri); + if (!environment) { + return [ + new NoProjectEnvironment( + projectItem.project, + projectItem, + `No environment provided by ${manager.displayName}`, + ), + ]; } - - this._environmentViews.delete(projectItem.id); const view = new ProjectEnvironment(projectItem, environment); - this._environmentViews.set(projectItem.id, view); + this.revealMap.set(projectItem.project.uri.fsPath, view); return [view]; } @@ -159,7 +189,7 @@ export class WorkspaceView implements TreeDataProvider { if (pkgManager) { const item = new ProjectPackageRootTreeItem(environmentItem, pkgManager, environment); - this._viewsPackageRoots.set(environment.envId.id, item); + this.packageRoots.set(environmentItem.parent.project.uri.fsPath, item); views.push(item); } else { views.push(new ProjectEnvironmentInfo(environmentItem, 'No package manager found')); diff --git a/src/features/views/pythonStatusBar.ts b/src/features/views/pythonStatusBar.ts new file mode 100644 index 0000000..6f02754 --- /dev/null +++ b/src/features/views/pythonStatusBar.ts @@ -0,0 +1,35 @@ +import { Disposable, StatusBarAlignment, StatusBarItem, ThemeColor } from 'vscode'; +import { createStatusBarItem } from '../../common/window.apis'; + +export interface PythonStatusBar extends Disposable { + show(text?: string): void; + hide(): void; +} + +export class PythonStatusBarImpl implements Disposable { + private disposables: Disposable[] = []; + private readonly statusBarItem: StatusBarItem; + constructor() { + this.statusBarItem = createStatusBarItem('python.interpreterDisplay', StatusBarAlignment.Right, 100); + this.statusBarItem.command = 'python-envs.set'; + this.statusBarItem.name = 'Python Interpreter'; + this.statusBarItem.tooltip = 'Select Python Interpreter'; + this.statusBarItem.text = '$(loading~spin)'; + this.statusBarItem.show(); + this.disposables.push(this.statusBarItem); + } + + public show(text?: string) { + this.statusBarItem.text = text ?? 'Select Python Interpreter'; + this.statusBarItem.backgroundColor = text ? undefined : new ThemeColor('statusBarItem.warningBackground'); + this.statusBarItem.show(); + } + + public hide() { + this.statusBarItem.hide(); + } + + dispose() { + this.disposables.forEach((d) => d.dispose()); + } +} diff --git a/src/features/views/revealHandler.ts b/src/features/views/revealHandler.ts new file mode 100644 index 0000000..eed9ef0 --- /dev/null +++ b/src/features/views/revealHandler.ts @@ -0,0 +1,39 @@ +import { activeTextEditor } from '../../common/window.apis'; +import { WorkspaceView } from './projectView'; +import { EnvManagerView } from './envManagersView'; +import { PythonStatusBar } from './pythonStatusBar'; +import { isPythonProjectFile } from '../../common/utils/fileNameUtils'; +import { PythonEnvironmentApi } from '../../api'; + +export function updateViewsAndStatus( + statusBar: PythonStatusBar, + workspaceView: WorkspaceView, + managerView: EnvManagerView, + api: PythonEnvironmentApi, +) { + const activeDocument = activeTextEditor()?.document; + if (!activeDocument || activeDocument.isUntitled || activeDocument.uri.scheme !== 'file') { + statusBar.hide(); + return; + } + + if ( + activeDocument.languageId !== 'python' && + activeDocument.languageId !== 'pip-requirements' && + !isPythonProjectFile(activeDocument.uri.fsPath) + ) { + statusBar.hide(); + return; + } + + const env = workspaceView.reveal(activeDocument.uri); + managerView.reveal(env); + if (env) { + statusBar.show(env?.displayName); + } else { + setImmediate(async () => { + const e = await api.getEnvironment(activeDocument.uri); + statusBar.show(e?.displayName); + }); + } +} diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 01881f8..ba1c45d 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -259,13 +259,14 @@ export class NoProjectEnvironment implements ProjectTreeItem { constructor( public readonly project: PythonProject, public readonly parent: ProjectItem, + private readonly label: string, private readonly description?: string, private readonly tooltip?: string | MarkdownString, private readonly iconPath?: string | IconPath, ) { const randomStr1 = Math.random().toString(36).substring(2); this.id = `${this.parent.id}>>>none>>>${randomStr1}`; - const item = new TreeItem('Please select an environment', TreeItemCollapsibleState.None); + const item = new TreeItem(this.label, TreeItemCollapsibleState.None); item.contextValue = 'no-environment'; item.description = this.description; item.tooltip = this.tooltip; diff --git a/src/managers/sysPython/main.ts b/src/managers/sysPython/main.ts index b4bb1c2..4727b27 100644 --- a/src/managers/sysPython/main.ts +++ b/src/managers/sysPython/main.ts @@ -7,6 +7,8 @@ import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { UvProjectCreator } from './uvProjectCreator'; import { isUvInstalled } from './utils'; +import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; +import { createSimpleDebounce } from '../../common/utils/debounce'; export async function registerSystemPythonFeatures( nativeFinder: NativePythonFinder, @@ -24,6 +26,23 @@ export async function registerSystemPythonFeatures( api.registerEnvironmentManager(venvManager), ); + const venvDebouncedRefresh = createSimpleDebounce(500, () => { + venvManager.refresh(undefined); + }); + const watcher = createFileSystemWatcher('{**/pyenv.cfg,**/bin/python,**/python.exe}', false, true, false); + disposables.push( + watcher, + watcher.onDidCreate(() => { + venvDebouncedRefresh.trigger(); + }), + watcher.onDidDelete(() => { + venvDebouncedRefresh.trigger(); + }), + onDidDeleteFiles(() => { + venvDebouncedRefresh.trigger(); + }), + ); + setImmediate(async () => { if (await isUvInstalled(log)) { disposables.push(api.registerPythonProjectCreator(new UvProjectCreator(api, log))); diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index 4344172..65b6450 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -154,8 +154,8 @@ export class SysPythonManager implements EnvironmentManager { async resolve(context: ResolveEnvironmentContext): Promise { if (context instanceof Uri) { - // NOTE: `environmentPath` for envs in `this.collection` for venv always points to the python - // executable in the venv. This is set when we create the PythonEnvironment object. + // NOTE: `environmentPath` for envs in `this.collection` for system envs always points to the python + // executable. This is set when we create the PythonEnvironment object. const found = this.findEnvironmentByPath(context.fsPath); if (found) { // If it is in the collection, then it is a venv, and it should already be fully resolved. @@ -182,6 +182,10 @@ export class SysPythonManager implements EnvironmentManager { if (resolved) { // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. + + // For all other env types we need to ensure that the environment is of the type managed by the manager. + // But System is a exception, this is the last resort for resolving. So we don't need to check. + // We will just add it and treat it as a non-activatable environment. this.collection.push(resolved); this._onDidChangeEnvironments.fire([{ environment: resolved, kind: EnvironmentChangeKind.add }]); } @@ -247,7 +251,7 @@ export class SysPythonManager implements EnvironmentManager { const env = await getSystemEnvForWorkspace(p); if (env) { - const found = this.findEnvironmentByPath(p); + const found = this.findEnvironmentByPath(env); if (found) { this.fsPathToEnv.set(p, found); @@ -256,7 +260,7 @@ export class SysPythonManager implements EnvironmentManager { const resolved = await resolveSystemPythonEnvironmentPath(env, this.nativeFinder, this.api, this); if (resolved) { - // If resolved add it to the collection + // If resolved add it to the collection. this.fsPathToEnv.set(p, resolved); this.collection.push(resolved); } else { diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 7472f6f..638a9a6 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -29,7 +29,7 @@ import { } from './venvUtils'; import * as path from 'path'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; +import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; @@ -100,8 +100,7 @@ export class VenvManager implements EnvironmentManager { const globals = await this.baseManager.getEnvironments('global'); const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot); if (environment) { - this.collection.push(environment); - this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.add }]); + this.addEnvironment(environment, true); } return environment; } @@ -263,13 +262,41 @@ export class VenvManager implements EnvironmentManager { this.baseManager, ); if (resolved) { - // This is just like finding a new environment or creating a new one. - // Add it to collection, and trigger the added event. - this.collection.push(resolved); - this._onDidChangeEnvironments.fire([{ environment: resolved, kind: EnvironmentChangeKind.add }]); + if (resolved.envId.managerId === `${ENVS_EXTENSION_ID}:venv`) { + // This is just like finding a new environment or creating a new one. + // Add it to collection, and trigger the added event. + this.addEnvironment(resolved, true); + + // We should only return the resolved env if it is a venv. + // Fall through an return undefined if it is not a venv + return resolved; + } + } + + return undefined; + } + + private addEnvironment(environment: PythonEnvironment, raiseEvent?: boolean): void { + if (this.collection.find((e) => e.envId.id === environment.envId.id)) { + return; } - return resolved; + const oldEnv = this.findEnvironmentByPath(environment.environmentPath.fsPath); + if (oldEnv) { + this.collection = this.collection.filter((e) => e.envId.id !== oldEnv.envId.id); + this.collection.push(environment); + if (raiseEvent) { + this._onDidChangeEnvironments.fire([ + { environment: oldEnv, kind: EnvironmentChangeKind.remove }, + { environment, kind: EnvironmentChangeKind.add }, + ]); + } + } else { + this.collection.push(environment); + if (raiseEvent) { + this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.add }]); + } + } } private async loadEnvMap() { @@ -295,7 +322,7 @@ export class VenvManager implements EnvironmentManager { // If the environment is resolved, add it to the collection if (this.globalEnv) { - this.collection.push(this.globalEnv); + this.addEnvironment(this.globalEnv, false); } } } @@ -307,6 +334,7 @@ export class VenvManager implements EnvironmentManager { const sorted = sortEnvironments(this.collection); const paths = this.api.getPythonProjects().map((p) => path.normalize(p.uri.fsPath)); + const events: (() => void)[] = []; for (const p of paths) { const env = await getVenvForWorkspace(p); @@ -317,7 +345,9 @@ export class VenvManager implements EnvironmentManager { if (found) { this.fsPathToEnv.set(p, found); if (pw && previous?.envId.id !== found.envId.id) { - this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: found }); + events.push(() => + this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: found }), + ); } } else { const resolved = await resolveVenvPythonEnvironmentPath( @@ -330,9 +360,11 @@ export class VenvManager implements EnvironmentManager { if (resolved) { // If resolved add it to the collection this.fsPathToEnv.set(p, resolved); - this.collection.push(resolved); + this.addEnvironment(resolved, false); if (pw && previous?.envId.id !== resolved.envId.id) { - this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: resolved }); + events.push(() => + this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: resolved }), + ); } } else { this.log.error(`Failed to resolve python environment: ${env}`); @@ -355,6 +387,8 @@ export class VenvManager implements EnvironmentManager { } } } + + events.forEach((e) => e()); } private findEnvironmentByPath(fsPath: string, collection?: PythonEnvironment[]): PythonEnvironment | undefined { diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index ed923b6..0173b86 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -34,6 +34,7 @@ import { showOpenDialog, } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; +import { getPackagesToInstallFromInstallable } from '../../common/pickers/packages'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -53,7 +54,11 @@ export async function getVenvForWorkspace(fsPath: string): Promise { const state = await getWorkspacePersistentState(); - return await state.get(VENV_GLOBAL_KEY); + const envPath: string | undefined = await state.get(VENV_GLOBAL_KEY); + if (envPath && (await fsapi.pathExists(envPath))) { + return envPath; + } + return undefined; } export async function setVenvForGlobal(envPath: string | undefined): Promise { @@ -277,6 +286,18 @@ export async function createPythonVenv( const pythonPath = os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); + const project = api.getPythonProject(venvRoot); + const installable = await getProjectInstallable(api, project ? [project] : undefined); + + let packages: string[] = []; + if (installable && installable.length > 0) { + const packagesToInstall = await getPackagesToInstallFromInstallable(installable); + if (!packagesToInstall) { + return; + } + packages = packagesToInstall; + } + return await withProgress( { location: ProgressLocation.Notification, @@ -318,7 +339,7 @@ export async function createPythonVenv( version: resolved.version, description: pythonPath, environmentPath: Uri.file(pythonPath), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'logo.svg')), + iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), sysPrefix: resolved.prefix, execInfo: { run: { @@ -330,6 +351,10 @@ export async function createPythonVenv( manager, ); log.info(`Created venv environment: ${name}`); + + if (packages?.length > 0) { + await api.installPackages(env, packages, { upgrade: false }); + } return env; } else { throw new Error('Could not resolve the virtual environment'); @@ -430,7 +455,7 @@ export async function getProjectInstallable( progress.report({ message: 'Searching for Requirements and TOML files' }); const results: Uri[] = ( await Promise.all([ - findFiles('**/requirements*.txt', exclude, undefined, token), + findFiles('**/*requirements*.txt', exclude, undefined, token), findFiles('**/requirements/*.txt', exclude, undefined, token), findFiles('**/pyproject.toml', exclude, undefined, token), ]) From ace0ec30a9228336549e4e41e3d638c130422968 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 07:49:47 -0800 Subject: [PATCH 012/328] Bump cross-spawn from 7.0.3 to 7.0.6 (#24) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.

Changelog

Sourced from cross-spawn's changelog.

7.0.6 (2024-11-18)

Bug Fixes

  • update cross-spawn version to 7.0.5 in package-lock.json (f700743)

7.0.5 (2024-11-07)

Bug Fixes

  • fix escaping bug introduced by backtracking (640d391)

7.0.4 (2024-11-07)

Bug Fixes

Commits
  • 77cd97f chore(release): 7.0.6
  • 6717de4 chore: upgrade standard-version
  • f700743 fix: update cross-spawn version to 7.0.5 in package-lock.json
  • 9a7e3b2 chore: fix build status badge
  • 0852683 chore(release): 7.0.5
  • 640d391 fix: fix escaping bug introduced by backtracking
  • bff0c87 chore: remove codecov
  • a7c6abc chore: replace travis with github workflows
  • 9b9246e chore(release): 7.0.4
  • 5ff3a07 fix: disable regexp backtracking (#160)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cross-spawn&package-manager=npm_and_yarn&previous-version=7.0.3&new-version=7.0.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebe4afb..80b207c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1841,9 +1841,9 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6581,9 +6581,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From 2faaeafaae6881c1f9b696766d1423df8af7c492 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:38:13 -0600 Subject: [PATCH 013/328] Update the readme (#14) Update readme with features and settings Decided it would be best to wait to add gifs until it is fully hooked into the Python extension --------- Co-authored-by: Luciana Abud <45497113+luabud@users.noreply.github.com> --- README.md | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d8a4dd5..1f4de4d 100644 --- a/README.md +++ b/README.md @@ -2,37 +2,49 @@ ## Overview -Python Environments and Package Manager is a VS Code extension that helps users manage their Python environments and package management. It is a preview extension and the APIs and features are subject to change as the project evolves. +The Python Environments and Package Manager extension for VS Code helps you manage Python environments and packages using your preferred environment manager backed by its extensible APIs. This extension provides unique support to specify environments for specific files or whole Python folders or projects, including multi-root & mono-repos scenarios. + +> Note: This extension is in preview and its APIs and features are subject to change as the project continues to evolve. ## Features ### Environment Management -This extension provides an environment view for the user to manage their Python environments. The user can create, delete, and switch between environments. The user can also install and uninstall packages in the current environment. This extension provides APIs for extension developers to contribute environment managers. +This extension provides an Environments view, which can be accessed via the VS Code Activity Bar, where you can manage your Python environments. Here, you can create, delete, and switch between environments, as well as install and uninstall packages within the selected environment. It also provides APIs for extension developers to contribute their own environment managers. -The extension by uses `venv` as the default environment manager. You can change this by setting the `python-envs.defaultEnvManager` setting to a different environment manager. Following are the out of the box environment managers: +By default, the extension uses the `venv` environment manager. This default manager determines how environments are created, managed, and where packages are installed. However, users can change the default by setting the `python-envs.defaultEnvManager` to a different environment manager. The following environment managers are supported out of the box: |Id| name |Description| |---|----|--| |ms-python.python:venv| `venv` |The default environment manager. It is a built-in environment manager provided by the Python standard library.| -|ms-python.python:system| System Installed Python | These are python installs on your system. Installed either with your OS, or from python.org, or any other OS package manager | -|ms-python.python:conda| `conda` |The conda environment manager. It is a popular environment manager for Python.| +|ms-python.python:system| System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | +|ms-python.python:conda| `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | +The environment manager is responsible for specifying which package manager will be used by default to install and manage Python packages within the environment. This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. ### Package Management -This extension provides a package view for the user to manage their Python packages. The user can install and uninstall packages in the any environment. This extension provides APIs for extension developers to contribute package managers. +This extension provides a package view for you to manage, install and uninstall you Python packages in any particular environment. This extension provides APIs for extension developers to contribute package managers. -The extension by uses `pip` as the default package manager. You can change this by setting the `python-envs.defaultPackageManager` setting to a different package manager. Following are the out of the box package managers: +The extension uses `pip` as the default package manager. You can change this by setting the `python-envs.defaultPackageManager` setting to a different package manager. The following are package managers supported out of the box: |Id| name |Description| |---|----|--| -|ms-python.python:pip| `pip` |The default package manager. It is a built-in package manager provided by the Python standard library.| -|ms-python.python:conda| `conda` |The conda package manager. It is a popular package manager for Python.| +|ms-python.python:pip| `pip` | Pip acts as the default package manager and it's typically built-in to Python.| +|ms-python.python:conda| `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | + +## Settings Reference + +| Setting (python-envs.) | Default | Description | +| ----- | ----- | -----| +| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | +| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | +| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | + ## API Reference -See the `src\api.ts` for the full list of APIs. +See `src\api.ts` for the full list of APIs. ## Contributing @@ -61,18 +73,11 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio ## Data and telemetry -The Microsoft Python Extension for Visual Studio Code collects usage -data and sends it to Microsoft to help improve our products and -services. Read our -[privacy statement](https://privacy.microsoft.com/privacystatement) to -learn more. This extension respects the `telemetry.enableTelemetry` -setting which you can learn more about at -https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting. +The Microsoft Python Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.enableTelemetry` setting which you can learn more about at https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting. ## Trademarks -This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft -trademarks or logos is subject to and must follow +This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies. \ No newline at end of file From 35c128e4ac9c37d95ae366908153438bc9562098 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 22 Nov 2024 23:36:48 +0530 Subject: [PATCH 014/328] Bug fixes and API tweaks (#25) Fixes https://github.com/microsoft/vscode-python-environments/issues/26 --- src/api.ts | 32 ++-- src/common/pickers/projects.ts | 10 +- src/extension.ts | 24 +-- src/features/envCommands.ts | 121 ++++++--------- src/features/envManagers.ts | 156 +++++++++++++++++++- src/features/projectCreators.ts | 15 +- src/features/projectManager.ts | 15 +- src/features/pythonApi.ts | 91 +++++------- src/features/terminal/activateMenuButton.ts | 2 +- src/features/terminal/terminalManager.ts | 52 ++++--- src/features/views/revealHandler.ts | 16 +- src/internal.api.ts | 9 +- 12 files changed, 340 insertions(+), 203 deletions(-) diff --git a/src/api.ts b/src/api.ts index 065a4ba..99f13ba 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1,4 +1,14 @@ -import { Uri, Disposable, MarkdownString, Event, LogOutputChannel, ThemeIcon, Terminal, TaskExecution } from 'vscode'; +import { + Uri, + Disposable, + MarkdownString, + Event, + LogOutputChannel, + ThemeIcon, + Terminal, + TaskExecution, + TerminalOptions, +} from 'vscode'; /** * The path to an icon, or a theme-specific configuration of icons. @@ -954,7 +964,7 @@ export interface PythonPackageManagementApi { * @param packages The packages to install. * @param options Options for installing packages. */ - installPackages(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; + installPackages(environment: PythonEnvironment, packages: string[], options?: PackageInstallOptions): Promise; /** * Uninstall packages from a Python Environment. @@ -1027,25 +1037,27 @@ export interface PythonProjectModifyApi { */ export interface PythonProjectApi extends PythonProjectCreationApi, PythonProjectGetterApi, PythonProjectModifyApi {} +export interface PythonTerminalOptions extends TerminalOptions { + /** + * Whether to show the terminal. + */ + disableActivation?: boolean; +} + export interface PythonTerminalCreateApi { - createTerminal( - environment: PythonEnvironment, - cwd: string | Uri, - envVars?: { [key: string]: string }, - ): Promise; + createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; } export interface PythonTerminalExecutionOptions { cwd: string | Uri; args?: string[]; - show?: boolean; } export interface PythonTerminalRunApi { runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise; runInDedicatedTerminal( - terminalKey: Uri, + terminalKey: Uri | string, environment: PythonEnvironment, options: PythonTerminalExecutionOptions, ): Promise; @@ -1082,7 +1094,7 @@ export interface PythonTaskRunApi { export interface PythonBackgroundRunOptions { args: string[]; cwd?: string; - env?: { [key: string]: string }; + env?: { [key: string]: string | undefined }; } export interface PythonBackgroundRunApi { runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise; diff --git a/src/common/pickers/projects.ts b/src/common/pickers/projects.ts index 3be4db8..708b0d7 100644 --- a/src/common/pickers/projects.ts +++ b/src/common/pickers/projects.ts @@ -1,7 +1,7 @@ import path from 'path'; import { QuickPickItem } from 'vscode'; import { PythonProject } from '../../api'; -import { showQuickPick } from '../window.apis'; +import { showQuickPick, showQuickPickWithButtons } from '../window.apis'; interface ProjectQuickPickItem extends QuickPickItem { project: PythonProject; @@ -27,17 +27,21 @@ export async function pickProject(projects: ReadonlyArray): Promi return undefined; } -export async function pickProjectMany(projects: ReadonlyArray): Promise { +export async function pickProjectMany( + projects: readonly PythonProject[], + showBackButton?: boolean, +): Promise { if (projects.length > 1) { const items: ProjectQuickPickItem[] = projects.map((pw) => ({ label: path.basename(pw.uri.fsPath), description: pw.uri.fsPath, project: pw, })); - const item = await showQuickPick(items, { + const item = await showQuickPickWithButtons(items, { placeHolder: 'Select a project, folder or script', ignoreFocusOut: true, canPickMany: true, + showBackButton: showBackButton, }); if (Array.isArray(item)) { return item.map((p) => p.project); diff --git a/src/extension.ts b/src/extension.ts index 3f2330e..fec847f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,7 @@ import { commands, ExtensionContext, LogOutputChannel } from 'vscode'; import { PythonEnvironmentManagers } from './features/envManagers'; -import { registerLogger } from './common/logging'; +import { registerLogger, traceInfo } from './common/logging'; import { EnvManagerView } from './features/views/envManagersView'; import { addPythonProject, @@ -120,18 +120,10 @@ export async function activate(context: ExtensionContext): Promise { - const result = await setEnvironmentCommand(item, envManagers, projectManager); - if (result) { - workspaceView.updateProject(); - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); - } + await setEnvironmentCommand(item, envManagers, projectManager); }), commands.registerCommand('python-envs.setEnv', async (item) => { - const result = await setEnvironmentCommand(item, envManagers, projectManager); - if (result) { - workspaceView.updateProject(); - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); - } + await setEnvironmentCommand(item, envManagers, projectManager); }), commands.registerCommand('python-envs.reset', async (item) => { await resetEnvironmentCommand(item, envManagers, projectManager); @@ -194,9 +186,19 @@ export async function activate(context: ExtensionContext): Promise { + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), envManagers.onDidChangeEnvironments(async () => { + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); + updateViewsAndStatus(statusBar, workspaceView, managerView, api); + }), + envManagers.onDidChangeEnvironmentFiltered(async (e) => { + const location = e.uri?.fsPath ?? 'global'; + traceInfo( + `Internal: Changed environment from ${e.old?.displayName} to ${e.new?.displayName} for: ${location}`, + ); + await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), ); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 996b2f4..9da9224 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -17,8 +17,6 @@ import { getDefaultEnvManagerSetting, getDefaultPkgManagerSetting, EditProjectSettings, - setAllManagerSettings, - EditAllManagerSettings, } from './settings/settingHelpers'; import { getAbsolutePath } from '../common/utils/fileNameUtils'; @@ -168,65 +166,47 @@ export async function handlePackagesCommand( } } -export interface EnvironmentSetResult { - project?: PythonProject; - environment: PythonEnvironment; -} - export async function setEnvironmentCommand( context: unknown, em: EnvironmentManagers, wm: PythonProjectManager, -): Promise { +): Promise { if (context instanceof PythonEnvTreeItem) { - const view = context as PythonEnvTreeItem; - const manager = view.parent.manager; - const projects = await pickProjectMany(wm.getProjects()); - if (projects && projects.length > 0) { - await Promise.all(projects.map((p) => manager.set(p.uri, view.environment))); - await setAllManagerSettings( - projects.map((p) => ({ - project: p, - envManager: manager.id, - packageManager: manager.preferredPackageManagerId, - })), - ); - return projects.map((p) => ({ project: p, environment: view.environment })); + try { + const view = context as PythonEnvTreeItem; + const projects = await pickProjectMany(wm.getProjects()); + if (projects && projects.length > 0) { + const uris = projects.map((p) => p.uri); + await em.setEnvironments(uris, view.environment); + } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + await setEnvironmentCommand(context, em, wm); + } + throw ex; } - return; } else if (context instanceof ProjectItem) { const view = context as ProjectItem; - return setEnvironmentCommand([view.project.uri], em, wm); + await setEnvironmentCommand([view.project.uri], em, wm); } else if (context instanceof Uri) { - return setEnvironmentCommand([context], em, wm); + await setEnvironmentCommand([context], em, wm); } else if (context === undefined) { - const project = await pickProjectMany(wm.getProjects()); - if (project && project.length > 0) { - try { - const result = setEnvironmentCommand(project, em, wm); - return result; - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return setEnvironmentCommand(context, em, wm); - } + try { + const projects = await pickProjectMany(wm.getProjects()); + if (projects && projects.length > 0) { + const uris = projects.map((p) => p.uri); + await setEnvironmentCommand(uris, em, wm); + } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + await setEnvironmentCommand(context, em, wm); } + throw ex; } - return; } else if (Array.isArray(context) && context.length > 0 && context.every((c) => c instanceof Uri)) { const uris = context as Uri[]; - const projects: PythonProject[] = []; - const projectEnvManagers: InternalEnvironmentManager[] = []; - uris.forEach((uri) => { - const project = wm.get(uri); - if (project) { - projects.push(project); - const manager = em.getEnvironmentManager(uri); - if (manager && !projectEnvManagers.includes(manager)) { - projectEnvManagers.push(manager); - } - } - }); - + const projects = wm.getProjects(uris).map((p) => p); + const projectEnvManagers = em.getProjectEnvManagers(uris); const recommended = projectEnvManagers.length === 1 && uris.length === 1 ? await projectEnvManagers[0].get(uris[0]) : undefined; const selected = await pickEnvironment(em.managers, projectEnvManagers, { @@ -234,29 +214,14 @@ export async function setEnvironmentCommand( recommended, showBackButton: uris.length > 1, }); - const manager = em.managers.find((m) => m.id === selected?.envId.managerId); - if (selected && manager) { - const promises: Thenable[] = []; - const settings: EditAllManagerSettings[] = []; - uris.forEach((uri) => { - const m = em.getEnvironmentManager(uri); - promises.push(manager.set(uri, selected)); - if (manager.id !== m?.id) { - settings.push({ - project: wm.get(uri), - envManager: manager.id, - packageManager: manager.preferredPackageManagerId, - }); - } - }); - await Promise.all(promises); - await setAllManagerSettings(settings); - return projects.map((p) => ({ project: p, environment: selected })); + + if (selected) { + await em.setEnvironments(uris, selected); } - return; + } else { + traceError(`Invalid context for setting environment command: ${context}`); + window.showErrorMessage('Invalid context for setting environment'); } - traceError(`Invalid context for setting environment command: ${context}`); - window.showErrorMessage('Invalid context for setting environment'); } export async function resetEnvironmentCommand( @@ -338,9 +303,17 @@ export async function addPythonProject( return; } - let results = await creator.create(); - if (results === undefined) { - return; + let results: PythonProject | PythonProject[] | undefined; + try { + results = await creator.create(); + if (results === undefined) { + return; + } + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + return addPythonProject(resource, wm, em, pc); + } + throw ex; } if (!Array.isArray(results)) { @@ -435,13 +408,13 @@ export async function createTerminalCommand( const env = await api.getEnvironment(uri); const pw = api.getPythonProject(uri); if (env && pw) { - return await tm.create(env, pw.uri); + return await tm.create(env, { cwd: pw.uri }); } } else if (context instanceof ProjectItem) { const view = context as ProjectItem; const env = await api.getEnvironment(view.project.uri); if (env) { - const terminal = await tm.create(env, view.project.uri); + const terminal = await tm.create(env, { cwd: view.project.uri }); terminal.show(); return terminal; } @@ -449,7 +422,7 @@ export async function createTerminalCommand( const view = context as PythonEnvTreeItem; const pw = await pickProject(api.getPythonProjects()); if (pw) { - const terminal = await tm.create(view.environment, pw.uri); + const terminal = await tm.create(view.environment, { cwd: pw.uri }); terminal.show(); return terminal; } diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 45ef040..e60cda7 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -4,11 +4,19 @@ import { DidChangeEnvironmentsEventArgs, DidChangePackagesEventArgs, EnvironmentManager, + GetEnvironmentScope, PackageManager, + PythonEnvironment, PythonProject, + SetEnvironmentScope, } from '../api'; import { traceError } from '../common/logging'; -import { getDefaultEnvManagerSetting, getDefaultPkgManagerSetting } from './settings/settingHelpers'; +import { + EditAllManagerSettings, + getDefaultEnvManagerSetting, + getDefaultPkgManagerSetting, + setAllManagerSettings, +} from './settings/settingHelpers'; import { DidChangeEnvironmentManagerEventArgs, DidChangePackageManagerEventArgs, @@ -35,11 +43,13 @@ function generateId(name: string): string { export class PythonEnvironmentManagers implements EnvironmentManagers { private _environmentManagers: Map = new Map(); private _packageManagers: Map = new Map(); + private readonly _previousEnvironments = new Map(); private _onDidChangeEnvironmentManager = new EventEmitter(); private _onDidChangePackageManager = new EventEmitter(); private _onDidChangeEnvironments = new EventEmitter(); private _onDidChangeEnvironment = new EventEmitter(); + private _onDidChangeEnvironmentFiltered = new EventEmitter(); private _onDidChangePackages = new EventEmitter(); public onDidChangeEnvironmentManager: Event = @@ -48,8 +58,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { public onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; public onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; public onDidChangePackages: Event = this._onDidChangePackages.event; + public onDidChangeEnvironmentFiltered: Event = + this._onDidChangeEnvironmentFiltered.event; - constructor(private readonly workspaceManager: PythonProjectManager) {} + constructor(private readonly pm: PythonProjectManager) {} public registerEnvironmentManager(manager: EnvironmentManager): Disposable { const managerId = generateId(manager.name); @@ -74,7 +86,7 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { ); }), mgr.onDidChangeEnvironment((e: DidChangeEnvironmentEventArgs) => { - if (e.old === undefined && e.new === undefined) { + if (e.old?.envId.id === e.new?.envId.id) { return; } @@ -141,7 +153,7 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { if (context === undefined || context instanceof Uri) { // get default environment manager from setting - const defaultEnvManagerId = getDefaultEnvManagerSetting(this.workspaceManager, context); + const defaultEnvManagerId = getDefaultEnvManagerSetting(this.pm, context); if (defaultEnvManagerId === undefined) { return undefined; } @@ -162,8 +174,8 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } if (context === undefined || context instanceof Uri) { - const defaultPkgManagerId = getDefaultPkgManagerSetting(this.workspaceManager, context); - const defaultEnvManagerId = getDefaultEnvManagerSetting(this.workspaceManager, context); + const defaultPkgManagerId = getDefaultPkgManagerSetting(this.pm, context); + const defaultEnvManagerId = getDefaultEnvManagerSetting(this.pm, context); if (defaultPkgManagerId) { return this._packageManagers.get(defaultPkgManagerId); } @@ -223,4 +235,136 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { await manager.clearCache(); } } + + public async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + const customScope = environment ? environment : scope; + const manager = this.getEnvironmentManager(customScope); + if (!manager) { + traceError( + `No environment manager found for: ${ + customScope instanceof Uri ? customScope.fsPath : customScope?.environmentPath?.fsPath + }`, + ); + return; + } + await manager.set(scope, environment); + + const project = scope ? this.pm.get(scope) : undefined; + if (scope) { + const packageManager = this.getPackageManager(environment); + if (project && packageManager) { + await setAllManagerSettings([ + { + project, + envManager: manager.id, + packageManager: packageManager.id, + }, + ]); + } + } + + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== environment?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); + setImmediate(() => + this._onDidChangeEnvironmentFiltered.fire({ uri: project?.uri, new: environment, old: oldEnv }), + ); + } + } + + public async setEnvironments(scope: Uri[], environment?: PythonEnvironment): Promise { + if (environment) { + const manager = this.managers.find((m) => m.id === environment.envId.managerId); + if (!manager) { + traceError( + `No environment manager found for: ${ + environment.environmentPath ? environment.environmentPath.fsPath : '' + }`, + ); + return; + } + + const promises: Promise[] = []; + const settings: EditAllManagerSettings[] = []; + const events: DidChangeEnvironmentEventArgs[] = []; + scope.forEach((uri) => { + const m = this.getEnvironmentManager(uri); + promises.push(manager.set(uri, environment)); + if (manager.id !== m?.id) { + settings.push({ + project: this.pm.get(uri), + envManager: manager.id, + packageManager: manager.preferredPackageManagerId, + }); + } + + const project = this.pm.get(uri); + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== environment?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); + events.push({ uri: project?.uri, new: environment, old: oldEnv }); + } + }); + await Promise.all(promises); + await setAllManagerSettings(settings); + setImmediate(() => events.forEach((e) => this._onDidChangeEnvironmentFiltered.fire(e))); + } else { + const promises: Promise[] = []; + const events: DidChangeEnvironmentEventArgs[] = []; + scope.forEach((uri) => { + const manager = this.getEnvironmentManager(uri); + if (manager) { + const setAndAddEvent = async () => { + await manager.set(uri); + + const project = this.pm.get(uri); + + // Always get the new first, then compare with the old. This has minor impact on the ordering of + // events. But it ensures that we always get the latest environment at the time of this call. + const newEnv = await manager.get(uri); + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== newEnv?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); + events.push({ uri: project?.uri, new: newEnv, old: oldEnv }); + } + }; + promises.push(setAndAddEvent()); + } + }); + await Promise.all(promises); + setImmediate(() => events.forEach((e) => this._onDidChangeEnvironmentFiltered.fire(e))); + } + } + + async getEnvironment(scope: GetEnvironmentScope): Promise { + const manager = this.getEnvironmentManager(scope); + if (!manager) { + return undefined; + } + + const project = scope ? this.pm.get(scope) : undefined; + + // Always get the new first, then compare with the old. This has minor impact on the ordering of + // events. But it ensures that we always get the latest environment at the time of this call. + const newEnv = await manager.get(scope); + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== newEnv?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); + setImmediate(() => + this._onDidChangeEnvironmentFiltered.fire({ uri: project?.uri, new: newEnv, old: oldEnv }), + ); + } + return newEnv; + } + + getProjectEnvManagers(uris: Uri[]): InternalEnvironmentManager[] { + const projectEnvManagers: InternalEnvironmentManager[] = []; + uris.forEach((uri) => { + const manager = this.getEnvironmentManager(uri); + if (manager && !projectEnvManagers.includes(manager)) { + projectEnvManagers.push(manager); + } + }); + return projectEnvManagers; + } } diff --git a/src/features/projectCreators.ts b/src/features/projectCreators.ts index 8963485..f2550d4 100644 --- a/src/features/projectCreators.ts +++ b/src/features/projectCreators.ts @@ -1,10 +1,10 @@ import * as path from 'path'; -import { Disposable, Uri, window } from 'vscode'; +import { Disposable, Uri } from 'vscode'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../api'; import { ProjectCreators } from '../internal.api'; import { showErrorMessage } from '../common/errors/utils'; import { findFiles } from '../common/workspace.apis'; -import { showOpenDialog } from '../common/window.apis'; +import { showOpenDialog, showQuickPickWithButtons } from '../common/window.apis'; export class ProjectCreatorsImpl implements ProjectCreators { private _creators: PythonProjectCreator[] = []; @@ -78,13 +78,20 @@ function getUniqueUri(uris: Uri[]): { async function pickProjects(uris: Uri[]): Promise { const items = getUniqueUri(uris); - const selected = await window.showQuickPick(items, { + const selected = await showQuickPickWithButtons(items, { canPickMany: true, ignoreFocusOut: true, placeHolder: 'Select the folders to add as Python projects', + showBackButton: true, }); - return selected?.map((s) => s.uri); + if (Array.isArray(selected)) { + return selected.map((s) => s.uri); + } else if (selected) { + return [selected.uri]; + } + + return undefined; } export function registerAutoProjectProvider(pc: ProjectCreators): Disposable { diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 31d354f..0316f4f 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -112,8 +112,19 @@ export class PythonProjectManagerImpl implements PythonProjectManager { this._onDidChangeProjects.fire(Array.from(this._projects.values())); } - getProjects(): ReadonlyArray { - return Array.from(this._projects.values()); + getProjects(uris?: Uri[]): ReadonlyArray { + if (uris === undefined) { + return Array.from(this._projects.values()); + } else { + const projects: PythonProject[] = []; + for (const uri of uris) { + const project = this.get(uri); + if (project !== undefined && !projects.includes(project)) { + projects.push(project); + } + } + return projects; + } } get(uri: Uri): PythonProject | undefined { diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 518f377..eee1e2b 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -26,6 +26,7 @@ import { PythonTaskExecutionOptions, PythonTerminalExecutionOptions, PythonBackgroundRunOptions, + PythonTerminalOptions, } from '../api'; import { EnvironmentManagers, @@ -36,7 +37,7 @@ import { PythonProjectManager, } from '../internal.api'; import { createDeferred } from '../common/utils/deferred'; -import { traceError } from '../common/logging'; +import { traceError, traceInfo } from '../common/logging'; import { showErrorMessage } from '../common/errors/utils'; import { pickEnvironmentManager } from '../common/pickers/managers'; import { handlePythonPath } from '../common/utils/pythonPath'; @@ -44,7 +45,6 @@ import { TerminalManager } from './terminal/terminalManager'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; import { runInBackground } from './execution/runInBackground'; -import { setAllManagerSettings } from './settings/settingHelpers'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); @@ -52,13 +52,27 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangePythonProjects = new EventEmitter(); private readonly _onDidChangePackages = new EventEmitter(); - private readonly _previousEnvironments = new Map(); constructor( private readonly envManagers: EnvironmentManagers, private readonly projectManager: PythonProjectManager, private readonly projectCreators: ProjectCreators, private readonly terminalManager: TerminalManager, - ) {} + private readonly disposables: Disposable[] = [], + ) { + this.disposables.push( + this._onDidChangeEnvironment, + this._onDidChangeEnvironments, + this._onDidChangePythonProjects, + this._onDidChangePackages, + this.envManagers.onDidChangeEnvironmentFiltered((e) => { + this._onDidChangeEnvironment.fire(e); + const location = e.uri?.fsPath ?? 'global'; + traceInfo( + `Python API: Changed environment from ${e.old?.displayName} to ${e.new?.displayName} for: ${location}`, + ); + }), + ); + } registerEnvironmentManager(manager: EnvironmentManager): Disposable { const disposables: Disposable[] = []; @@ -69,14 +83,15 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { if (manager.onDidChangeEnvironment) { disposables.push( manager.onDidChangeEnvironment((e) => { - const mgr = this.envManagers.getEnvironmentManager(e.uri); - if (mgr?.equals(manager)) { - // Fire this event only if the manager set for current uri - // is the same as the manager that triggered environment change - setImmediate(() => { - this._onDidChangeEnvironment.fire(e); - }); - } + setImmediate(async () => { + // This will ensure that we use the right manager and only trigger the event + // if the user selected manager decided to change the environment. + // This ensures that if a unselected manager changes environment and raises events + // we don't trigger the Python API event which can cause issues with the consumers. + // This will trigger onDidChangeEnvironmentFiltered event in envManagers, which the Python + // API listens to, and re-triggers the onDidChangeEnvironment event. + await this.envManagers.getEnvironment(e.uri); + }); }), ); } @@ -161,47 +176,11 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return items; } onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; - async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { - const manager = environment - ? this.envManagers.getEnvironmentManager(environment.envId.managerId) - : this.envManagers.getEnvironmentManager(scope); - - if (!manager) { - throw new Error('No environment manager found'); - } - await manager.set(scope, environment); - if (scope) { - const project = this.projectManager.get(scope); - const packageManager = this.envManagers.getPackageManager(environment); - if (project && packageManager) { - await setAllManagerSettings([ - { - project, - envManager: manager.id, - packageManager: packageManager.id, - }, - ]); - } - } - - const oldEnv = this._previousEnvironments.get(scope?.toString() ?? 'global'); - if (oldEnv?.envId.id !== environment?.envId.id) { - this._previousEnvironments.set(scope?.toString() ?? 'global', environment); - this._onDidChangeEnvironment.fire({ uri: scope, new: environment, old: oldEnv }); - } + setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + return this.envManagers.setEnvironment(scope, environment); } async getEnvironment(scope: GetEnvironmentScope): Promise { - const manager = this.envManagers.getEnvironmentManager(scope); - if (!manager) { - return undefined; - } - const oldEnv = this._previousEnvironments.get(scope?.toString() ?? 'global'); - const newEnv = await manager.get(scope); - if (oldEnv?.envId.id !== newEnv?.envId.id) { - this._previousEnvironments.set(scope?.toString() ?? 'global', newEnv); - this._onDidChangeEnvironment.fire({ uri: scope, new: newEnv, old: oldEnv }); - } - return newEnv; + return this.envManagers.getEnvironment(scope); } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { @@ -306,12 +285,8 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { registerPythonProjectCreator(creator: PythonProjectCreator): Disposable { return this.projectCreators.registerPythonProjectCreator(creator); } - async createTerminal( - environment: PythonEnvironment, - cwd: string | Uri, - envVars?: { [key: string]: string }, - ): Promise { - return this.terminalManager.create(environment, cwd, envVars); + async createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise { + return this.terminalManager.create(environment, options); } async runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise { const terminal = await this.terminalManager.getProjectTerminal( @@ -322,7 +297,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return terminal; } async runInDedicatedTerminal( - terminalKey: Uri, + terminalKey: Uri | string, environment: PythonEnvironment, options: PythonTerminalExecutionOptions, ): Promise { diff --git a/src/features/terminal/activateMenuButton.ts b/src/features/terminal/activateMenuButton.ts index ac85e60..69e9f6e 100644 --- a/src/features/terminal/activateMenuButton.ts +++ b/src/features/terminal/activateMenuButton.ts @@ -58,7 +58,7 @@ export async function getEnvironmentForTerminal( // This is a heuristic approach to attempt to find the environment for this terminal. // This is not guaranteed to work, but is better than nothing. - let tempCwd = (t.creationOptions as TerminalOptions)?.cwd; + let tempCwd = t.shellIntegration?.cwd ?? (t.creationOptions as TerminalOptions)?.cwd; let cwd = typeof tempCwd === 'string' ? Uri.file(tempCwd) : tempCwd; if (cwd) { const manager = em.getEnvironmentManager(cwd); diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 8c24e94..91a4b4d 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -21,7 +21,7 @@ import { terminals, withProgress, } from '../../common/window.apis'; -import { IconPath, PythonEnvironment, PythonProject } from '../../api'; +import { IconPath, PythonEnvironment, PythonProject, PythonTerminalOptions } from '../../api'; import { getActivationCommand, getDeactivationCommand, isActivatableEnvironment } from '../common/activation'; import { showErrorMessage } from '../../common/errors/utils'; import { quoteArgs } from '../execution/execUtils'; @@ -47,11 +47,7 @@ export interface TerminalActivation { } export interface TerminalCreation { - create( - environment: PythonEnvironment, - cwd?: string | Uri, - env?: { [key: string]: string | null | undefined }, - ): Promise; + create(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; } export interface TerminalGetters { @@ -61,7 +57,7 @@ export interface TerminalGetters { createNew?: boolean, ): Promise; getDedicatedTerminal( - uri: Uri, + terminalKey: Uri | string, project: Uri | PythonProject, environment: PythonEnvironment, createNew?: boolean, @@ -291,18 +287,24 @@ export class TerminalManagerImpl implements TerminalManager { } } - public async create( - environment: PythonEnvironment, - cwd?: string | Uri | undefined, - env?: { [key: string]: string | null | undefined }, - ): Promise { - const activatable = isActivatableEnvironment(environment); + public async create(environment: PythonEnvironment, options: PythonTerminalOptions): Promise { + // const name = options.name ?? `Python: ${environment.displayName}`; const newTerminal = createTerminal({ - // name: `Python: ${environment.displayName}`, - iconPath: getIconPath(environment.iconPath), - cwd, - env, + name: options.name, + shellPath: options.shellPath, + shellArgs: options.shellArgs, + cwd: options.cwd, + env: options.env, + strictEnv: options.strictEnv, + message: options.message, + iconPath: options.iconPath ?? getIconPath(environment.iconPath), + hideFromUser: options.hideFromUser, + color: options.color, + location: options.location, + isTransient: options.isTransient, }); + const activatable = !options.disableActivation && isActivatableEnvironment(environment); + if (activatable) { try { await withProgress( @@ -318,17 +320,19 @@ export class TerminalManagerImpl implements TerminalManager { showErrorMessage(`Failed to activate ${environment.displayName}`); } } + return newTerminal; } private dedicatedTerminals = new Map(); async getDedicatedTerminal( - uri: Uri, + terminalKey: Uri, project: Uri | PythonProject, environment: PythonEnvironment, createNew: boolean = false, ): Promise { - const key = `${environment.envId.id}:${path.normalize(uri.fsPath)}`; + const part = terminalKey instanceof Uri ? path.normalize(terminalKey.fsPath) : terminalKey; + const key = `${environment.envId.id}:${part}`; if (!createNew) { const terminal = this.dedicatedTerminals.get(key); if (terminal) { @@ -337,15 +341,15 @@ export class TerminalManagerImpl implements TerminalManager { } const puri = project instanceof Uri ? project : project.uri; - const config = getConfiguration('python', uri); + const config = getConfiguration('python', terminalKey); const projectStat = await fsapi.stat(puri.fsPath); const projectDir = projectStat.isDirectory() ? puri.fsPath : path.dirname(puri.fsPath); - const uriStat = await fsapi.stat(uri.fsPath); - const uriDir = uriStat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); + const uriStat = await fsapi.stat(terminalKey.fsPath); + const uriDir = uriStat.isDirectory() ? terminalKey.fsPath : path.dirname(terminalKey.fsPath); const cwd = config.get('terminal.executeInFileDir', false) ? uriDir : projectDir; - const newTerminal = await this.create(environment, cwd); + const newTerminal = await this.create(environment, { cwd }); this.dedicatedTerminals.set(key, newTerminal); const disable = onDidCloseTerminal((terminal) => { @@ -374,7 +378,7 @@ export class TerminalManagerImpl implements TerminalManager { } const stat = await fsapi.stat(uri.fsPath); const cwd = stat.isDirectory() ? uri.fsPath : path.dirname(uri.fsPath); - const newTerminal = await this.create(environment, cwd); + const newTerminal = await this.create(environment, { cwd }); this.projectTerminals.set(key, newTerminal); const disable = onDidCloseTerminal((terminal) => { diff --git a/src/features/views/revealHandler.ts b/src/features/views/revealHandler.ts index eed9ef0..2698d31 100644 --- a/src/features/views/revealHandler.ts +++ b/src/features/views/revealHandler.ts @@ -11,6 +11,8 @@ export function updateViewsAndStatus( managerView: EnvManagerView, api: PythonEnvironmentApi, ) { + workspaceView.updateProject(); + const activeDocument = activeTextEditor()?.document; if (!activeDocument || activeDocument.isUntitled || activeDocument.uri.scheme !== 'file') { statusBar.hide(); @@ -26,14 +28,10 @@ export function updateViewsAndStatus( return; } - const env = workspaceView.reveal(activeDocument.uri); - managerView.reveal(env); - if (env) { + workspaceView.reveal(activeDocument.uri); + setImmediate(async () => { + const env = await api.getEnvironment(activeDocument.uri); statusBar.show(env?.displayName); - } else { - setImmediate(async () => { - const e = await api.getEnvironment(activeDocument.uri); - statusBar.show(e?.displayName); - }); - } + managerView.reveal(env); + }); } diff --git a/src/internal.api.ts b/src/internal.api.ts index 9dbdef5..172325d 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -73,6 +73,7 @@ export interface EnvironmentManagers extends Disposable { onDidChangeEnvironments: Event; onDidChangeEnvironment: Event; + onDidChangeEnvironmentFiltered: Event; onDidChangePackages: Event; onDidChangeEnvironmentManager: Event; @@ -85,6 +86,12 @@ export interface EnvironmentManagers extends Disposable { packageManagers: InternalPackageManager[]; clearCache(scope: EnvironmentManagerScope): Promise; + + setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; + setEnvironments(scope: Uri[], environment?: PythonEnvironment): Promise; + getEnvironment(scope: GetEnvironmentScope): Promise; + + getProjectEnvManagers(uris: Uri[]): InternalEnvironmentManager[]; } export class InternalEnvironmentManager implements EnvironmentManager { @@ -238,7 +245,7 @@ export interface PythonProjectManager extends Disposable { ): PythonProject; add(pyWorkspace: PythonProject | PythonProject[]): void; remove(pyWorkspace: PythonProject | PythonProject[]): void; - getProjects(): ReadonlyArray; + getProjects(uris?: Uri[]): ReadonlyArray; get(uri: Uri): PythonProject | undefined; onDidChangeProjects: Event; } From cb3e949c167321f4cd88a537f1c0df68ca7359e2 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 26 Nov 2024 13:18:32 +0530 Subject: [PATCH 015/328] Environment Variable management and bug fixes (#28) --- package-lock.json | 18 +++++ package.json | 1 + src/api.ts | 37 ++++++++- src/common/utils/internalVariables.ts | 40 ++++++++++ src/common/workspace.fs.apis.ts | 9 +++ src/extension.ts | 10 ++- src/features/envCommands.ts | 22 ++++-- src/features/execution/envVarUtils.ts | 34 ++++++++ src/features/execution/envVariableManager.ts | 83 ++++++++++++++++++++ src/features/pythonApi.ts | 47 ++++++++--- 10 files changed, 280 insertions(+), 21 deletions(-) create mode 100644 src/common/utils/internalVariables.ts create mode 100644 src/common/workspace.fs.apis.ts create mode 100644 src/features/execution/envVarUtils.ts create mode 100644 src/features/execution/envVariableManager.ts diff --git a/package-lock.json b/package-lock.json index 80b207c..7f562d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", "@vscode/test-cli": "^0.0.10", + "dotenv": "^16.4.5", "fs-extra": "^11.2.0", "stack-trace": "0.0.10", "vscode-jsonrpc": "^9.0.0-next.5", @@ -2073,6 +2074,18 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -6738,6 +6751,11 @@ "domhandler": "^5.0.3" } }, + "dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==" + }, "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", diff --git a/package.json b/package.json index 19ea498..9b407cb 100644 --- a/package.json +++ b/package.json @@ -451,6 +451,7 @@ "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", "@vscode/test-cli": "^0.0.10", + "dotenv": "^16.4.5", "fs-extra": "^11.2.0", "stack-trace": "0.0.10", "vscode-jsonrpc": "^9.0.0-next.5", diff --git a/src/api.ts b/src/api.ts index 99f13ba..0030838 100644 --- a/src/api.ts +++ b/src/api.ts @@ -8,6 +8,7 @@ import { Terminal, TaskExecution, TerminalOptions, + FileChangeType, } from 'vscode'; /** @@ -1105,6 +1106,39 @@ export interface PythonExecutionApi PythonTerminalRunApi, PythonTaskRunApi, PythonBackgroundRunApi {} + +export interface DidChangeEnvironmentVariablesEventArgs { + uri?: Uri; + changeTye: FileChangeType; +} + +export interface PythonEnvironmentVariablesApi { + /** + * Get environment variables for a workspace. This picks up `.env` file from the root of the + * workspace. + * + * Order of overrides: + * 1. `baseEnvVar` if given or `process.env` + * 2. `.env` file from the "python.envFile" setting in the workspace. + * 3. `.env` file at the root of the python project. + * 4. `overrides` in the order provided. + * + * @param uri The URI of the project, workspace or a file in a for which environment variables are required. + * @param overrides Additional environment variables to override the defaults. + * @param baseEnvVar The base environment variables that should be used as a starting point. + */ + getEnvironmentVariables( + uri: Uri, + overrides?: ({ [key: string]: string | undefined } | Uri)[], + baseEnvVar?: { [key: string]: string | undefined }, + ): Promise<{ [key: string]: string | undefined }>; + + /** + * Event raised when `.env` file changes or any other monitored source of env variable changes. + */ + onDidChangeEnvironmentVariables: Event; +} + /** * The API for interacting with Python environments, package managers, and projects. */ @@ -1112,4 +1146,5 @@ export interface PythonEnvironmentApi extends PythonEnvironmentManagerApi, PythonPackageManagerApi, PythonProjectApi, - PythonExecutionApi {} + PythonExecutionApi, + PythonEnvironmentVariablesApi {} diff --git a/src/common/utils/internalVariables.ts b/src/common/utils/internalVariables.ts new file mode 100644 index 0000000..22d5888 --- /dev/null +++ b/src/common/utils/internalVariables.ts @@ -0,0 +1,40 @@ +import { Uri } from 'vscode'; +import { getWorkspaceFolder, getWorkspaceFolders } from '../workspace.apis'; + +export function resolveVariables(value: string, project?: Uri, env?: { [key: string]: string }): string { + const substitutions = new Map(); + const home = process.env.HOME || process.env.USERPROFILE; + if (home) { + substitutions.set('${userHome}', home); + } + + if (project) { + substitutions.set('${pythonProject}', project.fsPath); + } + + const workspace = project ? getWorkspaceFolder(project) : undefined; + if (workspace) { + substitutions.set('${workspaceFolder}', workspace.uri.fsPath); + } + substitutions.set('${cwd}', process.cwd()); + (getWorkspaceFolders() ?? []).forEach((w) => { + substitutions.set('${workspaceFolder:' + w.name + '}', w.uri.fsPath); + }); + + const substEnv = env || process.env; + if (substEnv) { + for (const [key, value] of Object.entries(substEnv)) { + if (value && key.length > 0) { + substitutions.set('${env:' + key + '}', value); + } + } + } + + let result = value; + substitutions.forEach((v, k) => { + while (k.length > 0 && result.indexOf(k) >= 0) { + result = result.replace(k, v); + } + }); + return result; +} diff --git a/src/common/workspace.fs.apis.ts b/src/common/workspace.fs.apis.ts new file mode 100644 index 0000000..f10e7ad --- /dev/null +++ b/src/common/workspace.fs.apis.ts @@ -0,0 +1,9 @@ +import { FileStat, Uri, workspace } from 'vscode'; + +export function readFile(uri: Uri): Thenable { + return workspace.fs.readFile(uri); +} + +export function stat(uri: Uri): Thenable { + return workspace.fs.stat(uri); +} diff --git a/src/extension.ts b/src/extension.ts index fec847f..df00c4c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -51,6 +51,7 @@ import { } from './features/terminal/activateMenuButton'; import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; +import { EnvVarManager, PythonEnvVariableManager } from './features/execution/envVariableManager'; export async function activate(context: ExtensionContext): Promise { // Logging should be set up before anything else. @@ -69,6 +70,9 @@ export async function activate(context: ExtensionContext): Promise { - await createEnvironmentCommand(item, envManagers, projectManager); + return await createEnvironmentCommand(item, envManagers, projectManager); }), commands.registerCommand('python-envs.createAny', async () => { - await createAnyEnvironmentCommand(envManagers, projectManager); + return await createAnyEnvironmentCommand(envManagers, projectManager); }), commands.registerCommand('python-envs.remove', async (item) => { await removeEnvironmentCommand(item, envManagers); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 9da9224..c1cd02f 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -68,34 +68,43 @@ export async function createEnvironmentCommand( context: unknown, em: EnvironmentManagers, pm: PythonProjectManager, -): Promise { +): Promise { if (context instanceof EnvManagerTreeItem) { const manager = (context as EnvManagerTreeItem).manager; const projects = await pickProjectMany(pm.getProjects()); if (projects) { - await manager.create(projects.length === 0 ? 'global' : projects.map((p) => p.uri)); + return await manager.create(projects.length === 0 ? 'global' : projects.map((p) => p.uri)); + } else { + traceError(`No projects found for ${context}`); } } else if (context instanceof Uri) { const manager = em.getEnvironmentManager(context as Uri); const project = pm.get(context as Uri); if (project) { - await manager?.create(project.uri); + return await manager?.create(project.uri); + } else { + traceError(`No project found for ${context}`); } } else { traceError(`Invalid context for create command: ${context}`); } } -export async function createAnyEnvironmentCommand(em: EnvironmentManagers, pm: PythonProjectManager): Promise { +export async function createAnyEnvironmentCommand( + em: EnvironmentManagers, + pm: PythonProjectManager, +): Promise { const projects = await pickProjectMany(pm.getProjects()); if (projects && projects.length > 0) { const defaultManagers: InternalEnvironmentManager[] = []; + projects.forEach((p) => { const manager = em.getEnvironmentManager(p.uri); if (manager && manager.supportsCreate && !defaultManagers.includes(manager)) { defaultManagers.push(manager); } }); + const managerId = await pickEnvironmentManager( em.managers.filter((m) => m.supportsCreate), defaultManagers, @@ -103,13 +112,14 @@ export async function createAnyEnvironmentCommand(em: EnvironmentManagers, pm: P const manager = em.managers.find((m) => m.id === managerId); if (manager) { - await manager.create(projects.map((p) => p.uri)); + return await manager.create(projects.map((p) => p.uri)); } } else if (projects && projects.length === 0) { const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); + const manager = em.managers.find((m) => m.id === managerId); if (manager) { - await manager.create('global'); + return await manager.create('global'); } } } diff --git a/src/features/execution/envVarUtils.ts b/src/features/execution/envVarUtils.ts new file mode 100644 index 0000000..03c1e0c --- /dev/null +++ b/src/features/execution/envVarUtils.ts @@ -0,0 +1,34 @@ +import { Uri } from 'vscode'; +import { readFile } from '../../common/workspace.fs.apis'; +import { parse } from 'dotenv'; + +export function mergeEnvVariables( + base: { [key: string]: string | undefined }, + other: { [key: string]: string | undefined }, +) { + const env: { [key: string]: string | undefined } = {}; + + Object.keys(other).forEach((otherKey) => { + let value = other[otherKey]; + if (value === undefined || value === '') { + // SOME_ENV_VAR= + delete env[otherKey]; + } else { + Object.keys(base).forEach((baseKey) => { + const baseValue = base[baseKey]; + if (baseValue) { + value = value?.replace(`\${${baseKey}}`, baseValue); + } + }); + env[otherKey] = value; + } + }); + + return env; +} + +export async function parseEnvFile(envFile: Uri): Promise<{ [key: string]: string | undefined }> { + const raw = await readFile(envFile); + const contents = Buffer.from(raw).toString('utf-8'); + return parse(contents); +} diff --git a/src/features/execution/envVariableManager.ts b/src/features/execution/envVariableManager.ts new file mode 100644 index 0000000..e6449dc --- /dev/null +++ b/src/features/execution/envVariableManager.ts @@ -0,0 +1,83 @@ +import * as path from 'path'; +import * as fsapi from 'fs-extra'; +import { Uri, Event, EventEmitter, FileChangeType } from 'vscode'; +import { DidChangeEnvironmentVariablesEventArgs, PythonEnvironmentVariablesApi } from '../../api'; +import { Disposable } from 'vscode-jsonrpc'; +import { createFileSystemWatcher, getConfiguration } from '../../common/workspace.apis'; +import { PythonProjectManager } from '../../internal.api'; +import { mergeEnvVariables, parseEnvFile } from './envVarUtils'; +import { resolveVariables } from '../../common/utils/internalVariables'; + +export interface EnvVarManager extends PythonEnvironmentVariablesApi, Disposable {} + +export class PythonEnvVariableManager implements EnvVarManager { + private disposables: Disposable[] = []; + + private _onDidChangeEnvironmentVariables; + private watcher; + + constructor(private pm: PythonProjectManager) { + this._onDidChangeEnvironmentVariables = new EventEmitter(); + this.onDidChangeEnvironmentVariables = this._onDidChangeEnvironmentVariables.event; + + this.watcher = createFileSystemWatcher('**/.env'); + this.disposables.push( + this._onDidChangeEnvironmentVariables, + this.watcher, + this.watcher.onDidCreate((e) => + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Created }), + ), + this.watcher.onDidChange((e) => + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Changed }), + ), + this.watcher.onDidDelete((e) => + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Deleted }), + ), + ); + } + + async getEnvironmentVariables( + uri: Uri, + overrides?: ({ [key: string]: string | undefined } | Uri)[], + baseEnvVar?: { [key: string]: string | undefined }, + ): Promise<{ [key: string]: string | undefined }> { + const project = this.pm.get(uri); + + const base = baseEnvVar || { ...process.env }; + let env = base; + + const config = getConfiguration('python', project?.uri ?? uri); + let envFilePath = config.get('envFile'); + envFilePath = envFilePath ? path.normalize(resolveVariables(envFilePath)) : undefined; + + if (envFilePath && (await fsapi.pathExists(envFilePath))) { + const other = await parseEnvFile(Uri.file(envFilePath)); + env = mergeEnvVariables(env, other); + } + + let projectEnvFilePath = project ? path.normalize(path.join(project.uri.fsPath, '.env')) : undefined; + if ( + projectEnvFilePath && + projectEnvFilePath?.toLowerCase() !== envFilePath?.toLowerCase() && + (await fsapi.pathExists(projectEnvFilePath)) + ) { + const other = await parseEnvFile(Uri.file(projectEnvFilePath)); + env = mergeEnvVariables(env, other); + } + + if (overrides) { + for (const override of overrides) { + const other = override instanceof Uri ? await parseEnvFile(override) : override; + env = mergeEnvVariables(env, other); + } + } + + return env; + } + + onDidChangeEnvironmentVariables: Event; + + dispose(): void { + this.disposables.forEach((disposable) => disposable.dispose()); + } +} diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index eee1e2b..5b42967 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -27,6 +27,7 @@ import { PythonTerminalExecutionOptions, PythonBackgroundRunOptions, PythonTerminalOptions, + DidChangeEnvironmentVariablesEventArgs, } from '../api'; import { EnvironmentManagers, @@ -45,18 +46,21 @@ import { TerminalManager } from './terminal/terminalManager'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; import { runInBackground } from './execution/runInBackground'; +import { EnvVarManager } from './execution/envVariableManager'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); private readonly _onDidChangeEnvironment = new EventEmitter(); private readonly _onDidChangePythonProjects = new EventEmitter(); private readonly _onDidChangePackages = new EventEmitter(); + private readonly _onDidChangeEnvironmentVariables = new EventEmitter(); constructor( private readonly envManagers: EnvironmentManagers, private readonly projectManager: PythonProjectManager, private readonly projectCreators: ProjectCreators, private readonly terminalManager: TerminalManager, + private readonly envVarManager: EnvVarManager, private readonly disposables: Disposable[] = [], ) { this.disposables.push( @@ -64,6 +68,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { this._onDidChangeEnvironments, this._onDidChangePythonProjects, this._onDidChangePackages, + this._onDidChangeEnvironmentVariables, this.envManagers.onDidChangeEnvironmentFiltered((e) => { this._onDidChangeEnvironment.fire(e); const location = e.uri?.fsPath ?? 'global'; @@ -71,6 +76,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { `Python API: Changed environment from ${e.old?.displayName} to ${e.new?.displayName} for: ${location}`, ); }), + this.envVarManager.onDidChangeEnvironmentVariables((e) => this._onDidChangeEnvironmentVariables.fire(e)), ); } @@ -114,32 +120,38 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { if (scope === 'global' || (!Array.isArray(scope) && scope instanceof Uri)) { const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope); if (!manager) { - return Promise.reject(new Error('No environment manager found')); + throw new Error('No environment manager found'); } - return manager.create(scope); - } else if (Array.isArray(scope) && scope.length === 1 && scope[0] instanceof Uri) { - const manager = this.envManagers.getEnvironmentManager(scope[0]); - if (!manager) { - return Promise.reject(new Error('No environment manager found')); + if (!manager.supportsCreate) { + throw new Error(`Environment manager does not support creating environments: ${manager.id}`); } return manager.create(scope); + } else if (Array.isArray(scope) && scope.length === 1 && scope[0] instanceof Uri) { + return this.createEnvironment(scope[0]); } else if (Array.isArray(scope) && scope.length > 0 && scope.every((s) => s instanceof Uri)) { const managers: InternalEnvironmentManager[] = []; scope.forEach((s) => { const manager = this.envManagers.getEnvironmentManager(s); - if (manager && !managers.includes(manager)) { + if (manager && !managers.includes(manager) && manager.supportsCreate) { managers.push(manager); } }); if (managers.length === 0) { - return Promise.reject(new Error('No environment managers found')); + throw new Error('No environment managers found'); } + const managerId = await pickEnvironmentManager(managers); if (!managerId) { - return Promise.reject(new Error('No environment manager selected')); + throw new Error('No environment manager selected'); } - const result = await managers.find((m) => m.id === managerId)?.create(scope); + + const manager = managers.find((m) => m.id === managerId); + if (!manager) { + throw new Error('No environment manager found'); + } + + const result = await manager.create(scope); return result; } } @@ -315,6 +327,16 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise { return runInBackground(environment, options); } + + onDidChangeEnvironmentVariables: Event = + this._onDidChangeEnvironmentVariables.event; + getEnvironmentVariables( + uri: Uri, + overrides?: ({ [key: string]: string | undefined } | Uri)[], + baseEnvVar?: { [key: string]: string | undefined }, + ): Promise<{ [key: string]: string | undefined }> { + return this.envVarManager.getEnvironmentVariables(uri, overrides, baseEnvVar); + } } let _deferred = createDeferred(); @@ -323,8 +345,11 @@ export function setPythonApi( projectMgr: PythonProjectManager, projectCreators: ProjectCreators, terminalManager: TerminalManager, + envVarManager: EnvVarManager, ) { - _deferred.resolve(new PythonEnvironmentApiImpl(envMgr, projectMgr, projectCreators, terminalManager)); + _deferred.resolve( + new PythonEnvironmentApiImpl(envMgr, projectMgr, projectCreators, terminalManager, envVarManager), + ); } export function getPythonApi(): Promise { From 4189b9559fcf6392da6e445554434d6d2add8783 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 27 Nov 2024 13:03:41 +0530 Subject: [PATCH 016/328] Unit test framework and some bug fixes (#29) This PR adds: 1. A mock framework for all VS Code types to allow easy and fast testing. 2. Adds a sample test 3. Fixes few bugs found while setting up the framework --- .vscode/launch.json | 70 +- .vscode/tasks.json | 69 +- package-lock.json | 592 ++++- package.json | 6 +- src/managers/conda/condaEnvManager.ts | 7 +- src/managers/conda/main.ts | 30 +- src/managers/sysPython/venvUtils.ts | 4 +- .../common/internalVariables.unit.test.ts | 42 + src/test/extension.test.ts | 15 - src/test/mocks/helper.ts | 27 + src/test/mocks/mementos.ts | 34 + src/test/mocks/mockChildProcess.ts | 243 ++ src/test/mocks/mockDocument.ts | 232 ++ src/test/mocks/mockWorkspaceConfig.ts | 53 + src/test/mocks/vsc/README.md | 7 + src/test/mocks/vsc/arrays.ts | 399 +++ src/test/mocks/vsc/charCode.ts | 425 +++ src/test/mocks/vsc/extHostedTypes.ts | 2333 +++++++++++++++++ src/test/mocks/vsc/htmlContent.ts | 101 + src/test/mocks/vsc/index.ts | 596 +++++ src/test/mocks/vsc/position.ts | 145 + src/test/mocks/vsc/range.ts | 397 +++ src/test/mocks/vsc/selection.ts | 235 ++ src/test/mocks/vsc/strings.ts | 35 + src/test/mocks/vsc/telemetryReporter.ts | 11 + src/test/mocks/vsc/uri.ts | 731 ++++++ src/test/mocks/vsc/uuid.ts | 109 + src/test/unittests.ts | 132 + 28 files changed, 6841 insertions(+), 239 deletions(-) create mode 100644 src/test/common/internalVariables.unit.test.ts delete mode 100644 src/test/extension.test.ts create mode 100644 src/test/mocks/helper.ts create mode 100644 src/test/mocks/mementos.ts create mode 100644 src/test/mocks/mockChildProcess.ts create mode 100644 src/test/mocks/mockDocument.ts create mode 100644 src/test/mocks/mockWorkspaceConfig.ts create mode 100644 src/test/mocks/vsc/README.md create mode 100644 src/test/mocks/vsc/arrays.ts create mode 100644 src/test/mocks/vsc/charCode.ts create mode 100644 src/test/mocks/vsc/extHostedTypes.ts create mode 100644 src/test/mocks/vsc/htmlContent.ts create mode 100644 src/test/mocks/vsc/index.ts create mode 100644 src/test/mocks/vsc/position.ts create mode 100644 src/test/mocks/vsc/range.ts create mode 100644 src/test/mocks/vsc/selection.ts create mode 100644 src/test/mocks/vsc/strings.ts create mode 100644 src/test/mocks/vsc/telemetryReporter.ts create mode 100644 src/test/mocks/vsc/uri.ts create mode 100644 src/test/mocks/vsc/uuid.ts create mode 100644 src/test/unittests.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index d4df9e9..64418e1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,33 +3,45 @@ // Hover to view descriptions of existing attributes. // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 { - "version": "0.2.0", - "configurations": [ - { - "name": "Run Extension", - "type": "extensionHost", - "request": "launch", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}" - ], - "outFiles": [ - "${workspaceFolder}/dist/**/*.js" - ], - "preLaunchTask": "${defaultBuildTask}" - }, - { - "name": "Extension Tests", - "type": "extensionHost", - "request": "launch", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}", - "--extensionTestsPath=${workspaceFolder}/out/test/suite/index" - ], - "outFiles": [ - "${workspaceFolder}/out/**/*.js", - "${workspaceFolder}/dist/**/*.js" - ], - "preLaunchTask": "tasks: watch-tests" - } - ] + "version": "0.2.0", + "configurations": [ + { + "name": "Run Extension", + "type": "extensionHost", + "request": "launch", + "args": ["--extensionDevelopmentPath=${workspaceFolder}"], + "outFiles": ["${workspaceFolder}/dist/**/*.js"], + "preLaunchTask": "${defaultBuildTask}" + }, + { + "args": [ + "-u=tdd", + "--timeout=999999", + "--colors", + "--recursive", + //"--grep", "", + "--require=out/test/unittests.js", + "./out/test/**/*.unit.test.js" + ], + "internalConsoleOptions": "openOnSessionStart", + "name": "Unit Tests", + "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", + "request": "launch", + "skipFiles": ["/**"], + "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"], + "type": "node", + "preLaunchTask": "tasks: watch-tests" + }, + { + "name": "Extension Tests", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}", + "--extensionTestsPath=${workspaceFolder}/out/test/" + ], + "outFiles": ["${workspaceFolder}/out/**/*.js", "${workspaceFolder}/dist/**/*.js"], + "preLaunchTask": "tasks: watch-tests" + } + ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c2ab68a..400c607 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,40 +1,37 @@ // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format { - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "watch", - "problemMatcher": "$ts-webpack-watch", - "isBackground": true, - "presentation": { - "reveal": "never", - "group": "watchers" - }, - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "type": "npm", - "script": "watch-tests", - "problemMatcher": "$tsc-watch", - "isBackground": true, - "presentation": { - "reveal": "never", - "group": "watchers" - }, - "group": "build" - }, - { - "label": "tasks: watch-tests", - "dependsOn": [ - "npm: watch", - "npm: watch-tests" - ], - "problemMatcher": [] - } - ] + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "watch", + "problemMatcher": "$ts-webpack-watch", + "isBackground": true, + "presentation": { + "reveal": "never", + "group": "watchers" + }, + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "type": "npm", + "script": "watch-tests", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "presentation": { + "reveal": "never", + "group": "watchers" + }, + "group": "build" + }, + { + "label": "tasks: watch-tests", + "dependsOn": ["npm: watch", "npm: watch-tests"], + "problemMatcher": [] + } + ] } diff --git a/package-lock.json b/package-lock.json index 7f562d6..c3934a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "@types/glob": "^8.1.0", "@types/mocha": "^10.0.1", "@types/node": "20.2.5", + "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", "@types/vscode": "^1.93.0", "@types/which": "^3.0.4", @@ -31,8 +32,11 @@ "@vscode/vsce": "^2.24.0", "eslint": "^8.41.0", "glob": "^8.1.0", - "mocha": "^10.2.0", + "mocha": "^10.8.2", + "sinon": "^19.0.2", "ts-loader": "^9.4.3", + "ts-mockito": "^2.6.1", + "typemoq": "^2.1.0", "typescript": "^5.1.3", "webpack": "^5.85.0", "webpack-cli": "^5.1.1" @@ -479,6 +483,55 @@ "node": ">=14" } }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + } + }, + "node_modules/@sinonjs/samsam/node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -557,6 +610,23 @@ "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, + "node_modules/@types/sinon": { + "version": "17.0.3", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", + "integrity": "sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/sinonjs__fake-timers": "*" + } + }, + "node_modules/@types/sinonjs__fake-timers": { + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz", + "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/stack-trace": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz", @@ -1317,9 +1387,10 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", "engines": { "node": ">=6" } @@ -1773,6 +1844,14 @@ "node": ">=6.0" } }, + "node_modules/circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "deprecated": "CircularJSON is in maintenance only, flatted is its successor.", + "dev": true, + "license": "MIT" + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -1902,11 +1981,12 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -1988,9 +2068,10 @@ } }, "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -3241,6 +3322,13 @@ "setimmediate": "^1.0.5" } }, + "node_modules/just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true, + "license": "MIT" + }, "node_modules/keytar": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", @@ -3334,6 +3422,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -3522,30 +3624,31 @@ "optional": true }, "node_modules/mocha": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", - "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", - "dependencies": { - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.4", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "8.1.0", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "5.0.1", - "ms": "2.1.3", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "workerpool": "6.2.1", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" }, "bin": { "_mocha": "bin/_mocha", @@ -3559,14 +3662,16 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "node_modules/mocha/node_modules/minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3574,11 +3679,6 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -3594,9 +3694,10 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/mute-stream": { "version": "0.0.8", @@ -3629,6 +3730,20 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + } + }, "node_modules/node-abi": { "version": "3.56.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.56.0.tgz", @@ -3862,6 +3977,16 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" }, + "node_modules/path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -3958,6 +4083,17 @@ "node": ">=8" } }, + "node_modules/postinstall-build": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.3.tgz", + "integrity": "sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg==", + "deprecated": "postinstall-build's behavior is now built into npm! You should migrate off of postinstall-build and use the new `prepare` lifecycle script with npm 5.0.0 or greater.", + "dev": true, + "license": "MIT", + "bin": { + "postinstall-build": "cli.js" + } + }, "node_modules/prebuild-install": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", @@ -4306,9 +4442,10 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -4443,6 +4580,35 @@ "simple-concat": "^1.0.0" } }, + "node_modules/sinon": { + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", + "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -4686,15 +4852,6 @@ } } }, - "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -4774,6 +4931,16 @@ "webpack": "^5.0.0" } }, + "node_modules/ts-mockito": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/ts-mockito/-/ts-mockito-2.6.1.tgz", + "integrity": "sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.5" + } + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -4828,6 +4995,16 @@ "node": ">= 0.8.0" } }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -4851,6 +5028,22 @@ "underscore": "^1.12.1" } }, + "node_modules/typemoq": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typemoq/-/typemoq-2.1.0.tgz", + "integrity": "sha512-DtRNLb7x8yCTv/KHlwes+NI+aGb4Vl1iPC63Hhtcvk1DpxSAZzKWQv0RQFY0jX2Uqj0SDBNl8Na4e6MV6TNDgw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "circular-json": "^0.3.1", + "lodash": "^4.17.4", + "postinstall-build": "^5.0.1" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/typescript": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", @@ -5113,9 +5306,10 @@ "dev": true }, "node_modules/workerpool": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", - "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "7.0.0", @@ -5208,9 +5402,10 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "license": "ISC", "engines": { "node": ">=10" } @@ -5587,6 +5782,49 @@ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "optional": true }, + "@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1" + } + }, + "@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + }, + "dependencies": { + "type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true + } + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -5662,6 +5900,21 @@ "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, + "@types/sinon": { + "version": "17.0.3", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", + "integrity": "sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==", + "dev": true, + "requires": { + "@types/sinonjs__fake-timers": "*" + } + }, + "@types/sinonjs__fake-timers": { + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz", + "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==", + "dev": true + }, "@types/stack-trace": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz", @@ -6223,9 +6476,9 @@ "requires": {} }, "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==" }, "ansi-regex": { "version": "5.0.1", @@ -6531,6 +6784,12 @@ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -6638,11 +6897,11 @@ "dev": true }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "requires": { - "ms": "2.1.2" + "ms": "^2.1.3" } }, "decamelize": { @@ -6692,9 +6951,9 @@ "optional": true }, "diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==" }, "dir-glob": { "version": "3.0.1", @@ -7609,6 +7868,12 @@ "setimmediate": "^1.0.5" } }, + "just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true + }, "keytar": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", @@ -7683,6 +7948,18 @@ "p-locate": "^5.0.0" } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -7819,30 +8096,30 @@ "optional": true }, "mocha": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", - "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", - "requires": { - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.4", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "8.1.0", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "5.0.1", - "ms": "2.1.3", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "workerpool": "6.2.1", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "requires": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" }, "dependencies": { "brace-expansion": { @@ -7854,18 +8131,13 @@ } }, "minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "requires": { "brace-expansion": "^2.0.1" } }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -7877,9 +8149,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "mute-stream": { "version": "0.0.8", @@ -7912,6 +8184,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + } + }, "node-abi": { "version": "3.56.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.56.0.tgz", @@ -8092,6 +8377,12 @@ } } }, + "path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true + }, "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -8163,6 +8454,12 @@ } } }, + "postinstall-build": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.3.tgz", + "integrity": "sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg==", + "dev": true + }, "prebuild-install": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", @@ -8409,9 +8706,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "requires": { "randombytes": "^2.1.0" } @@ -8494,6 +8791,28 @@ "simple-concat": "^1.0.0" } }, + "sinon": { + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", + "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" + }, + "dependencies": { + "diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true + } + } + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -8662,17 +8981,6 @@ "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.1", "terser": "^5.26.0" - }, - "dependencies": { - "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - } } }, "test-exclude": { @@ -8733,6 +9041,15 @@ "source-map": "^0.7.4" } }, + "ts-mockito": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/ts-mockito/-/ts-mockito-2.6.1.tgz", + "integrity": "sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==", + "dev": true, + "requires": { + "lodash": "^4.17.5" + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -8772,6 +9089,12 @@ "prelude-ls": "^1.2.1" } }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -8789,6 +9112,17 @@ "underscore": "^1.12.1" } }, + "typemoq": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typemoq/-/typemoq-2.1.0.tgz", + "integrity": "sha512-DtRNLb7x8yCTv/KHlwes+NI+aGb4Vl1iPC63Hhtcvk1DpxSAZzKWQv0RQFY0jX2Uqj0SDBNl8Na4e6MV6TNDgw==", + "dev": true, + "requires": { + "circular-json": "^0.3.1", + "lodash": "^4.17.4", + "postinstall-build": "^5.0.1" + } + }, "typescript": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", @@ -8960,9 +9294,9 @@ "dev": true }, "workerpool": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", - "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==" }, "wrap-ansi": { "version": "7.0.0", @@ -9030,9 +9364,9 @@ } }, "yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==" + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" }, "yargs-unparser": { "version": "2.0.0", diff --git a/package.json b/package.json index 9b407cb..0f394b5 100644 --- a/package.json +++ b/package.json @@ -432,6 +432,7 @@ "@types/glob": "^8.1.0", "@types/mocha": "^10.0.1", "@types/node": "20.2.5", + "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", "@types/vscode": "^1.93.0", "@types/which": "^3.0.4", @@ -441,8 +442,11 @@ "@vscode/vsce": "^2.24.0", "eslint": "^8.41.0", "glob": "^8.1.0", - "mocha": "^10.2.0", + "mocha": "^10.8.2", + "sinon": "^19.0.2", "ts-loader": "^9.4.3", + "ts-mockito": "^2.6.1", + "typemoq": "^2.1.0", "typescript": "^5.1.3", "webpack": "^5.85.0", "webpack-cli": "^5.1.1" diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index 8257763..a6066f7 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { Disposable, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, Uri, window } from 'vscode'; +import { Disposable, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, Uri } from 'vscode'; import { CreateEnvironmentScope, DidChangeEnvironmentEventArgs, @@ -29,6 +29,7 @@ import { } from './condaUtils'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { withProgress } from '../../common/window.apis'; export class CondaEnvManager implements EnvironmentManager, Disposable { private collection: PythonEnvironment[] = []; @@ -73,7 +74,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { this._initialized = createDeferred(); - await window.withProgress( + await withProgress( { location: ProgressLocation.Window, title: 'Discovering Conda environments', @@ -164,7 +165,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { this.disposablesMap.forEach((d) => d.dispose()); this.disposablesMap.clear(); - await window.withProgress( + await withProgress( { location: ProgressLocation.Window, title: 'Refreshing Conda Environments', diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts index e62dae3..278a4cd 100644 --- a/src/managers/conda/main.ts +++ b/src/managers/conda/main.ts @@ -6,14 +6,14 @@ import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { traceInfo } from '../../common/logging'; import { getConda } from './condaUtils'; -import { onDidChangeConfiguration } from '../../common/workspace.apis'; -async function register( - api: PythonEnvironmentApi, +export async function registerCondaFeatures( nativeFinder: NativePythonFinder, + disposables: Disposable[], log: LogOutputChannel, -): Promise { - const disposables: Disposable[] = []; +): Promise { + const api: PythonEnvironmentApi = await getPythonApi(); + try { await getConda(); const envManager = new CondaEnvManager(nativeFinder, api, log); @@ -28,24 +28,4 @@ async function register( } catch (ex) { traceInfo('Conda not found, turning off conda features.'); } - return Disposable.from(...disposables); -} - -export async function registerCondaFeatures( - nativeFinder: NativePythonFinder, - disposables: Disposable[], - log: LogOutputChannel, -): Promise { - const api: PythonEnvironmentApi = await getPythonApi(); - - const disposable: Disposable = await register(api, nativeFinder, log); - - disposables.push( - disposable, - onDidChangeConfiguration((e) => { - if (e.affectsConfiguration('python.condaPath')) { - // TODO: This setting requires a reload of the extension. - } - }), - ); } diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 0173b86..c459a12 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -109,7 +109,9 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { const shellActivation: Map = new Map(); shellActivation.set(TerminalShellType.bash, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); - shellActivation.set(TerminalShellType.powershell, [{ executable: path.join(binDir, 'Activate.ps1') }]); + shellActivation.set(TerminalShellType.powershell, [ + { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, + ]); shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); diff --git a/src/test/common/internalVariables.unit.test.ts b/src/test/common/internalVariables.unit.test.ts new file mode 100644 index 0000000..4d88ba6 --- /dev/null +++ b/src/test/common/internalVariables.unit.test.ts @@ -0,0 +1,42 @@ +import assert from 'node:assert'; +import { resolveVariables } from '../../common/utils/internalVariables'; +import * as workspaceApi from '../../common/workspace.apis'; +import * as sinon from 'sinon'; + +suite('Internal Variable substitution', () => { + let getWorkspaceFolderStub: sinon.SinonStub; + let getWorkspaceFoldersStub: sinon.SinonStub; + + const home = process.env.HOME ?? process.env.USERPROFILE; + const project = { name: 'project', uri: { fsPath: 'project' } }; + const workspaceFolder = { name: 'workspaceFolder', uri: { fsPath: 'workspaceFolder' } }; + + setup(() => { + getWorkspaceFolderStub = sinon.stub(workspaceApi, 'getWorkspaceFolder'); + getWorkspaceFoldersStub = sinon.stub(workspaceApi, 'getWorkspaceFolders'); + + getWorkspaceFolderStub.callsFake(() => { + return workspaceFolder; + }); + + getWorkspaceFoldersStub.callsFake(() => { + return [workspaceFolder]; + }); + }); + + [ + { variable: '${userHome}', substitution: home }, + { variable: '${pythonProject}', substitution: project.uri.fsPath }, + { variable: '${workspaceFolder}', substitution: workspaceFolder.uri.fsPath }, + ].forEach((item) => { + test(`Resolve ${item.variable}`, () => { + const value = `Some ${item.variable} text`; + const result = resolveVariables(value, project.uri as any); + assert.equal(result, `Some ${item.substitution} text`); + }); + }); + + teardown(() => { + sinon.restore(); + }); +}); diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts deleted file mode 100644 index 0418112..0000000 --- a/src/test/extension.test.ts +++ /dev/null @@ -1,15 +0,0 @@ -import * as assert from 'assert'; - -// You can import and use all API from the 'vscode' module -// as well as import your extension to test it -import * as vscode from 'vscode'; -// import * as myExtension from '../../extension'; - -suite('Extension Test Suite', () => { - vscode.window.showInformationMessage('Start all tests.'); - - test('Sample test', () => { - assert.strictEqual(-1, [1, 2, 3].indexOf(5)); - assert.strictEqual(-1, [1, 2, 3].indexOf(0)); - }); -}); diff --git a/src/test/mocks/helper.ts b/src/test/mocks/helper.ts new file mode 100644 index 0000000..1ca4e62 --- /dev/null +++ b/src/test/mocks/helper.ts @@ -0,0 +1,27 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +import * as TypeMoq from 'typemoq'; +import { Readable } from 'stream'; +import * as common from 'typemoq/Common/_all'; + +export class FakeReadableStream extends Readable { + _read(_size: unknown): void | null { + // custom reading logic here + this.push(null); // end the stream + } +} + +export function createTypeMoq( + targetCtor?: common.CtorWithArgs, + behavior?: TypeMoq.MockBehavior, + shouldOverrideTarget?: boolean, + ...targetCtorArgs: any[] +): TypeMoq.IMock { + // Use typemoqs for those things that are resolved as promises. mockito doesn't allow nesting of mocks. ES6 Proxy class + // is the problem. We still need to make it thenable though. See this issue: https://github.com/florinn/typemoq/issues/67 + const result = TypeMoq.Mock.ofType(targetCtor, behavior, shouldOverrideTarget, ...targetCtorArgs); + result.setup((x: any) => x.then).returns(() => undefined); + return result; +} diff --git a/src/test/mocks/mementos.ts b/src/test/mocks/mementos.ts new file mode 100644 index 0000000..12ca6a2 --- /dev/null +++ b/src/test/mocks/mementos.ts @@ -0,0 +1,34 @@ +import { Memento } from 'vscode'; + +export class MockMemento implements Memento { + // Note: This has to be called _value so that it matches + // what VS code has for a memento. We use this to eliminate a bad bug + // with writing too much data to global storage. See bug https://github.com/microsoft/vscode-python/issues/9159 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + private _value: Record = {}; + + public keys(): string[] { + return Object.keys(this._value); + } + + // @ts-ignore Ignore the return value warning + // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any + public get(key: any, defaultValue?: any); + + public get(key: string, defaultValue?: T): T { + const exists = this._value.hasOwnProperty(key); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return exists ? this._value[key] : (defaultValue! as any); + } + + // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any + public update(key: string, value: any): Thenable { + this._value[key] = value; + return Promise.resolve(); + } + + public clear(): void { + this._value = {}; + } +} diff --git a/src/test/mocks/mockChildProcess.ts b/src/test/mocks/mockChildProcess.ts new file mode 100644 index 0000000..e26ea1c --- /dev/null +++ b/src/test/mocks/mockChildProcess.ts @@ -0,0 +1,243 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +import { Serializable, SendHandle, MessageOptions } from 'child_process'; +import { EventEmitter } from 'node:events'; +import { Writable, Readable, Pipe } from 'stream'; +import { FakeReadableStream } from './helper'; + +export class MockChildProcess extends EventEmitter { + constructor(spawnfile: string, spawnargs: string[]) { + super(); + this.spawnfile = spawnfile; + this.spawnargs = spawnargs; + this.stdin = new Writable(); + this.stdout = new FakeReadableStream(); + this.stderr = new FakeReadableStream(); + this.channel = null; + this.stdio = [this.stdin, this.stdout, this.stdout, this.stderr, null]; + this.killed = false; + this.connected = false; + this.exitCode = null; + this.signalCode = null; + this.eventMap = new Map(); + } + + stdin: Writable | null; + + stdout: Readable | null; + + stderr: Readable | null; + + eventMap: Map; + + readonly channel?: Pipe | null | undefined; + + readonly stdio: [ + Writable | null, + // stdin + Readable | null, + // stdout + Readable | null, + // stderr + Readable | Writable | null | undefined, + // extra + Readable | Writable | null | undefined, // extra + ]; + + readonly killed: boolean; + + readonly pid?: number | undefined; + + readonly connected: boolean; + + readonly exitCode: number | null; + + readonly signalCode: NodeJS.Signals | null; + + readonly spawnargs: string[]; + + readonly spawnfile: string; + + signal?: NodeJS.Signals | number; + + send(message: Serializable, callback?: (error: Error | null) => void): boolean; + + send(message: Serializable, sendHandle?: SendHandle, callback?: (error: Error | null) => void): boolean; + + send( + message: Serializable, + sendHandle?: SendHandle, + options?: MessageOptions, + callback?: (error: Error | null) => void, + ): boolean; + + send( + message: Serializable, + _sendHandleOrCallback?: SendHandle | ((error: Error | null) => void), + _optionsOrCallback?: MessageOptions | ((error: Error | null) => void), + _callback?: (error: Error | null) => void, + ): boolean { + // Implementation of the send method + // For example, you might want to emit a 'message' event + this.stdout?.push(message.toString()); + return true; + } + + // eslint-disable-next-line class-methods-use-this + disconnect(): void { + /* noop */ + } + + // eslint-disable-next-line class-methods-use-this + unref(): void { + /* noop */ + } + + // eslint-disable-next-line class-methods-use-this + ref(): void { + /* noop */ + } + + addListener(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + addListener(event: 'disconnect', listener: () => void): this; + + addListener(event: 'error', listener: (err: Error) => void): this; + + addListener(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + addListener(event: 'message', listener: (message: Serializable, sendHandle: SendHandle) => void): this; + + addListener(event: 'spawn', listener: () => void): this; + + addListener(event: string, listener: (...args: any[]) => void): this { + if (this.eventMap.has(event)) { + this.eventMap.get(event).push(listener); + } else { + this.eventMap.set(event, [listener]); + } + return this; + } + + emit(event: 'close', code: number | null, signal: NodeJS.Signals | null): boolean; + + emit(event: 'disconnect'): boolean; + + emit(event: 'error', err: Error): boolean; + + emit(event: 'exit', code: number | null, signal: NodeJS.Signals | null): boolean; + + emit(event: 'message', message: Serializable, sendHandle: SendHandle): boolean; + + emit(event: 'spawn', listener: () => void): boolean; + + emit(event: string | symbol, ...args: unknown[]): boolean { + if (this.eventMap.has(event.toString())) { + this.eventMap.get(event.toString()).forEach((listener: (...arg0: unknown[]) => void) => { + const argsArray: unknown[] = Array.isArray(args) ? args : [args]; + listener(...argsArray); + }); + } + return true; + } + + on(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + on(event: 'disconnect', listener: () => void): this; + + on(event: 'error', listener: (err: Error) => void): this; + + on(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + on(event: 'message', listener: (message: Serializable, sendHandle: SendHandle) => void): this; + + on(event: 'spawn', listener: () => void): this; + + on(event: string, listener: (...args: any[]) => void): this { + if (this.eventMap.has(event)) { + this.eventMap.get(event).push(listener); + } else { + this.eventMap.set(event, [listener]); + } + return this; + } + + once(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + once(event: 'disconnect', listener: () => void): this; + + once(event: 'error', listener: (err: Error) => void): this; + + once(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + once(event: 'message', listener: (message: Serializable, sendHandle: SendHandle) => void): this; + + once(event: 'spawn', listener: () => void): this; + + once(event: string, listener: (...args: any[]) => void): this { + if (this.eventMap.has(event)) { + this.eventMap.get(event).push(listener); + } else { + this.eventMap.set(event, [listener]); + } + return this; + } + + prependListener(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + prependListener(event: 'disconnect', listener: () => void): this; + + prependListener(event: 'error', listener: (err: Error) => void): this; + + prependListener(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + prependListener(event: 'message', listener: (message: Serializable, sendHandle: SendHandle) => void): this; + + prependListener(event: 'spawn', listener: () => void): this; + + prependListener(event: string, listener: (...args: any[]) => void): this { + if (this.eventMap.has(event)) { + this.eventMap.get(event).push(listener); + } else { + this.eventMap.set(event, [listener]); + } + return this; + } + + prependOnceListener(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + prependOnceListener(event: 'disconnect', listener: () => void): this; + + prependOnceListener(event: 'error', listener: (err: Error) => void): this; + + prependOnceListener(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this; + + prependOnceListener(event: 'message', listener: (message: Serializable, sendHandle: SendHandle) => void): this; + + prependOnceListener(event: 'spawn', listener: () => void): this; + + prependOnceListener(event: string, listener: (...args: any[]) => void): this { + if (this.eventMap.has(event)) { + this.eventMap.get(event).push(listener); + } else { + this.eventMap.set(event, [listener]); + } + return this; + } + + trigger(event: string): Array { + if (this.eventMap.has(event)) { + return this.eventMap.get(event); + } + return []; + } + + kill(_signal?: NodeJS.Signals | number): boolean { + this.stdout?.destroy(); + return true; + } + + dispose(): void { + this.stdout?.destroy(); + } +} diff --git a/src/test/mocks/mockDocument.ts b/src/test/mocks/mockDocument.ts new file mode 100644 index 0000000..811c591 --- /dev/null +++ b/src/test/mocks/mockDocument.ts @@ -0,0 +1,232 @@ +/* eslint-disable max-classes-per-file */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import { EndOfLine, Position, Range, TextDocument, TextDocumentContentChangeEvent, TextLine, Uri } from 'vscode'; + +class MockLine implements TextLine { + private _range: Range; + + private _rangeWithLineBreak: Range; + + private _firstNonWhitespaceIndex: number | undefined; + + private _isEmpty: boolean | undefined; + + constructor(private _contents: string, private _line: number, private _offset: number) { + this._range = new Range(new Position(_line, 0), new Position(_line, _contents.length)); + this._rangeWithLineBreak = new Range(this.range.start, new Position(_line, _contents.length + 1)); + } + + public get offset(): number { + return this._offset; + } + + public get lineNumber(): number { + return this._line; + } + + public get text(): string { + return this._contents; + } + + public get range(): Range { + return this._range; + } + + public get rangeIncludingLineBreak(): Range { + return this._rangeWithLineBreak; + } + + public get firstNonWhitespaceCharacterIndex(): number { + if (this._firstNonWhitespaceIndex === undefined) { + this._firstNonWhitespaceIndex = this._contents.trimLeft().length - this._contents.length; + } + return this._firstNonWhitespaceIndex; + } + + public get isEmptyOrWhitespace(): boolean { + if (this._isEmpty === undefined) { + this._isEmpty = this._contents.length === 0 || this._contents.trim().length === 0; + } + return this._isEmpty; + } +} + +export class MockDocument implements TextDocument { + private _uri: Uri; + + private _version = 0; + + private _lines: MockLine[] = []; + + private _contents = ''; + + private _isUntitled = false; + + private _isDirty = false; + + private _language = 'python'; + + private _onSave: (doc: TextDocument) => Promise; + + constructor( + contents: string, + fileName: string, + onSave: (doc: TextDocument) => Promise, + language?: string, + ) { + this._uri = Uri.file(fileName); + this._contents = contents; + this._lines = this.createLines(); + this._onSave = onSave; + this._language = language ?? this._language; + } + + public setContent(contents: string): void { + this._contents = contents; + this._lines = this.createLines(); + } + + public addContent(contents: string): void { + this.setContent(`${this._contents}\n${contents}`); + } + + public forceUntitled(): void { + this._isUntitled = true; + this._isDirty = true; + } + + public get uri(): Uri { + return this._uri; + } + + public get fileName(): string { + return this._uri.fsPath; + } + + public get isUntitled(): boolean { + return this._isUntitled; + } + + public get languageId(): string { + return this._language; + } + + public get version(): number { + return this._version; + } + + public get isDirty(): boolean { + return this._isDirty; + } + + // eslint-disable-next-line class-methods-use-this + public get isClosed(): boolean { + return false; + } + + public save(): Thenable { + return this._onSave(this); + } + + // eslint-disable-next-line class-methods-use-this + public get eol(): EndOfLine { + return EndOfLine.LF; + } + + public get lineCount(): number { + return this._lines.length; + } + + public lineAt(position: Position | number): TextLine { + if (typeof position === 'number') { + return this._lines[position as number]; + } + return this._lines[position.line]; + } + + public offsetAt(position: Position): number { + return this.convertToOffset(position); + } + + public positionAt(offset: number): Position { + let line = 0; + let ch = 0; + while (line + 1 < this._lines.length && this._lines[line + 1].offset <= offset) { + line += 1; + } + if (line < this._lines.length) { + ch = offset - this._lines[line].offset; + } + return new Position(line, ch); + } + + public getText(range?: Range | undefined): string { + if (!range) { + return this._contents; + } + const startOffset = this.convertToOffset(range.start); + const endOffset = this.convertToOffset(range.end); + return this._contents.substr(startOffset, endOffset - startOffset); + } + + // eslint-disable-next-line class-methods-use-this + public getWordRangeAtPosition(position: Position, regexp?: RegExp | undefined): Range | undefined { + if (!regexp && position.line > 0) { + // use default when custom-regexp isn't provided + regexp = /a/; + } + + return undefined; + } + + // eslint-disable-next-line class-methods-use-this + public validateRange(range: Range): Range { + return range; + } + + // eslint-disable-next-line class-methods-use-this + public validatePosition(position: Position): Position { + return position; + } + + public edit(c: TextDocumentContentChangeEvent): void { + this._version += 1; + const before = this._contents.substr(0, c.rangeOffset); + const after = this._contents.substr(c.rangeOffset + c.rangeLength); + this._contents = `${before}${c.text}${after}`; + this._lines = this.createLines(); + } + + private createLines(): MockLine[] { + const split = this._contents.split('\n'); + let prevLine: MockLine | undefined; + return split.map((s, i) => { + const nextLine = this.createTextLine(s, i, prevLine); + prevLine = nextLine; + return nextLine; + }); + } + + // eslint-disable-next-line class-methods-use-this + private createTextLine(line: string, index: number, prevLine: MockLine | undefined): MockLine { + return new MockLine( + line, + index, + prevLine ? prevLine.offset + prevLine.rangeIncludingLineBreak.end.character : 0, + ); + } + + private convertToOffset(pos: Position): number { + if (pos.line < this._lines.length) { + return ( + this._lines[pos.line].offset + + Math.min(this._lines[pos.line].rangeIncludingLineBreak.end.character, pos.character) + ); + } + return this._contents.length; + } +} diff --git a/src/test/mocks/mockWorkspaceConfig.ts b/src/test/mocks/mockWorkspaceConfig.ts new file mode 100644 index 0000000..8627cd5 --- /dev/null +++ b/src/test/mocks/mockWorkspaceConfig.ts @@ -0,0 +1,53 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import { ConfigurationTarget, WorkspaceConfiguration } from 'vscode'; + +type SectionType = { + key: string; + defaultValue?: T | undefined; + globalValue?: T | undefined; + globalLanguageValue?: T | undefined; + workspaceValue?: T | undefined; + workspaceLanguageValue?: T | undefined; + workspaceFolderValue?: T | undefined; + workspaceFolderLanguageValue?: T | undefined; +}; + +export class MockWorkspaceConfiguration implements WorkspaceConfiguration { + private values = new Map(); + + constructor(defaultSettings?: { [key: string]: unknown }) { + if (defaultSettings) { + const keys = [...Object.keys(defaultSettings)]; + keys.forEach((k) => this.values.set(k, defaultSettings[k])); + } + } + + public get(key: string, defaultValue?: T): T | undefined { + if (this.values.has(key)) { + return this.values.get(key) as T; + } + + return arguments.length > 1 ? defaultValue : undefined; + } + + public has(section: string): boolean { + return this.values.has(section); + } + + public inspect(section: string): SectionType | undefined { + return this.values.get(section) as SectionType; + } + + public update( + section: string, + value: unknown, + _configurationTarget?: boolean | ConfigurationTarget | undefined, + ): Promise { + this.values.set(section, value); + return Promise.resolve(); + } +} diff --git a/src/test/mocks/vsc/README.md b/src/test/mocks/vsc/README.md new file mode 100644 index 0000000..2803528 --- /dev/null +++ b/src/test/mocks/vsc/README.md @@ -0,0 +1,7 @@ +# This folder contains classes exposed by VS Code required in running the unit tests. + +- These classes are only used when running unit tests that are not hosted by VS Code. +- So even if these classes were buggy, it doesn't matter, running the tests under VS Code host will ensure the right classes are available. +- The purpose of these classes are to avoid having to use VS Code as the hosting environment for the tests, making it faster to run the tests and not have to rely on VS Code host to run the tests. +- Everything in here must either be within a namespace prefixed with `vscMock` or exported types must be prefixed with `vscMock`. + This is to prevent developers from accidentally importing them into their Code. Even if they did, the extension would fail to load and tests would fail. diff --git a/src/test/mocks/vsc/arrays.ts b/src/test/mocks/vsc/arrays.ts new file mode 100644 index 0000000..ad2020c --- /dev/null +++ b/src/test/mocks/vsc/arrays.ts @@ -0,0 +1,399 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +/** + * Returns the last element of an array. + * @param array The array. + * @param n Which element from the end (default is zero). + */ +export function tail(array: T[], n = 0): T { + return array[array.length - (1 + n)]; +} + +export function equals(one: T[], other: T[], itemEquals: (a: T, b: T) => boolean = (a, b) => a === b): boolean { + if (one.length !== other.length) { + return false; + } + + for (let i = 0, len = one.length; i < len; i += 1) { + if (!itemEquals(one[i], other[i])) { + return false; + } + } + + return true; +} + +export function binarySearch(array: T[], key: T, comparator: (op1: T, op2: T) => number): number { + let low = 0; + let high = array.length - 1; + + while (low <= high) { + const mid = ((low + high) / 2) | 0; + const comp = comparator(array[mid], key); + if (comp < 0) { + low = mid + 1; + } else if (comp > 0) { + high = mid - 1; + } else { + return mid; + } + } + return -(low + 1); +} + +/** + * Takes a sorted array and a function p. The array is sorted in such a way that all elements where p(x) is false + * are located before all elements where p(x) is true. + * @returns the least x for which p(x) is true or array.length if no element fullfills the given function. + */ +export function findFirst(array: T[], p: (x: T) => boolean): number { + let low = 0; + let high = array.length; + if (high === 0) { + return 0; // no children + } + while (low < high) { + const mid = Math.floor((low + high) / 2); + if (p(array[mid])) { + high = mid; + } else { + low = mid + 1; + } + } + return low; +} + +/** + * Like `Array#sort` but always stable. Usually runs a little slower `than Array#sort` + * so only use this when actually needing stable sort. + */ +export function mergeSort(data: T[], compare: (a: T, b: T) => number): T[] { + _divideAndMerge(data, compare); + return data; +} + +function _divideAndMerge(data: T[], compare: (a: T, b: T) => number): void { + if (data.length <= 1) { + // sorted + return; + } + const p = (data.length / 2) | 0; + const left = data.slice(0, p); + const right = data.slice(p); + + _divideAndMerge(left, compare); + _divideAndMerge(right, compare); + + let leftIdx = 0; + let rightIdx = 0; + let i = 0; + while (leftIdx < left.length && rightIdx < right.length) { + const ret = compare(left[leftIdx], right[rightIdx]); + if (ret <= 0) { + // smaller_equal -> take left to preserve order + data[(i += 1)] = left[(leftIdx += 1)]; + } else { + // greater -> take right + data[(i += 1)] = right[(rightIdx += 1)]; + } + } + while (leftIdx < left.length) { + data[(i += 1)] = left[(leftIdx += 1)]; + } + while (rightIdx < right.length) { + data[(i += 1)] = right[(rightIdx += 1)]; + } +} + +export function groupBy(data: T[], compare: (a: T, b: T) => number): T[][] { + const result: T[][] = []; + let currentGroup: T[] | undefined; + + for (const element of mergeSort(data.slice(0), compare)) { + if (!currentGroup || compare(currentGroup[0], element) !== 0) { + currentGroup = [element]; + result.push(currentGroup); + } else { + currentGroup.push(element); + } + } + return result; +} + +type IMutableSplice = { + deleteCount: number; + start: number; + toInsert: T[]; +}; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +type ISplice = Array & any; + +/** + * Diffs two *sorted* arrays and computes the splices which apply the diff. + */ +export function sortedDiff(before: T[], after: T[], compare: (a: T, b: T) => number): ISplice[] { + const result: IMutableSplice[] = []; + + function pushSplice(start: number, deleteCount: number, toInsert: T[]): void { + if (deleteCount === 0 && toInsert.length === 0) { + return; + } + + const latest = result[result.length - 1]; + + if (latest && latest.start + latest.deleteCount === start) { + latest.deleteCount += deleteCount; + latest.toInsert.push(...toInsert); + } else { + result.push({ start, deleteCount, toInsert }); + } + } + + let beforeIdx = 0; + let afterIdx = 0; + + while (beforeIdx !== before.length || afterIdx !== after.length) { + const beforeElement = before[beforeIdx]; + const afterElement = after[afterIdx]; + const n = compare(beforeElement, afterElement); + if (n === 0) { + // equal + beforeIdx += 1; + afterIdx += 1; + } else if (n < 0) { + // beforeElement is smaller -> before element removed + pushSplice(beforeIdx, 1, []); + beforeIdx += 1; + } else if (n > 0) { + // beforeElement is greater -> after element added + pushSplice(beforeIdx, 0, [afterElement]); + afterIdx += 1; + } + } + + if (beforeIdx === before.length) { + pushSplice(beforeIdx, 0, after.slice(afterIdx)); + } else if (afterIdx === after.length) { + pushSplice(beforeIdx, before.length - beforeIdx, []); + } + + return result; +} + +/** + * Takes two *sorted* arrays and computes their delta (removed, added elements). + * Finishes in `Math.min(before.length, after.length)` steps. + */ +export function delta(before: T[], after: T[], compare: (a: T, b: T) => number): { removed: T[]; added: T[] } { + const splices = sortedDiff(before, after, compare); + const removed: T[] = []; + const added: T[] = []; + + for (const splice of splices) { + removed.push(...before.slice(splice.start, splice.start + splice.deleteCount)); + added.push(...splice.toInsert); + } + + return { removed, added }; +} + +/** + * Returns the top N elements from the array. + * + * Faster than sorting the entire array when the array is a lot larger than N. + * + * @param array The unsorted array. + * @param compare A sort function for the elements. + * @param n The number of elements to return. + * @return The first n elemnts from array when sorted with compare. + */ +export function top(array: T[], compare: (a: T, b: T) => number, n: number): T[] { + if (n === 0) { + return []; + } + const result = array.slice(0, n).sort(compare); + topStep(array, compare, result, n, array.length); + return result; +} + +function topStep(array: T[], compare: (a: T, b: T) => number, result: T[], i: number, m: number): void { + for (const n = result.length; i < m; i += 1) { + const element = array[i]; + if (compare(element, result[n - 1]) < 0) { + result.pop(); + const j = findFirst(result, (e) => compare(element, e) < 0); + result.splice(j, 0, element); + } + } +} + +/** + * @returns a new array with all undefined or null values removed. The original array is not modified at all. + */ +export function coalesce(array: T[]): T[] { + if (!array) { + return array; + } + + return array.filter((e) => !!e); +} + +/** + * Moves the element in the array for the provided positions. + */ +export function move(array: unknown[], from: number, to: number): void { + array.splice(to, 0, array.splice(from, 1)[0]); +} + +/** + * @returns {{false}} if the provided object is an array + * and not empty. + */ +export function isFalsyOrEmpty(obj: unknown): boolean { + return !Array.isArray(obj) || (>obj).length === 0; +} + +/** + * Removes duplicates from the given array. The optional keyFn allows to specify + * how elements are checked for equalness by returning a unique string for each. + */ +export function distinct(array: T[], keyFn?: (t: T) => string): T[] { + if (!keyFn) { + return array.filter((element, position) => array.indexOf(element) === position); + } + + const seen: Record = Object.create(null); + return array.filter((elem) => { + const key = keyFn(elem); + if (seen[key]) { + return false; + } + + seen[key] = true; + + return true; + }); +} + +export function uniqueFilter(keyFn: (t: T) => string): (t: T) => boolean { + const seen: Record = Object.create(null); + + return (element) => { + const key = keyFn(element); + + if (seen[key]) { + return false; + } + + seen[key] = true; + return true; + }; +} + +export function firstIndex(array: T[], fn: (item: T) => boolean): number { + for (let i = 0; i < array.length; i += 1) { + const element = array[i]; + + if (fn(element)) { + return i; + } + } + + return -1; +} + +export function first(array: T[], fn: (item: T) => boolean, notFoundValue: T | null = null): T { + const idx = firstIndex(array, fn); + return idx < 0 && notFoundValue !== null ? notFoundValue : array[idx]; +} + +export function commonPrefixLength(one: T[], other: T[], eqls: (a: T, b: T) => boolean = (a, b) => a === b): number { + let result = 0; + + for (let i = 0, len = Math.min(one.length, other.length); i < len && eqls(one[i], other[i]); i += 1) { + result += 1; + } + + return result; +} + +export function flatten(arr: T[][]): T[] { + return ([] as T[]).concat(...arr); +} + +export function range(to: number): number[]; +export function range(from: number, to: number): number[]; +export function range(arg: number, to?: number): number[] { + let from = typeof to === 'number' ? arg : 0; + + if (typeof to === 'number') { + from = arg; + } else { + from = 0; + to = arg; + } + + const result: number[] = []; + + if (from <= to) { + for (let i = from; i < to; i += 1) { + result.push(i); + } + } else { + for (let i = from; i > to; i -= 1) { + result.push(i); + } + } + + return result; +} + +export function fill(num: number, valueFn: () => T, arr: T[] = []): T[] { + for (let i = 0; i < num; i += 1) { + arr[i] = valueFn(); + } + + return arr; +} + +export function index(array: T[], indexer: (t: T) => string): Record; +export function index(array: T[], indexer: (t: T) => string, merger?: (t: T, r: R) => R): Record; +export function index( + array: T[], + indexer: (t: T) => string, + merger: (t: T, r: R) => R = (t) => (t as unknown) as R, +): Record { + return array.reduce((r, t) => { + const key = indexer(t); + r[key] = merger(t, r[key]); + return r; + }, Object.create(null)); +} + +/** + * Inserts an element into an array. Returns a function which, when + * called, will remove that element from the array. + */ +export function insert(array: T[], element: T): () => void { + array.push(element); + + return () => { + const idx = array.indexOf(element); + if (idx > -1) { + array.splice(idx, 1); + } + }; +} + +/** + * Insert `insertArr` inside `target` at `insertIndex`. + * Please don't touch unless you understand https://jsperf.com/inserting-an-array-within-an-array + */ +export function arrayInsert(target: T[], insertIndex: number, insertArr: T[]): T[] { + const before = target.slice(0, insertIndex); + const after = target.slice(insertIndex); + return before.concat(insertArr, after); +} diff --git a/src/test/mocks/vsc/charCode.ts b/src/test/mocks/vsc/charCode.ts new file mode 100644 index 0000000..fe450d4 --- /dev/null +++ b/src/test/mocks/vsc/charCode.ts @@ -0,0 +1,425 @@ +/* eslint-disable camelcase */ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// Names from https://blog.codinghorror.com/ascii-pronunciation-rules-for-programmers/ + +/** + * An inlined enum containing useful character codes (to be used with String.charCodeAt). + * Please leave the const keyword such that it gets inlined when compiled to JavaScript! + */ +export const enum CharCode { + Null = 0, + /** + * The `\b` character. + */ + Backspace = 8, + /** + * The `\t` character. + */ + Tab = 9, + /** + * The `\n` character. + */ + LineFeed = 10, + /** + * The `\r` character. + */ + CarriageReturn = 13, + Space = 32, + /** + * The `!` character. + */ + ExclamationMark = 33, + /** + * The `"` character. + */ + DoubleQuote = 34, + /** + * The `#` character. + */ + Hash = 35, + /** + * The `$` character. + */ + DollarSign = 36, + /** + * The `%` character. + */ + PercentSign = 37, + /** + * The `&` character. + */ + Ampersand = 38, + /** + * The `'` character. + */ + SingleQuote = 39, + /** + * The `(` character. + */ + OpenParen = 40, + /** + * The `)` character. + */ + CloseParen = 41, + /** + * The `*` character. + */ + Asterisk = 42, + /** + * The `+` character. + */ + Plus = 43, + /** + * The `,` character. + */ + Comma = 44, + /** + * The `-` character. + */ + Dash = 45, + /** + * The `.` character. + */ + Period = 46, + /** + * The `/` character. + */ + Slash = 47, + + Digit0 = 48, + Digit1 = 49, + Digit2 = 50, + Digit3 = 51, + Digit4 = 52, + Digit5 = 53, + Digit6 = 54, + Digit7 = 55, + Digit8 = 56, + Digit9 = 57, + + /** + * The `:` character. + */ + Colon = 58, + /** + * The `;` character. + */ + Semicolon = 59, + /** + * The `<` character. + */ + LessThan = 60, + /** + * The `=` character. + */ + Equals = 61, + /** + * The `>` character. + */ + GreaterThan = 62, + /** + * The `?` character. + */ + QuestionMark = 63, + /** + * The `@` character. + */ + AtSign = 64, + + A = 65, + B = 66, + C = 67, + D = 68, + E = 69, + F = 70, + G = 71, + H = 72, + I = 73, + J = 74, + K = 75, + L = 76, + M = 77, + N = 78, + O = 79, + P = 80, + Q = 81, + R = 82, + S = 83, + T = 84, + U = 85, + V = 86, + W = 87, + X = 88, + Y = 89, + Z = 90, + + /** + * The `[` character. + */ + OpenSquareBracket = 91, + /** + * The `\` character. + */ + Backslash = 92, + /** + * The `]` character. + */ + CloseSquareBracket = 93, + /** + * The `^` character. + */ + Caret = 94, + /** + * The `_` character. + */ + Underline = 95, + /** + * The ``(`)`` character. + */ + BackTick = 96, + + a = 97, + b = 98, + c = 99, + d = 100, + e = 101, + f = 102, + g = 103, + h = 104, + i = 105, + j = 106, + k = 107, + l = 108, + m = 109, + n = 110, + o = 111, + p = 112, + q = 113, + r = 114, + s = 115, + t = 116, + u = 117, + v = 118, + w = 119, + x = 120, + y = 121, + z = 122, + + /** + * The `{` character. + */ + OpenCurlyBrace = 123, + /** + * The `|` character. + */ + Pipe = 124, + /** + * The `}` character. + */ + CloseCurlyBrace = 125, + /** + * The `~` character. + */ + Tilde = 126, + + U_Combining_Grave_Accent = 0x0300, // U+0300 Combining Grave Accent + U_Combining_Acute_Accent = 0x0301, // U+0301 Combining Acute Accent + U_Combining_Circumflex_Accent = 0x0302, // U+0302 Combining Circumflex Accent + U_Combining_Tilde = 0x0303, // U+0303 Combining Tilde + U_Combining_Macron = 0x0304, // U+0304 Combining Macron + U_Combining_Overline = 0x0305, // U+0305 Combining Overline + U_Combining_Breve = 0x0306, // U+0306 Combining Breve + U_Combining_Dot_Above = 0x0307, // U+0307 Combining Dot Above + U_Combining_Diaeresis = 0x0308, // U+0308 Combining Diaeresis + U_Combining_Hook_Above = 0x0309, // U+0309 Combining Hook Above + U_Combining_Ring_Above = 0x030a, // U+030A Combining Ring Above + U_Combining_Double_Acute_Accent = 0x030b, // U+030B Combining Double Acute Accent + U_Combining_Caron = 0x030c, // U+030C Combining Caron + U_Combining_Vertical_Line_Above = 0x030d, // U+030D Combining Vertical Line Above + U_Combining_Double_Vertical_Line_Above = 0x030e, // U+030E Combining Double Vertical Line Above + U_Combining_Double_Grave_Accent = 0x030f, // U+030F Combining Double Grave Accent + U_Combining_Candrabindu = 0x0310, // U+0310 Combining Candrabindu + U_Combining_Inverted_Breve = 0x0311, // U+0311 Combining Inverted Breve + U_Combining_Turned_Comma_Above = 0x0312, // U+0312 Combining Turned Comma Above + U_Combining_Comma_Above = 0x0313, // U+0313 Combining Comma Above + U_Combining_Reversed_Comma_Above = 0x0314, // U+0314 Combining Reversed Comma Above + U_Combining_Comma_Above_Right = 0x0315, // U+0315 Combining Comma Above Right + U_Combining_Grave_Accent_Below = 0x0316, // U+0316 Combining Grave Accent Below + U_Combining_Acute_Accent_Below = 0x0317, // U+0317 Combining Acute Accent Below + U_Combining_Left_Tack_Below = 0x0318, // U+0318 Combining Left Tack Below + U_Combining_Right_Tack_Below = 0x0319, // U+0319 Combining Right Tack Below + U_Combining_Left_Angle_Above = 0x031a, // U+031A Combining Left Angle Above + U_Combining_Horn = 0x031b, // U+031B Combining Horn + U_Combining_Left_Half_Ring_Below = 0x031c, // U+031C Combining Left Half Ring Below + U_Combining_Up_Tack_Below = 0x031d, // U+031D Combining Up Tack Below + U_Combining_Down_Tack_Below = 0x031e, // U+031E Combining Down Tack Below + U_Combining_Plus_Sign_Below = 0x031f, // U+031F Combining Plus Sign Below + U_Combining_Minus_Sign_Below = 0x0320, // U+0320 Combining Minus Sign Below + U_Combining_Palatalized_Hook_Below = 0x0321, // U+0321 Combining Palatalized Hook Below + U_Combining_Retroflex_Hook_Below = 0x0322, // U+0322 Combining Retroflex Hook Below + U_Combining_Dot_Below = 0x0323, // U+0323 Combining Dot Below + U_Combining_Diaeresis_Below = 0x0324, // U+0324 Combining Diaeresis Below + U_Combining_Ring_Below = 0x0325, // U+0325 Combining Ring Below + U_Combining_Comma_Below = 0x0326, // U+0326 Combining Comma Below + U_Combining_Cedilla = 0x0327, // U+0327 Combining Cedilla + U_Combining_Ogonek = 0x0328, // U+0328 Combining Ogonek + U_Combining_Vertical_Line_Below = 0x0329, // U+0329 Combining Vertical Line Below + U_Combining_Bridge_Below = 0x032a, // U+032A Combining Bridge Below + U_Combining_Inverted_Double_Arch_Below = 0x032b, // U+032B Combining Inverted Double Arch Below + U_Combining_Caron_Below = 0x032c, // U+032C Combining Caron Below + U_Combining_Circumflex_Accent_Below = 0x032d, // U+032D Combining Circumflex Accent Below + U_Combining_Breve_Below = 0x032e, // U+032E Combining Breve Below + U_Combining_Inverted_Breve_Below = 0x032f, // U+032F Combining Inverted Breve Below + U_Combining_Tilde_Below = 0x0330, // U+0330 Combining Tilde Below + U_Combining_Macron_Below = 0x0331, // U+0331 Combining Macron Below + U_Combining_Low_Line = 0x0332, // U+0332 Combining Low Line + U_Combining_Double_Low_Line = 0x0333, // U+0333 Combining Double Low Line + U_Combining_Tilde_Overlay = 0x0334, // U+0334 Combining Tilde Overlay + U_Combining_Short_Stroke_Overlay = 0x0335, // U+0335 Combining Short Stroke Overlay + U_Combining_Long_Stroke_Overlay = 0x0336, // U+0336 Combining Long Stroke Overlay + U_Combining_Short_Solidus_Overlay = 0x0337, // U+0337 Combining Short Solidus Overlay + U_Combining_Long_Solidus_Overlay = 0x0338, // U+0338 Combining Long Solidus Overlay + U_Combining_Right_Half_Ring_Below = 0x0339, // U+0339 Combining Right Half Ring Below + U_Combining_Inverted_Bridge_Below = 0x033a, // U+033A Combining Inverted Bridge Below + U_Combining_Square_Below = 0x033b, // U+033B Combining Square Below + U_Combining_Seagull_Below = 0x033c, // U+033C Combining Seagull Below + U_Combining_X_Above = 0x033d, // U+033D Combining X Above + U_Combining_Vertical_Tilde = 0x033e, // U+033E Combining Vertical Tilde + U_Combining_Double_Overline = 0x033f, // U+033F Combining Double Overline + U_Combining_Grave_Tone_Mark = 0x0340, // U+0340 Combining Grave Tone Mark + U_Combining_Acute_Tone_Mark = 0x0341, // U+0341 Combining Acute Tone Mark + U_Combining_Greek_Perispomeni = 0x0342, // U+0342 Combining Greek Perispomeni + U_Combining_Greek_Koronis = 0x0343, // U+0343 Combining Greek Koronis + U_Combining_Greek_Dialytika_Tonos = 0x0344, // U+0344 Combining Greek Dialytika Tonos + U_Combining_Greek_Ypogegrammeni = 0x0345, // U+0345 Combining Greek Ypogegrammeni + U_Combining_Bridge_Above = 0x0346, // U+0346 Combining Bridge Above + U_Combining_Equals_Sign_Below = 0x0347, // U+0347 Combining Equals Sign Below + U_Combining_Double_Vertical_Line_Below = 0x0348, // U+0348 Combining Double Vertical Line Below + U_Combining_Left_Angle_Below = 0x0349, // U+0349 Combining Left Angle Below + U_Combining_Not_Tilde_Above = 0x034a, // U+034A Combining Not Tilde Above + U_Combining_Homothetic_Above = 0x034b, // U+034B Combining Homothetic Above + U_Combining_Almost_Equal_To_Above = 0x034c, // U+034C Combining Almost Equal To Above + U_Combining_Left_Right_Arrow_Below = 0x034d, // U+034D Combining Left Right Arrow Below + U_Combining_Upwards_Arrow_Below = 0x034e, // U+034E Combining Upwards Arrow Below + U_Combining_Grapheme_Joiner = 0x034f, // U+034F Combining Grapheme Joiner + U_Combining_Right_Arrowhead_Above = 0x0350, // U+0350 Combining Right Arrowhead Above + U_Combining_Left_Half_Ring_Above = 0x0351, // U+0351 Combining Left Half Ring Above + U_Combining_Fermata = 0x0352, // U+0352 Combining Fermata + U_Combining_X_Below = 0x0353, // U+0353 Combining X Below + U_Combining_Left_Arrowhead_Below = 0x0354, // U+0354 Combining Left Arrowhead Below + U_Combining_Right_Arrowhead_Below = 0x0355, // U+0355 Combining Right Arrowhead Below + U_Combining_Right_Arrowhead_And_Up_Arrowhead_Below = 0x0356, // U+0356 Combining Right Arrowhead And Up Arrowhead Below + U_Combining_Right_Half_Ring_Above = 0x0357, // U+0357 Combining Right Half Ring Above + U_Combining_Dot_Above_Right = 0x0358, // U+0358 Combining Dot Above Right + U_Combining_Asterisk_Below = 0x0359, // U+0359 Combining Asterisk Below + U_Combining_Double_Ring_Below = 0x035a, // U+035A Combining Double Ring Below + U_Combining_Zigzag_Above = 0x035b, // U+035B Combining Zigzag Above + U_Combining_Double_Breve_Below = 0x035c, // U+035C Combining Double Breve Below + U_Combining_Double_Breve = 0x035d, // U+035D Combining Double Breve + U_Combining_Double_Macron = 0x035e, // U+035E Combining Double Macron + U_Combining_Double_Macron_Below = 0x035f, // U+035F Combining Double Macron Below + U_Combining_Double_Tilde = 0x0360, // U+0360 Combining Double Tilde + U_Combining_Double_Inverted_Breve = 0x0361, // U+0361 Combining Double Inverted Breve + U_Combining_Double_Rightwards_Arrow_Below = 0x0362, // U+0362 Combining Double Rightwards Arrow Below + U_Combining_Latin_Small_Letter_A = 0x0363, // U+0363 Combining Latin Small Letter A + U_Combining_Latin_Small_Letter_E = 0x0364, // U+0364 Combining Latin Small Letter E + U_Combining_Latin_Small_Letter_I = 0x0365, // U+0365 Combining Latin Small Letter I + U_Combining_Latin_Small_Letter_O = 0x0366, // U+0366 Combining Latin Small Letter O + U_Combining_Latin_Small_Letter_U = 0x0367, // U+0367 Combining Latin Small Letter U + U_Combining_Latin_Small_Letter_C = 0x0368, // U+0368 Combining Latin Small Letter C + U_Combining_Latin_Small_Letter_D = 0x0369, // U+0369 Combining Latin Small Letter D + U_Combining_Latin_Small_Letter_H = 0x036a, // U+036A Combining Latin Small Letter H + U_Combining_Latin_Small_Letter_M = 0x036b, // U+036B Combining Latin Small Letter M + U_Combining_Latin_Small_Letter_R = 0x036c, // U+036C Combining Latin Small Letter R + U_Combining_Latin_Small_Letter_T = 0x036d, // U+036D Combining Latin Small Letter T + U_Combining_Latin_Small_Letter_V = 0x036e, // U+036E Combining Latin Small Letter V + U_Combining_Latin_Small_Letter_X = 0x036f, // U+036F Combining Latin Small Letter X + + /** + * Unicode Character 'LINE SEPARATOR' (U+2028) + * http://www.fileformat.info/info/unicode/char/2028/index.htm + */ + LINE_SEPARATOR_2028 = 8232, + + // http://www.fileformat.info/info/unicode/category/Sk/list.htm + U_CIRCUMFLEX = Caret, // U+005E CIRCUMFLEX + U_GRAVE_ACCENT = BackTick, // U+0060 GRAVE ACCENT + U_DIAERESIS = 0x00a8, // U+00A8 DIAERESIS + U_MACRON = 0x00af, // U+00AF MACRON + U_ACUTE_ACCENT = 0x00b4, // U+00B4 ACUTE ACCENT + U_CEDILLA = 0x00b8, // U+00B8 CEDILLA + U_MODIFIER_LETTER_LEFT_ARROWHEAD = 0x02c2, // U+02C2 MODIFIER LETTER LEFT ARROWHEAD + U_MODIFIER_LETTER_RIGHT_ARROWHEAD = 0x02c3, // U+02C3 MODIFIER LETTER RIGHT ARROWHEAD + U_MODIFIER_LETTER_UP_ARROWHEAD = 0x02c4, // U+02C4 MODIFIER LETTER UP ARROWHEAD + U_MODIFIER_LETTER_DOWN_ARROWHEAD = 0x02c5, // U+02C5 MODIFIER LETTER DOWN ARROWHEAD + U_MODIFIER_LETTER_CENTRED_RIGHT_HALF_RING = 0x02d2, // U+02D2 MODIFIER LETTER CENTRED RIGHT HALF RING + U_MODIFIER_LETTER_CENTRED_LEFT_HALF_RING = 0x02d3, // U+02D3 MODIFIER LETTER CENTRED LEFT HALF RING + U_MODIFIER_LETTER_UP_TACK = 0x02d4, // U+02D4 MODIFIER LETTER UP TACK + U_MODIFIER_LETTER_DOWN_TACK = 0x02d5, // U+02D5 MODIFIER LETTER DOWN TACK + U_MODIFIER_LETTER_PLUS_SIGN = 0x02d6, // U+02D6 MODIFIER LETTER PLUS SIGN + U_MODIFIER_LETTER_MINUS_SIGN = 0x02d7, // U+02D7 MODIFIER LETTER MINUS SIGN + U_BREVE = 0x02d8, // U+02D8 BREVE + U_DOT_ABOVE = 0x02d9, // U+02D9 DOT ABOVE + U_RING_ABOVE = 0x02da, // U+02DA RING ABOVE + U_OGONEK = 0x02db, // U+02DB OGONEK + U_SMALL_TILDE = 0x02dc, // U+02DC SMALL TILDE + U_DOUBLE_ACUTE_ACCENT = 0x02dd, // U+02DD DOUBLE ACUTE ACCENT + U_MODIFIER_LETTER_RHOTIC_HOOK = 0x02de, // U+02DE MODIFIER LETTER RHOTIC HOOK + U_MODIFIER_LETTER_CROSS_ACCENT = 0x02df, // U+02DF MODIFIER LETTER CROSS ACCENT + U_MODIFIER_LETTER_EXTRA_HIGH_TONE_BAR = 0x02e5, // U+02E5 MODIFIER LETTER EXTRA-HIGH TONE BAR + U_MODIFIER_LETTER_HIGH_TONE_BAR = 0x02e6, // U+02E6 MODIFIER LETTER HIGH TONE BAR + U_MODIFIER_LETTER_MID_TONE_BAR = 0x02e7, // U+02E7 MODIFIER LETTER MID TONE BAR + U_MODIFIER_LETTER_LOW_TONE_BAR = 0x02e8, // U+02E8 MODIFIER LETTER LOW TONE BAR + U_MODIFIER_LETTER_EXTRA_LOW_TONE_BAR = 0x02e9, // U+02E9 MODIFIER LETTER EXTRA-LOW TONE BAR + U_MODIFIER_LETTER_YIN_DEPARTING_TONE_MARK = 0x02ea, // U+02EA MODIFIER LETTER YIN DEPARTING TONE MARK + U_MODIFIER_LETTER_YANG_DEPARTING_TONE_MARK = 0x02eb, // U+02EB MODIFIER LETTER YANG DEPARTING TONE MARK + U_MODIFIER_LETTER_UNASPIRATED = 0x02ed, // U+02ED MODIFIER LETTER UNASPIRATED + U_MODIFIER_LETTER_LOW_DOWN_ARROWHEAD = 0x02ef, // U+02EF MODIFIER LETTER LOW DOWN ARROWHEAD + U_MODIFIER_LETTER_LOW_UP_ARROWHEAD = 0x02f0, // U+02F0 MODIFIER LETTER LOW UP ARROWHEAD + U_MODIFIER_LETTER_LOW_LEFT_ARROWHEAD = 0x02f1, // U+02F1 MODIFIER LETTER LOW LEFT ARROWHEAD + U_MODIFIER_LETTER_LOW_RIGHT_ARROWHEAD = 0x02f2, // U+02F2 MODIFIER LETTER LOW RIGHT ARROWHEAD + U_MODIFIER_LETTER_LOW_RING = 0x02f3, // U+02F3 MODIFIER LETTER LOW RING + U_MODIFIER_LETTER_MIDDLE_GRAVE_ACCENT = 0x02f4, // U+02F4 MODIFIER LETTER MIDDLE GRAVE ACCENT + U_MODIFIER_LETTER_MIDDLE_DOUBLE_GRAVE_ACCENT = 0x02f5, // U+02F5 MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT + U_MODIFIER_LETTER_MIDDLE_DOUBLE_ACUTE_ACCENT = 0x02f6, // U+02F6 MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT + U_MODIFIER_LETTER_LOW_TILDE = 0x02f7, // U+02F7 MODIFIER LETTER LOW TILDE + U_MODIFIER_LETTER_RAISED_COLON = 0x02f8, // U+02F8 MODIFIER LETTER RAISED COLON + U_MODIFIER_LETTER_BEGIN_HIGH_TONE = 0x02f9, // U+02F9 MODIFIER LETTER BEGIN HIGH TONE + U_MODIFIER_LETTER_END_HIGH_TONE = 0x02fa, // U+02FA MODIFIER LETTER END HIGH TONE + U_MODIFIER_LETTER_BEGIN_LOW_TONE = 0x02fb, // U+02FB MODIFIER LETTER BEGIN LOW TONE + U_MODIFIER_LETTER_END_LOW_TONE = 0x02fc, // U+02FC MODIFIER LETTER END LOW TONE + U_MODIFIER_LETTER_SHELF = 0x02fd, // U+02FD MODIFIER LETTER SHELF + U_MODIFIER_LETTER_OPEN_SHELF = 0x02fe, // U+02FE MODIFIER LETTER OPEN SHELF + U_MODIFIER_LETTER_LOW_LEFT_ARROW = 0x02ff, // U+02FF MODIFIER LETTER LOW LEFT ARROW + U_GREEK_LOWER_NUMERAL_SIGN = 0x0375, // U+0375 GREEK LOWER NUMERAL SIGN + U_GREEK_TONOS = 0x0384, // U+0384 GREEK TONOS + U_GREEK_DIALYTIKA_TONOS = 0x0385, // U+0385 GREEK DIALYTIKA TONOS + U_GREEK_KORONIS = 0x1fbd, // U+1FBD GREEK KORONIS + U_GREEK_PSILI = 0x1fbf, // U+1FBF GREEK PSILI + U_GREEK_PERISPOMENI = 0x1fc0, // U+1FC0 GREEK PERISPOMENI + U_GREEK_DIALYTIKA_AND_PERISPOMENI = 0x1fc1, // U+1FC1 GREEK DIALYTIKA AND PERISPOMENI + U_GREEK_PSILI_AND_VARIA = 0x1fcd, // U+1FCD GREEK PSILI AND VARIA + U_GREEK_PSILI_AND_OXIA = 0x1fce, // U+1FCE GREEK PSILI AND OXIA + U_GREEK_PSILI_AND_PERISPOMENI = 0x1fcf, // U+1FCF GREEK PSILI AND PERISPOMENI + U_GREEK_DASIA_AND_VARIA = 0x1fdd, // U+1FDD GREEK DASIA AND VARIA + U_GREEK_DASIA_AND_OXIA = 0x1fde, // U+1FDE GREEK DASIA AND OXIA + U_GREEK_DASIA_AND_PERISPOMENI = 0x1fdf, // U+1FDF GREEK DASIA AND PERISPOMENI + U_GREEK_DIALYTIKA_AND_VARIA = 0x1fed, // U+1FED GREEK DIALYTIKA AND VARIA + U_GREEK_DIALYTIKA_AND_OXIA = 0x1fee, // U+1FEE GREEK DIALYTIKA AND OXIA + U_GREEK_VARIA = 0x1fef, // U+1FEF GREEK VARIA + U_GREEK_OXIA = 0x1ffd, // U+1FFD GREEK OXIA + U_GREEK_DASIA = 0x1ffe, // U+1FFE GREEK DASIA + + U_OVERLINE = 0x203e, // Unicode Character 'OVERLINE' + + /** + * UTF-8 BOM + * Unicode Character 'ZERO WIDTH NO-BREAK SPACE' (U+FEFF) + * http://www.fileformat.info/info/unicode/char/feff/index.htm + */ + UTF8_BOM = 65279, +} diff --git a/src/test/mocks/vsc/extHostedTypes.ts b/src/test/mocks/vsc/extHostedTypes.ts new file mode 100644 index 0000000..f87b501 --- /dev/null +++ b/src/test/mocks/vsc/extHostedTypes.ts @@ -0,0 +1,2333 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable max-classes-per-file */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import { relative } from 'path'; +import * as vscode from 'vscode'; +import * as vscMockHtmlContent from './htmlContent'; +import * as vscMockStrings from './strings'; +import * as vscUri from './uri'; +import { generateUuid } from './uuid'; + +export enum NotebookCellKind { + Markup = 1, + Code = 2, +} + +export enum CellOutputKind { + Text = 1, + Error = 2, + Rich = 3, +} +export enum NotebookCellRunState { + Running = 1, + Idle = 2, + Success = 3, + Error = 4, +} + +export interface IRelativePattern { + base: string; + pattern: string; + pathToRelative(from: string, to: string): string; +} + +const illegalArgument = (msg = 'Illegal Argument') => new Error(msg); + +export class Disposable { + static from(...disposables: { dispose(): () => void }[]): Disposable { + return new Disposable(() => { + if (disposables) { + for (const disposable of disposables) { + if (disposable && typeof disposable.dispose === 'function') { + disposable.dispose(); + } + } + + disposables = []; + } + }); + } + + private _callOnDispose: (() => void) | undefined; + + constructor(callOnDispose: () => void) { + this._callOnDispose = callOnDispose; + } + + dispose(): void { + if (typeof this._callOnDispose === 'function') { + this._callOnDispose(); + this._callOnDispose = undefined; + } + } +} + +export class Position { + static Min(...positions: Position[]): Position { + let result = positions.pop(); + for (const p of positions) { + if (result && p.isBefore(result)) { + result = p; + } + } + return result || new Position(0, 0); + } + + static Max(...positions: Position[]): Position { + let result = positions.pop(); + for (const p of positions) { + if (result && p.isAfter(result)) { + result = p; + } + } + return result || new Position(0, 0); + } + + static isPosition(other: unknown): other is Position { + if (!other) { + return false; + } + if (other instanceof Position) { + return true; + } + const { line, character } = other; + if (typeof line === 'number' && typeof character === 'number') { + return true; + } + return false; + } + + private _line: number; + + private _character: number; + + get line(): number { + return this._line; + } + + get character(): number { + return this._character; + } + + constructor(line: number, character: number) { + if (line < 0) { + throw illegalArgument('line must be non-negative'); + } + if (character < 0) { + throw illegalArgument('character must be non-negative'); + } + this._line = line; + this._character = character; + } + + isBefore(other: Position): boolean { + if (this._line < other._line) { + return true; + } + if (other._line < this._line) { + return false; + } + return this._character < other._character; + } + + isBeforeOrEqual(other: Position): boolean { + if (this._line < other._line) { + return true; + } + if (other._line < this._line) { + return false; + } + return this._character <= other._character; + } + + isAfter(other: Position): boolean { + return !this.isBeforeOrEqual(other); + } + + isAfterOrEqual(other: Position): boolean { + return !this.isBefore(other); + } + + isEqual(other: Position): boolean { + return this._line === other._line && this._character === other._character; + } + + compareTo(other: Position): number { + if (this._line < other._line) { + return -1; + } + if (this._line > other.line) { + return 1; + } + // equal line + if (this._character < other._character) { + return -1; + } + if (this._character > other._character) { + return 1; + } + // equal line and character + return 0; + } + + translate(change: { lineDelta?: number; characterDelta?: number }): Position; + + translate(lineDelta?: number, characterDelta?: number): Position; + + translate( + lineDeltaOrChange: number | { lineDelta?: number; characterDelta?: number } | undefined, + characterDelta = 0, + ): Position { + if (lineDeltaOrChange === null || characterDelta === null) { + throw illegalArgument(); + } + + let lineDelta: number; + if (typeof lineDeltaOrChange === 'undefined') { + lineDelta = 0; + } else if (typeof lineDeltaOrChange === 'number') { + lineDelta = lineDeltaOrChange; + } else { + lineDelta = typeof lineDeltaOrChange.lineDelta === 'number' ? lineDeltaOrChange.lineDelta : 0; + characterDelta = + typeof lineDeltaOrChange.characterDelta === 'number' ? lineDeltaOrChange.characterDelta : 0; + } + + if (lineDelta === 0 && characterDelta === 0) { + return this; + } + return new Position(this.line + lineDelta, this.character + characterDelta); + } + + with(change: { line?: number; character?: number }): Position; + + with(line?: number, character?: number): Position; + + with( + lineOrChange: number | { line?: number; character?: number } | undefined, + character: number = this.character, + ): Position { + if (lineOrChange === null || character === null) { + throw illegalArgument(); + } + + let line: number; + if (typeof lineOrChange === 'undefined') { + line = this.line; + } else if (typeof lineOrChange === 'number') { + line = lineOrChange; + } else { + line = typeof lineOrChange.line === 'number' ? lineOrChange.line : this.line; + character = typeof lineOrChange.character === 'number' ? lineOrChange.character : this.character; + } + + if (line === this.line && character === this.character) { + return this; + } + return new Position(line, character); + } + + toJSON(): { line: number; character: number } { + return { line: this.line, character: this.character }; + } +} + +export class Range { + static isRange(thing: unknown): thing is vscode.Range { + if (thing instanceof Range) { + return true; + } + if (!thing) { + return false; + } + return Position.isPosition((thing as Range).start) && Position.isPosition((thing as Range).end); + } + + protected _start: Position; + + protected _end: Position; + + get start(): Position { + return this._start; + } + + get end(): Position { + return this._end; + } + + constructor(start: Position, end: Position); + + constructor(startLine: number, startColumn: number, endLine: number, endColumn: number); + + constructor( + startLineOrStart: number | Position, + startColumnOrEnd: number | Position, + endLine?: number, + endColumn?: number, + ) { + let start: Position | undefined; + let end: Position | undefined; + + if ( + typeof startLineOrStart === 'number' && + typeof startColumnOrEnd === 'number' && + typeof endLine === 'number' && + typeof endColumn === 'number' + ) { + start = new Position(startLineOrStart, startColumnOrEnd); + end = new Position(endLine, endColumn); + } else if (startLineOrStart instanceof Position && startColumnOrEnd instanceof Position) { + start = startLineOrStart; + end = startColumnOrEnd; + } + + if (!start || !end) { + throw new Error('Invalid arguments'); + } + + if (start.isBefore(end)) { + this._start = start; + this._end = end; + } else { + this._start = end; + this._end = start; + } + } + + contains(positionOrRange: Position | Range): boolean { + if (positionOrRange instanceof Range) { + return this.contains(positionOrRange._start) && this.contains(positionOrRange._end); + } + if (positionOrRange instanceof Position) { + if (positionOrRange.isBefore(this._start)) { + return false; + } + if (this._end.isBefore(positionOrRange)) { + return false; + } + return true; + } + return false; + } + + isEqual(other: Range): boolean { + return this._start.isEqual(other._start) && this._end.isEqual(other._end); + } + + intersection(other: Range): Range | undefined { + const start = Position.Max(other.start, this._start); + const end = Position.Min(other.end, this._end); + if (start.isAfter(end)) { + // this happens when there is no overlap: + // |-----| + // |----| + return undefined; + } + return new Range(start, end); + } + + union(other: Range): Range { + if (this.contains(other)) { + return this; + } + if (other.contains(this)) { + return other; + } + const start = Position.Min(other.start, this._start); + const end = Position.Max(other.end, this.end); + return new Range(start, end); + } + + get isEmpty(): boolean { + return this._start.isEqual(this._end); + } + + get isSingleLine(): boolean { + return this._start.line === this._end.line; + } + + with(change: { start?: Position; end?: Position }): Range; + + with(start?: Position, end?: Position): Range; + + with(startOrChange: Position | { start?: Position; end?: Position } | undefined, end: Position = this.end): Range { + if (startOrChange === null || end === null) { + throw illegalArgument(); + } + + let start: Position; + if (!startOrChange) { + start = this.start; + } else if (Position.isPosition(startOrChange)) { + start = startOrChange; + } else { + start = startOrChange.start || this.start; + end = startOrChange.end || this.end; + } + + if (start.isEqual(this._start) && end.isEqual(this.end)) { + return this; + } + return new Range(start, end); + } + + toJSON(): [Position, Position] { + return [this.start, this.end]; + } +} + +export class Selection extends Range { + static isSelection(thing: unknown): thing is Selection { + if (thing instanceof Selection) { + return true; + } + if (!thing) { + return false; + } + return ( + Range.isRange(thing) && + Position.isPosition((thing).anchor) && + Position.isPosition((thing).active) && + typeof (thing).isReversed === 'boolean' + ); + } + + private _anchor: Position; + + public get anchor(): Position { + return this._anchor; + } + + private _active: Position; + + public get active(): Position { + return this._active; + } + + constructor(anchor: Position, active: Position); + + constructor(anchorLine: number, anchorColumn: number, activeLine: number, activeColumn: number); + + constructor( + anchorLineOrAnchor: number | Position, + anchorColumnOrActive: number | Position, + activeLine?: number, + activeColumn?: number, + ) { + let anchor: Position | undefined; + let active: Position | undefined; + + if ( + typeof anchorLineOrAnchor === 'number' && + typeof anchorColumnOrActive === 'number' && + typeof activeLine === 'number' && + typeof activeColumn === 'number' + ) { + anchor = new Position(anchorLineOrAnchor, anchorColumnOrActive); + active = new Position(activeLine, activeColumn); + } else if (anchorLineOrAnchor instanceof Position && anchorColumnOrActive instanceof Position) { + anchor = anchorLineOrAnchor; + active = anchorColumnOrActive; + } + + if (!anchor || !active) { + throw new Error('Invalid arguments'); + } + + super(anchor, active); + + this._anchor = anchor; + this._active = active; + } + + get isReversed(): boolean { + return this._anchor === this._end; + } + + toJSON(): [Position, Position] { + return ({ + start: this.start, + end: this.end, + active: this.active, + anchor: this.anchor, + } as unknown) as [Position, Position]; + } +} + +export enum EndOfLine { + LF = 1, + CRLF = 2, +} + +export class TextEdit { + static isTextEdit(thing: unknown): thing is TextEdit { + if (thing instanceof TextEdit) { + return true; + } + if (!thing) { + return false; + } + return Range.isRange(thing) && typeof (thing).newText === 'string'; + } + + static replace(range: Range, newText: string): TextEdit { + return new TextEdit(range, newText); + } + + static insert(position: Position, newText: string): TextEdit { + return TextEdit.replace(new Range(position, position), newText); + } + + static delete(range: Range): TextEdit { + return TextEdit.replace(range, ''); + } + + static setEndOfLine(eol: EndOfLine): TextEdit { + const ret = new TextEdit(new Range(new Position(0, 0), new Position(0, 0)), ''); + ret.newEol = eol; + return ret; + } + + _range: Range = new Range(new Position(0, 0), new Position(0, 0)); + + newText = ''; + + _newEol: EndOfLine = EndOfLine.LF; + + get range(): Range { + return this._range; + } + + set range(value: Range) { + if (value && !Range.isRange(value)) { + throw illegalArgument('range'); + } + this._range = value; + } + + get newEol(): EndOfLine { + return this._newEol; + } + + set newEol(value: EndOfLine) { + if (value && typeof value !== 'number') { + throw illegalArgument('newEol'); + } + this._newEol = value; + } + + constructor(range: Range, newText: string) { + this.range = range; + this.newText = newText; + } +} + +export class WorkspaceEdit implements vscode.WorkspaceEdit { + // eslint-disable-next-line class-methods-use-this + appendNotebookCellOutput( + _uri: vscode.Uri, + _index: number, + _outputs: vscode.NotebookCellOutput[], + _metadata?: vscode.WorkspaceEditEntryMetadata, + ): void { + // Noop. + } + + // eslint-disable-next-line class-methods-use-this + replaceNotebookCellOutputItems( + _uri: vscode.Uri, + _index: number, + _outputId: string, + _items: vscode.NotebookCellOutputItem[], + _metadata?: vscode.WorkspaceEditEntryMetadata, + ): void { + // Noop. + } + + // eslint-disable-next-line class-methods-use-this + appendNotebookCellOutputItems( + _uri: vscode.Uri, + _index: number, + _outputId: string, + _items: vscode.NotebookCellOutputItem[], + _metadata?: vscode.WorkspaceEditEntryMetadata, + ): void { + // Noop. + } + + // eslint-disable-next-line class-methods-use-this + replaceNotebookCells( + _uri: vscode.Uri, + _start: number, + _end: number, + _cells: vscode.NotebookCellData[], + _metadata?: vscode.WorkspaceEditEntryMetadata, + ): void { + // Noop. + } + + // eslint-disable-next-line class-methods-use-this + replaceNotebookCellOutput( + _uri: vscode.Uri, + _index: number, + _outputs: vscode.NotebookCellOutput[], + _metadata?: vscode.WorkspaceEditEntryMetadata, + ): void { + // Noop. + } + + private _seqPool = 0; + + private _resourceEdits: { seq: number; from: vscUri.URI; to: vscUri.URI }[] = []; + + private _textEdits = new Map(); + + // createResource(uri: vscode.Uri): void { + // this.renameResource(undefined, uri); + // } + + // deleteResource(uri: vscode.Uri): void { + // this.renameResource(uri, undefined); + // } + + // renameResource(from: vscode.Uri, to: vscode.Uri): void { + // this._resourceEdits.push({ seq: this._seqPool+= 1, from, to }); + // } + + // resourceEdits(): [vscode.Uri, vscode.Uri][] { + // return this._resourceEdits.map(({ from, to }) => (<[vscode.Uri, vscode.Uri]>[from, to])); + // } + + // eslint-disable-next-line class-methods-use-this + createFile(_uri: vscode.Uri, _options?: { overwrite?: boolean; ignoreIfExists?: boolean }): void { + throw new Error('Method not implemented.'); + } + + // eslint-disable-next-line class-methods-use-this + deleteFile(_uri: vscode.Uri, _options?: { recursive?: boolean; ignoreIfNotExists?: boolean }): void { + throw new Error('Method not implemented.'); + } + + // eslint-disable-next-line class-methods-use-this + renameFile( + _oldUri: vscode.Uri, + _newUri: vscode.Uri, + _options?: { overwrite?: boolean; ignoreIfExists?: boolean }, + ): void { + throw new Error('Method not implemented.'); + } + + replace(uri: vscUri.URI, range: Range, newText: string): void { + const edit = new TextEdit(range, newText); + let array = this.get(uri); + if (array) { + array.push(edit); + } else { + array = [edit]; + } + this.set(uri, array); + } + + insert(resource: vscUri.URI, position: Position, newText: string): void { + this.replace(resource, new Range(position, position), newText); + } + + delete(resource: vscUri.URI, range: Range): void { + this.replace(resource, range, ''); + } + + has(uri: vscUri.URI): boolean { + return this._textEdits.has(uri.toString()); + } + + set(uri: vscUri.URI, edits: readonly unknown[]): void { + let data = this._textEdits.get(uri.toString()); + if (!data) { + data = { seq: this._seqPool += 1, uri, edits: [] }; + this._textEdits.set(uri.toString(), data); + } + if (!edits) { + data.edits = []; + } else { + data.edits = edits.slice(0) as TextEdit[]; + } + } + + get(uri: vscUri.URI): TextEdit[] { + if (!this._textEdits.has(uri.toString())) { + return []; + } + const { edits } = this._textEdits.get(uri.toString()) || {}; + return edits ? edits.slice() : []; + } + + entries(): [vscUri.URI, TextEdit[]][] { + const res: [vscUri.URI, TextEdit[]][] = []; + this._textEdits.forEach((value) => res.push([value.uri, value.edits])); + return res.slice(); + } + + allEntries(): ([vscUri.URI, TextEdit[]] | [vscUri.URI, vscUri.URI])[] { + return this.entries(); + // // use the 'seq' the we have assigned when inserting + // // the operation and use that order in the resulting + // // array + // const res: ([vscUri.URI, TextEdit[]] | [vscUri.URI,vscUri.URI])[] = []; + // this._textEdits.forEach(value => { + // const { seq, uri, edits } = value; + // res[seq] = [uri, edits]; + // }); + // this._resourceEdits.forEach(value => { + // const { seq, from, to } = value; + // res[seq] = [from, to]; + // }); + // return res; + } + + get size(): number { + return this._textEdits.size + this._resourceEdits.length; + } + + toJSON(): [vscUri.URI, TextEdit[]][] { + return this.entries(); + } +} + +export class SnippetString { + static isSnippetString(thing: unknown): thing is SnippetString { + if (thing instanceof SnippetString) { + return true; + } + if (!thing) { + return false; + } + return typeof (thing).value === 'string'; + } + + private static _escape(value: string): string { + return value.replace(/\$|}|\\/g, '\\$&'); + } + + private _tabstop = 1; + + value: string; + + constructor(value?: string) { + this.value = value || ''; + } + + appendText(string: string): SnippetString { + this.value += SnippetString._escape(string); + return this; + } + + appendTabstop(number: number = (this._tabstop += 1)): SnippetString { + this.value += '$'; + this.value += number; + return this; + } + + appendPlaceholder( + value: string | ((snippet: SnippetString) => void), + number: number = (this._tabstop += 1), + ): SnippetString { + if (typeof value === 'function') { + const nested = new SnippetString(); + nested._tabstop = this._tabstop; + value(nested); + this._tabstop = nested._tabstop; + value = nested.value; + } else { + value = SnippetString._escape(value); + } + + this.value += '${'; + this.value += number; + this.value += ':'; + this.value += value; + this.value += '}'; + + return this; + } + + appendChoice(values: string[], number: number = (this._tabstop += 1)): SnippetString { + const value = SnippetString._escape(values.toString()); + + this.value += '${'; + this.value += number; + this.value += '|'; + this.value += value; + this.value += '|}'; + + return this; + } + + appendVariable(name: string, defaultValue?: string | ((snippet: SnippetString) => void)): SnippetString { + if (typeof defaultValue === 'function') { + const nested = new SnippetString(); + nested._tabstop = this._tabstop; + defaultValue(nested); + this._tabstop = nested._tabstop; + defaultValue = nested.value; + } else if (typeof defaultValue === 'string') { + defaultValue = defaultValue.replace(/\$|}/g, '\\$&'); // CodeQL [SM02383] don't escape backslashes here (by design) + } + + this.value += '${'; + this.value += name; + if (defaultValue) { + this.value += ':'; + this.value += defaultValue; + } + this.value += '}'; + + return this; + } +} + +export enum DiagnosticTag { + Unnecessary = 1, +} + +export enum DiagnosticSeverity { + Hint = 3, + Information = 2, + Warning = 1, + Error = 0, +} + +export class Location { + static isLocation(thing: unknown): thing is Location { + if (thing instanceof Location) { + return true; + } + if (!thing) { + return false; + } + return Range.isRange((thing).range) && vscUri.URI.isUri((thing).uri); + } + + uri: vscUri.URI; + + range: Range = new Range(new Position(0, 0), new Position(0, 0)); + + constructor(uri: vscUri.URI, rangeOrPosition: Range | Position) { + this.uri = uri; + + if (!rangeOrPosition) { + // that's OK + } else if (rangeOrPosition instanceof Range) { + this.range = rangeOrPosition; + } else if (rangeOrPosition instanceof Position) { + this.range = new Range(rangeOrPosition, rangeOrPosition); + } else { + throw new Error('Illegal argument'); + } + } + + toJSON(): { uri: vscUri.URI; range: Range } { + return { + uri: this.uri, + range: this.range, + }; + } +} + +export class DiagnosticRelatedInformation { + static is(thing: unknown): thing is DiagnosticRelatedInformation { + if (!thing) { + return false; + } + return ( + typeof (thing).message === 'string' && + (thing).location && + Range.isRange((thing).location.range) && + vscUri.URI.isUri((thing).location.uri) + ); + } + + location: Location; + + message: string; + + constructor(location: Location, message: string) { + this.location = location; + this.message = message; + } +} + +export class Diagnostic { + range: Range; + + message: string; + + source = ''; + + code: string | number = ''; + + severity: DiagnosticSeverity; + + relatedInformation: DiagnosticRelatedInformation[] = []; + + customTags?: DiagnosticTag[]; + + constructor(range: Range, message: string, severity: DiagnosticSeverity = DiagnosticSeverity.Error) { + this.range = range; + this.message = message; + this.severity = severity; + } + + toJSON(): { severity: DiagnosticSeverity; message: string; range: Range; source: string; code: string | number } { + return { + severity: (DiagnosticSeverity[this.severity] as unknown) as DiagnosticSeverity, + message: this.message, + range: this.range, + source: this.source, + code: this.code, + }; + } +} + +export class Hover { + public contents: vscode.MarkdownString[]; + + public range: Range; + + constructor(contents: vscode.MarkdownString | vscode.MarkdownString[], range?: Range) { + if (!contents) { + throw new Error('Illegal argument, contents must be defined'); + } + if (Array.isArray(contents)) { + this.contents = contents; + } else if (vscMockHtmlContent.isMarkdownString(contents)) { + this.contents = [contents]; + } else { + this.contents = [contents]; + } + + this.range = range || new Range(new Position(0, 0), new Position(0, 0)); + } +} + +export enum DocumentHighlightKind { + Text = 0, + Read = 1, + Write = 2, +} + +export class DocumentHighlight { + range: Range; + + kind: DocumentHighlightKind; + + constructor(range: Range, kind: DocumentHighlightKind = DocumentHighlightKind.Text) { + this.range = range; + this.kind = kind; + } + + toJSON(): { range: Range; kind: DocumentHighlightKind } { + return { + range: this.range, + kind: (DocumentHighlightKind[this.kind] as unknown) as DocumentHighlightKind, + }; + } +} + +export enum SymbolKind { + File = 0, + Module = 1, + Namespace = 2, + Package = 3, + Class = 4, + Method = 5, + Property = 6, + Field = 7, + Constructor = 8, + Enum = 9, + Interface = 10, + Function = 11, + Variable = 12, + Constant = 13, + String = 14, + Number = 15, + Boolean = 16, + Array = 17, + Object = 18, + Key = 19, + Null = 20, + EnumMember = 21, + Struct = 22, + Event = 23, + Operator = 24, + TypeParameter = 25, +} + +export class SymbolInformation { + name: string; + + location: Location = new Location( + vscUri.URI.parse('testLocation'), + new Range(new Position(0, 0), new Position(0, 0)), + ); + + kind: SymbolKind; + + containerName: string; + + constructor(name: string, kind: SymbolKind, containerName: string, location: Location); + + constructor(name: string, kind: SymbolKind, range: Range, uri?: vscUri.URI, containerName?: string); + + constructor( + name: string, + kind: SymbolKind, + rangeOrContainer: string | Range, + locationOrUri?: Location | vscUri.URI, + containerName?: string, + ) { + this.name = name; + this.kind = kind; + this.containerName = containerName || ''; + + if (typeof rangeOrContainer === 'string') { + this.containerName = rangeOrContainer; + } + + if (locationOrUri instanceof Location) { + this.location = locationOrUri; + } else if (rangeOrContainer instanceof Range) { + this.location = new Location(locationOrUri as vscUri.URI, rangeOrContainer); + } + } + + toJSON(): { name: string; kind: SymbolKind; location: Location; containerName: string } { + return { + name: this.name, + kind: (SymbolKind[this.kind] as unknown) as SymbolKind, + location: this.location, + containerName: this.containerName, + }; + } +} + +export class SymbolInformation2 extends SymbolInformation { + definingRange: Range; + + children: SymbolInformation2[]; + + constructor(name: string, kind: SymbolKind, containerName: string, location: Location) { + super(name, kind, containerName, location); + + this.children = []; + this.definingRange = location.range; + } +} + +export enum CodeActionTrigger { + Automatic = 1, + Manual = 2, +} + +export class CodeAction { + title: string; + + command?: vscode.Command; + + edit?: WorkspaceEdit; + + dianostics?: Diagnostic[]; + + kind?: CodeActionKind; + + constructor(title: string, kind?: CodeActionKind) { + this.title = title; + this.kind = kind; + } +} + +export class CodeActionKind { + private static readonly sep = '.'; + + public static readonly Empty = new CodeActionKind(''); + + public static readonly QuickFix = CodeActionKind.Empty.append('quickfix'); + + public static readonly Refactor = CodeActionKind.Empty.append('refactor'); + + public static readonly RefactorExtract = CodeActionKind.Refactor.append('extract'); + + public static readonly RefactorInline = CodeActionKind.Refactor.append('inline'); + + public static readonly RefactorRewrite = CodeActionKind.Refactor.append('rewrite'); + + public static readonly Source = CodeActionKind.Empty.append('source'); + + public static readonly SourceOrganizeImports = CodeActionKind.Source.append('organizeImports'); + + constructor(public readonly value: string) {} + + public append(parts: string): CodeActionKind { + return new CodeActionKind(this.value ? this.value + CodeActionKind.sep + parts : parts); + } + + public contains(other: CodeActionKind): boolean { + return this.value === other.value || vscMockStrings.startsWith(other.value, this.value + CodeActionKind.sep); + } +} + +export class CodeLens { + range: Range; + + command: vscode.Command | undefined; + + constructor(range: Range, command?: vscode.Command) { + this.range = range; + this.command = command; + } + + get isResolved(): boolean { + return !!this.command; + } +} + +export class MarkdownString { + value: string; + + isTrusted?: boolean; + + constructor(value?: string) { + this.value = value || ''; + } + + appendText(value: string): MarkdownString { + // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash + this.value += value.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&'); + return this; + } + + appendMarkdown(value: string): MarkdownString { + this.value += value; + return this; + } + + appendCodeblock(code: string, language = ''): MarkdownString { + this.value += '\n```'; + this.value += language; + this.value += '\n'; + this.value += code; + this.value += '\n```\n'; + return this; + } +} + +export class ParameterInformation { + label: string; + + documentation?: string | MarkdownString; + + constructor(label: string, documentation?: string | MarkdownString) { + this.label = label; + this.documentation = documentation; + } +} + +export class SignatureInformation { + label: string; + + documentation?: string | MarkdownString; + + parameters: ParameterInformation[]; + + constructor(label: string, documentation?: string | MarkdownString) { + this.label = label; + this.documentation = documentation; + this.parameters = []; + } +} + +export class SignatureHelp { + signatures: SignatureInformation[]; + + activeSignature: number; + + activeParameter: number; + + constructor() { + this.signatures = []; + this.activeSignature = -1; + this.activeParameter = -1; + } +} + +export enum CompletionTriggerKind { + Invoke = 0, + TriggerCharacter = 1, + TriggerForIncompleteCompletions = 2, +} + +export interface CompletionContext { + triggerKind: CompletionTriggerKind; + triggerCharacter: string; +} + +export enum CompletionItemKind { + Text = 0, + Method = 1, + Function = 2, + Constructor = 3, + Field = 4, + Variable = 5, + Class = 6, + Interface = 7, + Module = 8, + Property = 9, + Unit = 10, + Value = 11, + Enum = 12, + Keyword = 13, + Snippet = 14, + Color = 15, + File = 16, + Reference = 17, + Folder = 18, + EnumMember = 19, + Constant = 20, + Struct = 21, + Event = 22, + Operator = 23, + TypeParameter = 24, + User = 25, + Issue = 26, +} + +export enum CompletionItemTag { + Deprecated = 1, +} + +export interface CompletionItemLabel { + name: string; + signature?: string; + qualifier?: string; + type?: string; +} + +export class CompletionItem { + label: string; + + label2?: CompletionItemLabel; + + kind?: CompletionItemKind; + + tags?: CompletionItemTag[]; + + detail?: string; + + documentation?: string | MarkdownString; + + sortText?: string; + + filterText?: string; + + preselect?: boolean; + + insertText?: string | SnippetString; + + keepWhitespace?: boolean; + + range?: Range; + + commitCharacters?: string[]; + + textEdit?: TextEdit; + + additionalTextEdits?: TextEdit[]; + + command?: vscode.Command; + + constructor(label: string, kind?: CompletionItemKind) { + this.label = label; + this.kind = kind; + } + + toJSON(): { + label: string; + label2?: CompletionItemLabel; + kind?: CompletionItemKind; + detail?: string; + documentation?: string | MarkdownString; + sortText?: string; + filterText?: string; + preselect?: boolean; + insertText?: string | SnippetString; + textEdit?: TextEdit; + } { + return { + label: this.label, + label2: this.label2, + kind: this.kind && ((CompletionItemKind[this.kind] as unknown) as CompletionItemKind), + detail: this.detail, + documentation: this.documentation, + sortText: this.sortText, + filterText: this.filterText, + preselect: this.preselect, + insertText: this.insertText, + textEdit: this.textEdit, + }; + } +} + +export class CompletionList { + isIncomplete?: boolean; + + items: vscode.CompletionItem[]; + + constructor(items: vscode.CompletionItem[] = [], isIncomplete = false) { + this.items = items; + this.isIncomplete = isIncomplete; + } +} + +export class CallHierarchyItem { + name: string; + + kind: SymbolKind; + + tags?: ReadonlyArray; + + detail?: string; + + uri: vscode.Uri; + + range: vscode.Range; + + selectionRange: vscode.Range; + + constructor( + kind: vscode.SymbolKind, + name: string, + detail: string, + uri: vscode.Uri, + range: vscode.Range, + selectionRange: vscode.Range, + ) { + this.kind = kind; + this.name = name; + this.detail = detail; + this.uri = uri; + this.range = range; + this.selectionRange = selectionRange; + } +} + +export enum ViewColumn { + Active = -1, + Beside = -2, + One = 1, + Two = 2, + Three = 3, + Four = 4, + Five = 5, + Six = 6, + Seven = 7, + Eight = 8, + Nine = 9, +} + +export enum StatusBarAlignment { + Left = 1, + Right = 2, +} + +export enum TextEditorLineNumbersStyle { + Off = 0, + On = 1, + Relative = 2, +} + +export enum TextDocumentSaveReason { + Manual = 1, + AfterDelay = 2, + FocusOut = 3, +} + +export enum TextEditorRevealType { + Default = 0, + InCenter = 1, + InCenterIfOutsideViewport = 2, + AtTop = 3, +} + +// eslint-disable-next-line import/export +export enum TextEditorSelectionChangeKind { + Keyboard = 1, + Mouse = 2, + Command = 3, +} + +/** + * These values match very carefully the values of `TrackedRangeStickiness` + */ +export enum DecorationRangeBehavior { + /** + * TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges + */ + OpenOpen = 0, + /** + * TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges + */ + ClosedClosed = 1, + /** + * TrackedRangeStickiness.GrowsOnlyWhenTypingBefore + */ + OpenClosed = 2, + /** + * TrackedRangeStickiness.GrowsOnlyWhenTypingAfter + */ + ClosedOpen = 3, +} + +// eslint-disable-next-line import/export, @typescript-eslint/no-namespace +export namespace TextEditorSelectionChangeKind { + export function fromValue(s: string): TextEditorSelectionChangeKind | undefined { + switch (s) { + case 'keyboard': + return TextEditorSelectionChangeKind.Keyboard; + case 'mouse': + return TextEditorSelectionChangeKind.Mouse; + case 'api': + return TextEditorSelectionChangeKind.Command; + default: + return undefined; + } + } +} + +export class DocumentLink { + range: Range; + + target: vscUri.URI; + + constructor(range: Range, target: vscUri.URI) { + if (target && !(target instanceof vscUri.URI)) { + throw illegalArgument('target'); + } + if (!Range.isRange(range) || range.isEmpty) { + throw illegalArgument('range'); + } + this.range = range; + this.target = target; + } +} + +export class Color { + readonly red: number; + + readonly green: number; + + readonly blue: number; + + readonly alpha: number; + + constructor(red: number, green: number, blue: number, alpha: number) { + this.red = red; + this.green = green; + this.blue = blue; + this.alpha = alpha; + } +} + +export type IColorFormat = string | { opaque: string; transparent: string }; + +export class ColorInformation { + range: Range; + + color: Color; + + constructor(range: Range, color: Color) { + if (color && !(color instanceof Color)) { + throw illegalArgument('color'); + } + if (!Range.isRange(range) || range.isEmpty) { + throw illegalArgument('range'); + } + this.range = range; + this.color = color; + } +} + +export class ColorPresentation { + label: string; + + textEdit?: TextEdit; + + additionalTextEdits?: TextEdit[]; + + constructor(label: string) { + if (!label || typeof label !== 'string') { + throw illegalArgument('label'); + } + this.label = label; + } +} + +export enum ColorFormat { + RGB = 0, + HEX = 1, + HSL = 2, +} + +export enum SourceControlInputBoxValidationType { + Error = 0, + Warning = 1, + Information = 2, +} + +export enum TaskRevealKind { + Always = 1, + + Silent = 2, + + Never = 3, +} + +export enum TaskPanelKind { + Shared = 1, + + Dedicated = 2, + + New = 3, +} + +export class TaskGroup implements vscode.TaskGroup { + private _id: string; + + public isDefault = undefined; + + public static Clean: TaskGroup = new TaskGroup('clean', 'Clean'); + + public static Build: TaskGroup = new TaskGroup('build', 'Build'); + + public static Rebuild: TaskGroup = new TaskGroup('rebuild', 'Rebuild'); + + public static Test: TaskGroup = new TaskGroup('test', 'Test'); + + public static from(value: string): TaskGroup | undefined { + switch (value) { + case 'clean': + return TaskGroup.Clean; + case 'build': + return TaskGroup.Build; + case 'rebuild': + return TaskGroup.Rebuild; + case 'test': + return TaskGroup.Test; + default: + return undefined; + } + } + + constructor(id: string, _label: string) { + if (typeof id !== 'string') { + throw illegalArgument('name'); + } + if (typeof _label !== 'string') { + throw illegalArgument('name'); + } + this._id = id; + } + + get id(): string { + return this._id; + } +} + +export class ProcessExecution implements vscode.ProcessExecution { + private _process: string; + + private _args: string[] | undefined; + + private _options: vscode.ProcessExecutionOptions | undefined; + + constructor(process: string, options?: vscode.ProcessExecutionOptions); + + constructor(process: string, args: string[], options?: vscode.ProcessExecutionOptions); + + constructor( + process: string, + varg1?: string[] | vscode.ProcessExecutionOptions, + varg2?: vscode.ProcessExecutionOptions, + ) { + if (typeof process !== 'string') { + throw illegalArgument('process'); + } + this._process = process; + if (varg1) { + if (Array.isArray(varg1)) { + this._args = varg1; + this._options = varg2; + } else { + this._options = varg1; + } + } + + if (this._args === undefined) { + this._args = []; + } + } + + get process(): string { + return this._process; + } + + set process(value: string) { + if (typeof value !== 'string') { + throw illegalArgument('process'); + } + this._process = value; + } + + get args(): string[] { + return this._args || []; + } + + set args(value: string[]) { + if (!Array.isArray(value)) { + value = []; + } + this._args = value; + } + + get options(): vscode.ProcessExecutionOptions { + return this._options || {}; + } + + set options(value: vscode.ProcessExecutionOptions) { + this._options = value; + } + + // eslint-disable-next-line class-methods-use-this + public computeId(): string { + // const hash = crypto.createHash('md5'); + // hash.update('process'); + // if (this._process !== void 0) { + // hash.update(this._process); + // } + // if (this._args && this._args.length > 0) { + // for (let arg of this._args) { + // hash.update(arg); + // } + // } + // return hash.digest('hex'); + throw new Error('Not supported'); + } +} + +export class ShellExecution implements vscode.ShellExecution { + private _commandLine = ''; + + private _command: string | vscode.ShellQuotedString = ''; + + private _args: (string | vscode.ShellQuotedString)[] = []; + + private _options: vscode.ShellExecutionOptions | undefined; + + constructor(commandLine: string, options?: vscode.ShellExecutionOptions); + + constructor( + command: string | vscode.ShellQuotedString, + args: (string | vscode.ShellQuotedString)[], + options?: vscode.ShellExecutionOptions, + ); + + constructor( + arg0: string | vscode.ShellQuotedString, + arg1?: vscode.ShellExecutionOptions | (string | vscode.ShellQuotedString)[], + arg2?: vscode.ShellExecutionOptions, + ) { + if (Array.isArray(arg1)) { + if (!arg0) { + throw illegalArgument("command can't be undefined or null"); + } + if (typeof arg0 !== 'string' && typeof arg0.value !== 'string') { + throw illegalArgument('command'); + } + this._command = arg0; + this._args = arg1 as (string | vscode.ShellQuotedString)[]; + this._options = arg2; + } else { + if (typeof arg0 !== 'string') { + throw illegalArgument('commandLine'); + } + this._commandLine = arg0; + this._options = arg1; + } + } + + get commandLine(): string { + return this._commandLine; + } + + set commandLine(value: string) { + if (typeof value !== 'string') { + throw illegalArgument('commandLine'); + } + this._commandLine = value; + } + + get command(): string | vscode.ShellQuotedString { + return this._command; + } + + set command(value: string | vscode.ShellQuotedString) { + if (typeof value !== 'string' && typeof value.value !== 'string') { + throw illegalArgument('command'); + } + this._command = value; + } + + get args(): (string | vscode.ShellQuotedString)[] { + return this._args; + } + + set args(value: (string | vscode.ShellQuotedString)[]) { + this._args = value || []; + } + + get options(): vscode.ShellExecutionOptions { + return this._options || {}; + } + + set options(value: vscode.ShellExecutionOptions) { + this._options = value; + } + + // eslint-disable-next-line class-methods-use-this + public computeId(): string { + // const hash = crypto.createHash('md5'); + // hash.update('shell'); + // if (this._commandLine !== void 0) { + // hash.update(this._commandLine); + // } + // if (this._command !== void 0) { + // hash.update(typeof this._command === 'string' ? this._command : this._command.value); + // } + // if (this._args && this._args.length > 0) { + // for (let arg of this._args) { + // hash.update(typeof arg === 'string' ? arg : arg.value); + // } + // } + // return hash.digest('hex'); + throw new Error('Not spported'); + } +} + +export enum ShellQuoting { + Escape = 1, + Strong = 2, + Weak = 3, +} + +export enum TaskScope { + Global = 1, + Workspace = 2, +} + +export class Task implements vscode.Task { + private static ProcessType = 'process'; + + private static ShellType = 'shell'; + + private static EmptyType = '$empty'; + + private __id: string | undefined; + + private _definition!: vscode.TaskDefinition; + + private _scope: vscode.TaskScope.Global | vscode.TaskScope.Workspace | vscode.WorkspaceFolder | undefined; + + private _name!: string; + + private _execution: ProcessExecution | ShellExecution | undefined; + + private _problemMatchers: string[]; + + private _hasDefinedMatchers: boolean; + + private _isBackground: boolean; + + private _source!: string; + + private _group: TaskGroup | undefined; + + private _presentationOptions: vscode.TaskPresentationOptions; + + private _runOptions: vscode.RunOptions; + + constructor( + definition: vscode.TaskDefinition, + name: string, + source: string, + execution?: ProcessExecution | ShellExecution, + problemMatchers?: string | string[], + ); + + constructor( + definition: vscode.TaskDefinition, + scope: vscode.TaskScope.Global | vscode.TaskScope.Workspace | vscode.WorkspaceFolder, + name: string, + source: string, + execution?: ProcessExecution | ShellExecution, + problemMatchers?: string | string[], + ); + + constructor( + definition: vscode.TaskDefinition, + arg2: string | (vscode.TaskScope.Global | vscode.TaskScope.Workspace) | vscode.WorkspaceFolder, + arg3: string, + arg4?: string | ProcessExecution | ShellExecution, + arg5?: ProcessExecution | ShellExecution | string | string[], + arg6?: string | string[], + ) { + this.definition = definition; + let problemMatchers: string | string[]; + if (typeof arg2 === 'string') { + this.name = arg2; + this.source = arg3; + this.execution = arg4 as ProcessExecution | ShellExecution; + problemMatchers = arg5 as string | string[]; + } else { + this.target = arg2; + this.name = arg3; + this.source = arg4 as string; + this.execution = arg5 as ProcessExecution | ShellExecution; + problemMatchers = arg6 as string | string[]; + } + if (typeof problemMatchers === 'string') { + this._problemMatchers = [problemMatchers]; + this._hasDefinedMatchers = true; + } else if (Array.isArray(problemMatchers)) { + this._problemMatchers = problemMatchers; + this._hasDefinedMatchers = true; + } else { + this._problemMatchers = []; + this._hasDefinedMatchers = false; + } + this._isBackground = false; + this._presentationOptions = Object.create(null); + this._runOptions = Object.create(null); + } + + get _id(): string | undefined { + return this.__id; + } + + set _id(value: string | undefined) { + this.__id = value; + } + + private clear(): void { + if (this.__id === undefined) { + return; + } + this.__id = undefined; + this._scope = undefined; + this.computeDefinitionBasedOnExecution(); + } + + private computeDefinitionBasedOnExecution(): void { + if (this._execution instanceof ProcessExecution) { + this._definition = { + type: Task.ProcessType, + id: this._execution.computeId(), + }; + } else if (this._execution instanceof ShellExecution) { + this._definition = { + type: Task.ShellType, + id: this._execution.computeId(), + }; + } else { + this._definition = { + type: Task.EmptyType, + id: generateUuid(), + }; + } + } + + get definition(): vscode.TaskDefinition { + return this._definition; + } + + set definition(value: vscode.TaskDefinition) { + if (value === undefined || value === null) { + throw illegalArgument("Kind can't be undefined or null"); + } + this.clear(); + this._definition = value; + } + + get scope(): vscode.TaskScope.Global | vscode.TaskScope.Workspace | vscode.WorkspaceFolder | undefined { + return this._scope; + } + + set target(value: vscode.TaskScope.Global | vscode.TaskScope.Workspace | vscode.WorkspaceFolder) { + this.clear(); + this._scope = value; + } + + get name(): string { + return this._name; + } + + set name(value: string) { + if (typeof value !== 'string') { + throw illegalArgument('name'); + } + this.clear(); + this._name = value; + } + + get execution(): ProcessExecution | ShellExecution | undefined { + return this._execution; + } + + set execution(value: ProcessExecution | ShellExecution | undefined) { + if (value === null) { + value = undefined; + } + this.clear(); + this._execution = value; + const { type } = this._definition; + if (Task.EmptyType === type || Task.ProcessType === type || Task.ShellType === type) { + this.computeDefinitionBasedOnExecution(); + } + } + + get problemMatchers(): string[] { + return this._problemMatchers; + } + + set problemMatchers(value: string[]) { + if (!Array.isArray(value)) { + this.clear(); + this._problemMatchers = []; + this._hasDefinedMatchers = false; + } else { + this.clear(); + this._problemMatchers = value; + this._hasDefinedMatchers = true; + } + } + + get hasDefinedMatchers(): boolean { + return this._hasDefinedMatchers; + } + + get isBackground(): boolean { + return this._isBackground; + } + + set isBackground(value: boolean) { + if (value !== true && value !== false) { + value = false; + } + this.clear(); + this._isBackground = value; + } + + get source(): string { + return this._source; + } + + set source(value: string) { + if (typeof value !== 'string' || value.length === 0) { + throw illegalArgument('source must be a string of length > 0'); + } + this.clear(); + this._source = value; + } + + get group(): TaskGroup | undefined { + return this._group; + } + + set group(value: TaskGroup | undefined) { + if (value === null) { + value = undefined; + } + this.clear(); + this._group = value; + } + + get presentationOptions(): vscode.TaskPresentationOptions { + return this._presentationOptions; + } + + set presentationOptions(value: vscode.TaskPresentationOptions) { + if (value === null || value === undefined) { + value = Object.create(null); + } + this.clear(); + this._presentationOptions = value; + } + + get runOptions(): vscode.RunOptions { + return this._runOptions; + } + + set runOptions(value: vscode.RunOptions) { + if (value === null || value === undefined) { + value = Object.create(null); + } + this.clear(); + this._runOptions = value; + } +} + +export enum ProgressLocation { + SourceControl = 1, + Window = 10, + Notification = 15, +} + +export enum TreeItemCollapsibleState { + None = 0, + Collapsed = 1, + Expanded = 2, +} + +export class TreeItem { + label?: string; + + resourceUri?: vscUri.URI; + + iconPath?: string | vscUri.URI | { light: string | vscUri.URI; dark: string | vscUri.URI }; + + command?: vscode.Command; + + contextValue?: string; + + tooltip?: string; + + constructor(label: string, collapsibleState?: vscode.TreeItemCollapsibleState); + + constructor(resourceUri: vscUri.URI, collapsibleState?: vscode.TreeItemCollapsibleState); + + constructor( + arg1: string | vscUri.URI, + public collapsibleState: vscode.TreeItemCollapsibleState = TreeItemCollapsibleState.None, + ) { + if (arg1 instanceof vscUri.URI) { + this.resourceUri = arg1; + } else { + this.label = arg1; + } + } +} + +export class ThemeIcon { + static readonly File = new ThemeIcon('file'); + + static readonly Folder = new ThemeIcon('folder'); + + readonly id: string; + + private constructor(id: string) { + this.id = id; + } +} + +export class ThemeColor { + id: string; + + constructor(id: string) { + this.id = id; + } +} + +export enum ConfigurationTarget { + Global = 1, + + Workspace = 2, + + WorkspaceFolder = 3, +} + +export class RelativePattern implements IRelativePattern { + baseUri: vscode.Uri; + + base: string; + + pattern: string; + + constructor(base: vscode.WorkspaceFolder | string, pattern: string) { + if (typeof base !== 'string') { + if (!base || !vscUri.URI.isUri(base.uri)) { + throw illegalArgument('base'); + } + } + + if (typeof pattern !== 'string') { + throw illegalArgument('pattern'); + } + + this.baseUri = typeof base === 'string' ? vscUri.URI.parse(base) : base.uri; + this.base = typeof base === 'string' ? base : base.uri.fsPath; + this.pattern = pattern; + } + + // eslint-disable-next-line class-methods-use-this + public pathToRelative(from: string, to: string): string { + return relative(from, to); + } +} + +export class Breakpoint { + readonly enabled: boolean; + + readonly condition?: string; + + readonly hitCondition?: string; + + readonly logMessage?: string; + + protected constructor(enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string) { + this.enabled = typeof enabled === 'boolean' ? enabled : true; + if (typeof condition === 'string') { + this.condition = condition; + } + if (typeof hitCondition === 'string') { + this.hitCondition = hitCondition; + } + if (typeof logMessage === 'string') { + this.logMessage = logMessage; + } + } +} + +export class SourceBreakpoint extends Breakpoint { + readonly location: Location; + + constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string) { + super(enabled, condition, hitCondition, logMessage); + if (location === null) { + throw illegalArgument('location'); + } + this.location = location; + } +} + +export class FunctionBreakpoint extends Breakpoint { + readonly functionName: string; + + constructor( + functionName: string, + enabled?: boolean, + condition?: string, + hitCondition?: string, + logMessage?: string, + ) { + super(enabled, condition, hitCondition, logMessage); + if (!functionName) { + throw illegalArgument('functionName'); + } + this.functionName = functionName; + } +} + +export class DebugAdapterExecutable { + readonly command: string; + + readonly args: string[]; + + constructor(command: string, args?: string[]) { + this.command = command; + this.args = args || []; + } +} + +export class DebugAdapterServer { + readonly port: number; + + readonly host?: string; + + constructor(port: number, host?: string) { + this.port = port; + this.host = host; + } +} + +export enum LogLevel { + Trace = 1, + Debug = 2, + Info = 3, + Warning = 4, + Error = 5, + Critical = 6, + Off = 7, +} + +// #region file api + +export enum FileChangeType { + Changed = 1, + Created = 2, + Deleted = 3, +} + +export class FileSystemError extends Error { + static FileExists(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'EntryExists', FileSystemError.FileExists); + } + + static FileNotFound(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'EntryNotFound', FileSystemError.FileNotFound); + } + + static FileNotADirectory(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'EntryNotADirectory', FileSystemError.FileNotADirectory); + } + + static FileIsADirectory(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'EntryIsADirectory', FileSystemError.FileIsADirectory); + } + + static NoPermissions(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'NoPermissions', FileSystemError.NoPermissions); + } + + static Unavailable(messageOrUri?: string | vscUri.URI): FileSystemError { + return new FileSystemError(messageOrUri, 'Unavailable', FileSystemError.Unavailable); + } + + constructor(uriOrMessage?: string | vscUri.URI, code?: string, terminator?: () => void) { + super(vscUri.URI.isUri(uriOrMessage) ? uriOrMessage.toString(true) : uriOrMessage); + this.name = code ? `${code} (FileSystemError)` : `FileSystemError`; + + Object.setPrototypeOf(this, FileSystemError.prototype); + + if (typeof Error.captureStackTrace === 'function' && typeof terminator === 'function') { + // nice stack traces + Error.captureStackTrace(this, terminator); + } + } + + // eslint-disable-next-line class-methods-use-this + public get code(): string { + return ''; + } +} + +// #endregion + +// #region folding api + +export class FoldingRange { + start: number; + + end: number; + + kind?: FoldingRangeKind; + + constructor(start: number, end: number, kind?: FoldingRangeKind) { + this.start = start; + this.end = end; + this.kind = kind; + } +} + +export enum FoldingRangeKind { + Comment = 1, + Imports = 2, + Region = 3, +} + +// #endregion + +export enum CommentThreadCollapsibleState { + /** + * Determines an item is collapsed + */ + Collapsed = 0, + /** + * Determines an item is expanded + */ + Expanded = 1, +} + +export class QuickInputButtons { + static readonly Back: vscode.QuickInputButton = { iconPath: vscUri.URI.file('back') }; +} + +export enum SymbolTag { + Deprecated = 1, +} + +export class TypeHierarchyItem { + name: string; + + kind: SymbolKind; + + tags?: ReadonlyArray; + + detail?: string; + + uri: vscode.Uri; + + range: Range; + + selectionRange: Range; + + constructor(kind: SymbolKind, name: string, detail: string, uri: vscode.Uri, range: Range, selectionRange: Range) { + this.name = name; + this.kind = kind; + this.detail = detail; + this.uri = uri; + this.range = range; + this.selectionRange = selectionRange; + } +} + +export declare type LSPObject = { + [key: string]: LSPAny; +}; + +export declare type LSPArray = LSPAny[]; + +export declare type integer = number; +export declare type uinteger = number; +export declare type decimal = number; + +export declare type LSPAny = LSPObject | LSPArray | string | integer | uinteger | decimal | boolean | null; + +export class ProtocolTypeHierarchyItem extends TypeHierarchyItem { + data?; + + constructor( + kind: SymbolKind, + name: string, + detail: string, + uri: vscode.Uri, + range: Range, + selectionRange: Range, + data?: LSPAny, + ) { + super(kind, name, detail, uri, range, selectionRange); + this.data = data; + } +} + +export class CancellationError extends Error {} + +export class LSPCancellationError extends CancellationError { + data; + + constructor(data: any) { + super(); + this.data = data; + } +} diff --git a/src/test/mocks/vsc/htmlContent.ts b/src/test/mocks/vsc/htmlContent.ts new file mode 100644 index 0000000..df07c6a --- /dev/null +++ b/src/test/mocks/vsc/htmlContent.ts @@ -0,0 +1,101 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import * as vscMockArrays from './arrays'; + +export interface IMarkdownString { + value: string; + isTrusted?: boolean; +} + +export class MarkdownString implements IMarkdownString { + value: string; + + isTrusted?: boolean; + + constructor(value = '') { + this.value = value; + } + + appendText(value: string): MarkdownString { + // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash + this.value += value.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&'); + return this; + } + + appendMarkdown(value: string): MarkdownString { + this.value += value; + return this; + } + + appendCodeblock(langId: string, code: string): MarkdownString { + this.value += '\n```'; + this.value += langId; + this.value += '\n'; + this.value += code; + this.value += '\n```\n'; + return this; + } +} + +export function isEmptyMarkdownString(oneOrMany: IMarkdownString | IMarkdownString[]): boolean { + if (isMarkdownString(oneOrMany)) { + return !oneOrMany.value; + } + if (Array.isArray(oneOrMany)) { + return oneOrMany.every(isEmptyMarkdownString); + } + return true; +} + +export function isMarkdownString(thing: unknown): thing is IMarkdownString { + if (thing instanceof MarkdownString) { + return true; + } + if (thing && typeof thing === 'object') { + return ( + typeof (thing).value === 'string' && + (typeof (thing).isTrusted === 'boolean' || + (thing).isTrusted === undefined) + ); + } + return false; +} + +export function markedStringsEquals( + a: IMarkdownString | IMarkdownString[], + b: IMarkdownString | IMarkdownString[], +): boolean { + if (!a && !b) { + return true; + } + if (!a || !b) { + return false; + } + if (Array.isArray(a) && Array.isArray(b)) { + return vscMockArrays.equals(a, b, markdownStringEqual); + } + if (isMarkdownString(a) && isMarkdownString(b)) { + return markdownStringEqual(a, b); + } + return false; +} + +function markdownStringEqual(a: IMarkdownString, b: IMarkdownString): boolean { + if (a === b) { + return true; + } + if (!a || !b) { + return false; + } + return a.value === b.value && a.isTrusted === b.isTrusted; +} + +export function removeMarkdownEscapes(text: string): string { + if (!text) { + return text; + } + return text.replace(/\\([\\`*_{}[\]()#+\-.!])/g, '$1'); +} diff --git a/src/test/mocks/vsc/index.ts b/src/test/mocks/vsc/index.ts new file mode 100644 index 0000000..152beb6 --- /dev/null +++ b/src/test/mocks/vsc/index.ts @@ -0,0 +1,596 @@ +/* eslint-disable max-classes-per-file */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import { EventEmitter as NodeEventEmitter } from 'events'; +import * as vscode from 'vscode'; + +// export * from './range'; +// export * from './position'; +// export * from './selection'; +export * as vscMockExtHostedTypes from './extHostedTypes'; +export * as vscUri from './uri'; + +const escapeCodiconsRegex = /(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi; +export function escapeCodicons(text: string): string { + return text.replace(escapeCodiconsRegex, (match, escaped) => (escaped ? match : `\\${match}`)); +} + +export class ThemeIcon { + static readonly File: ThemeIcon; + + static readonly Folder: ThemeIcon; + + constructor(public readonly id: string, public readonly color?: ThemeColor) {} +} + +export class ThemeColor { + constructor(public readonly id: string) {} +} + +export enum ExtensionKind { + /** + * Extension runs where the UI runs. + */ + UI = 1, + + /** + * Extension runs where the remote extension host runs. + */ + Workspace = 2, +} + +export enum LanguageStatusSeverity { + Information = 0, + Warning = 1, + Error = 2, +} + +export enum QuickPickItemKind { + Separator = -1, + Default = 0, +} + +export class Disposable { + static from(...disposables: { dispose(): () => void }[]): Disposable { + return new Disposable(() => { + if (disposables) { + for (const disposable of disposables) { + if (disposable && typeof disposable.dispose === 'function') { + disposable.dispose(); + } + } + + disposables = []; + } + }); + } + + private _callOnDispose: (() => void) | undefined; + + constructor(callOnDispose: () => void) { + this._callOnDispose = callOnDispose; + } + + dispose(): void { + if (typeof this._callOnDispose === 'function') { + this._callOnDispose(); + this._callOnDispose = undefined; + } + } +} + +// eslint-disable-next-line @typescript-eslint/no-namespace +export namespace l10n { + export function t(message: string, ...args: unknown[]): string; + export function t(options: { + message: string; + args?: Array | Record; + comment: string | string[]; + }): string; + + export function t( + message: + | string + | { + message: string; + args?: Array | Record; + comment: string | string[]; + }, + ...args: unknown[] + ): string { + let _message = message; + let _args: unknown[] | Record | undefined = args; + if (typeof message !== 'string') { + _message = message.message; + _args = message.args ?? args; + } + + if ((_args as Array).length > 0) { + return (_message as string).replace(/{(\d+)}/g, (match, number) => + (_args as Array)[number] === undefined ? match : (_args as Array)[number], + ); + } + return _message as string; + } + export const bundle: { [key: string]: string } | undefined = undefined; + export const uri: vscode.Uri | undefined = undefined; +} + +export class EventEmitter implements vscode.EventEmitter { + public event: vscode.Event; + + public emitter: NodeEventEmitter; + + constructor() { + this.event = (this.add.bind(this) as unknown) as vscode.Event; + this.emitter = new NodeEventEmitter(); + } + + public fire(data?: T): void { + this.emitter.emit('evt', data); + } + + public dispose(): void { + this.emitter.removeAllListeners(); + } + + protected add = ( + listener: (e: T) => void, + _thisArgs?: EventEmitter, + _disposables?: Disposable[], + ): Disposable => { + const bound = _thisArgs ? listener.bind(_thisArgs) : listener; + this.emitter.addListener('evt', bound); + return { + dispose: () => { + this.emitter.removeListener('evt', bound); + }, + } as Disposable; + }; +} + +export class CancellationToken extends EventEmitter implements vscode.CancellationToken { + public isCancellationRequested!: boolean; + + public onCancellationRequested: vscode.Event; + + constructor() { + super(); + this.onCancellationRequested = this.add.bind(this) as vscode.Event; + } + + public cancel(): void { + this.isCancellationRequested = true; + this.fire(); + } +} + +export class CancellationTokenSource { + public token: CancellationToken; + + constructor() { + this.token = new CancellationToken(); + } + + public cancel(): void { + this.token.cancel(); + } + + public dispose(): void { + this.token.dispose(); + } +} + +export class CodeAction { + public title: string; + + public edit?: vscode.WorkspaceEdit; + + public diagnostics?: vscode.Diagnostic[]; + + public command?: vscode.Command; + + public kind?: CodeActionKind; + + public isPreferred?: boolean; + + constructor(_title: string, _kind?: CodeActionKind) { + this.title = _title; + this.kind = _kind; + } +} + +export enum CompletionItemKind { + Text = 0, + Method = 1, + Function = 2, + Constructor = 3, + Field = 4, + Variable = 5, + Class = 6, + Interface = 7, + Module = 8, + Property = 9, + Unit = 10, + Value = 11, + Enum = 12, + Keyword = 13, + Snippet = 14, + Color = 15, + Reference = 17, + File = 16, + Folder = 18, + EnumMember = 19, + Constant = 20, + Struct = 21, + Event = 22, + Operator = 23, + TypeParameter = 24, + User = 25, + Issue = 26, +} +export enum SymbolKind { + File = 0, + Module = 1, + Namespace = 2, + Package = 3, + Class = 4, + Method = 5, + Property = 6, + Field = 7, + Constructor = 8, + Enum = 9, + Interface = 10, + Function = 11, + Variable = 12, + Constant = 13, + String = 14, + Number = 15, + Boolean = 16, + Array = 17, + Object = 18, + Key = 19, + Null = 20, + EnumMember = 21, + Struct = 22, + Event = 23, + Operator = 24, + TypeParameter = 25, +} +export enum IndentAction { + None = 0, + Indent = 1, + IndentOutdent = 2, + Outdent = 3, +} + +export enum CompletionTriggerKind { + Invoke = 0, + TriggerCharacter = 1, + TriggerForIncompleteCompletions = 2, +} + +export class MarkdownString { + public value: string; + + public isTrusted?: boolean; + + public readonly supportThemeIcons?: boolean; + + constructor(value?: string, supportThemeIcons = false) { + this.value = value ?? ''; + this.supportThemeIcons = supportThemeIcons; + } + + public static isMarkdownString(thing?: string | MarkdownString | unknown): thing is vscode.MarkdownString { + if (thing instanceof MarkdownString) { + return true; + } + return ( + thing !== undefined && + typeof thing === 'object' && + thing !== null && + thing.hasOwnProperty('appendCodeblock') && + thing.hasOwnProperty('appendMarkdown') && + thing.hasOwnProperty('appendText') && + thing.hasOwnProperty('value') + ); + } + + public appendText(value: string): MarkdownString { + // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash + this.value += (this.supportThemeIcons ? escapeCodicons(value) : value) + .replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&') + .replace(/\n/g, '\n\n'); + + return this; + } + + public appendMarkdown(value: string): MarkdownString { + this.value += value; + + return this; + } + + public appendCodeblock(code: string, language = ''): MarkdownString { + this.value += '\n```'; + this.value += language; + this.value += '\n'; + this.value += code; + this.value += '\n```\n'; + return this; + } +} + +export class Hover { + public contents: vscode.MarkdownString[] | vscode.MarkedString[]; + + public range: vscode.Range | undefined; + + constructor( + contents: vscode.MarkdownString | vscode.MarkedString | vscode.MarkdownString[] | vscode.MarkedString[], + range?: vscode.Range, + ) { + if (!contents) { + throw new Error('Illegal argument, contents must be defined'); + } + if (Array.isArray(contents)) { + this.contents = contents; + } else if (MarkdownString.isMarkdownString(contents)) { + this.contents = [contents]; + } else { + this.contents = [contents]; + } + this.range = range; + } +} + +export class CodeActionKind { + public static readonly Empty: CodeActionKind = new CodeActionKind('empty'); + + public static readonly QuickFix: CodeActionKind = new CodeActionKind('quick.fix'); + + public static readonly Refactor: CodeActionKind = new CodeActionKind('refactor'); + + public static readonly RefactorExtract: CodeActionKind = new CodeActionKind('refactor.extract'); + + public static readonly RefactorInline: CodeActionKind = new CodeActionKind('refactor.inline'); + + public static readonly RefactorMove: CodeActionKind = new CodeActionKind('refactor.move'); + + public static readonly RefactorRewrite: CodeActionKind = new CodeActionKind('refactor.rewrite'); + + public static readonly Source: CodeActionKind = new CodeActionKind('source'); + + public static readonly SourceOrganizeImports: CodeActionKind = new CodeActionKind('source.organize.imports'); + + public static readonly SourceFixAll: CodeActionKind = new CodeActionKind('source.fix.all'); + + public static readonly Notebook: CodeActionKind = new CodeActionKind('notebook'); + + private constructor(private _value: string) {} + + public append(parts: string): CodeActionKind { + return new CodeActionKind(`${this._value}.${parts}`); + } + + public intersects(other: CodeActionKind): boolean { + return this._value.includes(other._value) || other._value.includes(this._value); + } + + public contains(other: CodeActionKind): boolean { + return this._value.startsWith(other._value); + } + + public get value(): string { + return this._value; + } +} + +export interface DebugAdapterExecutableOptions { + env?: { [key: string]: string }; + cwd?: string; +} + +export class DebugAdapterServer { + constructor(public readonly port: number, public readonly host?: string) {} +} +export class DebugAdapterExecutable { + constructor( + public readonly command: string, + public readonly args: string[] = [], + public readonly options?: DebugAdapterExecutableOptions, + ) {} +} + +export enum FileType { + Unknown = 0, + File = 1, + Directory = 2, + SymbolicLink = 64, +} + +export enum UIKind { + Desktop = 1, + Web = 2, +} + +export class InlayHint { + tooltip?: string | MarkdownString | undefined; + + textEdits?: vscode.TextEdit[]; + + paddingLeft?: boolean; + + paddingRight?: boolean; + + constructor( + public position: vscode.Position, + public label: string | vscode.InlayHintLabelPart[], + public kind?: vscode.InlayHintKind, + ) {} +} + +export enum LogLevel { + /** + * No messages are logged with this level. + */ + Off = 0, + + /** + * All messages are logged with this level. + */ + Trace = 1, + + /** + * Messages with debug and higher log level are logged with this level. + */ + Debug = 2, + + /** + * Messages with info and higher log level are logged with this level. + */ + Info = 3, + + /** + * Messages with warning and higher log level are logged with this level. + */ + Warning = 4, + + /** + * Only error messages are logged with this level. + */ + Error = 5, +} + +export class TestMessage { + /** + * Human-readable message text to display. + */ + message: string | MarkdownString; + + /** + * Expected test output. If given with {@link TestMessage.actualOutput actualOutput }, a diff view will be shown. + */ + expectedOutput?: string; + + /** + * Actual test output. If given with {@link TestMessage.expectedOutput expectedOutput }, a diff view will be shown. + */ + actualOutput?: string; + + /** + * Associated file location. + */ + location?: vscode.Location; + + /** + * Creates a new TestMessage that will present as a diff in the editor. + * @param message Message to display to the user. + * @param expected Expected output. + * @param actual Actual output. + */ + static diff(message: string | MarkdownString, expected: string, actual: string): TestMessage { + const testMessage = new TestMessage(message); + testMessage.expectedOutput = expected; + testMessage.actualOutput = actual; + return testMessage; + } + + /** + * Creates a new TestMessage instance. + * @param message The message to show to the user. + */ + constructor(message: string | MarkdownString) { + this.message = message; + } +} + +export interface TestItemCollection extends Iterable<[string, vscode.TestItem]> { + /** + * Gets the number of items in the collection. + */ + readonly size: number; + + /** + * Replaces the items stored by the collection. + * @param items Items to store. + */ + replace(items: readonly vscode.TestItem[]): void; + + /** + * Iterate over each entry in this collection. + * + * @param callback Function to execute for each entry. + * @param thisArg The `this` context used when invoking the handler function. + */ + forEach(callback: (item: vscode.TestItem, collection: TestItemCollection) => unknown, thisArg?: unknown): void; + + /** + * Adds the test item to the children. If an item with the same ID already + * exists, it'll be replaced. + * @param item Item to add. + */ + add(item: vscode.TestItem): void; + + /** + * Removes a single test item from the collection. + * @param itemId Item ID to delete. + */ + delete(itemId: string): void; + + /** + * Efficiently gets a test item by ID, if it exists, in the children. + * @param itemId Item ID to get. + * @returns The found item or undefined if it does not exist. + */ + get(itemId: string): vscode.TestItem | undefined; +} + +/** + * Represents a location inside a resource, such as a line + * inside a text file. + */ +export class Location { + /** + * The resource identifier of this location. + */ + uri: vscode.Uri; + + /** + * The document range of this location. + */ + range: vscode.Range; + + /** + * Creates a new location object. + * + * @param uri The resource identifier. + * @param rangeOrPosition The range or position. Positions will be converted to an empty range. + */ + constructor(uri: vscode.Uri, rangeOrPosition: vscode.Range) { + this.uri = uri; + this.range = rangeOrPosition; + } +} + +/** + * The kind of executions that {@link TestRunProfile TestRunProfiles} control. + */ +export enum TestRunProfileKind { + /** + * The `Run` test profile kind. + */ + Run = 1, + /** + * The `Debug` test profile kind. + */ + Debug = 2, + /** + * The `Coverage` test profile kind. + */ + Coverage = 3, +} diff --git a/src/test/mocks/vsc/position.ts b/src/test/mocks/vsc/position.ts new file mode 100644 index 0000000..b05107e --- /dev/null +++ b/src/test/mocks/vsc/position.ts @@ -0,0 +1,145 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +/** + * A position in the editor. This interface is suitable for serialization. + */ +export interface IPosition { + /** + * line number (starts at 1) + */ + readonly lineNumber: number; + /** + * column (the first character in a line is between column 1 and column 2) + */ + readonly column: number; +} + +/** + * A position in the editor. + */ +export class Position { + /** + * line number (starts at 1) + */ + public readonly lineNumber: number; + + /** + * column (the first character in a line is between column 1 and column 2) + */ + public readonly column: number; + + constructor(lineNumber: number, column: number) { + this.lineNumber = lineNumber; + this.column = column; + } + + /** + * Test if this position equals other position + */ + public equals(other: IPosition): boolean { + return Position.equals(this, other); + } + + /** + * Test if position `a` equals position `b` + */ + public static equals(a: IPosition, b: IPosition): boolean { + if (!a && !b) { + return true; + } + return !!a && !!b && a.lineNumber === b.lineNumber && a.column === b.column; + } + + /** + * Test if this position is before other position. + * If the two positions are equal, the result will be false. + */ + public isBefore(other: IPosition): boolean { + return Position.isBefore(this, other); + } + + /** + * Test if position `a` is before position `b`. + * If the two positions are equal, the result will be false. + */ + public static isBefore(a: IPosition, b: IPosition): boolean { + if (a.lineNumber < b.lineNumber) { + return true; + } + if (b.lineNumber < a.lineNumber) { + return false; + } + return a.column < b.column; + } + + /** + * Test if this position is before other position. + * If the two positions are equal, the result will be true. + */ + public isBeforeOrEqual(other: IPosition): boolean { + return Position.isBeforeOrEqual(this, other); + } + + /** + * Test if position `a` is before position `b`. + * If the two positions are equal, the result will be true. + */ + public static isBeforeOrEqual(a: IPosition, b: IPosition): boolean { + if (a.lineNumber < b.lineNumber) { + return true; + } + if (b.lineNumber < a.lineNumber) { + return false; + } + return a.column <= b.column; + } + + /** + * A function that compares positions, useful for sorting + */ + public static compare(a: IPosition, b: IPosition): number { + const aLineNumber = a.lineNumber | 0; + const bLineNumber = b.lineNumber | 0; + + if (aLineNumber === bLineNumber) { + const aColumn = a.column | 0; + const bColumn = b.column | 0; + return aColumn - bColumn; + } + + return aLineNumber - bLineNumber; + } + + /** + * Clone this position. + */ + public clone(): Position { + return new Position(this.lineNumber, this.column); + } + + /** + * Convert to a human-readable representation. + */ + public toString(): string { + return `(${this.lineNumber},${this.column})`; + } + + // --- + + /** + * Create a `Position` from an `IPosition`. + */ + public static lift(pos: IPosition): Position { + return new Position(pos.lineNumber, pos.column); + } + + /** + * Test if `obj` is an `IPosition`. + */ + public static isIPosition(obj?: { lineNumber: unknown; column: unknown }): obj is IPosition { + return obj !== undefined && typeof obj.lineNumber === 'number' && typeof obj.column === 'number'; + } +} diff --git a/src/test/mocks/vsc/range.ts b/src/test/mocks/vsc/range.ts new file mode 100644 index 0000000..538e9ec --- /dev/null +++ b/src/test/mocks/vsc/range.ts @@ -0,0 +1,397 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import * as vscMockPosition from './position'; + +/** + * A range in the editor. This interface is suitable for serialization. + */ +export interface IRange { + /** + * Line number on which the range starts (starts at 1). + */ + readonly startLineNumber: number; + /** + * Column on which the range starts in line `startLineNumber` (starts at 1). + */ + readonly startColumn: number; + /** + * Line number on which the range ends. + */ + readonly endLineNumber: number; + /** + * Column on which the range ends in line `endLineNumber`. + */ + readonly endColumn: number; +} + +/** + * A range in the editor. (startLineNumber,startColumn) is <= (endLineNumber,endColumn) + */ +export class Range { + /** + * Line number on which the range starts (starts at 1). + */ + public readonly startLineNumber: number; + + /** + * Column on which the range starts in line `startLineNumber` (starts at 1). + */ + public readonly startColumn: number; + + /** + * Line number on which the range ends. + */ + public readonly endLineNumber: number; + + /** + * Column on which the range ends in line `endLineNumber`. + */ + public readonly endColumn: number; + + constructor(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number) { + if (startLineNumber > endLineNumber || (startLineNumber === endLineNumber && startColumn > endColumn)) { + this.startLineNumber = endLineNumber; + this.startColumn = endColumn; + this.endLineNumber = startLineNumber; + this.endColumn = startColumn; + } else { + this.startLineNumber = startLineNumber; + this.startColumn = startColumn; + this.endLineNumber = endLineNumber; + this.endColumn = endColumn; + } + } + + /** + * Test if this range is empty. + */ + public isEmpty(): boolean { + return Range.isEmpty(this); + } + + /** + * Test if `range` is empty. + */ + public static isEmpty(range: IRange): boolean { + return range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn; + } + + /** + * Test if position is in this range. If the position is at the edges, will return true. + */ + public containsPosition(position: vscMockPosition.IPosition): boolean { + return Range.containsPosition(this, position); + } + + /** + * Test if `position` is in `range`. If the position is at the edges, will return true. + */ + public static containsPosition(range: IRange, position: vscMockPosition.IPosition): boolean { + if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) { + return false; + } + if (position.lineNumber === range.startLineNumber && position.column < range.startColumn) { + return false; + } + if (position.lineNumber === range.endLineNumber && position.column > range.endColumn) { + return false; + } + return true; + } + + /** + * Test if range is in this range. If the range is equal to this range, will return true. + */ + public containsRange(range: IRange): boolean { + return Range.containsRange(this, range); + } + + /** + * Test if `otherRange` is in `range`. If the ranges are equal, will return true. + */ + public static containsRange(range: IRange, otherRange: IRange): boolean { + if (otherRange.startLineNumber < range.startLineNumber || otherRange.endLineNumber < range.startLineNumber) { + return false; + } + if (otherRange.startLineNumber > range.endLineNumber || otherRange.endLineNumber > range.endLineNumber) { + return false; + } + if (otherRange.startLineNumber === range.startLineNumber && otherRange.startColumn < range.startColumn) { + return false; + } + if (otherRange.endLineNumber === range.endLineNumber && otherRange.endColumn > range.endColumn) { + return false; + } + return true; + } + + /** + * A reunion of the two ranges. + * The smallest position will be used as the start point, and the largest one as the end point. + */ + public plusRange(range: IRange): Range { + return Range.plusRange(this, range); + } + + /** + * A reunion of the two ranges. + * The smallest position will be used as the start point, and the largest one as the end point. + */ + public static plusRange(a: IRange, b: IRange): Range { + let startLineNumber: number; + let startColumn: number; + let endLineNumber: number; + let endColumn: number; + if (b.startLineNumber < a.startLineNumber) { + startLineNumber = b.startLineNumber; + startColumn = b.startColumn; + } else if (b.startLineNumber === a.startLineNumber) { + startLineNumber = b.startLineNumber; + startColumn = Math.min(b.startColumn, a.startColumn); + } else { + startLineNumber = a.startLineNumber; + startColumn = a.startColumn; + } + + if (b.endLineNumber > a.endLineNumber) { + endLineNumber = b.endLineNumber; + endColumn = b.endColumn; + } else if (b.endLineNumber === a.endLineNumber) { + endLineNumber = b.endLineNumber; + endColumn = Math.max(b.endColumn, a.endColumn); + } else { + endLineNumber = a.endLineNumber; + endColumn = a.endColumn; + } + + return new Range(startLineNumber, startColumn, endLineNumber, endColumn); + } + + /** + * A intersection of the two ranges. + */ + public intersectRanges(range: IRange): Range | null { + return Range.intersectRanges(this, range); + } + + /** + * A intersection of the two ranges. + */ + public static intersectRanges(a: IRange, b: IRange): Range | null { + let resultStartLineNumber = a.startLineNumber; + let resultStartColumn = a.startColumn; + let resultEndLineNumber = a.endLineNumber; + let resultEndColumn = a.endColumn; + const otherStartLineNumber = b.startLineNumber; + const otherStartColumn = b.startColumn; + const otherEndLineNumber = b.endLineNumber; + const otherEndColumn = b.endColumn; + + if (resultStartLineNumber < otherStartLineNumber) { + resultStartLineNumber = otherStartLineNumber; + resultStartColumn = otherStartColumn; + } else if (resultStartLineNumber === otherStartLineNumber) { + resultStartColumn = Math.max(resultStartColumn, otherStartColumn); + } + + if (resultEndLineNumber > otherEndLineNumber) { + resultEndLineNumber = otherEndLineNumber; + resultEndColumn = otherEndColumn; + } else if (resultEndLineNumber === otherEndLineNumber) { + resultEndColumn = Math.min(resultEndColumn, otherEndColumn); + } + + // Check if selection is now empty + if (resultStartLineNumber > resultEndLineNumber) { + return null; + } + if (resultStartLineNumber === resultEndLineNumber && resultStartColumn > resultEndColumn) { + return null; + } + + return new Range(resultStartLineNumber, resultStartColumn, resultEndLineNumber, resultEndColumn); + } + + /** + * Test if this range equals other. + */ + public equalsRange(other: IRange): boolean { + return Range.equalsRange(this, other); + } + + /** + * Test if range `a` equals `b`. + */ + public static equalsRange(a: IRange, b: IRange): boolean { + return ( + !!a && + !!b && + a.startLineNumber === b.startLineNumber && + a.startColumn === b.startColumn && + a.endLineNumber === b.endLineNumber && + a.endColumn === b.endColumn + ); + } + + /** + * Return the end position (which will be after or equal to the start position) + */ + public getEndPosition(): vscMockPosition.Position { + return new vscMockPosition.Position(this.endLineNumber, this.endColumn); + } + + /** + * Return the start position (which will be before or equal to the end position) + */ + public getStartPosition(): vscMockPosition.Position { + return new vscMockPosition.Position(this.startLineNumber, this.startColumn); + } + + /** + * Transform to a user presentable string representation. + */ + public toString(): string { + return `[${this.startLineNumber},${this.startColumn} -> ${this.endLineNumber},${this.endColumn}]`; + } + + /** + * Create a new range using this range's start position, and using endLineNumber and endColumn as the end position. + */ + public setEndPosition(endLineNumber: number, endColumn: number): Range { + return new Range(this.startLineNumber, this.startColumn, endLineNumber, endColumn); + } + + /** + * Create a new range using this range's end position, and using startLineNumber and startColumn as the start position. + */ + public setStartPosition(startLineNumber: number, startColumn: number): Range { + return new Range(startLineNumber, startColumn, this.endLineNumber, this.endColumn); + } + + /** + * Create a new empty range using this range's start position. + */ + public collapseToStart(): Range { + return Range.collapseToStart(this); + } + + /** + * Create a new empty range using this range's start position. + */ + public static collapseToStart(range: IRange): Range { + return new Range(range.startLineNumber, range.startColumn, range.startLineNumber, range.startColumn); + } + + // --- + + public static fromPositions(start: vscMockPosition.IPosition, end: vscMockPosition.IPosition = start): Range { + return new Range(start.lineNumber, start.column, end.lineNumber, end.column); + } + + /** + * Create a `Range` from an `IRange`. + */ + public static lift(range: IRange): Range | null { + if (!range) { + return null; + } + return new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn); + } + + /** + * Test if `obj` is an `IRange`. + */ + public static isIRange(obj?: { + startLineNumber: unknown; + startColumn: unknown; + endLineNumber: unknown; + endColumn: unknown; + }): obj is IRange { + return ( + obj !== undefined && + typeof obj.startLineNumber === 'number' && + typeof obj.startColumn === 'number' && + typeof obj.endLineNumber === 'number' && + typeof obj.endColumn === 'number' + ); + } + + /** + * Test if the two ranges are touching in any way. + */ + public static areIntersectingOrTouching(a: IRange, b: IRange): boolean { + // Check if `a` is before `b` + if ( + a.endLineNumber < b.startLineNumber || + (a.endLineNumber === b.startLineNumber && a.endColumn < b.startColumn) + ) { + return false; + } + + // Check if `b` is before `a` + if ( + b.endLineNumber < a.startLineNumber || + (b.endLineNumber === a.startLineNumber && b.endColumn < a.startColumn) + ) { + return false; + } + + // These ranges must intersect + return true; + } + + /** + * A function that compares ranges, useful for sorting ranges + * It will first compare ranges on the startPosition and then on the endPosition + */ + public static compareRangesUsingStarts(a: IRange, b: IRange): number { + const aStartLineNumber = a.startLineNumber | 0; + const bStartLineNumber = b.startLineNumber | 0; + + if (aStartLineNumber === bStartLineNumber) { + const aStartColumn = a.startColumn | 0; + const bStartColumn = b.startColumn | 0; + + if (aStartColumn === bStartColumn) { + const aEndLineNumber = a.endLineNumber | 0; + const bEndLineNumber = b.endLineNumber | 0; + + if (aEndLineNumber === bEndLineNumber) { + const aEndColumn = a.endColumn | 0; + const bEndColumn = b.endColumn | 0; + return aEndColumn - bEndColumn; + } + return aEndLineNumber - bEndLineNumber; + } + return aStartColumn - bStartColumn; + } + return aStartLineNumber - bStartLineNumber; + } + + /** + * A function that compares ranges, useful for sorting ranges + * It will first compare ranges on the endPosition and then on the startPosition + */ + public static compareRangesUsingEnds(a: IRange, b: IRange): number { + if (a.endLineNumber === b.endLineNumber) { + if (a.endColumn === b.endColumn) { + if (a.startLineNumber === b.startLineNumber) { + return a.startColumn - b.startColumn; + } + return a.startLineNumber - b.startLineNumber; + } + return a.endColumn - b.endColumn; + } + return a.endLineNumber - b.endLineNumber; + } + + /** + * Test if the range spans multiple lines. + */ + public static spansMultipleLines(range: IRange): boolean { + return range.endLineNumber > range.startLineNumber; + } +} diff --git a/src/test/mocks/vsc/selection.ts b/src/test/mocks/vsc/selection.ts new file mode 100644 index 0000000..84b165f --- /dev/null +++ b/src/test/mocks/vsc/selection.ts @@ -0,0 +1,235 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +import * as vscMockPosition from './position'; +import * as vscMockRange from './range'; + +/** + * A selection in the editor. + * The selection is a range that has an orientation. + */ +export interface ISelection { + /** + * The line number on which the selection has started. + */ + readonly selectionStartLineNumber: number; + /** + * The column on `selectionStartLineNumber` where the selection has started. + */ + readonly selectionStartColumn: number; + /** + * The line number on which the selection has ended. + */ + readonly positionLineNumber: number; + /** + * The column on `positionLineNumber` where the selection has ended. + */ + readonly positionColumn: number; +} + +/** + * The direction of a selection. + */ +export enum SelectionDirection { + /** + * The selection starts above where it ends. + */ + LTR, + /** + * The selection starts below where it ends. + */ + RTL, +} + +/** + * A selection in the editor. + * The selection is a range that has an orientation. + */ +export class Selection extends vscMockRange.Range { + /** + * The line number on which the selection has started. + */ + public readonly selectionStartLineNumber: number; + + /** + * The column on `selectionStartLineNumber` where the selection has started. + */ + public readonly selectionStartColumn: number; + + /** + * The line number on which the selection has ended. + */ + public readonly positionLineNumber: number; + + /** + * The column on `positionLineNumber` where the selection has ended. + */ + public readonly positionColumn: number; + + constructor( + selectionStartLineNumber: number, + selectionStartColumn: number, + positionLineNumber: number, + positionColumn: number, + ) { + super(selectionStartLineNumber, selectionStartColumn, positionLineNumber, positionColumn); + this.selectionStartLineNumber = selectionStartLineNumber; + this.selectionStartColumn = selectionStartColumn; + this.positionLineNumber = positionLineNumber; + this.positionColumn = positionColumn; + } + + /** + * Clone this selection. + */ + public clone(): Selection { + return new Selection( + this.selectionStartLineNumber, + this.selectionStartColumn, + this.positionLineNumber, + this.positionColumn, + ); + } + + /** + * Transform to a human-readable representation. + */ + public toString(): string { + return `[${this.selectionStartLineNumber},${this.selectionStartColumn} -> ${this.positionLineNumber},${this.positionColumn}]`; + } + + /** + * Test if equals other selection. + */ + public equalsSelection(other: ISelection): boolean { + return Selection.selectionsEqual(this, other); + } + + /** + * Test if the two selections are equal. + */ + public static selectionsEqual(a: ISelection, b: ISelection): boolean { + return ( + a.selectionStartLineNumber === b.selectionStartLineNumber && + a.selectionStartColumn === b.selectionStartColumn && + a.positionLineNumber === b.positionLineNumber && + a.positionColumn === b.positionColumn + ); + } + + /** + * Get directions (LTR or RTL). + */ + public getDirection(): SelectionDirection { + if (this.selectionStartLineNumber === this.startLineNumber && this.selectionStartColumn === this.startColumn) { + return SelectionDirection.LTR; + } + return SelectionDirection.RTL; + } + + /** + * Create a new selection with a different `positionLineNumber` and `positionColumn`. + */ + public setEndPosition(endLineNumber: number, endColumn: number): Selection { + if (this.getDirection() === SelectionDirection.LTR) { + return new Selection(this.startLineNumber, this.startColumn, endLineNumber, endColumn); + } + return new Selection(endLineNumber, endColumn, this.startLineNumber, this.startColumn); + } + + /** + * Get the position at `positionLineNumber` and `positionColumn`. + */ + public getPosition(): vscMockPosition.Position { + return new vscMockPosition.Position(this.positionLineNumber, this.positionColumn); + } + + /** + * Create a new selection with a different `selectionStartLineNumber` and `selectionStartColumn`. + */ + public setStartPosition(startLineNumber: number, startColumn: number): Selection { + if (this.getDirection() === SelectionDirection.LTR) { + return new Selection(startLineNumber, startColumn, this.endLineNumber, this.endColumn); + } + return new Selection(this.endLineNumber, this.endColumn, startLineNumber, startColumn); + } + + // ---- + + /** + * Create a `Selection` from one or two positions + */ + public static fromPositions(start: vscMockPosition.IPosition, end: vscMockPosition.IPosition = start): Selection { + return new Selection(start.lineNumber, start.column, end.lineNumber, end.column); + } + + /** + * Create a `Selection` from an `ISelection`. + */ + public static liftSelection(sel: ISelection): Selection { + return new Selection( + sel.selectionStartLineNumber, + sel.selectionStartColumn, + sel.positionLineNumber, + sel.positionColumn, + ); + } + + /** + * `a` equals `b`. + */ + public static selectionsArrEqual(a: ISelection[], b: ISelection[]): boolean { + if ((a && !b) || (!a && b)) { + return false; + } + if (!a && !b) { + return true; + } + if (a.length !== b.length) { + return false; + } + for (let i = 0, len = a.length; i < len; i += 1) { + if (!this.selectionsEqual(a[i], b[i])) { + return false; + } + } + return true; + } + + /** + * Test if `obj` is an `ISelection`. + */ + public static isISelection(obj?: { + selectionStartLineNumber: unknown; + selectionStartColumn: unknown; + positionLineNumber: unknown; + positionColumn: unknown; + }): obj is ISelection { + return ( + obj !== undefined && + typeof obj.selectionStartLineNumber === 'number' && + typeof obj.selectionStartColumn === 'number' && + typeof obj.positionLineNumber === 'number' && + typeof obj.positionColumn === 'number' + ); + } + + /** + * Create with a direction. + */ + public static createWithDirection( + startLineNumber: number, + startColumn: number, + endLineNumber: number, + endColumn: number, + direction: SelectionDirection, + ): Selection { + if (direction === SelectionDirection.LTR) { + return new Selection(startLineNumber, startColumn, endLineNumber, endColumn); + } + + return new Selection(endLineNumber, endColumn, startLineNumber, startColumn); + } +} diff --git a/src/test/mocks/vsc/strings.ts b/src/test/mocks/vsc/strings.ts new file mode 100644 index 0000000..571b8bc --- /dev/null +++ b/src/test/mocks/vsc/strings.ts @@ -0,0 +1,35 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +/** + * Determines if haystack starts with needle. + */ +export function startsWith(haystack: string, needle: string): boolean { + if (haystack.length < needle.length) { + return false; + } + + for (let i = 0; i < needle.length; i += 1) { + if (haystack[i] !== needle[i]) { + return false; + } + } + + return true; +} + +/** + * Determines if haystack ends with needle. + */ +export function endsWith(haystack: string, needle: string): boolean { + const diff = haystack.length - needle.length; + if (diff > 0) { + return haystack.indexOf(needle, diff) === diff; + } + if (diff === 0) { + return haystack === needle; + } + return false; +} diff --git a/src/test/mocks/vsc/telemetryReporter.ts b/src/test/mocks/vsc/telemetryReporter.ts new file mode 100644 index 0000000..5df8bca --- /dev/null +++ b/src/test/mocks/vsc/telemetryReporter.ts @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +export class vscMockTelemetryReporter { + // eslint-disable-next-line class-methods-use-this + public sendTelemetryEvent(): void { + // Noop. + } +} diff --git a/src/test/mocks/vsc/uri.ts b/src/test/mocks/vsc/uri.ts new file mode 100644 index 0000000..671c60c --- /dev/null +++ b/src/test/mocks/vsc/uri.ts @@ -0,0 +1,731 @@ +/* eslint-disable max-classes-per-file */ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import * as pathImport from 'path'; +import { CharCode } from './charCode'; + +const isWindows = /^win/.test(process.platform); + +const _schemePattern = /^\w[\w\d+.-]*$/; +const _singleSlashStart = /^\//; +const _doubleSlashStart = /^\/\//; + +const _empty = ''; +const _slash = '/'; +const _regexp = /^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/; + +const _pathSepMarker = isWindows ? 1 : undefined; + +let _throwOnMissingSchema = true; + +/** + * @internal + */ +export function setUriThrowOnMissingScheme(value: boolean): boolean { + const old = _throwOnMissingSchema; + _throwOnMissingSchema = value; + return old; +} + +function _validateUri(ret: URI, _strict?: boolean): void { + // scheme, must be set + // if (!ret.scheme) { + // // if (_strict || _throwOnMissingSchema) { + // // throw new Error(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`); + // // } else { + // console.warn(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`); + // // } + // } + + // scheme, https://tools.ietf.org/html/rfc3986#section-3.1 + // ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) + if (ret.scheme && !_schemePattern.test(ret.scheme)) { + throw new Error('[UriError]: Scheme contains illegal characters.'); + } + + // path, http://tools.ietf.org/html/rfc3986#section-3.3 + // If a URI contains an authority component, then the path component + // must either be empty or begin with a slash ("/") character. If a URI + // does not contain an authority component, then the path cannot begin + // with two slash characters ("//"). + if (ret.path) { + if (ret.authority) { + if (!_singleSlashStart.test(ret.path)) { + throw new Error( + '[UriError]: If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character', + ); + } + } else if (_doubleSlashStart.test(ret.path)) { + throw new Error( + '[UriError]: If a URI does not contain an authority component, then the path cannot begin with two slash characters ("//")', + ); + } + } +} + +// for a while we allowed uris *without* schemes and this is the migration +// for them, e.g. an uri without scheme and without strict-mode warns and falls +// back to the file-scheme. that should cause the least carnage and still be a +// clear warning +function _schemeFix(scheme: string, _strict: boolean): string { + if (_strict || _throwOnMissingSchema) { + return scheme || _empty; + } + if (!scheme) { + console.trace('BAD uri lacks scheme, falling back to file-scheme.'); + scheme = 'file'; + } + return scheme; +} + +// implements a bit of https://tools.ietf.org/html/rfc3986#section-5 +function _referenceResolution(scheme: string, path: string): string { + // the slash-character is our 'default base' as we don't + // support constructing URIs relative to other URIs. This + // also means that we alter and potentially break paths. + // see https://tools.ietf.org/html/rfc3986#section-5.1.4 + switch (scheme) { + case 'https': + case 'http': + case 'file': + if (!path) { + path = _slash; + } else if (path[0] !== _slash) { + path = _slash + path; + } + break; + default: + break; + } + return path; +} + +/** + * Uniform Resource Identifier (URI) http://tools.ietf.org/html/rfc3986. + * This class is a simple parser which creates the basic component parts + * (http://tools.ietf.org/html/rfc3986#section-3) with minimal validation + * and encoding. + * + * foo://example.com:8042/over/there?name=ferret#nose + * \_/ \______________/\_________/ \_________/ \__/ + * | | | | | + * scheme authority path query fragment + * | _____________________|__ + * / \ / \ + * urn:example:animal:ferret:nose + */ + +export class URI implements UriComponents { + static isUri(thing: unknown): thing is URI { + if (thing instanceof URI) { + return true; + } + if (!thing) { + return false; + } + return ( + typeof (thing).authority === 'string' && + typeof (thing).fragment === 'string' && + typeof (thing).path === 'string' && + typeof (thing).query === 'string' && + typeof (thing).scheme === 'string' && + typeof (thing).fsPath === 'function' && + typeof (thing).with === 'function' && + typeof (thing).toString === 'function' + ); + } + + /** + * scheme is the 'http' part of 'http://www.msft.com/some/path?query#fragment'. + * The part before the first colon. + */ + readonly scheme: string; + + /** + * authority is the 'www.msft.com' part of 'http://www.msft.com/some/path?query#fragment'. + * The part between the first double slashes and the next slash. + */ + readonly authority: string; + + /** + * path is the '/some/path' part of 'http://www.msft.com/some/path?query#fragment'. + */ + readonly path: string; + + /** + * query is the 'query' part of 'http://www.msft.com/some/path?query#fragment'. + */ + readonly query: string; + + /** + * fragment is the 'fragment' part of 'http://www.msft.com/some/path?query#fragment'. + */ + readonly fragment: string; + + /** + * @internal + */ + protected constructor( + scheme: string, + authority?: string, + path?: string, + query?: string, + fragment?: string, + _strict?: boolean, + ); + + /** + * @internal + */ + protected constructor(components: UriComponents); + + /** + * @internal + */ + protected constructor( + schemeOrData: string | UriComponents, + authority?: string, + path?: string, + query?: string, + fragment?: string, + _strict = false, + ) { + if (typeof schemeOrData === 'object') { + this.scheme = schemeOrData.scheme || _empty; + this.authority = schemeOrData.authority || _empty; + this.path = schemeOrData.path || _empty; + this.query = schemeOrData.query || _empty; + this.fragment = schemeOrData.fragment || _empty; + // no validation because it's this URI + // that creates uri components. + // _validateUri(this); + } else { + this.scheme = _schemeFix(schemeOrData, _strict); + this.authority = authority || _empty; + this.path = _referenceResolution(this.scheme, path || _empty); + this.query = query || _empty; + this.fragment = fragment || _empty; + + _validateUri(this, _strict); + } + } + + // ---- filesystem path ----------------------- + + /** + * Returns a string representing the corresponding file system path of this URI. + * Will handle UNC paths, normalizes windows drive letters to lower-case, and uses the + * platform specific path separator. + * + * * Will *not* validate the path for invalid characters and semantics. + * * Will *not* look at the scheme of this URI. + * * The result shall *not* be used for display purposes but for accessing a file on disk. + * + * + * The *difference* to `URI#path` is the use of the platform specific separator and the handling + * of UNC paths. See the below sample of a file-uri with an authority (UNC path). + * + * ```ts + const u = URI.parse('file://server/c$/folder/file.txt') + u.authority === 'server' + u.path === '/shares/c$/file.txt' + u.fsPath === '\\server\c$\folder\file.txt' + ``` + * + * Using `URI#path` to read a file (using fs-apis) would not be enough because parts of the path, + * namely the server name, would be missing. Therefore `URI#fsPath` exists - it's sugar to ease working + * with URIs that represent files on disk (`file` scheme). + */ + get fsPath(): string { + // if (this.scheme !== 'file') { + // console.warn(`[UriError] calling fsPath with scheme ${this.scheme}`); + // } + return _makeFsPath(this); + } + + // ---- modify to new ------------------------- + + with(change: { + scheme?: string; + authority?: string | null; + path?: string | null; + query?: string | null; + fragment?: string | null; + }): URI { + if (!change) { + return this; + } + + let { scheme, authority, path, query, fragment } = change; + if (scheme === undefined) { + scheme = this.scheme; + } else if (scheme === null) { + scheme = _empty; + } + if (authority === undefined) { + authority = this.authority; + } else if (authority === null) { + authority = _empty; + } + if (path === undefined) { + path = this.path; + } else if (path === null) { + path = _empty; + } + if (query === undefined) { + query = this.query; + } else if (query === null) { + query = _empty; + } + if (fragment === undefined) { + fragment = this.fragment; + } else if (fragment === null) { + fragment = _empty; + } + + if ( + scheme === this.scheme && + authority === this.authority && + path === this.path && + query === this.query && + fragment === this.fragment + ) { + return this; + } + + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return new _URI(scheme, authority, path, query, fragment); + } + + // ---- parse & validate ------------------------ + + /** + * Creates a new URI from a string, e.g. `http://www.msft.com/some/path`, + * `file:///usr/home`, or `scheme:with/path`. + * + * @param value A string which represents an URI (see `URI#toString`). + * @param {boolean} [_strict=false] + */ + static parse(value: string, _strict = false): URI { + const match = _regexp.exec(value); + if (!match) { + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return new _URI(_empty, _empty, _empty, _empty, _empty); + } + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return new _URI( + match[2] || _empty, + decodeURIComponent(match[4] || _empty), + decodeURIComponent(match[5] || _empty), + decodeURIComponent(match[7] || _empty), + decodeURIComponent(match[9] || _empty), + _strict, + ); + } + + /** + * Creates a new URI from a file system path, e.g. `c:\my\files`, + * `/usr/home`, or `\\server\share\some\path`. + * + * The *difference* between `URI#parse` and `URI#file` is that the latter treats the argument + * as path, not as stringified-uri. E.g. `URI.file(path)` is **not the same as** + * `URI.parse('file://' + path)` because the path might contain characters that are + * interpreted (# and ?). See the following sample: + * ```ts + const good = URI.file('/coding/c#/project1'); + good.scheme === 'file'; + good.path === '/coding/c#/project1'; + good.fragment === ''; + const bad = URI.parse('file://' + '/coding/c#/project1'); + bad.scheme === 'file'; + bad.path === '/coding/c'; // path is now broken + bad.fragment === '/project1'; + ``` + * + * @param path A file system path (see `URI#fsPath`) + */ + static file(path: string): URI { + let authority = _empty; + + // normalize to fwd-slashes on windows, + // on other systems bwd-slashes are valid + // filename character, eg /f\oo/ba\r.txt + if (isWindows) { + path = path.replace(/\\/g, _slash); + } + + // check for authority as used in UNC shares + // or use the path as given + if (path[0] === _slash && path[1] === _slash) { + const idx = path.indexOf(_slash, 2); + if (idx === -1) { + authority = path.substring(2); + path = _slash; + } else { + authority = path.substring(2, idx); + path = path.substring(idx) || _slash; + } + } + + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return new _URI('file', authority, path, _empty, _empty); + } + + static from(components: { + scheme: string; + authority?: string; + path?: string; + query?: string; + fragment?: string; + }): URI { + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return new _URI( + components.scheme, + components.authority, + components.path, + components.query, + components.fragment, + ); + } + + // ---- printing/externalize --------------------------- + + /** + * Creates a string representation for this URI. It's guaranteed that calling + * `URI.parse` with the result of this function creates an URI which is equal + * to this URI. + * + * * The result shall *not* be used for display purposes but for externalization or transport. + * * The result will be encoded using the percentage encoding and encoding happens mostly + * ignore the scheme-specific encoding rules. + * + * @param skipEncoding Do not encode the result, default is `false` + */ + toString(skipEncoding = false): string { + return _asFormatted(this, skipEncoding); + } + + toJSON(): UriComponents { + return this; + } + + static revive(data: UriComponents | URI): URI; + + static revive(data: UriComponents | URI | undefined): URI | undefined; + + static revive(data: UriComponents | URI | null): URI | null; + + static revive(data: UriComponents | URI | undefined | null): URI | undefined | null; + + static revive(data: UriComponents | URI | undefined | null): URI | undefined | null { + if (!data) { + return data; + } + if (data instanceof URI) { + return data; + } + // eslint-disable-next-line @typescript-eslint/no-use-before-define + const result = new _URI(data); + result._formatted = (data).external; + result._fsPath = (data)._sep === _pathSepMarker ? (data).fsPath : null; + return result; + } + + static joinPath(uri: URI, ...pathFragment: string[]): URI { + if (!uri.path) { + throw new Error(`[UriError]: cannot call joinPaths on URI without path`); + } + let newPath: string; + if (isWindows && uri.scheme === 'file') { + newPath = URI.file(pathImport.join(uri.fsPath, ...pathFragment)).path; + } else { + newPath = pathImport.join(uri.path, ...pathFragment); + } + return uri.with({ path: newPath }); + } +} + +export interface UriComponents { + scheme: string; + authority: string; + path: string; + query: string; + fragment: string; +} + +interface UriState extends UriComponents { + $mid: number; + external: string; + fsPath: string; + _sep: 1 | undefined; +} + +class _URI extends URI { + _formatted: string | null = null; + + _fsPath: string | null = null; + + constructor( + schemeOrData: string | UriComponents, + authority?: string, + path?: string, + query?: string, + fragment?: string, + _strict = false, + ) { + super(schemeOrData as string, authority, path, query, fragment, _strict); + this._fsPath = this.fsPath; + } + + get fsPath(): string { + if (!this._fsPath) { + this._fsPath = _makeFsPath(this); + } + return this._fsPath; + } + + toString(skipEncoding = false): string { + if (!skipEncoding) { + if (!this._formatted) { + this._formatted = _asFormatted(this, false); + } + return this._formatted; + } + // we don't cache that + return _asFormatted(this, true); + } + + toJSON(): UriComponents { + const res = { + $mid: 1, + }; + // cached state + if (this._fsPath) { + res.fsPath = this._fsPath; + if (_pathSepMarker) { + res._sep = _pathSepMarker; + } + } + if (this._formatted) { + res.external = this._formatted; + } + // uri components + if (this.path) { + res.path = this.path; + } + if (this.scheme) { + res.scheme = this.scheme; + } + if (this.authority) { + res.authority = this.authority; + } + if (this.query) { + res.query = this.query; + } + if (this.fragment) { + res.fragment = this.fragment; + } + return res; + } +} + +// reserved characters: https://tools.ietf.org/html/rfc3986#section-2.2 +const encodeTable: { [ch: number]: string } = { + [CharCode.Colon]: '%3A', // gen-delims + [CharCode.Slash]: '%2F', + [CharCode.QuestionMark]: '%3F', + [CharCode.Hash]: '%23', + [CharCode.OpenSquareBracket]: '%5B', + [CharCode.CloseSquareBracket]: '%5D', + [CharCode.AtSign]: '%40', + + [CharCode.ExclamationMark]: '%21', // sub-delims + [CharCode.DollarSign]: '%24', + [CharCode.Ampersand]: '%26', + [CharCode.SingleQuote]: '%27', + [CharCode.OpenParen]: '%28', + [CharCode.CloseParen]: '%29', + [CharCode.Asterisk]: '%2A', + [CharCode.Plus]: '%2B', + [CharCode.Comma]: '%2C', + [CharCode.Semicolon]: '%3B', + [CharCode.Equals]: '%3D', + + [CharCode.Space]: '%20', +}; + +function encodeURIComponentFast(uriComponent: string, allowSlash: boolean): string { + let res: string | undefined; + let nativeEncodePos = -1; + + for (let pos = 0; pos < uriComponent.length; pos += 1) { + const code = uriComponent.charCodeAt(pos); + + // unreserved characters: https://tools.ietf.org/html/rfc3986#section-2.3 + if ( + (code >= CharCode.a && code <= CharCode.z) || + (code >= CharCode.A && code <= CharCode.Z) || + (code >= CharCode.Digit0 && code <= CharCode.Digit9) || + code === CharCode.Dash || + code === CharCode.Period || + code === CharCode.Underline || + code === CharCode.Tilde || + (allowSlash && code === CharCode.Slash) + ) { + // check if we are delaying native encode + if (nativeEncodePos !== -1) { + res += encodeURIComponent(uriComponent.substring(nativeEncodePos, pos)); + nativeEncodePos = -1; + } + // check if we write into a new string (by default we try to return the param) + if (res !== undefined) { + res += uriComponent.charAt(pos); + } + } else { + // encoding needed, we need to allocate a new string + if (res === undefined) { + res = uriComponent.substr(0, pos); + } + + // check with default table first + const escaped = encodeTable[code]; + if (escaped !== undefined) { + // check if we are delaying native encode + if (nativeEncodePos !== -1) { + res += encodeURIComponent(uriComponent.substring(nativeEncodePos, pos)); + nativeEncodePos = -1; + } + + // append escaped variant to result + res += escaped; + } else if (nativeEncodePos === -1) { + // use native encode only when needed + nativeEncodePos = pos; + } + } + } + + if (nativeEncodePos !== -1) { + res += encodeURIComponent(uriComponent.substring(nativeEncodePos)); + } + + return res !== undefined ? res : uriComponent; +} + +function encodeURIComponentMinimal(path: string): string { + let res: string | undefined; + for (let pos = 0; pos < path.length; pos += 1) { + const code = path.charCodeAt(pos); + if (code === CharCode.Hash || code === CharCode.QuestionMark) { + if (res === undefined) { + res = path.substr(0, pos); + } + res += encodeTable[code]; + } else if (res !== undefined) { + res += path[pos]; + } + } + return res !== undefined ? res : path; +} + +/** + * Compute `fsPath` for the given uri + */ +function _makeFsPath(uri: URI): string { + let value: string; + if (uri.authority && uri.path.length > 1 && uri.scheme === 'file') { + // unc path: file://shares/c$/far/boo + value = `//${uri.authority}${uri.path}`; + } else if ( + uri.path.charCodeAt(0) === CharCode.Slash && + ((uri.path.charCodeAt(1) >= CharCode.A && uri.path.charCodeAt(1) <= CharCode.Z) || + (uri.path.charCodeAt(1) >= CharCode.a && uri.path.charCodeAt(1) <= CharCode.z)) && + uri.path.charCodeAt(2) === CharCode.Colon + ) { + // windows drive letter: file:///c:/far/boo + value = uri.path[1].toLowerCase() + uri.path.substr(2); + } else { + // other path + value = uri.path; + } + if (isWindows) { + value = value.replace(/\//g, '\\'); + } + return value; +} + +/** + * Create the external version of a uri + */ +function _asFormatted(uri: URI, skipEncoding: boolean): string { + const encoder = !skipEncoding ? encodeURIComponentFast : encodeURIComponentMinimal; + + let res = ''; + let { authority, path } = uri; + const { scheme, query, fragment } = uri; + if (scheme) { + res += scheme; + res += ':'; + } + if (authority || scheme === 'file') { + res += _slash; + res += _slash; + } + if (authority) { + let idx = authority.indexOf('@'); + if (idx !== -1) { + // @ + const userinfo = authority.substr(0, idx); + authority = authority.substr(idx + 1); + idx = userinfo.indexOf(':'); + if (idx === -1) { + res += encoder(userinfo, false); + } else { + // :@ + res += encoder(userinfo.substr(0, idx), false); + res += ':'; + res += encoder(userinfo.substr(idx + 1), false); + } + res += '@'; + } + authority = authority.toLowerCase(); + idx = authority.indexOf(':'); + if (idx === -1) { + res += encoder(authority, false); + } else { + // : + res += encoder(authority.substr(0, idx), false); + res += authority.substr(idx); + } + } + if (path) { + // lower-case windows drive letters in /C:/fff or C:/fff + if (path.length >= 3 && path.charCodeAt(0) === CharCode.Slash && path.charCodeAt(2) === CharCode.Colon) { + const code = path.charCodeAt(1); + if (code >= CharCode.A && code <= CharCode.Z) { + path = `/${String.fromCharCode(code + 32)}:${path.substr(3)}`; // "/c:".length === 3 + } + } else if (path.length >= 2 && path.charCodeAt(1) === CharCode.Colon) { + const code = path.charCodeAt(0); + if (code >= CharCode.A && code <= CharCode.Z) { + path = `${String.fromCharCode(code + 32)}:${path.substr(2)}`; // "/c:".length === 3 + } + } + // encode the rest of the path + res += encoder(path, true); + } + if (query) { + res += '?'; + res += encoder(query, false); + } + if (fragment) { + res += '#'; + res += !skipEncoding ? encodeURIComponentFast(fragment, false) : fragment; + } + return res; +} diff --git a/src/test/mocks/vsc/uuid.ts b/src/test/mocks/vsc/uuid.ts new file mode 100644 index 0000000..fd82544 --- /dev/null +++ b/src/test/mocks/vsc/uuid.ts @@ -0,0 +1,109 @@ +/* eslint-disable max-classes-per-file */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +'use strict'; + +/** + * Represents a UUID as defined by rfc4122. + */ + +export interface UUID { + /** + * @returns the canonical representation in sets of hexadecimal numbers separated by dashes. + */ + asHex(): string; +} + +class ValueUUID implements UUID { + constructor(public _value: string) { + // empty + } + + public asHex(): string { + return this._value; + } +} + +class V4UUID extends ValueUUID { + private static readonly _chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f']; + + private static readonly _timeHighBits = ['8', '9', 'a', 'b']; + + private static _oneOf(array: string[]): string { + return array[Math.floor(array.length * Math.random())]; + } + + private static _randomHex(): string { + return V4UUID._oneOf(V4UUID._chars); + } + + constructor() { + super( + [ + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + '-', + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + '-', + '4', + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + '-', + V4UUID._oneOf(V4UUID._timeHighBits), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + '-', + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + V4UUID._randomHex(), + ].join(''), + ); + } +} + +export function v4(): UUID { + return new V4UUID(); +} + +const _UUIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; + +export function isUUID(value: string): boolean { + return _UUIDPattern.test(value); +} + +/** + * Parses a UUID that is of the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx. + * @param value A uuid string. + */ +export function parse(value: string): UUID { + if (!isUUID(value)) { + throw new Error('invalid uuid'); + } + + return new ValueUUID(value); +} + +export function generateUuid(): string { + return v4().asHex(); +} diff --git a/src/test/unittests.ts b/src/test/unittests.ts new file mode 100644 index 0000000..8e7183c --- /dev/null +++ b/src/test/unittests.ts @@ -0,0 +1,132 @@ +import * as vscode from 'vscode'; +import * as vscodeMocks from './mocks/vsc'; +import { vscMockTelemetryReporter } from './mocks/vsc/telemetryReporter'; +import { anything, instance, mock, when } from 'ts-mockito'; +const Module = require('module'); + +type VSCode = typeof vscode; + +const mockedVSCode: Partial = {}; +export const mockedVSCodeNamespaces: { [P in keyof VSCode]?: VSCode[P] } = {}; +const originalLoad = Module._load; + +function generateMock(name: K): void { + const mockedObj = mock(); + (mockedVSCode as any)[name] = instance(mockedObj); + mockedVSCodeNamespaces[name] = mockedObj as any; +} + +class MockClipboard { + private text: string = ''; + public readText(): Promise { + return Promise.resolve(this.text); + } + public async writeText(value: string): Promise { + this.text = value; + } +} +export function initialize() { + generateMock('workspace'); + generateMock('window'); + generateMock('commands'); + generateMock('languages'); + generateMock('extensions'); + generateMock('env'); + generateMock('debug'); + generateMock('scm'); + generateMock('notebooks'); + + // Use mock clipboard fo testing purposes. + const clipboard = new MockClipboard(); + when(mockedVSCodeNamespaces.env!.clipboard).thenReturn(clipboard); + when(mockedVSCodeNamespaces.env!.appName).thenReturn('Insider'); + + // This API is used in src/client/telemetry/telemetry.ts + const extension = mock>(); + const packageJson = mock(); + const contributes = mock(); + when(extension.packageJSON).thenReturn(instance(packageJson)); + when(packageJson.contributes).thenReturn(instance(contributes)); + when(contributes.debuggers).thenReturn([{ aiKey: '' }]); + when(mockedVSCodeNamespaces.extensions!.getExtension(anything())).thenReturn(instance(extension)); + when(mockedVSCodeNamespaces.extensions!.all).thenReturn([]); + + // When upgrading to npm 9-10, this might have to change, as we could have explicit imports (named imports). + Module._load = function (request: any, _parent: any) { + if (request === 'vscode') { + return mockedVSCode; + } + if (request === '@vscode/extension-telemetry') { + return { default: vscMockTelemetryReporter as any }; + } + // less files need to be in import statements to be converted to css + // But we don't want to try to load them in the mock vscode + if (/\.less$/.test(request)) { + return; + } + return originalLoad.apply(this, arguments); + }; +} + +mockedVSCode.ThemeIcon = vscodeMocks.ThemeIcon; +mockedVSCode.l10n = vscodeMocks.l10n; +mockedVSCode.ThemeColor = vscodeMocks.ThemeColor; +mockedVSCode.MarkdownString = vscodeMocks.MarkdownString; +mockedVSCode.Hover = vscodeMocks.Hover; +mockedVSCode.Disposable = vscodeMocks.Disposable as any; +mockedVSCode.ExtensionKind = vscodeMocks.ExtensionKind; +mockedVSCode.CodeAction = vscodeMocks.CodeAction; +mockedVSCode.TestMessage = vscodeMocks.TestMessage; +mockedVSCode.Location = vscodeMocks.Location; +mockedVSCode.EventEmitter = vscodeMocks.EventEmitter; +mockedVSCode.CancellationTokenSource = vscodeMocks.CancellationTokenSource; +mockedVSCode.CompletionItemKind = vscodeMocks.CompletionItemKind; +mockedVSCode.SymbolKind = vscodeMocks.SymbolKind; +mockedVSCode.IndentAction = vscodeMocks.IndentAction; +mockedVSCode.Uri = vscodeMocks.vscUri.URI as any; +mockedVSCode.Range = vscodeMocks.vscMockExtHostedTypes.Range; +mockedVSCode.Position = vscodeMocks.vscMockExtHostedTypes.Position; +mockedVSCode.Selection = vscodeMocks.vscMockExtHostedTypes.Selection; +mockedVSCode.Location = vscodeMocks.vscMockExtHostedTypes.Location; +mockedVSCode.SymbolInformation = vscodeMocks.vscMockExtHostedTypes.SymbolInformation; +mockedVSCode.CallHierarchyItem = vscodeMocks.vscMockExtHostedTypes.CallHierarchyItem; +mockedVSCode.CompletionItem = vscodeMocks.vscMockExtHostedTypes.CompletionItem; +mockedVSCode.CompletionItemKind = vscodeMocks.vscMockExtHostedTypes.CompletionItemKind; +mockedVSCode.CodeLens = vscodeMocks.vscMockExtHostedTypes.CodeLens; +mockedVSCode.Diagnostic = vscodeMocks.vscMockExtHostedTypes.Diagnostic; +mockedVSCode.DiagnosticSeverity = vscodeMocks.vscMockExtHostedTypes.DiagnosticSeverity; +mockedVSCode.SnippetString = vscodeMocks.vscMockExtHostedTypes.SnippetString; +mockedVSCode.ConfigurationTarget = vscodeMocks.vscMockExtHostedTypes.ConfigurationTarget; +mockedVSCode.StatusBarAlignment = vscodeMocks.vscMockExtHostedTypes.StatusBarAlignment; +mockedVSCode.SignatureHelp = vscodeMocks.vscMockExtHostedTypes.SignatureHelp; +mockedVSCode.DocumentLink = vscodeMocks.vscMockExtHostedTypes.DocumentLink; +mockedVSCode.TextEdit = vscodeMocks.vscMockExtHostedTypes.TextEdit; +mockedVSCode.WorkspaceEdit = vscodeMocks.vscMockExtHostedTypes.WorkspaceEdit; +mockedVSCode.RelativePattern = vscodeMocks.vscMockExtHostedTypes.RelativePattern; +mockedVSCode.ProgressLocation = vscodeMocks.vscMockExtHostedTypes.ProgressLocation; +mockedVSCode.ViewColumn = vscodeMocks.vscMockExtHostedTypes.ViewColumn; +mockedVSCode.TextEditorRevealType = vscodeMocks.vscMockExtHostedTypes.TextEditorRevealType; +mockedVSCode.TreeItem = vscodeMocks.vscMockExtHostedTypes.TreeItem; +mockedVSCode.TreeItemCollapsibleState = vscodeMocks.vscMockExtHostedTypes.TreeItemCollapsibleState; +(mockedVSCode as any).CodeActionKind = vscodeMocks.CodeActionKind; +mockedVSCode.CompletionItemKind = vscodeMocks.CompletionItemKind; +mockedVSCode.CompletionTriggerKind = vscodeMocks.CompletionTriggerKind; +mockedVSCode.DebugAdapterExecutable = vscodeMocks.DebugAdapterExecutable; +mockedVSCode.DebugAdapterServer = vscodeMocks.DebugAdapterServer; +mockedVSCode.QuickInputButtons = vscodeMocks.vscMockExtHostedTypes.QuickInputButtons; +mockedVSCode.FileType = vscodeMocks.FileType; +mockedVSCode.UIKind = vscodeMocks.UIKind; +mockedVSCode.FileSystemError = vscodeMocks.vscMockExtHostedTypes.FileSystemError; +mockedVSCode.LanguageStatusSeverity = vscodeMocks.LanguageStatusSeverity; +mockedVSCode.QuickPickItemKind = vscodeMocks.QuickPickItemKind; +mockedVSCode.InlayHint = vscodeMocks.InlayHint; +mockedVSCode.LogLevel = vscodeMocks.LogLevel; +(mockedVSCode as any).NotebookCellKind = vscodeMocks.vscMockExtHostedTypes.NotebookCellKind; +(mockedVSCode as any).CellOutputKind = vscodeMocks.vscMockExtHostedTypes.CellOutputKind; +(mockedVSCode as any).NotebookCellRunState = vscodeMocks.vscMockExtHostedTypes.NotebookCellRunState; +(mockedVSCode as any).TypeHierarchyItem = vscodeMocks.vscMockExtHostedTypes.TypeHierarchyItem; +(mockedVSCode as any).ProtocolTypeHierarchyItem = vscodeMocks.vscMockExtHostedTypes.ProtocolTypeHierarchyItem; +(mockedVSCode as any).CancellationError = vscodeMocks.vscMockExtHostedTypes.CancellationError; +(mockedVSCode as any).LSPCancellationError = vscodeMocks.vscMockExtHostedTypes.LSPCancellationError; +mockedVSCode.TestRunProfileKind = vscodeMocks.TestRunProfileKind; +initialize(); From 0ed22f98cc63399bafef0c80e7ebb5a3b39dab2a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 27 Nov 2024 19:46:06 +0530 Subject: [PATCH 017/328] Add linting check and fix linting issues (#30) --- .github/workflows/pr-check.yml | 53 +- .github/workflows/push-check.yml | 54 +- .vscode/launch.json | 2 +- .vscode/settings.json | 4 + build/.mocha.unittests.json | 8 + eslint.config.mjs | 14 +- package-lock.json | 1172 ++++++++--------- package.json | 12 +- src/common/command.api.ts | 1 + src/common/extension.apis.ts | 1 + src/common/pickers/packages.ts | 2 + src/common/telemetry/reporter.ts | 1 - src/common/window.apis.ts | 1 + src/common/workspace.apis.ts | 1 + src/features/envCommands.ts | 5 +- src/features/terminal/terminalManager.ts | 1 + src/managers/common/utils.ts | 2 +- src/managers/conda/condaUtils.ts | 1 + src/managers/conda/main.ts | 2 +- .../common/internalVariables.unit.test.ts | 35 +- src/test/mocks/helper.ts | 2 +- src/test/mocks/mementos.ts | 4 +- src/test/mocks/mockChildProcess.ts | 5 +- src/test/mocks/mockDocument.ts | 10 - src/test/mocks/mockWorkspaceConfig.ts | 4 +- src/test/mocks/vsc/arrays.ts | 4 +- src/test/mocks/vsc/charCode.ts | 1 - src/test/mocks/vsc/extHostedTypes.ts | 32 +- src/test/mocks/vsc/htmlContent.ts | 2 - src/test/mocks/vsc/index.ts | 13 +- src/test/mocks/vsc/position.ts | 3 - src/test/mocks/vsc/selection.ts | 235 ---- src/test/mocks/vsc/telemetryReporter.ts | 3 - src/test/mocks/vsc/uri.ts | 9 - src/test/mocks/vsc/uuid.ts | 7 +- src/test/unittests.ts | 1 + tsconfig.json | 10 +- 37 files changed, 778 insertions(+), 939 deletions(-) create mode 100644 build/.mocha.unittests.json delete mode 100644 src/test/mocks/vsc/selection.ts diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 8aa6cc7..ea2bf99 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -8,8 +8,7 @@ on: - release* env: - NODE_VERSION: 18.17.1 - + NODE_VERSION: '20.18.0' jobs: build-vsix: @@ -24,3 +23,53 @@ jobs: uses: ./.github/actions/build-vsix with: node_version: ${{ env.NODE_VERSION }} + + lint: + name: Lint + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: 'npm' + + - name: Install Dependencies + run: npm ci + + - name: Run Linter + run: npm run lint + + ts-unit-tests: + name: TypeScript Unit Tests + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: 'npm' + + - name: Install Dependencies + run: npm ci + + - name: Compile Tests + run: npm run pretest + + - name: Localization + run: npx @vscode/l10n-dev@latest export ./src + + - name: Run Tests + run: npm run unittest diff --git a/.github/workflows/push-check.yml b/.github/workflows/push-check.yml index e8dd70e..c6ef189 100644 --- a/.github/workflows/push-check.yml +++ b/.github/workflows/push-check.yml @@ -9,7 +9,7 @@ on: - 'release-*' env: - NODE_VERSION: 18.17.1 + NODE_VERSION: '20.18.0' jobs: build-vsix: @@ -23,4 +23,54 @@ jobs: - name: Build VSIX uses: ./.github/actions/build-vsix with: - node_version: ${{ env.NODE_VERSION }} \ No newline at end of file + node_version: ${{ env.NODE_VERSION }} + + lint: + name: Lint + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: 'npm' + + - name: Install Dependencies + run: npm ci + + - name: Run Linter + run: npm run lint + + ts-unit-tests: + name: TypeScript Unit Tests + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: 'npm' + + - name: Install Dependencies + run: npm ci + + - name: Compile Tests + run: npm run pretest + + - name: Localization + run: npx @vscode/l10n-dev@latest export ./src + + - name: Run Tests + run: npm run unittest diff --git a/.vscode/launch.json b/.vscode/launch.json index 64418e1..152f2b5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,7 +16,7 @@ { "args": [ "-u=tdd", - "--timeout=999999", + "--timeout=180000", "--colors", "--recursive", //"--grep", "", diff --git a/.vscode/settings.json b/.vscode/settings.json index 43d5bdc..bf5eb7c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,9 @@ "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[python]": { + "editor.defaultFormatter": "charliermarsh.ruff", + "diffEditor.ignoreTrimWhitespace": false + }, "prettier.tabWidth": 4 } diff --git a/build/.mocha.unittests.json b/build/.mocha.unittests.json new file mode 100644 index 0000000..6792e77 --- /dev/null +++ b/build/.mocha.unittests.json @@ -0,0 +1,8 @@ +{ + "spec": "./out/test/**/*.unit.test.js", + "require": ["out/test/unittests.js"], + "ui": "tdd", + "recursive": true, + "colors": true, + "timeout": 180000 +} diff --git a/eslint.config.mjs b/eslint.config.mjs index d5c0b53..60ebcf3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -19,10 +19,22 @@ export default [{ selector: "import", format: ["camelCase", "PascalCase"], }], - + "@typescript-eslint/no-unused-vars": [ + "error", + { + "args": "all", + "argsIgnorePattern": "^_", + "caughtErrors": "all", + "caughtErrorsIgnorePattern": "^_", + "destructuredArrayIgnorePattern": "^_", + "varsIgnorePattern": "^_", + "ignoreRestSiblings": true + } + ], curly: "warn", eqeqeq: "warn", "no-throw-literal": "warn", semi: "warn", + "@typescript-eslint/no-explicit-any": "warn", }, }]; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c3934a8..d723ff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,11 +26,11 @@ "@types/stack-trace": "0.0.29", "@types/vscode": "^1.93.0", "@types/which": "^3.0.4", - "@typescript-eslint/eslint-plugin": "^5.59.8", - "@typescript-eslint/parser": "^5.59.8", + "@typescript-eslint/eslint-plugin": "^8.16.0", + "@typescript-eslint/parser": "^8.16.0", "@vscode/test-electron": "^2.3.2", "@vscode/vsce": "^2.24.0", - "eslint": "^8.41.0", + "eslint": "^9.15.0", "glob": "^8.1.0", "mocha": "^10.8.2", "sinon": "^19.0.2", @@ -84,24 +84,51 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -109,33 +136,81 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, "node_modules/@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "node_modules/@eslint/plugin-kit": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" }, "engines": { - "node": ">=10.10.0" + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, "node_modules/@humanwhocodes/module-importer": { @@ -151,11 +226,19 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", - "dev": true + "node_modules/@humanwhocodes/retry": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@iarna/toml": { "version": "2.2.5", @@ -444,6 +527,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -457,6 +541,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -466,6 +551,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -542,10 +628,11 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/fs-extra": { "version": "11.0.4", @@ -604,12 +691,6 @@ "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==", "dev": true }, - "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", - "dev": true - }, "node_modules/@types/sinon": { "version": "17.0.3", "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", @@ -646,32 +727,32 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.16.0.tgz", + "integrity": "sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/type-utils": "8.16.0", + "@typescript-eslint/utils": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -680,25 +761,27 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.16.0.tgz", + "integrity": "sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/typescript-estree": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -707,16 +790,17 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz", + "integrity": "sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -724,25 +808,26 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.16.0.tgz", + "integrity": "sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "8.16.0", + "@typescript-eslint/utils": "8.16.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -751,12 +836,13 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.16.0.tgz", + "integrity": "sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -764,21 +850,23 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz", + "integrity": "sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -790,54 +878,90 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.16.0.tgz", + "integrity": "sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/typescript-estree": "8.16.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz", + "integrity": "sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "8.16.0", + "eslint-visitor-keys": "^4.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } }, "node_modules/@vscode/extension-telemetry": { "version": "0.9.7", @@ -1320,10 +1444,11 @@ "dev": true }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -1345,6 +1470,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -1434,15 +1560,6 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/azure-devops-node-api": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz", @@ -1703,6 +1820,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2076,30 +2194,6 @@ "node": ">=0.3.1" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -2276,58 +2370,63 @@ } }, "node_modules/eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-scope": { @@ -2356,16 +2455,30 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -2376,22 +2489,37 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -2453,6 +2581,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -2487,6 +2616,7 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -2503,6 +2633,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2536,6 +2667,7 @@ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -2550,15 +2682,16 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, + "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-range": { @@ -2596,24 +2729,25 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "dev": true, + "license": "ISC" }, "node_modules/foreground-child": { "version": "3.3.0", @@ -2767,35 +2901,13 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, + "license": "MIT", "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2992,6 +3104,7 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3119,15 +3232,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -3273,7 +3377,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", @@ -3346,6 +3451,7 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -3524,6 +3630,7 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -3718,12 +3825,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -3877,6 +3978,7 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -3987,15 +4089,6 @@ "node": ">=16" } }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -4189,7 +4282,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/randombytes": { "version": "2.1.0", @@ -4326,6 +4420,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -4335,46 +4430,12 @@ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4394,6 +4455,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -4609,15 +4671,6 @@ "node": ">=0.3.1" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/source-map": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", @@ -4885,12 +4938,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "node_modules/tmp": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", @@ -4911,6 +4958,19 @@ "node": ">=8.0" } }, + "node_modules/ts-api-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.2.tgz", + "integrity": "sha512-ZF5gQIQa/UmzfvxbHZI3JXN0/Jt+vnAfAviNRAMc491laiK6YCLpCW9ft8oaCRFOTxCZtUTE6XB0ZQAe3olntw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-loader": { "version": "9.5.1", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", @@ -4944,22 +5004,8 @@ "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "peer": true }, "node_modules/tunnel": { "version": "0.0.6", @@ -5005,18 +5051,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/typed-rest-client": { "version": "1.8.11", "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.11.tgz", @@ -5483,21 +5517,38 @@ } }, "@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true + }, + "@eslint/config-array": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", + "dev": true, + "requires": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + } + }, + "@eslint/core": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", "dev": true }, "@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -5506,20 +5557,48 @@ } }, "@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", + "dev": true + }, + "@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", "dev": true }, - "@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "@eslint/plugin-kit": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" + "levn": "^0.4.1" + } + }, + "@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true + }, + "@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "requires": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "dependencies": { + "@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true + } } }, "@humanwhocodes/module-importer": { @@ -5528,10 +5607,10 @@ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true }, - "@humanwhocodes/object-schema": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "@humanwhocodes/retry": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "dev": true }, "@iarna/toml": { @@ -5832,9 +5911,9 @@ "dev": true }, "@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "@types/fs-extra": { @@ -5894,12 +5973,6 @@ "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==", "dev": true }, - "@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", - "dev": true - }, "@types/sinon": { "version": "17.0.3", "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", @@ -5934,110 +6007,129 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.16.0.tgz", + "integrity": "sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==", "dev": true, "requires": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/type-utils": "8.16.0", + "@typescript-eslint/utils": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" } }, "@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.16.0.tgz", + "integrity": "sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/typescript-estree": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz", + "integrity": "sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0" } }, "@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.16.0.tgz", + "integrity": "sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "8.16.0", + "@typescript-eslint/utils": "8.16.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.3.0" } }, "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.16.0.tgz", + "integrity": "sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz", + "integrity": "sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.16.0.tgz", + "integrity": "sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==", "dev": true, "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/typescript-estree": "8.16.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz", + "integrity": "sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "8.16.0", + "eslint-visitor-keys": "^4.2.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true + } } }, - "@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, "@vscode/extension-telemetry": { "version": "0.9.7", "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.7.tgz", @@ -6428,9 +6520,9 @@ "dev": true }, "acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true }, "acorn-import-attributes": { @@ -6507,12 +6599,6 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, "azure-devops-node-api": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz", @@ -6955,24 +7041,6 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==" }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, "dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -7094,61 +7162,63 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" }, "eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "dependencies": { "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, + "eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true + }, "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", @@ -7174,14 +7244,22 @@ "dev": true }, "espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "requires": { - "acorn": "^8.9.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.2.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true + } } }, "esquery": { @@ -7310,12 +7388,12 @@ } }, "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, "requires": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" } }, "fill-range": { @@ -7341,20 +7419,19 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==" }, "flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, "requires": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" } }, "flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true }, "foreground-child": { @@ -7471,27 +7548,10 @@ "dev": true }, "globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true }, "gopd": { "version": "1.0.1", @@ -7712,12 +7772,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, "is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -8172,12 +8226,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -8383,12 +8431,6 @@ "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", "dev": true }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -8641,31 +8683,6 @@ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -8813,12 +8830,6 @@ } } }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, "source-map": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", @@ -9008,12 +9019,6 @@ } } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "tmp": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", @@ -9028,6 +9033,13 @@ "is-number": "^7.0.0" } }, + "ts-api-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.2.tgz", + "integrity": "sha512-ZF5gQIQa/UmzfvxbHZI3JXN0/Jt+vnAfAviNRAMc491laiK6YCLpCW9ft8oaCRFOTxCZtUTE6XB0ZQAe3olntw==", + "dev": true, + "requires": {} + }, "ts-loader": { "version": "9.5.1", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", @@ -9053,16 +9065,8 @@ "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "peer": true }, "tunnel": { "version": "0.0.6", @@ -9095,12 +9099,6 @@ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - }, "typed-rest-client": { "version": "1.8.11", "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.11.tgz", diff --git a/package.json b/package.json index 0f394b5..6b2d433 100644 --- a/package.json +++ b/package.json @@ -422,9 +422,9 @@ "package": "webpack --mode production --devtool source-map --config ./webpack.config.js", "compile-tests": "tsc -p . --outDir out", "watch-tests": "tsc -p . -w --outDir out", - "pretest": "npm run compile-tests && npm run compile && npm run lint", - "lint": "eslint src --ext ts", - "test": "node ./out/test/runTest.js", + "pretest": "npm run compile-tests && npm run compile", + "lint": "eslint --config=eslint.config.mjs src", + "unittest": "mocha --config=./build/.mocha.unittests.json", "vsce-package": "vsce package -o ms-python-envs-insiders.vsix" }, "devDependencies": { @@ -436,11 +436,11 @@ "@types/stack-trace": "0.0.29", "@types/vscode": "^1.93.0", "@types/which": "^3.0.4", - "@typescript-eslint/eslint-plugin": "^5.59.8", - "@typescript-eslint/parser": "^5.59.8", + "@typescript-eslint/eslint-plugin": "^8.16.0", + "@typescript-eslint/parser": "^8.16.0", "@vscode/test-electron": "^2.3.2", "@vscode/vsce": "^2.24.0", - "eslint": "^8.41.0", + "eslint": "^9.15.0", "glob": "^8.1.0", "mocha": "^10.8.2", "sinon": "^19.0.2", diff --git a/src/common/command.api.ts b/src/common/command.api.ts index 375cc00..3fece44 100644 --- a/src/common/command.api.ts +++ b/src/common/command.api.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { commands } from 'vscode'; export function executeCommand(command: string, ...rest: any[]): Thenable { diff --git a/src/common/extension.apis.ts b/src/common/extension.apis.ts index 23ce30e..5a2f9cc 100644 --- a/src/common/extension.apis.ts +++ b/src/common/extension.apis.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { Extension, extensions } from 'vscode'; export function getExtension(extensionId: string): Extension | undefined { diff --git a/src/common/pickers/packages.ts b/src/common/pickers/packages.ts index 62e704a..262de55 100644 --- a/src/common/pickers/packages.ts +++ b/src/common/pickers/packages.ts @@ -219,6 +219,7 @@ async function getWorkspacePackages( handleItemButton(e.item.uri); }, ); + // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { if (ex === QuickInputButtons.Back) { throw ex; @@ -284,6 +285,7 @@ async function getCommonPackagesToInstall( handleItemButton(e.item.uri); }, ); + // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { if (ex === QuickInputButtons.Back) { throw ex; diff --git a/src/common/telemetry/reporter.ts b/src/common/telemetry/reporter.ts index f1eec9b..251349d 100644 --- a/src/common/telemetry/reporter.ts +++ b/src/common/telemetry/reporter.ts @@ -4,7 +4,6 @@ class ReporterImpl { private static telemetryReporter: TelemetryReporter | undefined; static getTelemetryReporter() { const tel = require('@vscode/extension-telemetry'); - // eslint-disable-next-line @typescript-eslint/naming-convention const Reporter = tel.default as typeof TelemetryReporter; ReporterImpl.telemetryReporter = new Reporter( '0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255', diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 9d5da86..55f06c1 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { CancellationToken, Disposable, diff --git a/src/common/workspace.apis.ts b/src/common/workspace.apis.ts index 7e2c3ea..e5d8daa 100644 --- a/src/common/workspace.apis.ts +++ b/src/common/workspace.apis.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { CancellationToken, ConfigurationChangeEvent, diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index c1cd02f..8680d1c 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -151,10 +151,11 @@ export async function handlePackagesCommand( if (!packages || packages.length === 0) { try { packages = await getPackagesToInstallFromPackageManager(packageManager, environment); - } catch (ex: any) { + } catch (ex) { if (ex === QuickInputButtons.Back) { return handlePackagesCommand(packageManager, environment, packages); } + throw ex; } } if (packages && packages.length > 0) { @@ -319,7 +320,7 @@ export async function addPythonProject( if (results === undefined) { return; } - } catch (ex: any) { + } catch (ex) { if (ex === QuickInputButtons.Back) { return addPythonProject(resource, wm, em, pc); } diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 91a4b4d..21a1a72 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -317,6 +317,7 @@ export class TerminalManagerImpl implements TerminalManager { }, ); } catch (e) { + traceError('Failed to activate environment:\r\n', e); showErrorMessage(`Failed to activate ${environment.displayName}`); } } diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 5aeb4ce..5bc9981 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -55,7 +55,7 @@ export function isGreater(a: string | undefined, b: string | undefined): boolean return false; } } - } catch (ex) { + } catch { return false; } return false; diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 029fba5..c5f0f71 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -147,6 +147,7 @@ async function runConda(args: string[]): Promise { return deferred.promise; } +// eslint-disable-next-line @typescript-eslint/no-explicit-any async function getCondaInfo(): Promise { const raw = await runConda(['info', '--envs', '--json']); return JSON.parse(raw); diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts index 278a4cd..f234b2a 100644 --- a/src/managers/conda/main.ts +++ b/src/managers/conda/main.ts @@ -26,6 +26,6 @@ export async function registerCondaFeatures( api.registerPackageManager(packageManager), ); } catch (ex) { - traceInfo('Conda not found, turning off conda features.'); + traceInfo('Conda not found, turning off conda features.', ex); } } diff --git a/src/test/common/internalVariables.unit.test.ts b/src/test/common/internalVariables.unit.test.ts index 4d88ba6..f9ed6b6 100644 --- a/src/test/common/internalVariables.unit.test.ts +++ b/src/test/common/internalVariables.unit.test.ts @@ -2,41 +2,44 @@ import assert from 'node:assert'; import { resolveVariables } from '../../common/utils/internalVariables'; import * as workspaceApi from '../../common/workspace.apis'; import * as sinon from 'sinon'; +import * as path from 'path'; +import { Uri } from 'vscode'; suite('Internal Variable substitution', () => { let getWorkspaceFolderStub: sinon.SinonStub; let getWorkspaceFoldersStub: sinon.SinonStub; - const home = process.env.HOME ?? process.env.USERPROFILE; - const project = { name: 'project', uri: { fsPath: 'project' } }; - const workspaceFolder = { name: 'workspaceFolder', uri: { fsPath: 'workspaceFolder' } }; + const home = process.env.HOME ?? process.env.USERPROFILE ?? ''; + const project = { name: 'project1', uri: { fsPath: path.join(home, 'workspace1', 'project1') } }; + const workspaceFolder = { name: 'workspace1', uri: { fsPath: path.join(home, 'workspace1') } }; setup(() => { getWorkspaceFolderStub = sinon.stub(workspaceApi, 'getWorkspaceFolder'); getWorkspaceFoldersStub = sinon.stub(workspaceApi, 'getWorkspaceFolders'); - getWorkspaceFolderStub.callsFake(() => { - return workspaceFolder; - }); + getWorkspaceFolderStub.returns(workspaceFolder); + getWorkspaceFoldersStub.returns([workspaceFolder]); + }); - getWorkspaceFoldersStub.callsFake(() => { - return [workspaceFolder]; - }); + teardown(() => { + sinon.restore(); }); [ { variable: '${userHome}', substitution: home }, { variable: '${pythonProject}', substitution: project.uri.fsPath }, { variable: '${workspaceFolder}', substitution: workspaceFolder.uri.fsPath }, + { variable: '${workspaceFolder:workspace1}', substitution: workspaceFolder.uri.fsPath }, + { variable: '${cwd}', substitution: process.cwd() }, + process.platform === 'win32' + ? { variable: '${env:USERPROFILE}', substitution: home } + : { variable: '${env:HOME}', substitution: home }, ].forEach((item) => { test(`Resolve ${item.variable}`, () => { - const value = `Some ${item.variable} text`; - const result = resolveVariables(value, project.uri as any); - assert.equal(result, `Some ${item.substitution} text`); + // Two times here to ensure that both instances are handled + const value = `Some ${item.variable} text ${item.variable}`; + const result = resolveVariables(value, project.uri as unknown as Uri); + assert.equal(result, `Some ${item.substitution} text ${item.substitution}`); }); }); - - teardown(() => { - sinon.restore(); - }); }); diff --git a/src/test/mocks/helper.ts b/src/test/mocks/helper.ts index 1ca4e62..b612aaa 100644 --- a/src/test/mocks/helper.ts +++ b/src/test/mocks/helper.ts @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ + /* eslint-disable @typescript-eslint/no-explicit-any */ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. diff --git a/src/test/mocks/mementos.ts b/src/test/mocks/mementos.ts index 12ca6a2..4cae66c 100644 --- a/src/test/mocks/mementos.ts +++ b/src/test/mocks/mementos.ts @@ -12,7 +12,7 @@ export class MockMemento implements Memento { } // @ts-ignore Ignore the return value warning - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any public get(key: any, defaultValue?: any); public get(key: string, defaultValue?: T): T { @@ -22,7 +22,7 @@ export class MockMemento implements Memento { return exists ? this._value[key] : (defaultValue! as any); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any public update(key: string, value: any): Thenable { this._value[key] = value; return Promise.resolve(); diff --git a/src/test/mocks/mockChildProcess.ts b/src/test/mocks/mockChildProcess.ts index e26ea1c..33cac2a 100644 --- a/src/test/mocks/mockChildProcess.ts +++ b/src/test/mocks/mockChildProcess.ts @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ + /* eslint-disable @typescript-eslint/no-explicit-any */ import { Serializable, SendHandle, MessageOptions } from 'child_process'; import { EventEmitter } from 'node:events'; @@ -83,17 +83,14 @@ export class MockChildProcess extends EventEmitter { return true; } - // eslint-disable-next-line class-methods-use-this disconnect(): void { /* noop */ } - // eslint-disable-next-line class-methods-use-this unref(): void { /* noop */ } - // eslint-disable-next-line class-methods-use-this ref(): void { /* noop */ } diff --git a/src/test/mocks/mockDocument.ts b/src/test/mocks/mockDocument.ts index 811c591..fed220e 100644 --- a/src/test/mocks/mockDocument.ts +++ b/src/test/mocks/mockDocument.ts @@ -1,9 +1,5 @@ -/* eslint-disable max-classes-per-file */ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -'use strict'; - import { EndOfLine, Position, Range, TextDocument, TextDocumentContentChangeEvent, TextLine, Uri } from 'vscode'; class MockLine implements TextLine { @@ -123,7 +119,6 @@ export class MockDocument implements TextDocument { return this._isDirty; } - // eslint-disable-next-line class-methods-use-this public get isClosed(): boolean { return false; } @@ -132,7 +127,6 @@ export class MockDocument implements TextDocument { return this._onSave(this); } - // eslint-disable-next-line class-methods-use-this public get eol(): EndOfLine { return EndOfLine.LF; } @@ -173,7 +167,6 @@ export class MockDocument implements TextDocument { return this._contents.substr(startOffset, endOffset - startOffset); } - // eslint-disable-next-line class-methods-use-this public getWordRangeAtPosition(position: Position, regexp?: RegExp | undefined): Range | undefined { if (!regexp && position.line > 0) { // use default when custom-regexp isn't provided @@ -183,12 +176,10 @@ export class MockDocument implements TextDocument { return undefined; } - // eslint-disable-next-line class-methods-use-this public validateRange(range: Range): Range { return range; } - // eslint-disable-next-line class-methods-use-this public validatePosition(position: Position): Position { return position; } @@ -211,7 +202,6 @@ export class MockDocument implements TextDocument { }); } - // eslint-disable-next-line class-methods-use-this private createTextLine(line: string, index: number, prevLine: MockLine | undefined): MockLine { return new MockLine( line, diff --git a/src/test/mocks/mockWorkspaceConfig.ts b/src/test/mocks/mockWorkspaceConfig.ts index 8627cd5..a1d151e 100644 --- a/src/test/mocks/mockWorkspaceConfig.ts +++ b/src/test/mocks/mockWorkspaceConfig.ts @@ -1,8 +1,5 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -'use strict'; - import { ConfigurationTarget, WorkspaceConfiguration } from 'vscode'; type SectionType = { @@ -45,6 +42,7 @@ export class MockWorkspaceConfiguration implements WorkspaceConfiguration { public update( section: string, value: unknown, + _configurationTarget?: boolean | ConfigurationTarget | undefined, ): Promise { this.values.set(section, value); diff --git a/src/test/mocks/vsc/arrays.ts b/src/test/mocks/vsc/arrays.ts index ad2020c..45624a2 100644 --- a/src/test/mocks/vsc/arrays.ts +++ b/src/test/mocks/vsc/arrays.ts @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -'use strict'; - /** * Returns the last element of an array. * @param array The array. @@ -364,7 +362,7 @@ export function index(array: T[], indexer: (t: T) => string, merger?: (t: export function index( array: T[], indexer: (t: T) => string, - merger: (t: T, r: R) => R = (t) => (t as unknown) as R, + merger: (t: T, r: R) => R = (t) => t as unknown as R, ): Record { return array.reduce((r, t) => { const key = indexer(t); diff --git a/src/test/mocks/vsc/charCode.ts b/src/test/mocks/vsc/charCode.ts index fe450d4..6d032c4 100644 --- a/src/test/mocks/vsc/charCode.ts +++ b/src/test/mocks/vsc/charCode.ts @@ -1,4 +1,3 @@ -/* eslint-disable camelcase */ /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/src/test/mocks/vsc/extHostedTypes.ts b/src/test/mocks/vsc/extHostedTypes.ts index f87b501..1da8659 100644 --- a/src/test/mocks/vsc/extHostedTypes.ts +++ b/src/test/mocks/vsc/extHostedTypes.ts @@ -1,11 +1,7 @@ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable max-classes-per-file */ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -'use strict'; - import { relative } from 'path'; import * as vscode from 'vscode'; import * as vscMockHtmlContent from './htmlContent'; @@ -450,12 +446,12 @@ export class Selection extends Range { } toJSON(): [Position, Position] { - return ({ + return { start: this.start, end: this.end, active: this.active, anchor: this.anchor, - } as unknown) as [Position, Position]; + } as unknown as [Position, Position]; } } @@ -528,7 +524,6 @@ export class TextEdit { } export class WorkspaceEdit implements vscode.WorkspaceEdit { - // eslint-disable-next-line class-methods-use-this appendNotebookCellOutput( _uri: vscode.Uri, _index: number, @@ -538,7 +533,6 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { // Noop. } - // eslint-disable-next-line class-methods-use-this replaceNotebookCellOutputItems( _uri: vscode.Uri, _index: number, @@ -549,7 +543,6 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { // Noop. } - // eslint-disable-next-line class-methods-use-this appendNotebookCellOutputItems( _uri: vscode.Uri, _index: number, @@ -560,7 +553,6 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { // Noop. } - // eslint-disable-next-line class-methods-use-this replaceNotebookCells( _uri: vscode.Uri, _start: number, @@ -571,7 +563,6 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { // Noop. } - // eslint-disable-next-line class-methods-use-this replaceNotebookCellOutput( _uri: vscode.Uri, _index: number, @@ -603,17 +594,14 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { // return this._resourceEdits.map(({ from, to }) => (<[vscode.Uri, vscode.Uri]>[from, to])); // } - // eslint-disable-next-line class-methods-use-this createFile(_uri: vscode.Uri, _options?: { overwrite?: boolean; ignoreIfExists?: boolean }): void { throw new Error('Method not implemented.'); } - // eslint-disable-next-line class-methods-use-this deleteFile(_uri: vscode.Uri, _options?: { recursive?: boolean; ignoreIfNotExists?: boolean }): void { throw new Error('Method not implemented.'); } - // eslint-disable-next-line class-methods-use-this renameFile( _oldUri: vscode.Uri, _newUri: vscode.Uri, @@ -648,7 +636,7 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit { set(uri: vscUri.URI, edits: readonly unknown[]): void { let data = this._textEdits.get(uri.toString()); if (!data) { - data = { seq: this._seqPool += 1, uri, edits: [] }; + data = { seq: (this._seqPool += 1), uri, edits: [] }; this._textEdits.set(uri.toString(), data); } if (!edits) { @@ -884,7 +872,7 @@ export class Diagnostic { toJSON(): { severity: DiagnosticSeverity; message: string; range: Range; source: string; code: string | number } { return { - severity: (DiagnosticSeverity[this.severity] as unknown) as DiagnosticSeverity, + severity: DiagnosticSeverity[this.severity] as unknown as DiagnosticSeverity, message: this.message, range: this.range, source: this.source, @@ -933,7 +921,7 @@ export class DocumentHighlight { toJSON(): { range: Range; kind: DocumentHighlightKind } { return { range: this.range, - kind: (DocumentHighlightKind[this.kind] as unknown) as DocumentHighlightKind, + kind: DocumentHighlightKind[this.kind] as unknown as DocumentHighlightKind, }; } } @@ -1008,7 +996,7 @@ export class SymbolInformation { toJSON(): { name: string; kind: SymbolKind; location: Location; containerName: string } { return { name: this.name, - kind: (SymbolKind[this.kind] as unknown) as SymbolKind, + kind: SymbolKind[this.kind] as unknown as SymbolKind, location: this.location, containerName: this.containerName, }; @@ -1269,7 +1257,7 @@ export class CompletionItem { return { label: this.label, label2: this.label2, - kind: this.kind && ((CompletionItemKind[this.kind] as unknown) as CompletionItemKind), + kind: this.kind && (CompletionItemKind[this.kind] as unknown as CompletionItemKind), detail: this.detail, documentation: this.documentation, sortText: this.sortText, @@ -1362,7 +1350,6 @@ export enum TextEditorRevealType { AtTop = 3, } -// eslint-disable-next-line import/export export enum TextEditorSelectionChangeKind { Keyboard = 1, Mouse = 2, @@ -1391,7 +1378,6 @@ export enum DecorationRangeBehavior { ClosedOpen = 3, } -// eslint-disable-next-line import/export, @typescript-eslint/no-namespace export namespace TextEditorSelectionChangeKind { export function fromValue(s: string): TextEditorSelectionChangeKind | undefined { switch (s) { @@ -1610,7 +1596,6 @@ export class ProcessExecution implements vscode.ProcessExecution { this._options = value; } - // eslint-disable-next-line class-methods-use-this public computeId(): string { // const hash = crypto.createHash('md5'); // hash.update('process'); @@ -1706,7 +1691,6 @@ export class ShellExecution implements vscode.ShellExecution { this._options = value; } - // eslint-disable-next-line class-methods-use-this public computeId(): string { // const hash = crypto.createHash('md5'); // hash.update('shell'); @@ -2080,7 +2064,6 @@ export class RelativePattern implements IRelativePattern { this.pattern = pattern; } - // eslint-disable-next-line class-methods-use-this public pathToRelative(from: string, to: string): string { return relative(from, to); } @@ -2216,7 +2199,6 @@ export class FileSystemError extends Error { } } - // eslint-disable-next-line class-methods-use-this public get code(): string { return ''; } diff --git a/src/test/mocks/vsc/htmlContent.ts b/src/test/mocks/vsc/htmlContent.ts index df07c6a..0812c39 100644 --- a/src/test/mocks/vsc/htmlContent.ts +++ b/src/test/mocks/vsc/htmlContent.ts @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -'use strict'; - import * as vscMockArrays from './arrays'; export interface IMarkdownString { diff --git a/src/test/mocks/vsc/index.ts b/src/test/mocks/vsc/index.ts index 152beb6..6049339 100644 --- a/src/test/mocks/vsc/index.ts +++ b/src/test/mocks/vsc/index.ts @@ -1,9 +1,5 @@ -/* eslint-disable max-classes-per-file */ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -'use strict'; - import { EventEmitter as NodeEventEmitter } from 'events'; import * as vscode from 'vscode'; @@ -82,7 +78,6 @@ export class Disposable { } } -// eslint-disable-next-line @typescript-eslint/no-namespace export namespace l10n { export function t(message: string, ...args: unknown[]): string; export function t(options: { @@ -125,7 +120,7 @@ export class EventEmitter implements vscode.EventEmitter { public emitter: NodeEventEmitter; constructor() { - this.event = (this.add.bind(this) as unknown) as vscode.Event; + this.event = this.add.bind(this) as unknown as vscode.Event; this.emitter = new NodeEventEmitter(); } @@ -144,11 +139,15 @@ export class EventEmitter implements vscode.EventEmitter { ): Disposable => { const bound = _thisArgs ? listener.bind(_thisArgs) : listener; this.emitter.addListener('evt', bound); - return { + const disposable = { dispose: () => { this.emitter.removeListener('evt', bound); }, } as Disposable; + if (_disposables) { + _disposables.push(disposable); + } + return disposable; }; } diff --git a/src/test/mocks/vsc/position.ts b/src/test/mocks/vsc/position.ts index b05107e..0ecb3ea 100644 --- a/src/test/mocks/vsc/position.ts +++ b/src/test/mocks/vsc/position.ts @@ -1,8 +1,5 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -'use strict'; - /** * A position in the editor. This interface is suitable for serialization. */ diff --git a/src/test/mocks/vsc/selection.ts b/src/test/mocks/vsc/selection.ts deleted file mode 100644 index 84b165f..0000000 --- a/src/test/mocks/vsc/selection.ts +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -'use strict'; - -import * as vscMockPosition from './position'; -import * as vscMockRange from './range'; - -/** - * A selection in the editor. - * The selection is a range that has an orientation. - */ -export interface ISelection { - /** - * The line number on which the selection has started. - */ - readonly selectionStartLineNumber: number; - /** - * The column on `selectionStartLineNumber` where the selection has started. - */ - readonly selectionStartColumn: number; - /** - * The line number on which the selection has ended. - */ - readonly positionLineNumber: number; - /** - * The column on `positionLineNumber` where the selection has ended. - */ - readonly positionColumn: number; -} - -/** - * The direction of a selection. - */ -export enum SelectionDirection { - /** - * The selection starts above where it ends. - */ - LTR, - /** - * The selection starts below where it ends. - */ - RTL, -} - -/** - * A selection in the editor. - * The selection is a range that has an orientation. - */ -export class Selection extends vscMockRange.Range { - /** - * The line number on which the selection has started. - */ - public readonly selectionStartLineNumber: number; - - /** - * The column on `selectionStartLineNumber` where the selection has started. - */ - public readonly selectionStartColumn: number; - - /** - * The line number on which the selection has ended. - */ - public readonly positionLineNumber: number; - - /** - * The column on `positionLineNumber` where the selection has ended. - */ - public readonly positionColumn: number; - - constructor( - selectionStartLineNumber: number, - selectionStartColumn: number, - positionLineNumber: number, - positionColumn: number, - ) { - super(selectionStartLineNumber, selectionStartColumn, positionLineNumber, positionColumn); - this.selectionStartLineNumber = selectionStartLineNumber; - this.selectionStartColumn = selectionStartColumn; - this.positionLineNumber = positionLineNumber; - this.positionColumn = positionColumn; - } - - /** - * Clone this selection. - */ - public clone(): Selection { - return new Selection( - this.selectionStartLineNumber, - this.selectionStartColumn, - this.positionLineNumber, - this.positionColumn, - ); - } - - /** - * Transform to a human-readable representation. - */ - public toString(): string { - return `[${this.selectionStartLineNumber},${this.selectionStartColumn} -> ${this.positionLineNumber},${this.positionColumn}]`; - } - - /** - * Test if equals other selection. - */ - public equalsSelection(other: ISelection): boolean { - return Selection.selectionsEqual(this, other); - } - - /** - * Test if the two selections are equal. - */ - public static selectionsEqual(a: ISelection, b: ISelection): boolean { - return ( - a.selectionStartLineNumber === b.selectionStartLineNumber && - a.selectionStartColumn === b.selectionStartColumn && - a.positionLineNumber === b.positionLineNumber && - a.positionColumn === b.positionColumn - ); - } - - /** - * Get directions (LTR or RTL). - */ - public getDirection(): SelectionDirection { - if (this.selectionStartLineNumber === this.startLineNumber && this.selectionStartColumn === this.startColumn) { - return SelectionDirection.LTR; - } - return SelectionDirection.RTL; - } - - /** - * Create a new selection with a different `positionLineNumber` and `positionColumn`. - */ - public setEndPosition(endLineNumber: number, endColumn: number): Selection { - if (this.getDirection() === SelectionDirection.LTR) { - return new Selection(this.startLineNumber, this.startColumn, endLineNumber, endColumn); - } - return new Selection(endLineNumber, endColumn, this.startLineNumber, this.startColumn); - } - - /** - * Get the position at `positionLineNumber` and `positionColumn`. - */ - public getPosition(): vscMockPosition.Position { - return new vscMockPosition.Position(this.positionLineNumber, this.positionColumn); - } - - /** - * Create a new selection with a different `selectionStartLineNumber` and `selectionStartColumn`. - */ - public setStartPosition(startLineNumber: number, startColumn: number): Selection { - if (this.getDirection() === SelectionDirection.LTR) { - return new Selection(startLineNumber, startColumn, this.endLineNumber, this.endColumn); - } - return new Selection(this.endLineNumber, this.endColumn, startLineNumber, startColumn); - } - - // ---- - - /** - * Create a `Selection` from one or two positions - */ - public static fromPositions(start: vscMockPosition.IPosition, end: vscMockPosition.IPosition = start): Selection { - return new Selection(start.lineNumber, start.column, end.lineNumber, end.column); - } - - /** - * Create a `Selection` from an `ISelection`. - */ - public static liftSelection(sel: ISelection): Selection { - return new Selection( - sel.selectionStartLineNumber, - sel.selectionStartColumn, - sel.positionLineNumber, - sel.positionColumn, - ); - } - - /** - * `a` equals `b`. - */ - public static selectionsArrEqual(a: ISelection[], b: ISelection[]): boolean { - if ((a && !b) || (!a && b)) { - return false; - } - if (!a && !b) { - return true; - } - if (a.length !== b.length) { - return false; - } - for (let i = 0, len = a.length; i < len; i += 1) { - if (!this.selectionsEqual(a[i], b[i])) { - return false; - } - } - return true; - } - - /** - * Test if `obj` is an `ISelection`. - */ - public static isISelection(obj?: { - selectionStartLineNumber: unknown; - selectionStartColumn: unknown; - positionLineNumber: unknown; - positionColumn: unknown; - }): obj is ISelection { - return ( - obj !== undefined && - typeof obj.selectionStartLineNumber === 'number' && - typeof obj.selectionStartColumn === 'number' && - typeof obj.positionLineNumber === 'number' && - typeof obj.positionColumn === 'number' - ); - } - - /** - * Create with a direction. - */ - public static createWithDirection( - startLineNumber: number, - startColumn: number, - endLineNumber: number, - endColumn: number, - direction: SelectionDirection, - ): Selection { - if (direction === SelectionDirection.LTR) { - return new Selection(startLineNumber, startColumn, endLineNumber, endColumn); - } - - return new Selection(endLineNumber, endColumn, startLineNumber, startColumn); - } -} diff --git a/src/test/mocks/vsc/telemetryReporter.ts b/src/test/mocks/vsc/telemetryReporter.ts index 5df8bca..02360e6 100644 --- a/src/test/mocks/vsc/telemetryReporter.ts +++ b/src/test/mocks/vsc/telemetryReporter.ts @@ -1,10 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -'use strict'; - export class vscMockTelemetryReporter { - // eslint-disable-next-line class-methods-use-this public sendTelemetryEvent(): void { // Noop. } diff --git a/src/test/mocks/vsc/uri.ts b/src/test/mocks/vsc/uri.ts index 671c60c..e06b34f 100644 --- a/src/test/mocks/vsc/uri.ts +++ b/src/test/mocks/vsc/uri.ts @@ -1,11 +1,8 @@ -/* eslint-disable max-classes-per-file */ /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as pathImport from 'path'; import { CharCode } from './charCode'; @@ -298,7 +295,6 @@ export class URI implements UriComponents { return this; } - // eslint-disable-next-line @typescript-eslint/no-use-before-define return new _URI(scheme, authority, path, query, fragment); } @@ -314,10 +310,8 @@ export class URI implements UriComponents { static parse(value: string, _strict = false): URI { const match = _regexp.exec(value); if (!match) { - // eslint-disable-next-line @typescript-eslint/no-use-before-define return new _URI(_empty, _empty, _empty, _empty, _empty); } - // eslint-disable-next-line @typescript-eslint/no-use-before-define return new _URI( match[2] || _empty, decodeURIComponent(match[4] || _empty), @@ -372,7 +366,6 @@ export class URI implements UriComponents { } } - // eslint-disable-next-line @typescript-eslint/no-use-before-define return new _URI('file', authority, path, _empty, _empty); } @@ -383,7 +376,6 @@ export class URI implements UriComponents { query?: string; fragment?: string; }): URI { - // eslint-disable-next-line @typescript-eslint/no-use-before-define return new _URI( components.scheme, components.authority, @@ -429,7 +421,6 @@ export class URI implements UriComponents { if (data instanceof URI) { return data; } - // eslint-disable-next-line @typescript-eslint/no-use-before-define const result = new _URI(data); result._formatted = (data).external; result._fsPath = (data)._sep === _pathSepMarker ? (data).fsPath : null; diff --git a/src/test/mocks/vsc/uuid.ts b/src/test/mocks/vsc/uuid.ts index fd82544..05176df 100644 --- a/src/test/mocks/vsc/uuid.ts +++ b/src/test/mocks/vsc/uuid.ts @@ -1,9 +1,6 @@ -/* eslint-disable max-classes-per-file */ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -'use strict'; - /** * Represents a UUID as defined by rfc4122. */ @@ -86,10 +83,10 @@ export function v4(): UUID { return new V4UUID(); } -const _UUIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; +const UUIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; export function isUUID(value: string): boolean { - return _UUIDPattern.test(value); + return UUIDPattern.test(value); } /** diff --git a/src/test/unittests.ts b/src/test/unittests.ts index 8e7183c..caf5fa0 100644 --- a/src/test/unittests.ts +++ b/src/test/unittests.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import * as vscode from 'vscode'; import * as vscodeMocks from './mocks/vsc'; import { vscMockTelemetryReporter } from './mocks/vsc/telemetryReporter'; diff --git a/tsconfig.json b/tsconfig.json index 1a96fa0..e11381a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,9 @@ { - "compilerOptions": { + "compilerOptions": { "module": "NodeNext", "moduleResolution": "NodeNext", - "target": "ES2020", - "lib": [ - "ES2020" - ], + "target": "ES2020", + "lib": ["ES2020"], "sourceMap": true, "rootDir": "src", "experimentalDecorators": true, @@ -18,5 +16,5 @@ "noFallthroughCasesInSwitch": true, "resolveJsonModule": true, "removeComments": true - } + } } From a709df1e6ed6a8e875b4ea785c173be12810989c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Sun, 1 Dec 2024 23:23:08 +0530 Subject: [PATCH 018/328] Add support for Global namespace (#35) Fixes https://github.com/microsoft/vscode-python-environments/issues/31 Fixes https://github.com/microsoft/vscode-python-environments/issues/32 --- package.json | 2 +- src/common/utils/fileNameUtils.ts | 12 ++-- src/extension.ts | 8 ++- src/features/envCommands.ts | 66 +++++++++++++++++---- src/features/envManagers.ts | 77 ++++++++++++++++++------- src/features/settings/settingHelpers.ts | 2 +- src/features/views/projectView.ts | 26 +++++---- src/features/views/treeViewItems.ts | 23 +++++++- src/features/views/utils.ts | 12 ++++ src/internal.api.ts | 2 +- src/managers/sysPython/venvManager.ts | 34 ++++++++--- src/managers/sysPython/venvUtils.ts | 34 ++--------- 12 files changed, 206 insertions(+), 92 deletions(-) create mode 100644 src/features/views/utils.ts diff --git a/package.json b/package.json index 6b2d433..8ceb2da 100644 --- a/package.json +++ b/package.json @@ -310,7 +310,7 @@ }, { "command": "python-envs.removePythonProject", - "when": "view == python-projects && viewItem == python-workspace" + "when": "view == python-projects && viewItem == python-workspace-removable" }, { "command": "python-envs.set", diff --git a/src/common/utils/fileNameUtils.ts b/src/common/utils/fileNameUtils.ts index b55e7b2..1bfc65f 100644 --- a/src/common/utils/fileNameUtils.ts +++ b/src/common/utils/fileNameUtils.ts @@ -1,7 +1,8 @@ import * as path from 'path'; import * as fsapi from 'fs-extra'; import { KNOWN_FILES, KNOWN_TEMPLATE_ENDINGS } from '../constants'; -import { Uri, workspace } from 'vscode'; +import { Uri } from 'vscode'; +import { getWorkspaceFolders } from '../workspace.apis'; export function isPythonProjectFile(fileName: string): boolean { const baseName = path.basename(fileName).toLowerCase(); @@ -20,14 +21,15 @@ export async function getAbsolutePath(fsPath: string): Promise return Uri.file(fsPath); } - if (workspace.workspaceFolders && workspace.workspaceFolders.length > 0) { - if (workspace.workspaceFolders.length === 1) { - const absPath = path.resolve(workspace.workspaceFolders[0].uri.fsPath, fsPath); + const workspaceFolders = getWorkspaceFolders() ?? []; + if (workspaceFolders.length > 0) { + if (workspaceFolders.length === 1) { + const absPath = path.resolve(workspaceFolders[0].uri.fsPath, fsPath); if (await fsapi.pathExists(absPath)) { return Uri.file(absPath); } } else { - const workspaces = Array.from(workspace.workspaceFolders) + const workspaces = Array.from(workspaceFolders) .sort((a, b) => a.uri.fsPath.length - b.uri.fsPath.length) .reverse(); for (const folder of workspaces) { diff --git a/src/extension.ts b/src/extension.ts index df00c4c..1441169 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -109,8 +109,12 @@ export async function activate(context: ExtensionContext): Promise { return await createEnvironmentCommand(item, envManagers, projectManager); }), - commands.registerCommand('python-envs.createAny', async () => { - return await createAnyEnvironmentCommand(envManagers, projectManager); + commands.registerCommand('python-envs.createAny', async (options) => { + return await createAnyEnvironmentCommand( + envManagers, + projectManager, + options ?? { selectEnvironment: true }, + ); }), commands.registerCommand('python-envs.remove', async (item) => { await removeEnvironmentCommand(item, envManagers); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 8680d1c..4ccb6fb 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -6,7 +6,7 @@ import { ProjectCreators, PythonProjectManager, } from '../internal.api'; -import { traceError, traceVerbose } from '../common/logging'; +import { traceError, traceInfo, traceVerbose } from '../common/logging'; import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonProjectCreator } from '../api'; import * as path from 'path'; import { @@ -71,11 +71,25 @@ export async function createEnvironmentCommand( ): Promise { if (context instanceof EnvManagerTreeItem) { const manager = (context as EnvManagerTreeItem).manager; - const projects = await pickProjectMany(pm.getProjects()); - if (projects) { - return await manager.create(projects.length === 0 ? 'global' : projects.map((p) => p.uri)); - } else { - traceError(`No projects found for ${context}`); + const projects = pm.getProjects(); + if (projects.length === 0) { + const env = await manager.create('global'); + if (env) { + await em.setEnvironments('global', env); + } + return env; + } else if (projects.length > 0) { + const selected = await pickProjectMany(projects); + if (selected) { + const scope = selected.length === 0 ? 'global' : selected.map((p) => p.uri); + const env = await manager.create(scope); + if (env) { + await em.setEnvironments(scope, env); + } + return env; + } else { + traceInfo('No project selected or global condition met for environment creation'); + } } } else if (context instanceof Uri) { const manager = em.getEnvironmentManager(context as Uri); @@ -93,7 +107,10 @@ export async function createEnvironmentCommand( export async function createAnyEnvironmentCommand( em: EnvironmentManagers, pm: PythonProjectManager, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + options?: any, ): Promise { + const select = options?.selectEnvironment; const projects = await pickProjectMany(pm.getProjects()); if (projects && projects.length > 0) { const defaultManagers: InternalEnvironmentManager[] = []; @@ -112,14 +129,25 @@ export async function createAnyEnvironmentCommand( const manager = em.managers.find((m) => m.id === managerId); if (manager) { - return await manager.create(projects.map((p) => p.uri)); + const env = await manager.create(projects.map((p) => p.uri)); + if (select) { + await em.setEnvironments( + projects.map((p) => p.uri), + env, + ); + } + return env; } } else if (projects && projects.length === 0) { const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); const manager = em.managers.find((m) => m.id === managerId); if (manager) { - return await manager.create('global'); + const env = await manager.create('global'); + if (select) { + await manager.set(undefined, env); + } + return env; } } } @@ -203,10 +231,24 @@ export async function setEnvironmentCommand( await setEnvironmentCommand([context], em, wm); } else if (context === undefined) { try { - const projects = await pickProjectMany(wm.getProjects()); + const projects = wm.getProjects(); if (projects && projects.length > 0) { - const uris = projects.map((p) => p.uri); - await setEnvironmentCommand(uris, em, wm); + const selected = await pickProjectMany(projects); + if (selected && selected.length > 0) { + const uris = selected.map((p) => p.uri); + await setEnvironmentCommand(uris, em, wm); + } + } else { + const globalEnvManager = em.getEnvironmentManager(undefined); + const recommended = globalEnvManager ? await globalEnvManager.get(undefined) : undefined; + const selected = await pickEnvironment(em.managers, globalEnvManager ? [globalEnvManager] : [], { + projects: [], + recommended, + showBackButton: false, + }); + if (selected) { + await em.setEnvironments('global', selected); + } } } catch (ex) { if (ex === QuickInputButtons.Back) { @@ -487,7 +529,7 @@ export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi) const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); - if (environment && project) { + if (environment) { return await runAsTask( environment, { diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index e60cda7..647720b 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -272,7 +272,7 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } } - public async setEnvironments(scope: Uri[], environment?: PythonEnvironment): Promise { + public async setEnvironments(scope: Uri[] | string, environment?: PythonEnvironment): Promise { if (environment) { const manager = this.managers.find((m) => m.id === environment.envId.managerId); if (!manager) { @@ -287,50 +287,87 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { const promises: Promise[] = []; const settings: EditAllManagerSettings[] = []; const events: DidChangeEnvironmentEventArgs[] = []; - scope.forEach((uri) => { - const m = this.getEnvironmentManager(uri); - promises.push(manager.set(uri, environment)); + if (Array.isArray(scope) && scope.every((s) => s instanceof Uri)) { + scope.forEach((uri) => { + const m = this.getEnvironmentManager(uri); + promises.push(manager.set(uri, environment)); + if (manager.id !== m?.id) { + settings.push({ + project: this.pm.get(uri), + envManager: manager.id, + packageManager: manager.preferredPackageManagerId, + }); + } + + const project = this.pm.get(uri); + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== environment?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); + events.push({ uri: project?.uri, new: environment, old: oldEnv }); + } + }); + } else if (typeof scope === 'string' && scope === 'global') { + const m = this.getEnvironmentManager(undefined); + promises.push(manager.set(undefined, environment)); if (manager.id !== m?.id) { settings.push({ - project: this.pm.get(uri), + project: undefined, envManager: manager.id, packageManager: manager.preferredPackageManagerId, }); } - const project = this.pm.get(uri); - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const oldEnv = this._previousEnvironments.get('global'); if (oldEnv?.envId.id !== environment?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); - events.push({ uri: project?.uri, new: environment, old: oldEnv }); + this._previousEnvironments.set('global', environment); + events.push({ uri: undefined, new: environment, old: oldEnv }); } - }); + } await Promise.all(promises); await setAllManagerSettings(settings); setImmediate(() => events.forEach((e) => this._onDidChangeEnvironmentFiltered.fire(e))); } else { const promises: Promise[] = []; const events: DidChangeEnvironmentEventArgs[] = []; - scope.forEach((uri) => { - const manager = this.getEnvironmentManager(uri); + if (Array.isArray(scope) && scope.every((s) => s instanceof Uri)) { + scope.forEach((uri) => { + const manager = this.getEnvironmentManager(uri); + if (manager) { + const setAndAddEvent = async () => { + await manager.set(uri); + + const project = this.pm.get(uri); + + // Always get the new first, then compare with the old. This has minor impact on the ordering of + // events. But it ensures that we always get the latest environment at the time of this call. + const newEnv = await manager.get(uri); + const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + if (oldEnv?.envId.id !== newEnv?.envId.id) { + this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); + events.push({ uri: project?.uri, new: newEnv, old: oldEnv }); + } + }; + promises.push(setAndAddEvent()); + } + }); + } else if (typeof scope === 'string' && scope === 'global') { + const manager = this.getEnvironmentManager(undefined); if (manager) { const setAndAddEvent = async () => { - await manager.set(uri); - - const project = this.pm.get(uri); + await manager.set(undefined); // Always get the new first, then compare with the old. This has minor impact on the ordering of // events. But it ensures that we always get the latest environment at the time of this call. - const newEnv = await manager.get(uri); - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const newEnv = await manager.get(undefined); + const oldEnv = this._previousEnvironments.get('global'); if (oldEnv?.envId.id !== newEnv?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); - events.push({ uri: project?.uri, new: newEnv, old: oldEnv }); + this._previousEnvironments.set('global', newEnv); + events.push({ uri: undefined, new: newEnv, old: oldEnv }); } }; promises.push(setAndAddEvent()); } - }); + } await Promise.all(promises); setImmediate(() => events.forEach((e) => this._onDidChangeEnvironmentFiltered.fire(e))); } diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index fd18d06..e796583 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -101,7 +101,7 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr noWorkspace.forEach((e) => { if (e.project) { - traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); + traceInfo(`Unable to find workspace for ${e.project.uri.fsPath}, will use global settings for this.`); } }); diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index 7ea7a81..5da9297 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -21,6 +21,7 @@ import { ProjectEnvironmentInfo, ProjectPackage, ProjectPackageRootInfoTreeItem, + GlobalProjectItem, } from './treeViewItems'; import { onDidChangeConfiguration } from '../../common/workspace.apis'; import { createSimpleDebounce } from '../../common/utils/debounce'; @@ -100,12 +101,11 @@ export class WorkspaceView implements TreeDataProvider { reveal(context: Uri | PythonEnvironment): PythonEnvironment | undefined { if (context instanceof Uri) { const pw = this.projectManager.get(context); - if (pw) { - const view = this.revealMap.get(pw.uri.fsPath); - if (view) { - this.revealInternal(view); - return view.environment; - } + const key = pw ? pw.uri.fsPath : 'global'; + const view = this.revealMap.get(key); + if (view) { + this.revealInternal(view); + return view.environment; } } else { const view = Array.from(this.revealMap.values()).find((v) => v.environment.envId.id === context.envId.id); @@ -128,12 +128,17 @@ export class WorkspaceView implements TreeDataProvider { if (element === undefined) { this.projectViews.clear(); const views: ProjectTreeItem[] = []; - this.projectManager.getProjects().forEach((w) => { + const projects = this.projectManager.getProjects(); + projects.forEach((w) => { const view = new ProjectItem(w); this.projectViews.set(w.uri.fsPath, view); views.push(view); }); + if (projects.length === 0) { + views.push(new GlobalProjectItem()); + } + return views; } @@ -152,7 +157,8 @@ export class WorkspaceView implements TreeDataProvider { ]; } - const manager = this.envManagers.getEnvironmentManager(projectItem.project.uri); + const uri = projectItem.id === 'global' ? undefined : projectItem.project.uri; + const manager = this.envManagers.getEnvironmentManager(uri); if (!manager) { return [ new NoProjectEnvironment( @@ -164,7 +170,7 @@ export class WorkspaceView implements TreeDataProvider { ]; } - const environment = await manager?.get(projectItem.project.uri); + const environment = await manager?.get(uri); if (!environment) { return [ new NoProjectEnvironment( @@ -175,7 +181,7 @@ export class WorkspaceView implements TreeDataProvider { ]; } const view = new ProjectEnvironment(projectItem, environment); - this.revealMap.set(projectItem.project.uri.fsPath, view); + this.revealMap.set(uri ? uri.fsPath : 'global', view); return [view]; } diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index ba1c45d..fec897b 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -1,6 +1,7 @@ import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon, Uri } from 'vscode'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { PythonEnvironment, IconPath, Package, PythonProject } from '../../api'; +import { removable } from './utils'; export enum EnvTreeItemKind { manager = 'python-env-manager', @@ -207,7 +208,7 @@ export class ProjectItem implements ProjectTreeItem { constructor(public readonly project: PythonProject) { this.id = ProjectItem.getId(this.project); const item = new TreeItem(this.project.name, TreeItemCollapsibleState.Expanded); - item.contextValue = 'python-workspace'; + item.contextValue = removable(this.project) ? 'python-workspace-removable' : 'python-workspace'; item.description = this.project.description; item.tooltip = this.project.tooltip; item.resourceUri = project.uri.fsPath.endsWith('.py') ? this.project.uri : undefined; @@ -220,6 +221,22 @@ export class ProjectItem implements ProjectTreeItem { } } +export class GlobalProjectItem implements ProjectTreeItem { + public readonly kind = ProjectTreeItemKind.project; + public readonly parent: undefined; + public readonly id: string; + public readonly treeItem: TreeItem; + constructor() { + this.id = 'global'; + const item = new TreeItem('Global', TreeItemCollapsibleState.Expanded); + item.contextValue = 'python-workspace'; + item.description = 'Global Python environment'; + item.tooltip = 'Global Python environment'; + item.iconPath = new ThemeIcon('globe'); + this.treeItem = item; + } +} + export class ProjectEnvironment implements ProjectTreeItem { public readonly kind = ProjectTreeItemKind.environment; public readonly id: string; @@ -257,7 +274,7 @@ export class NoProjectEnvironment implements ProjectTreeItem { public readonly id: string; public readonly treeItem: TreeItem; constructor( - public readonly project: PythonProject, + public readonly project: PythonProject | undefined, public readonly parent: ProjectItem, private readonly label: string, private readonly description?: string, @@ -274,7 +291,7 @@ export class NoProjectEnvironment implements ProjectTreeItem { item.command = { command: 'python-envs.set', title: 'Set Environment', - arguments: [this.project.uri], + arguments: this.project ? [this.project.uri] : undefined, }; this.treeItem = item; } diff --git a/src/features/views/utils.ts b/src/features/views/utils.ts new file mode 100644 index 0000000..e2b9f7f --- /dev/null +++ b/src/features/views/utils.ts @@ -0,0 +1,12 @@ +import * as path from 'path'; +import { PythonProject } from '../../api'; +import { getWorkspaceFolder } from '../../common/workspace.apis'; + +export function removable(project: PythonProject): boolean { + const workspace = getWorkspaceFolder(project.uri); + if (workspace) { + // If the project path is same as the workspace path, then we cannot remove the project. + path.normalize(workspace?.uri.fsPath).toLowerCase() !== path.normalize(project.uri.fsPath).toLowerCase(); + } + return true; +} diff --git a/src/internal.api.ts b/src/internal.api.ts index 172325d..258750e 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -88,7 +88,7 @@ export interface EnvironmentManagers extends Disposable { clearCache(scope: EnvironmentManagerScope): Promise; setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; - setEnvironments(scope: Uri[], environment?: PythonEnvironment): Promise; + setEnvironments(scope: Uri[] | string, environment?: PythonEnvironment): Promise; getEnvironment(scope: GetEnvironmentScope): Promise; getProjectEnvManagers(uris: Uri[]): InternalEnvironmentManager[]; diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 638a9a6..f48fbd7 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -116,6 +116,10 @@ export class VenvManager implements EnvironmentManager { const newEnv = await this.get(uri); this._onDidChangeEnvironment.fire({ uri, old: environment, new: newEnv }); } + + if (this.globalEnv?.envId.id === environment.envId.id) { + await this.set(undefined, undefined); + } } private updateCollection(environment: PythonEnvironment): void { @@ -204,9 +208,12 @@ export class VenvManager implements EnvironmentManager { async set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { if (scope === undefined) { + const before = this.globalEnv; this.globalEnv = environment; - if (environment) { - await setVenvForGlobal(environment.environmentPath.fsPath); + await setVenvForGlobal(environment?.environmentPath.fsPath); + await this.resetGlobalEnv(); + if (before?.envId.id !== this.globalEnv?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: undefined, old: before, new: this.globalEnv }); } return; } @@ -217,15 +224,17 @@ export class VenvManager implements EnvironmentManager { return; } + const before = this.fsPathToEnv.get(pw.uri.fsPath); if (environment) { - const before = this.fsPathToEnv.get(pw.uri.fsPath); this.fsPathToEnv.set(pw.uri.fsPath, environment); await setVenvForWorkspace(pw.uri.fsPath, environment.environmentPath.fsPath); - this._onDidChangeEnvironment.fire({ uri: scope, old: before, new: environment }); } else { this.fsPathToEnv.delete(pw.uri.fsPath); await setVenvForWorkspace(pw.uri.fsPath, undefined); } + if (before?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: scope, old: before, new: environment }); + } } } @@ -299,11 +308,15 @@ export class VenvManager implements EnvironmentManager { } } - private async loadEnvMap() { + private async resetGlobalEnv() { this.globalEnv = undefined; - this.fsPathToEnv.clear(); - const globals = await this.baseManager.getEnvironments('global'); + await this.loadGlobalEnv(globals); + } + + private async loadGlobalEnv(globals: PythonEnvironment[]) { + this.globalEnv = undefined; + // Try to find a global environment const fsPath = await getVenvForGlobal(); @@ -331,6 +344,13 @@ export class VenvManager implements EnvironmentManager { if (!this.globalEnv) { this.globalEnv = getLatest(globals); } + } + + private async loadEnvMap() { + const globals = await this.baseManager.getEnvironments('global'); + await this.loadGlobalEnv(globals); + + this.fsPathToEnv.clear(); const sorted = sortEnvironments(this.collection); const paths = this.api.getPythonProjects().map((p) => path.normalize(p.uri.fsPath)); diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index c459a12..f591153 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -330,37 +330,11 @@ export async function createPythonVenv( } const resolved = await nativeFinder.resolve(pythonPath); - if (resolved.version && resolved.executable && resolved.prefix) { - const sv = shortVersion(resolved.version); - const env = api.createPythonEnvironmentItem( - { - name: `${name} (${sv})`, - displayName: `${name} (${sv})`, - shortDisplayName: `${name}:${sv}`, - displayPath: pythonPath, - version: resolved.version, - description: pythonPath, - environmentPath: Uri.file(pythonPath), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), - sysPrefix: resolved.prefix, - execInfo: { - run: { - executable: pythonPath, - args: [], - }, - }, - }, - manager, - ); - log.info(`Created venv environment: ${name}`); - - if (packages?.length > 0) { - await api.installPackages(env, packages, { upgrade: false }); - } - return env; - } else { - throw new Error('Could not resolve the virtual environment'); + const env = api.createPythonEnvironmentItem(getPythonInfo(resolved), manager); + if (packages?.length > 0) { + await api.installPackages(env, packages, { upgrade: false }); } + return env; } catch (e) { log.error(`Failed to create virtual environment: ${e}`); showErrorMessage(`Failed to create virtual environment`); From 44e0eeaf5af227156803136ad4c66e9b2315c3ce Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 2 Dec 2024 22:58:02 +0530 Subject: [PATCH 019/328] Clean-up and bug fixes (#36) --- README.md | 70 +++++++--- build/azure-pipeline.pre-release.yml | 24 ++-- build/azure-pipeline.stable.yml | 49 +++++-- package.json | 8 +- src/api.ts | 153 ++++++++++++++++----- src/features/views/treeViewItems.ts | 4 +- src/features/views/utils.ts | 2 +- src/internal.api.ts | 4 +- src/managers/conda/condaPackageManager.ts | 10 +- src/managers/sysPython/pipManager.ts | 10 +- src/managers/sysPython/sysPythonManager.ts | 5 + src/managers/sysPython/utils.ts | 25 ++-- src/managers/sysPython/venvManager.ts | 5 + 13 files changed, 254 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index 1f4de4d..33a602d 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ This extension provides an Environments view, which can be accessed via the VS C By default, the extension uses the `venv` environment manager. This default manager determines how environments are created, managed, and where packages are installed. However, users can change the default by setting the `python-envs.defaultEnvManager` to a different environment manager. The following environment managers are supported out of the box: -|Id| name |Description| -|---|----|--| -|ms-python.python:venv| `venv` |The default environment manager. It is a built-in environment manager provided by the Python standard library.| -|ms-python.python:system| System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | -|ms-python.python:conda| `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | +| Id | name | Description | +| ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| ms-python.python:venv | `venv` | The default environment manager. It is a built-in environment manager provided by the Python standard library. | +| ms-python.python:system | System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | +| ms-python.python:conda | `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | The environment manager is responsible for specifying which package manager will be used by default to install and manage Python packages within the environment. This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. @@ -28,27 +28,58 @@ This extension provides a package view for you to manage, install and uninstall The extension uses `pip` as the default package manager. You can change this by setting the `python-envs.defaultPackageManager` setting to a different package manager. The following are package managers supported out of the box: -|Id| name |Description| -|---|----|--| -|ms-python.python:pip| `pip` | Pip acts as the default package manager and it's typically built-in to Python.| -|ms-python.python:conda| `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | +| Id | name | Description | +| ---------------------- | ------- | ------------------------------------------------------------------------------ | +| ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | +| ms-python.python:conda | `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | ## Settings Reference -| Setting (python-envs.) | Default | Description | -| ----- | ----- | -----| -| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | -| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | -| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | +| Setting (python-envs.) | Default | Description | +| ---------------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | +| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | +| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | +## API Reference (proposed) -## API Reference +See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/src/api.ts) for the full list of Extension APIs. -See `src\api.ts` for the full list of APIs. +Consuming these APIs from your extension: + +```typescript +let _extApi: PythonEnvironmentApi | undefined; +async function getEnvExtApi(): Promise { + if (_extApi) { + return _extApi; + } + const extension = getExtension(ENVS_EXTENSION_ID); + if (!extension) { + throw new Error('Python Environments extension not found.'); + } + if (extension?.isActive) { + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; + } + + await extension.activate(); + + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; +} + +export async function activate(context: ExtensionContext) { + const envApi = await getEnvExtApi(); + + // Get the environment for the workspace folder or global python if no workspace is open + const uri = workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined; + const env = await envApi.getEnvironment(uri); +} +``` ## Contributing -This project welcomes contributions and suggestions. Most contributions require you to agree to a +This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. @@ -60,7 +91,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - ## Questions, issues, feature requests, and contributions - If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). @@ -77,7 +107,7 @@ The Microsoft Python Extension for Visual Studio Code collects usage data and se ## Trademarks -This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow +This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. -Any use of third-party trademarks or logos are subject to those third-party's policies. \ No newline at end of file +Any use of third-party trademarks or logos are subject to those third-party's policies. diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 525d791..770c002 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -2,13 +2,13 @@ trigger: none pr: none -schedules: - - cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT) - displayName: Nightly Pre-Release Schedule - always: false # only run if there are source code changes - branches: - include: - - main +# schedules: +# - cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT) +# displayName: Nightly Pre-Release Schedule +# always: false # only run if there are source code changes +# branches: +# include: +# - main resources: repositories: @@ -27,7 +27,8 @@ parameters: extends: template: azure-pipelines/extension/pre-release.yml@templates parameters: - publishExtension: ${{ parameters.publishExtension }} + # publishExtension: ${{ parameters.publishExtension }} + publishExtension: false ghCreateTag: false standardizedVersioning: true l10nSourcePaths: ./src @@ -71,7 +72,7 @@ extends: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' displayName: Select Python version @@ -79,15 +80,12 @@ extends: - script: npm ci displayName: Install NPM dependencies - - script: python ./build/update_package_file.py + - script: python ./build/update_package_json.py displayName: Update telemetry in package.json - script: python ./build/update_ext_version.py --for-publishing displayName: Update build number - - script: npx gulp prePublishBundle - displayName: Build - - bash: | mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin chmod +x $(Build.SourcesDirectory)/python-env-tools/bin diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml index 170d0e6..517be17 100644 --- a/build/azure-pipeline.stable.yml +++ b/build/azure-pipeline.stable.yml @@ -1,9 +1,4 @@ trigger: none -# branches: -# include: -# - release* -# tags: -# include: ['*'] pr: none resources: @@ -26,10 +21,42 @@ extends: l10nSourcePaths: ./src publishExtension: ${{ parameters.publishExtension }} ghCreateTag: true + + buildPlatforms: + - name: Linux + vsceTarget: 'web' + - name: Linux + packageArch: arm64 + vsceTarget: linux-arm64 + - name: Linux + packageArch: arm + vsceTarget: linux-armhf + - name: Linux + packageArch: x64 + vsceTarget: linux-x64 + - name: Linux + packageArch: arm64 + vsceTarget: alpine-arm64 + - name: Linux + packageArch: x64 + vsceTarget: alpine-x64 + - name: MacOS + packageArch: arm64 + vsceTarget: darwin-arm64 + - name: MacOS + packageArch: x64 + vsceTarget: darwin-x64 + - name: Windows + packageArch: arm + vsceTarget: win32-arm64 + - name: Windows + packageArch: x64 + vsceTarget: win32-x64 + buildSteps: - task: NodeTool@0 inputs: - versionSpec: '18.17.0' + versionSpec: '20.18.0' displayName: Select Node version - task: UsePythonVersion@0 @@ -42,14 +69,8 @@ extends: - script: npm ci displayName: Install NPM dependencies - - script: python -m pip install -U pip - displayName: Upgrade pip - - - script: python -m pip install wheel - displayName: Install wheel - - - script: python -m pip install nox - displayName: Install wheel + - script: python ./build/update_package_json.py + displayName: Update telemetry in package.json - script: python ./build/update_ext_version.py --release --for-publishing displayName: Update build number diff --git a/package.json b/package.json index 8ceb2da..6a7e78c 100644 --- a/package.json +++ b/package.json @@ -286,7 +286,7 @@ { "command": "python-envs.createTerminal", "group": "inline", - "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" + "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*activatable.*/" }, { "command": "python-envs.refreshPackages", @@ -315,16 +315,16 @@ { "command": "python-envs.set", "group": "inline", - "when": "view == python-projects && viewItem == python-workspace" + "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" }, { "command": "python-envs.reset", - "when": "view == python-projects && viewItem == python-workspace" + "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" }, { "command": "python-envs.createTerminal", "group": "inline", - "when": "view == python-projects && viewItem == python-workspace" + "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" } ], "view/title": [ diff --git a/src/api.ts b/src/api.ts index 0030838..190c0cc 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + import { Uri, Disposable, @@ -238,7 +241,7 @@ export type RefreshEnvironmentsScope = Uri | undefined; /** * The scope for which environments are required. - * - `undefined`/`"all"`: All environments. + * - `"all"`: All environments. * - `"global"`: Python installations that are usually a base for creating virtual environments. * - {@link Uri}: Environments for the workspace/folder/file pointed to by the Uri. */ @@ -294,23 +297,6 @@ export type DidChangeEnvironmentsEventArgs = { environment: PythonEnvironment; }[]; -export type PythonIsKnownContext = Uri | string; - -/** - * Result of checking if a context is a known Python environment. - */ -export interface PythonIsKnownResult { - /** - * The confidence level of the result (low, moderate, or high). - */ - confidence: 'low' | 'moderate' | 'high'; - - /** - * The Python environment match. - */ - result: 'unknown' | 'known' | 'canHandle'; -} - /** * Type representing the context for resolving a Python environment. */ @@ -332,7 +318,9 @@ export interface EnvironmentManager { /** * The preferred package manager ID for the environment manager. - * @example 'ms-python.python:pip' + * + * @example + * 'ms-python.python:pip' */ readonly preferredPackageManagerId: string; @@ -423,15 +411,6 @@ export interface EnvironmentManager { */ resolve(context: ResolveEnvironmentContext): Promise; - /** - * Checks if the specified context is a known Python environment. The string/Uri can point to the environment root folder - * or to python executable. It can also be a named environment. - * - * @param context - The URI/string context to check. - * @returns A promise that resolves to the result of the check. - */ - isKnown?(context: PythonIsKnownContext): Promise; - /** * Clears the environment manager's cache. * @@ -577,7 +556,7 @@ export interface PackageManager { /** * The log output channel for the package manager. */ - logOutput?: LogOutputChannel; + log?: LogOutputChannel; /** * Installs packages in the specified Python environment. @@ -615,9 +594,8 @@ export interface PackageManager { * @param environment The Python environment for which to get installable items. * * Note: An environment can be used by multiple projects, so the installable items returned. - * should be for the environment. IF you want to do it for a particular project, then you may - * shown a QuickPick to the user to select the project, and filter the installable items based - * on the project. + * should be for the environment. If you want to do it for a particular project, then you should + * ask user to select a project, and filter the installable items based on the project. */ getInstallable?(environment: PythonEnvironment): Promise; @@ -766,7 +744,8 @@ export interface Installable { readonly group?: string; /** - * Path to the requirements, version of the package, or any other project file path. + * Description about the installable item. This can also be path to the requirements, + * version of the package, or any other project file path. */ readonly description?: string; @@ -1046,17 +1025,70 @@ export interface PythonTerminalOptions extends TerminalOptions { } export interface PythonTerminalCreateApi { + /** + * Creates a terminal and activates any (activatable) environment for the terminal. + * + * @param environment The Python environment to activate. + * @param options Options for creating the terminal. + * + * Note: Non-activatable environments have no effect on the terminal. + */ createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; } +/** + * Options for running a Python script or module in a terminal. + * + * Example: + * * Running Script: `python myscript.py --arg1` + * ```typescript + * { + * args: ["myscript.py", "--arg1"] + * } + * ``` + * * Running a module: `python -m my_module --arg1` + * ```typescript + * { + * args: ["-m", "my_module", "--arg1"] + * } + * ``` + */ export interface PythonTerminalExecutionOptions { + /** + * Current working directory for the terminal. This in only used to create the terminal. + */ cwd: string | Uri; + + /** + * Arguments to pass to the python executable. + */ args?: string[]; + + /** + * Set `true` to show the terminal. + */ show?: boolean; } export interface PythonTerminalRunApi { + /** + * Runs a Python script or module in a terminal. This API will create a terminal if one is not available to use. + * If a terminal is available, it will be used to run the script or module. + * + * Note: + * - If you restart VS Code, this will create a new terminal, this is a limitation of VS Code. + * - If you close the terminal, this will create a new terminal. + * - In cases of multi-root/project scenario, it will create a separate terminal for each project. + */ runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise; + + /** + * Runs a Python script or module in a dedicated terminal. This API will create a terminal if one is not available to use. + * If a terminal is available, it will be used to run the script or module. This terminal will be dedicated to the script, + * and selected based on the `terminalKey`. + * + * @param terminalKey A unique key to identify the terminal. For scripts you can use the Uri of the script file. + */ runInDedicatedTerminal( terminalKey: Uri | string, environment: PythonEnvironment, @@ -1065,6 +1097,7 @@ export interface PythonTerminalRunApi { } /** + * Options for running a Python task. * * Example: * * Running Script: `python myscript.py --arg1` @@ -1081,23 +1114,63 @@ export interface PythonTerminalRunApi { * ``` */ export interface PythonTaskExecutionOptions { - project?: PythonProject; + /** + * Name of the task to run. + */ + name: string; + + /** + * Arguments to pass to the python executable. + */ args: string[]; + + /** + * The Python project to use for the task. + */ + project?: PythonProject; + + /** + * Current working directory for the task. Default is the project directory for the script being run. + */ cwd?: string; + + /** + * Environment variables to set for the task. + */ env?: { [key: string]: string }; - name: string; } export interface PythonTaskRunApi { + /** + * Run a Python script or module as a task. + * + */ runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise; } +/** + * Options for running a Python script or module in the background. + */ export interface PythonBackgroundRunOptions { + /** + * The Python environment to use for running the script or module. + */ args: string[]; + + /** + * Current working directory for the script or module. Default is the project directory for the script being run. + */ cwd?: string; + + /** + * Environment variables to set for the script or module. + */ env?: { [key: string]: string | undefined }; } export interface PythonBackgroundRunApi { + /** + * Run a Python script or module in the background. This API will create a new process to run the script or module. + */ runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise; } @@ -1107,8 +1180,18 @@ export interface PythonExecutionApi PythonTaskRunApi, PythonBackgroundRunApi {} +/** + * Event arguments for when the monitored `.env` files or any other sources change. + */ export interface DidChangeEnvironmentVariablesEventArgs { + /** + * The URI of the file that changed. No `Uri` means a non-file source of environment variables changed. + */ uri?: Uri; + + /** + * The type of change that occurred. + */ changeTye: FileChangeType; } diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index fec897b..6c3901b 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -2,6 +2,7 @@ import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon, import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { PythonEnvironment, IconPath, Package, PythonProject } from '../../api'; import { removable } from './utils'; +import { isActivatableEnvironment } from '../common/activation'; export enum EnvTreeItemKind { manager = 'python-env-manager', @@ -63,8 +64,9 @@ export class PythonEnvTreeItem implements EnvTreeItem { } private getContextValue() { + const activatable = isActivatableEnvironment(this.environment) ? '-activatable' : ''; const remove = this.parent.manager.supportsRemove ? '-remove' : ''; - return `pythonEnvironment${remove}`; + return `pythonEnvironment${remove}${activatable}`; } private setIcon(item: TreeItem) { diff --git a/src/features/views/utils.ts b/src/features/views/utils.ts index e2b9f7f..6f03314 100644 --- a/src/features/views/utils.ts +++ b/src/features/views/utils.ts @@ -6,7 +6,7 @@ export function removable(project: PythonProject): boolean { const workspace = getWorkspaceFolder(project.uri); if (workspace) { // If the project path is same as the workspace path, then we cannot remove the project. - path.normalize(workspace?.uri.fsPath).toLowerCase() !== path.normalize(project.uri.fsPath).toLowerCase(); + return path.normalize(workspace?.uri.fsPath).toLowerCase() !== path.normalize(project.uri.fsPath).toLowerCase(); } return true; } diff --git a/src/internal.api.ts b/src/internal.api.ts index 258750e..62e6e60 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -203,8 +203,8 @@ export class InternalPackageManager implements PackageManager { public get iconPath(): IconPath | undefined { return this.manager.iconPath; } - public get logOutput(): LogOutputChannel | undefined { - return this.manager.logOutput; + public get log(): LogOutputChannel | undefined { + return this.manager.log; } install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index ab26a6c..723a73f 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -28,7 +28,7 @@ export class CondaPackageManager implements PackageManager, Disposable { private packages: Map = new Map(); - constructor(public readonly api: PythonEnvironmentApi, public readonly logOutput: LogOutputChannel) { + constructor(public readonly api: PythonEnvironmentApi, public readonly log: LogOutputChannel) { this.name = 'conda'; this.displayName = 'Conda'; this.description = 'Conda package manager'; @@ -54,11 +54,11 @@ export class CondaPackageManager implements PackageManager, Disposable { this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { - this.logOutput.error('Error installing packages', e); + this.log.error('Error installing packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); if (result === 'View Output') { - this.logOutput.show(); + this.log.show(); } }); } @@ -80,11 +80,11 @@ export class CondaPackageManager implements PackageManager, Disposable { this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { - this.logOutput.error('Error uninstalling packages', e); + this.log.error('Error uninstalling packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); if (result === 'View Output') { - this.logOutput.show(); + this.log.show(); } }); } diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 1511fda..5123e4c 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -36,7 +36,7 @@ export class PipPackageManager implements PackageManager, Disposable { constructor( private readonly api: PythonEnvironmentApi, - public readonly logOutput: LogOutputChannel, + public readonly log: LogOutputChannel, private readonly venv: VenvManager, ) { this.name = 'pip'; @@ -65,11 +65,11 @@ export class PipPackageManager implements PackageManager, Disposable { this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment, manager: this, changes }); } catch (e) { - this.logOutput.error('Error installing packages', e); + this.log.error('Error installing packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); if (result === 'View Output') { - this.logOutput.show(); + this.log.show(); } }); } @@ -91,11 +91,11 @@ export class PipPackageManager implements PackageManager, Disposable { this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { - this.logOutput.error('Error uninstalling packages', e); + this.log.error('Error uninstalling packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); if (result === 'View Output') { - this.logOutput.show(); + this.log.show(); } }); } diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index 65b6450..33ba168 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -15,6 +15,7 @@ import { SetEnvironmentScope, } from '../../api'; import { + clearSystemEnvCache, getSystemEnvForGlobal, getSystemEnvForWorkspace, refreshPythons, @@ -193,6 +194,10 @@ export class SysPythonManager implements EnvironmentManager { return resolved; } + async clearCache(): Promise { + await clearSystemEnvCache(); + } + private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined { const normalized = path.normalize(fsPath); return this.collection.find((e) => { diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index a7793b7..7a79fb8 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -256,8 +256,8 @@ export async function refreshPackages( manager: PackageManager, ): Promise { if (!environment.execInfo) { - manager.logOutput?.error(`No executable found for python: ${environment.environmentPath.fsPath}`); - showErrorMessage(`No executable found for python: ${environment.environmentPath.fsPath}`, manager.logOutput); + manager.log?.error(`No executable found for python: ${environment.environmentPath.fsPath}`); + showErrorMessage(`No executable found for python: ${environment.environmentPath.fsPath}`, manager.log); return []; } @@ -268,19 +268,14 @@ export async function refreshPackages( data = await runUV( ['pip', 'list', '--python', environment.execInfo.run.executable], undefined, - manager.logOutput, + manager.log, ); } else { - data = await runPython( - environment.execInfo.run.executable, - ['-m', 'pip', 'list'], - undefined, - manager.logOutput, - ); + data = await runPython(environment.execInfo.run.executable, ['-m', 'pip', 'list'], undefined, manager.log); } } catch (e) { - manager.logOutput?.error('Error refreshing packages', e); - showErrorMessage('Error refreshing packages', manager.logOutput); + manager.log?.error('Error refreshing packages', e); + showErrorMessage('Error refreshing packages', manager.log); return []; } @@ -330,14 +325,14 @@ export async function installPackages( await runUV( [...installArgs, '--python', environment.execInfo.run.executable, ...packages], undefined, - manager.logOutput, + manager.log, ); } else { await runPython( environment.execInfo.run.executable, ['-m', ...installArgs, ...packages], undefined, - manager.logOutput, + manager.log, ); } @@ -376,14 +371,14 @@ export async function uninstallPackages( await runUV( ['pip', 'uninstall', '--python', environment.execInfo.run.executable, ...remove], undefined, - manager.logOutput, + manager.log, ); } else { await runPython( environment.execInfo.run.executable, ['-m', 'pip', 'uninstall', '-y', ...remove], undefined, - manager.logOutput, + manager.log, ); } return refreshPackages(environment, api, manager); diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index f48fbd7..438bfa1 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -16,6 +16,7 @@ import { SetEnvironmentScope, } from '../../api'; import { + clearVenvCache, createPythonVenv, findVirtualEnvironments, getGlobalVenvLocation, @@ -285,6 +286,10 @@ export class VenvManager implements EnvironmentManager { return undefined; } + async clearCache(): Promise { + await clearVenvCache(); + } + private addEnvironment(environment: PythonEnvironment, raiseEvent?: boolean): void { if (this.collection.find((e) => e.envId.id === environment.envId.id)) { return; From b566b276986d37d41754d9329802c649dd6feea1 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 2 Dec 2024 23:21:42 +0530 Subject: [PATCH 020/328] Set pre-release version (#37) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d723ff0..aeca172 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "0.0.0", + "version": "0.1.0-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "0.0.0", + "version": "0.1.0-dev", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 6a7e78c..dd14013 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environment Manager", "description": "Provides a unified python environment experience", - "version": "0.0.0", + "version": "0.1.0-dev", "publisher": "ms-python", "engines": { "vscode": "^1.93.0" From 511eda2729e514773b7378ecafd87c28a324d8e1 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Dec 2024 10:24:27 +0530 Subject: [PATCH 021/328] Fix bug with selecting global python (#39) Fixes https://github.com/microsoft/vscode-python-environments/issues/38 --- src/features/envCommands.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 4ccb6fb..22450dc 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -28,6 +28,7 @@ import { ProjectItem, ProjectEnvironment, ProjectPackageRootTreeItem, + GlobalProjectItem, } from './views/treeViewItems'; import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; @@ -213,10 +214,15 @@ export async function setEnvironmentCommand( if (context instanceof PythonEnvTreeItem) { try { const view = context as PythonEnvTreeItem; - const projects = await pickProjectMany(wm.getProjects()); - if (projects && projects.length > 0) { - const uris = projects.map((p) => p.uri); - await em.setEnvironments(uris, view.environment); + const projects = wm.getProjects(); + if (projects.length > 0) { + const selected = await pickProjectMany(projects); + if (selected && selected.length > 0) { + const uris = selected.map((p) => p.uri); + await em.setEnvironments(uris, view.environment); + } + } else { + await em.setEnvironments('global', view.environment); } } catch (ex) { if (ex === QuickInputButtons.Back) { @@ -227,12 +233,14 @@ export async function setEnvironmentCommand( } else if (context instanceof ProjectItem) { const view = context as ProjectItem; await setEnvironmentCommand([view.project.uri], em, wm); + } else if (context instanceof GlobalProjectItem) { + await setEnvironmentCommand(undefined, em, wm); } else if (context instanceof Uri) { await setEnvironmentCommand([context], em, wm); } else if (context === undefined) { try { const projects = wm.getProjects(); - if (projects && projects.length > 0) { + if (projects.length > 0) { const selected = await pickProjectMany(projects); if (selected && selected.length > 0) { const uris = selected.map((p) => p.uri); From a9ef331351288d6497faa90257a173f1d61fd764 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 4 Dec 2024 23:53:08 +0530 Subject: [PATCH 022/328] Fix bugs found during TPI (#63) Fixes https://github.com/microsoft/vscode-python-environments/issues/43 Fixes https://github.com/microsoft/vscode-python-environments/issues/62 --- package.json | 28 +++++++++++++++++++--------- src/features/envCommands.ts | 7 +++++++ src/features/views/projectView.ts | 5 +++-- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index dd14013..bc67a7e 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,16 @@ } } } + }, + "python-envs.showActivateButton": { + "type": "boolean", + "description": "Show the activate button in the terminal", + "default": false, + "scope": "machine", + "tags": [ + "onExP", + "preview" + ] } } }, @@ -90,13 +100,13 @@ }, { "command": "python-envs.addPythonProject", - "title": "Add Python Workspace", + "title": "Add Python Project", "category": "Python", "icon": "$(new-folder)" }, { "command": "python-envs.removePythonProject", - "title": "Remove Python Workspace", + "title": "Remove Python Project", "category": "Python", "icon": "$(remove)" }, @@ -376,36 +386,36 @@ "terminal/title/context": [ { "command": "python-envs.terminal.activate", - "when": "pythonTerminalActivation && !pythonTerminalActivated" + "when": "config.python-envs.showActivateButton && pythonTerminalActivation && !pythonTerminalActivated" }, { "command": "python-envs.terminal.deactivate", - "when": "pythonTerminalActivation && pythonTerminalActivated" + "when": "config.python-envs.showActivateButton && pythonTerminalActivation && pythonTerminalActivated" } ] }, "viewsContainers": { "activitybar": [ { - "id": "python-environments", - "title": "Python Environments", + "id": "python", + "title": "Python", "icon": "files/logo.svg" } ] }, "views": { - "python-environments": [ + "python": [ { "id": "python-projects", "name": "Python Projects", "icon": "files/logo.svg", - "contextualTitle": "Workspace Environment" + "contextualTitle": "Python Projects" }, { "id": "env-managers", "name": "Environment Managers", "icon": "files/logo.svg", - "contextualTitle": "Environment Manager" + "contextualTitle": "Environment Managers" } ] }, diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 22450dc..0bd7bfb 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -479,6 +479,13 @@ export async function createTerminalCommand( terminal.show(); return terminal; } + } else if (context instanceof GlobalProjectItem) { + const env = await api.getEnvironment(undefined); + if (env) { + const terminal = await tm.create(env, { cwd: undefined }); + terminal.show(); + return terminal; + } } else if (context instanceof PythonEnvTreeItem) { const view = context as PythonEnvTreeItem; const pw = await pickProject(api.getPythonProjects()); diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index 5da9297..dfd976b 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -188,14 +188,15 @@ export class WorkspaceView implements TreeDataProvider { if (element.kind === ProjectTreeItemKind.environment) { const environmentItem = element as ProjectEnvironment; const parent = environmentItem.parent; - const pkgManager = this.envManagers.getPackageManager(parent.project.uri); + const uri = parent.id === 'global' ? undefined : parent.project.uri; + const pkgManager = this.envManagers.getPackageManager(uri); const environment = environmentItem.environment; const views: ProjectTreeItem[] = []; if (pkgManager) { const item = new ProjectPackageRootTreeItem(environmentItem, pkgManager, environment); - this.packageRoots.set(environmentItem.parent.project.uri.fsPath, item); + this.packageRoots.set(uri ? uri.fsPath : 'global', item); views.push(item); } else { views.push(new ProjectEnvironmentInfo(environmentItem, 'No package manager found')); From 466df75e615541cbbf88407ebdbd1f34b88ebe7a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 4 Dec 2024 23:53:38 +0530 Subject: [PATCH 023/328] Use light and dark mode icons (#64) Fixes https://github.com/microsoft/vscode-python-environments/issues/52 --- files/dark_mode_icon.svg | 1 + files/light_mode_icon.svg | 1 + src/features/terminal/terminalManager.ts | 15 ++++++--------- src/managers/sysPython/pipManager.ts | 7 +++++-- src/managers/sysPython/sysPythonManager.ts | 7 +++++-- src/managers/sysPython/utils.ts | 5 ++++- src/managers/sysPython/venvManager.ts | 10 +++++++--- src/managers/sysPython/venvUtils.ts | 5 ++++- 8 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 files/dark_mode_icon.svg create mode 100644 files/light_mode_icon.svg diff --git a/files/dark_mode_icon.svg b/files/dark_mode_icon.svg new file mode 100644 index 0000000..c3ec6ec --- /dev/null +++ b/files/dark_mode_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/files/light_mode_icon.svg b/files/light_mode_icon.svg new file mode 100644 index 0000000..a24a66b --- /dev/null +++ b/files/light_mode_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 21a1a72..8e4b761 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -21,7 +21,7 @@ import { terminals, withProgress, } from '../../common/window.apis'; -import { IconPath, PythonEnvironment, PythonProject, PythonTerminalOptions } from '../../api'; +import { PythonEnvironment, PythonProject, PythonTerminalOptions } from '../../api'; import { getActivationCommand, getDeactivationCommand, isActivatableEnvironment } from '../common/activation'; import { showErrorMessage } from '../../common/errors/utils'; import { quoteArgs } from '../execution/execUtils'; @@ -29,13 +29,7 @@ import { createDeferred } from '../../common/utils/deferred'; import { traceError, traceVerbose } from '../../common/logging'; import { getConfiguration } from '../../common/workspace.apis'; import { EnvironmentManagers } from '../../internal.api'; - -function getIconPath(i: IconPath | undefined): IconPath | undefined { - if (i instanceof Uri) { - return i.fsPath.endsWith('__icon__.py') ? undefined : i; - } - return i; -} +import { EXTENSION_ROOT_DIR } from '../../common/constants'; const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds const SHELL_INTEGRATION_POLL_INTERVAL = 100; // 0.1 seconds @@ -297,7 +291,10 @@ export class TerminalManagerImpl implements TerminalManager { env: options.env, strictEnv: options.strictEnv, message: options.message, - iconPath: options.iconPath ?? getIconPath(environment.iconPath), + iconPath: options.iconPath ?? { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }, hideFromUser: options.hideFromUser, color: options.color, location: options.location, diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 5123e4c..497f529 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -12,10 +12,10 @@ import { PythonEnvironmentApi, } from '../../api'; import { installPackages, refreshPackages, uninstallPackages } from './utils'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { Disposable } from 'vscode-jsonrpc'; import { getProjectInstallable } from './venvUtils'; import { VenvManager } from './venvManager'; +import { EXTENSION_ROOT_DIR } from '../../common/constants'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -43,7 +43,10 @@ export class PipPackageManager implements PackageManager, Disposable { this.displayName = 'Pip'; this.description = 'This package manager for python installs using pip.'; this.tooltip = new MarkdownString('This package manager for python installs using `pip`.'); - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); + this.iconPath = { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }; } readonly name: string; readonly displayName?: string; diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index 33ba168..35cdea8 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -24,10 +24,10 @@ import { setSystemEnvForGlobal, setSystemEnvForWorkspace, } from './utils'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest } from '../common/utils'; +import { EXTENSION_ROOT_DIR } from '../../common/constants'; export class SysPythonManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -57,7 +57,10 @@ export class SysPythonManager implements EnvironmentManager { this.preferredPackageManagerId = 'ms-python.python:pip'; this.description = 'Manages Global python installs'; this.tooltip = new MarkdownString('$(globe) Python Environment Manager', true); - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); + this.iconPath = { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }; } private _initialized: Deferred | undefined; diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index 7a79fb8..cffcd6b 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -196,7 +196,10 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { version: env.version, description: env.executable, environmentPath: Uri.file(env.executable), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), + iconPath: { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }, sysPrefix: env.prefix, execInfo: { run: { diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 438bfa1..f9efaae 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -1,4 +1,4 @@ -import { ProgressLocation, Uri, window, LogOutputChannel, EventEmitter, MarkdownString } from 'vscode'; +import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString } from 'vscode'; import { CreateEnvironmentScope, DidChangeEnvironmentEventArgs, @@ -33,6 +33,7 @@ import { NativePythonFinder } from '../common/nativePythonFinder'; import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; +import { withProgress } from '../../common/window.apis'; export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -63,7 +64,10 @@ export class VenvManager implements EnvironmentManager { this.description = 'Manages virtual environments created using venv'; this.tooltip = new MarkdownString('Manages virtual environments created using `venv`', true); this.preferredPackageManagerId = 'ms-python.python:pip'; - this.iconPath = Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')); + this.iconPath = { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }; } private _initialized: Deferred | undefined; @@ -145,7 +149,7 @@ export class VenvManager implements EnvironmentManager { } private async internalRefresh(scope: RefreshEnvironmentsScope, hardRefresh: boolean, title: string): Promise { - await window.withProgress( + await withProgress( { location: ProgressLocation.Window, title, diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index f591153..63cd3cb 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -129,7 +129,10 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { version: env.version, description: env.executable, environmentPath: Uri.file(env.executable), - iconPath: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', '__icon__.py')), + iconPath: { + light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), + dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), + }, sysPrefix: env.prefix, execInfo: { run: { From de673770be335a007d110b2ca9ac3141b8ecf065 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 5 Dec 2024 13:03:35 +0530 Subject: [PATCH 024/328] Fix for add project not working when a project is selected (#68) Fixes https://github.com/microsoft/vscode-python-environments/issues/44 --- src/features/envCommands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 0bd7bfb..0ff8a66 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -358,7 +358,7 @@ export async function addPythonProject( return pw; } - if (resource === undefined) { + if (resource === undefined || resource instanceof ProjectItem) { const creator: PythonProjectCreator | undefined = await pickCreator(pc.getProjectCreators()); if (!creator) { return; From 01f26a88447d0f5f1443b462009c1c852f60acef Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 5 Dec 2024 13:09:51 +0530 Subject: [PATCH 025/328] Ensure venv creation and packages checks for python2 before attempting creation or package operations (#66) Closes https://github.com/microsoft/vscode-python-environments/issues/67 --- src/api.ts | 5 ++--- src/features/pythonApi.ts | 1 + src/internal.api.ts | 2 +- src/managers/sysPython/utils.ts | 8 ++++++++ src/managers/sysPython/venvUtils.ts | 19 +++++++++++++++++-- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/api.ts b/src/api.ts index 190c0cc..f853541 100644 --- a/src/api.ts +++ b/src/api.ts @@ -193,10 +193,9 @@ export interface PythonEnvironmentInfo { readonly iconPath?: IconPath; /** - * Information on how to execute the Python environment. If not provided, {@link PythonEnvironmentApi.resolveEnvironment} will be - * used to to get the details at later point if needed. The recommendation is to fill this in if known. + * Information on how to execute the Python environment. This is required for executing Python code in the environment. */ - readonly execInfo?: PythonEnvironmentExecutionInfo; + readonly execInfo: PythonEnvironmentExecutionInfo; /** * `sys.prefix` is the path to the base directory of the Python installation. Typically obtained by executing `sys.prefix` in the Python interpreter. diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 5b42967..cfe9924 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -116,6 +116,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { }; return new PythonEnvironmentImpl(envId, info); } + async createEnvironment(scope: CreateEnvironmentScope): Promise { if (scope === 'global' || (!Array.isArray(scope) && scope instanceof Uri)) { const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope); diff --git a/src/internal.api.ts b/src/internal.api.ts index 62e6e60..1d10048 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -266,7 +266,7 @@ export class PythonEnvironmentImpl implements PythonEnvironment { public readonly description?: string; public readonly tooltip?: string | MarkdownString; public readonly iconPath?: IconPath; - public readonly execInfo?: PythonEnvironmentExecutionInfo; + public readonly execInfo: PythonEnvironmentExecutionInfo; public readonly sysPrefix: string; constructor(public readonly envId: PythonEnvironmentId, info: PythonEnvironmentInfo) { diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index cffcd6b..f1f3609 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -313,6 +313,10 @@ export async function installPackages( api: PythonEnvironmentApi, manager: PackageManager, ): Promise { + if (environment.version.startsWith('2.')) { + throw new Error('Python 2.* is not supported (deprecated)'); + } + if (environment.execInfo) { if (packages.length === 0) { throw new Error('No packages selected to install'); @@ -350,6 +354,10 @@ export async function uninstallPackages( manager: PackageManager, packages: string[] | Package[], ): Promise { + if (environment.version.startsWith('2.')) { + throw new Error('Python 2.* is not supported (deprecated)'); + } + if (environment.execInfo) { const remove = []; for (let pkg of packages) { diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 63cd3cb..4780bcb 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -254,13 +254,22 @@ export async function createPythonVenv( basePythons: PythonEnvironment[], venvRoot: Uri, ): Promise { - const filtered = basePythons.filter((e) => e.execInfo); - if (filtered.length === 0) { + if (basePythons.length === 0) { log.error('No base python found'); showErrorMessage('No base python found'); return; } + const filtered = basePythons.filter((e) => e.version.startsWith('3.')); + if (filtered.length === 0) { + log.error('Did not find any base python 3.*'); + showErrorMessage('Did not find any base python 3.*'); + basePythons.forEach((e) => { + log.error(`available base python: ${e.version}`); + }); + return; + } + const basePython = await pickEnvironmentFrom(sortEnvironments(filtered)); if (!basePython || !basePython.execInfo) { log.error('No base python selected, cannot create virtual environment.'); @@ -268,6 +277,12 @@ export async function createPythonVenv( return; } + if (basePython.version.startsWith('2.')) { + log.error('Python 2.* is not supported for virtual env creation'); + showErrorMessage('Python 2.* is not supported, use Python 3.*'); + return; + } + const name = await showInputBox({ prompt: 'Enter name for virtual environment', value: '.venv', From 4ebddf916fa3534bd629916f0bdef8a78637e018 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 5 Dec 2024 13:10:54 +0530 Subject: [PATCH 026/328] Fix bugs found during TPI (#65) Fixes https://github.com/microsoft/vscode-python-environments/issues/54 Fixes https://github.com/microsoft/vscode-python-environments/issues/53 Fixes https://github.com/microsoft/vscode-python-environments/issues/46 --- src/common/pickers/packages.ts | 14 +++++----- src/managers/conda/condaPackageManager.ts | 29 ++++++++++++++++---- src/managers/conda/condaUtils.ts | 17 ++++++++---- src/managers/sysPython/pipManager.ts | 10 ++++--- src/managers/sysPython/utils.ts | 32 ++++++++++++++++++++--- src/managers/sysPython/venvUtils.ts | 2 -- 6 files changed, 79 insertions(+), 25 deletions(-) diff --git a/src/common/pickers/packages.ts b/src/common/pickers/packages.ts index 262de55..a8e54f6 100644 --- a/src/common/pickers/packages.ts +++ b/src/common/pickers/packages.ts @@ -325,19 +325,21 @@ async function getCommonPackagesToInstall( export async function getPackagesToInstallFromPackageManager( packageManager: InternalPackageManager, environment: PythonEnvironment, + cachedInstallables?: Installable[], ): Promise { - const packageType = packageManager.supportsGetInstallable - ? await getPackageType() - : PackageManagement.commonPackages; + let installable: Installable[] = cachedInstallables ?? []; + if (installable.length === 0 && packageManager.supportsGetInstallable) { + installable = await getInstallables(packageManager, environment); + } + const packageType = installable.length > 0 ? await getPackageType() : PackageManagement.commonPackages; if (packageType === PackageManagement.workspaceDependencies) { try { - const installable = await getInstallables(packageManager, environment); const result = await getWorkspacePackages(installable); return result; } catch (ex) { if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstallFromPackageManager(packageManager, environment); + return getPackagesToInstallFromPackageManager(packageManager, environment, installable); } if (ex === QuickInputButtons.Back) { throw ex; @@ -352,7 +354,7 @@ export async function getPackagesToInstallFromPackageManager( return result; } catch (ex) { if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstallFromPackageManager(packageManager, environment); + return getPackagesToInstallFromPackageManager(packageManager, environment, installable); } if (ex === QuickInputButtons.Back) { throw ex; diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 723a73f..cfa3544 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -1,4 +1,13 @@ -import { Disposable, Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, window } from 'vscode'; +import { + CancellationError, + Disposable, + Event, + EventEmitter, + LogOutputChannel, + MarkdownString, + ProgressLocation, + window, +} from 'vscode'; import { DidChangePackagesEventArgs, IconPath, @@ -45,15 +54,20 @@ export class CondaPackageManager implements PackageManager, Disposable { { location: ProgressLocation.Notification, title: 'Installing packages', + cancellable: true, }, - async () => { + async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, packages, options, this.api, this); + const after = await installPackages(environment, packages, options, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { + if (e instanceof CancellationError) { + return; + } + this.log.error('Error installing packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); @@ -71,15 +85,20 @@ export class CondaPackageManager implements PackageManager, Disposable { { location: ProgressLocation.Notification, title: 'Uninstalling packages', + cancellable: true, }, - async () => { + async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, packages, this.api, this); + const after = await uninstallPackages(environment, packages, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { + if (e instanceof CancellationError) { + return; + } + this.log.error('Error uninstalling packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error installing packages', 'View Output'); diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index c5f0f71..bf2395c 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -12,7 +12,7 @@ import { import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; -import { LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; +import { CancellationError, CancellationToken, LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; import { @@ -121,12 +121,17 @@ export async function getConda(): Promise { throw new Error('Conda not found'); } -async function runConda(args: string[]): Promise { +async function runConda(args: string[], token?: CancellationToken): Promise { const conda = await getConda(); const deferred = createDeferred(); const proc = ch.spawn(conda, args, { shell: true }); + token?.onCancellationRequested(() => { + proc.kill(); + deferred.reject(new CancellationError()); + }); + let stdout = ''; let stderr = ''; proc.stdout?.on('data', (data) => { @@ -591,7 +596,7 @@ export async function refreshPackages( name: parts[0], displayName: parts[0], version: parts[1], - description: parts[2], + description: parts[1], }, environment, manager, @@ -608,6 +613,7 @@ export async function installPackages( options: PackageInstallOptions, api: PythonEnvironmentApi, manager: PackageManager, + token: CancellationToken, ): Promise { if (!packages || packages.length === 0) { // TODO: Ask user to pick packages @@ -620,7 +626,7 @@ export async function installPackages( } args.push(...packages); - await runConda(args); + await runConda(args, token); return refreshPackages(environment, api, manager); } @@ -629,6 +635,7 @@ export async function uninstallPackages( packages: PackageInfo[] | string[], api: PythonEnvironmentApi, manager: PackageManager, + token: CancellationToken, ): Promise { const remove = []; for (let pkg of packages) { @@ -642,7 +649,7 @@ export async function uninstallPackages( throw new Error('No packages to remove'); } - await runConda(['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...remove]); + await runConda(['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...remove], token); return refreshPackages(environment, api, manager); } diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 497f529..67f541d 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -59,11 +59,12 @@ export class PipPackageManager implements PackageManager, Disposable { { location: ProgressLocation.Notification, title: 'Installing packages', + cancellable: true, }, - async () => { + async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, packages, options, this.api, this); + const after = await installPackages(environment, packages, options, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment, manager: this, changes }); @@ -85,11 +86,12 @@ export class PipPackageManager implements PackageManager, Disposable { { location: ProgressLocation.Notification, title: 'Uninstalling packages', + cancellable: true, }, - async () => { + async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, this.api, this, packages); + const after = await uninstallPackages(environment, this.api, this, packages, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index f1f3609..6891494 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { LogOutputChannel, QuickPickItem, Uri, window } from 'vscode'; +import { CancellationError, CancellationToken, LogOutputChannel, QuickPickItem, Uri, window } from 'vscode'; import { EnvironmentManager, Package, @@ -110,10 +110,20 @@ export async function isUvInstalled(log?: LogOutputChannel): Promise { return available.promise; } -export async function runUV(args: string[], cwd?: string, log?: LogOutputChannel): Promise { +export async function runUV( + args: string[], + cwd?: string, + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { log?.info(`Running: uv ${args.join(' ')}`); return new Promise((resolve, reject) => { const proc = ch.spawn('uv', args, { cwd: cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); + let builder = ''; proc.stdout?.on('data', (data) => { const s = data.toString('utf-8'); @@ -134,10 +144,20 @@ export async function runUV(args: string[], cwd?: string, log?: LogOutputChannel }); } -export async function runPython(python: string, args: string[], cwd?: string, log?: LogOutputChannel): Promise { +export async function runPython( + python: string, + args: string[], + cwd?: string, + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { log?.info(`Running: ${python} ${args.join(' ')}`); return new Promise((resolve, reject) => { const proc = ch.spawn(python, args, { cwd: cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); let builder = ''; proc.stdout?.on('data', (data) => { const s = data.toString('utf-8'); @@ -312,6 +332,7 @@ export async function installPackages( options: PackageInstallOptions, api: PythonEnvironmentApi, manager: PackageManager, + token?: CancellationToken, ): Promise { if (environment.version.startsWith('2.')) { throw new Error('Python 2.* is not supported (deprecated)'); @@ -333,6 +354,7 @@ export async function installPackages( [...installArgs, '--python', environment.execInfo.run.executable, ...packages], undefined, manager.log, + token, ); } else { await runPython( @@ -340,6 +362,7 @@ export async function installPackages( ['-m', ...installArgs, ...packages], undefined, manager.log, + token, ); } @@ -353,6 +376,7 @@ export async function uninstallPackages( api: PythonEnvironmentApi, manager: PackageManager, packages: string[] | Package[], + token?: CancellationToken, ): Promise { if (environment.version.startsWith('2.')) { throw new Error('Python 2.* is not supported (deprecated)'); @@ -383,6 +407,7 @@ export async function uninstallPackages( ['pip', 'uninstall', '--python', environment.execInfo.run.executable, ...remove], undefined, manager.log, + token, ); } else { await runPython( @@ -390,6 +415,7 @@ export async function uninstallPackages( ['-m', 'pip', 'uninstall', '-y', ...remove], undefined, manager.log, + token, ); } return refreshPackages(environment, api, manager); diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 4780bcb..b1e09a8 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -273,7 +273,6 @@ export async function createPythonVenv( const basePython = await pickEnvironmentFrom(sortEnvironments(filtered)); if (!basePython || !basePython.execInfo) { log.error('No base python selected, cannot create virtual environment.'); - showErrorMessage('No base python selected, cannot create virtual environment.'); return; } @@ -298,7 +297,6 @@ export async function createPythonVenv( }); if (!name) { log.error('No name entered, cannot create virtual environment.'); - showErrorMessage('No name entered, cannot create virtual environment.'); return; } From b20eea3063c802e1ad281b8cda91d96fe9213c40 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 09:45:48 +0530 Subject: [PATCH 027/328] Add some basic telemetry (#72) --- src/common/telemetry/constants.ts | 48 +++++++++++++++++++++++++++++-- src/common/telemetry/sender.ts | 8 ------ src/extension.ts | 7 +++++ src/features/envManagers.ts | 12 ++++++++ src/managers/sysPython/utils.ts | 5 ++++ 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index 7c41696..53128ea 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -1,4 +1,48 @@ -export enum EventNames {} +export enum EventNames { + EXTENSION_ACTIVATION_DURATION = 'EXTENSION.ACTIVATION_DURATION', + EXTENSION_MANAGER_REGISTRATION_DURATION = 'EXTENSION.MANAGER_REGISTRATION_DURATION', + + ENVIRONMENT_MANAGER_REGISTERED = 'ENVIRONMENT_MANAGER.REGISTERED', + PACKAGE_MANAGER_REGISTERED = 'PACKAGE_MANAGER.REGISTERED', + + VENV_USING_UV = 'VENV.USING_UV', +} // Map all events to their properties -export interface IEventNamePropertyMapping {} +export interface IEventNamePropertyMapping { + /* __GDPR__ + "extension_activation_duration": { + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + } + */ + [EventNames.EXTENSION_ACTIVATION_DURATION]: never | undefined; + /* __GDPR__ + "extension_manager_registration_duration": { + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + } + */ + [EventNames.EXTENSION_MANAGER_REGISTRATION_DURATION]: never | undefined; + + /* __GDPR__ + "environment_manager_registered": { + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + } + */ + [EventNames.ENVIRONMENT_MANAGER_REGISTERED]: { + managerId: string; + }; + + /* __GDPR__ + "package_manager_registered": { + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + } + */ + [EventNames.PACKAGE_MANAGER_REGISTERED]: { + managerId: string; + }; + + /* __GDPR__ + "venv_using_uv": {"owner": "karthiknadig" } + */ + [EventNames.VENV_USING_UV]: never | undefined; +} diff --git a/src/common/telemetry/sender.ts b/src/common/telemetry/sender.ts index 4a8d785..80874b1 100644 --- a/src/common/telemetry/sender.ts +++ b/src/common/telemetry/sender.ts @@ -57,14 +57,6 @@ export function sendTelemetryEvent

= ( diff --git a/src/extension.ts b/src/extension.ts index 1441169..38a6b0b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -52,8 +52,13 @@ import { import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; import { EnvVarManager, PythonEnvVariableManager } from './features/execution/envVariableManager'; +import { StopWatch } from './common/stopWatch'; +import { sendTelemetryEvent } from './common/telemetry/sender'; +import { EventNames } from './common/telemetry/constants'; export async function activate(context: ExtensionContext): Promise { + const start = new StopWatch(); + // Logging should be set up before anything else. const outputChannel: LogOutputChannel = createLogOutputChannel('Python Environments'); context.subscriptions.push(outputChannel, registerLogger(outputChannel)); @@ -222,8 +227,10 @@ export async function activate(context: ExtensionContext): Promise { this._environmentManagers.delete(managerId); disposables.forEach((d) => d.dispose()); @@ -129,6 +136,11 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { this._packageManagers.set(managerId, mgr); this._onDidChangePackageManager.fire({ kind: 'registered', manager: mgr }); + + sendTelemetryEvent(EventNames.PACKAGE_MANAGER_REGISTERED, undefined, { + managerId, + }); + return new Disposable(() => { this._packageManagers.delete(managerId); disposables.forEach((d) => d.dispose()); diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index 6891494..1f56971 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -22,6 +22,8 @@ import { createDeferred } from '../../common/utils/deferred'; import { showErrorMessage } from '../../common/errors/utils'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; +import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { EventNames } from '../../common/telemetry/constants'; export const SYSTEM_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:system:WORKSPACE_SELECTED`; export const SYSTEM_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:system:GLOBAL_SELECTED`; @@ -105,6 +107,9 @@ export async function isUvInstalled(log?: LogOutputChannel): Promise { }); proc.stdout.on('data', (d) => log?.info(d.toString())); proc.on('exit', (code) => { + if (code === 0) { + sendTelemetryEvent(EventNames.VENV_USING_UV); + } available.resolve(code === 0); }); return available.promise; From f9c3376de6678f727b07c51c449d6f28611c4e7e Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 09:46:03 +0530 Subject: [PATCH 028/328] Add title and descriptions from `package.json` to `package.nls.json` (#69) --- package.json | 54 ++++++++++++++++++++++++------------------------ package.nls.json | 30 +++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 27 deletions(-) create mode 100644 package.nls.json diff --git a/package.json b/package.json index bc67a7e..b6fcb3b 100644 --- a/package.json +++ b/package.json @@ -38,36 +38,36 @@ "properties": { "python-envs.defaultEnvManager": { "type": "string", - "description": "The default environment manager to use for creating and managing environments", + "description": "%python-envs.defaultEnvManager.description%", "default": "ms-python.python:venv", "scope": "window" }, "python-envs.defaultPackageManager": { "type": "string", - "description": "The default package manager to use for installing and managing packages", + "description": "%python-envs.defaultPackageManager.description%", "default": "ms-python.python:pip", "scope": "window" }, "python-envs.pythonProjects": { "type": "array", "default": [], - "description": "The list of python workspaces", + "description": "%python-envs.pythonProjects.description%", "scope": "window", "items": { "type": "object", "properties": { "path": { "type": "string", - "description": "The path to the workspace folder or a file" + "description": "%python-envs.pythonProjects.path.description%" }, "envManager": { "type": "string", - "description": "The environment manager to use for this workspace", + "description": "%python-envs.pythonProjects.envManager.description%", "default": "ms-python.python:venv" }, "packageManager": { "type": "string", - "description": "The package manager to use for this workspace", + "description": "%python-envs.pythonProjects.packageManager.description%", "default": "ms-python.python:pip" } } @@ -75,7 +75,7 @@ }, "python-envs.showActivateButton": { "type": "boolean", - "description": "Show the activate button in the terminal", + "description": "%python-envs.showActivateButton.description%", "default": false, "scope": "machine", "tags": [ @@ -88,124 +88,124 @@ "commands": [ { "command": "python-envs.setEnvManager", - "title": "Set Environment Manager", + "title": "%python-envs.setEnvManager.title%", "category": "Python", "icon": "$(gear)" }, { "command": "python-envs.setPkgManager", - "title": "Set Package Manager", + "title": "%python-envs.setPkgManager.title%", "category": "Python", "icon": "$(package)" }, { "command": "python-envs.addPythonProject", - "title": "Add Python Project", + "title": "%python-envs.addPythonProject.title%", "category": "Python", "icon": "$(new-folder)" }, { "command": "python-envs.removePythonProject", - "title": "Remove Python Project", + "title": "%python-envs.removePythonProject.title%", "category": "Python", "icon": "$(remove)" }, { "command": "python-envs.create", - "title": "Create Environment", + "title": "%python-envs.create.title%", "category": "Python", "icon": "$(add)" }, { "command": "python-envs.createAny", - "title": "Create Environment", + "title": "%python-envs.createAny.title%", "category": "Python", "icon": "$(add)" }, { "command": "python-envs.set", - "title": "Set Workspace Environment", + "title": "%python-envs.set.title%", "category": "Python", "icon": "$(check)" }, { "command": "python-envs.setEnv", - "title": "Set As Workspace Environment", + "title": "%python-envs.setEnv.title%", "category": "Python", "icon": "$(check)" }, { "command": "python-envs.reset", - "title": "Reset Environment Selection to Default", + "title": "%python-envs.reset.title%", "shortTitle": "Reset Environment", "category": "Python", "icon": "$(sync)" }, { "command": "python-envs.remove", - "title": "Delete Environment", + "title": "%python-envs.remove.title%", "category": "Python", "icon": "$(remove)" }, { "command": "python-envs.refreshAllManagers", - "title": "Refresh All Environment Managers", + "title": "%python-envs.refreshAllManagers.title%", "shortTitle": "Refresh All", "category": "Python", "icon": "$(refresh)" }, { "command": "python-envs.refreshManager", - "title": "Refresh Environments List", + "title": "%python-envs.refreshManager.title%", "category": "Python", "icon": "$(refresh)" }, { "command": "python-envs.refreshPackages", - "title": "Refresh Packages List", + "title": "%python-envs.refreshPackages.title%", "category": "Python", "icon": "$(refresh)" }, { "command": "python-envs.packages", - "title": "Install or Remove Packages", + "title": "%python-envs.packages.title%", "shortTitle": "Modify Packages", "category": "Python", "icon": "$(package)" }, { "command": "python-envs.clearCache", - "title": "Clear Cache", + "title": "%python-envs.clearCache.title%", "category": "Python", "icon": "$(trash)" }, { "command": "python-envs.runInTerminal", - "title": "Run in Terminal", + "title": "%python-envs.runInTerminal.title%", "category": "Python Envs", "icon": "$(play)" }, { "command": "python-envs.createTerminal", - "title": "Create Python Terminal", + "title": "%python-envs.createTerminal.title%", "category": "Python Envs", "icon": "$(terminal)" }, { "command": "python-envs.runAsTask", - "title": "Run as Task", + "title": "%python-envs.runAsTask.title%", "category": "Python Envs", "icon": "$(play)" }, { "command": "python-envs.terminal.activate", - "title": "Activate Environment in Current Terminal", + "title": "%python-envs.terminal.activate.title%", "category": "Python Envs", "icon": "$(zap)" }, { "command": "python-envs.terminal.deactivate", - "title": "Deactivate Environment in Current Terminal", + "title": "%python-envs.terminal.deactivate.title%", "category": "Python Envs", "icon": "$(circle-slash)" } diff --git a/package.nls.json b/package.nls.json new file mode 100644 index 0000000..ac9beb8 --- /dev/null +++ b/package.nls.json @@ -0,0 +1,30 @@ +{ + "python-envs.defaultEnvManager.description": "The default environment manager for creating and managing environments.", + "python-envs.defaultPackageManager.description": "The default package manager for installing packages in environments.", + "python-envs.pythonProjects.description": "The list of Python projects.", + "python-envs.pythonProjects.path.description": "The path to a folder or file in the workspace to be treated as a Python project.", + "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", + "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", + "python-envs.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", + + "python-envs.setEnvManager.title": "Set Environment Manager", + "python-envs.setPkgManager.title": "Set Package Manager", + "python-envs.addPythonProject.title": "Add Python Project", + "python-envs.removePythonProject.title": "Remove Python Project", + "python-envs.create.title": "Create Environment", + "python-envs.createAny.title": "Create Environment", + "python-envs.set.title": "Set Workspace Environment", + "python-envs.setEnv.title": "Set As Workspace Environment", + "python-envs.reset.title": "Reset Environment Selection to Default", + "python-envs.remove.title": "Delete Environment", + "python-envs.refreshAllManagers.title": "Refresh All Environment Managers", + "python-envs.refreshManager.title": "Refresh Environments List", + "python-envs.refreshPackages.title": "Refresh Packages List", + "python-envs.packages.title": "Install or Remove Packages", + "python-envs.clearCache.title": "Clear Cache", + "python-envs.runInTerminal.title": "Run in Terminal", + "python-envs.createTerminal.title": "Create Python Terminal", + "python-envs.runAsTask.title": "Run as Task", + "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", + "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal" +} From 288150885d4fc2fd5f0000772446f8ee0b4f8ed9 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 09:46:19 +0530 Subject: [PATCH 029/328] Use built-in icon for Python (#73) --- files/dark_mode_icon.svg | 1 - files/light_mode_icon.svg | 1 - package-lock.json | 2 +- package.json | 2 +- src/features/terminal/terminalManager.ts | 6 +----- src/managers/sysPython/pipManager.ts | 9 ++------- src/managers/sysPython/sysPythonManager.ts | 8 ++------ src/managers/sysPython/utils.ts | 10 +++------- src/managers/sysPython/venvManager.ts | 9 +++------ src/managers/sysPython/venvUtils.ts | 9 +++------ 10 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 files/dark_mode_icon.svg delete mode 100644 files/light_mode_icon.svg diff --git a/files/dark_mode_icon.svg b/files/dark_mode_icon.svg deleted file mode 100644 index c3ec6ec..0000000 --- a/files/dark_mode_icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/files/light_mode_icon.svg b/files/light_mode_icon.svg deleted file mode 100644 index a24a66b..0000000 --- a/files/light_mode_icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index aeca172..8058ece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.93.0" + "vscode": "^1.96.0-insider" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index b6fcb3b..eda0b02 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "version": "0.1.0-dev", "publisher": "ms-python", "engines": { - "vscode": "^1.93.0" + "vscode": "^1.96.0-insider" }, "categories": [ "Other" diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 8e4b761..ece342d 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -29,7 +29,6 @@ import { createDeferred } from '../../common/utils/deferred'; import { traceError, traceVerbose } from '../../common/logging'; import { getConfiguration } from '../../common/workspace.apis'; import { EnvironmentManagers } from '../../internal.api'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds const SHELL_INTEGRATION_POLL_INTERVAL = 100; // 0.1 seconds @@ -291,10 +290,7 @@ export class TerminalManagerImpl implements TerminalManager { env: options.env, strictEnv: options.strictEnv, message: options.message, - iconPath: options.iconPath ?? { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }, + iconPath: options.iconPath, hideFromUser: options.hideFromUser, color: options.color, location: options.location, diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/sysPython/pipManager.ts index 67f541d..f1c5d8c 100644 --- a/src/managers/sysPython/pipManager.ts +++ b/src/managers/sysPython/pipManager.ts @@ -1,5 +1,4 @@ -import * as path from 'path'; -import { Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, Uri, window } from 'vscode'; +import { Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, window } from 'vscode'; import { DidChangePackagesEventArgs, IconPath, @@ -15,7 +14,6 @@ import { installPackages, refreshPackages, uninstallPackages } from './utils'; import { Disposable } from 'vscode-jsonrpc'; import { getProjectInstallable } from './venvUtils'; import { VenvManager } from './venvManager'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -43,10 +41,7 @@ export class PipPackageManager implements PackageManager, Disposable { this.displayName = 'Pip'; this.description = 'This package manager for python installs using pip.'; this.tooltip = new MarkdownString('This package manager for python installs using `pip`.'); - this.iconPath = { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }; + this.iconPath = new ThemeIcon('python'); } readonly name: string; readonly displayName?: string; diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index 35cdea8..ebf6528 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, Uri, window } from 'vscode'; +import { EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, Uri, window } from 'vscode'; import { DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -27,7 +27,6 @@ import { import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest } from '../common/utils'; -import { EXTENSION_ROOT_DIR } from '../../common/constants'; export class SysPythonManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -57,10 +56,7 @@ export class SysPythonManager implements EnvironmentManager { this.preferredPackageManagerId = 'ms-python.python:pip'; this.description = 'Manages Global python installs'; this.tooltip = new MarkdownString('$(globe) Python Environment Manager', true); - this.iconPath = { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }; + this.iconPath = new ThemeIcon('globe'); } private _initialized: Deferred | undefined; diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index 1f56971..379e442 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -1,5 +1,4 @@ -import * as path from 'path'; -import { CancellationError, CancellationToken, LogOutputChannel, QuickPickItem, Uri, window } from 'vscode'; +import { CancellationError, CancellationToken, LogOutputChannel, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; import { EnvironmentManager, Package, @@ -11,7 +10,7 @@ import { ResolveEnvironmentContext, } from '../../api'; import * as ch from 'child_process'; -import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; import { isNativeEnvInfo, NativeEnvInfo, @@ -221,10 +220,7 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { version: env.version, description: env.executable, environmentPath: Uri.file(env.executable), - iconPath: { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }, + iconPath: new ThemeIcon('globe'), sysPrefix: env.prefix, execInfo: { run: { diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index f9efaae..0ef2f7b 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -1,4 +1,4 @@ -import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString } from 'vscode'; +import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString, ThemeIcon } from 'vscode'; import { CreateEnvironmentScope, DidChangeEnvironmentEventArgs, @@ -30,7 +30,7 @@ import { } from './venvUtils'; import * as path from 'path'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; import { withProgress } from '../../common/window.apis'; @@ -64,10 +64,7 @@ export class VenvManager implements EnvironmentManager { this.description = 'Manages virtual environments created using venv'; this.tooltip = new MarkdownString('Manages virtual environments created using `venv`', true); this.preferredPackageManagerId = 'ms-python.python:pip'; - this.iconPath = { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }; + this.iconPath = new ThemeIcon('python'); } private _initialized: Deferred | undefined; diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index b1e09a8..7d5a952 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -1,4 +1,4 @@ -import { LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, Uri } from 'vscode'; +import { LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; import { EnvironmentManager, Installable, @@ -15,7 +15,7 @@ import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; import { isUvInstalled, resolveSystemPythonEnvironmentPath, runPython, runUV } from './utils'; -import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; import { isNativeEnvInfo, NativeEnvInfo, @@ -129,10 +129,7 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { version: env.version, description: env.executable, environmentPath: Uri.file(env.executable), - iconPath: { - light: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'light_mode_icon.svg')), - dark: Uri.file(path.join(EXTENSION_ROOT_DIR, 'files', 'dark_mode_icon.svg')), - }, + iconPath: new ThemeIcon('python'), sysPrefix: env.prefix, execInfo: { run: { From a0c00f5e78d09d4aa3b7f50f8b08fbf52035d79d Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 09:47:02 +0530 Subject: [PATCH 030/328] Add sample and documentation (#71) Co-authored-by: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> --- .vscode/extensions.json | 6 +- .vscodeignore | 3 +- README.md | 33 +- examples/README.md | 87 + examples/sample1/.vscode/extensions.json | 11 + examples/sample1/.vscode/launch.json | 17 + examples/sample1/.vscode/settings.json | 22 + examples/sample1/.vscode/tasks.json | 37 + examples/sample1/.vscodeignore | 14 + examples/sample1/CHANGELOG.md | 9 + examples/sample1/README.md | 3 + examples/sample1/eslint.config.mjs | 27 + examples/sample1/package-lock.json | 4659 ++++++++++++++++++++ examples/sample1/package.json | 40 + examples/sample1/src/api.ts | 1232 ++++++ examples/sample1/src/extension.ts | 20 + examples/sample1/src/pythonEnvsApi.ts | 22 + examples/sample1/src/sampleEnvManager.ts | 87 + examples/sample1/tsconfig.json | 20 + examples/sample1/webpack.config.js | 48 + src/api.ts | 2 +- src/features/pythonApi.ts | 41 +- src/managers/sysPython/sysPythonManager.ts | 31 +- src/managers/sysPython/utils.ts | 13 - src/managers/sysPython/venvManager.ts | 19 +- src/managers/sysPython/venvUtils.ts | 13 - tsconfig.json | 3 +- 27 files changed, 6383 insertions(+), 136 deletions(-) create mode 100644 examples/README.md create mode 100644 examples/sample1/.vscode/extensions.json create mode 100644 examples/sample1/.vscode/launch.json create mode 100644 examples/sample1/.vscode/settings.json create mode 100644 examples/sample1/.vscode/tasks.json create mode 100644 examples/sample1/.vscodeignore create mode 100644 examples/sample1/CHANGELOG.md create mode 100644 examples/sample1/README.md create mode 100644 examples/sample1/eslint.config.mjs create mode 100644 examples/sample1/package-lock.json create mode 100644 examples/sample1/package.json create mode 100644 examples/sample1/src/api.ts create mode 100644 examples/sample1/src/extension.ts create mode 100644 examples/sample1/src/pythonEnvsApi.ts create mode 100644 examples/sample1/src/sampleEnvManager.ts create mode 100644 examples/sample1/tsconfig.json create mode 100644 examples/sample1/webpack.config.js diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 57dbdae..f36bb36 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,5 @@ { - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher"] + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher", "esbenp.prettier-vscode"] } diff --git a/.vscodeignore b/.vscodeignore index e95e16b..a61dc72 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -13,4 +13,5 @@ vsc-extension-quickstart.md **/*.ts .nox/ .venv/ -**/__pycache__/ \ No newline at end of file +**/__pycache__/ +examples/** diff --git a/README.md b/README.md index 33a602d..9d57cd1 100644 --- a/README.md +++ b/README.md @@ -45,37 +45,8 @@ The extension uses `pip` as the default package manager. You can change this by See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/src/api.ts) for the full list of Extension APIs. -Consuming these APIs from your extension: - -```typescript -let _extApi: PythonEnvironmentApi | undefined; -async function getEnvExtApi(): Promise { - if (_extApi) { - return _extApi; - } - const extension = getExtension(ENVS_EXTENSION_ID); - if (!extension) { - throw new Error('Python Environments extension not found.'); - } - if (extension?.isActive) { - _extApi = extension.exports as PythonEnvironmentApi; - return _extApi; - } - - await extension.activate(); - - _extApi = extension.exports as PythonEnvironmentApi; - return _extApi; -} - -export async function activate(context: ExtensionContext) { - const envApi = await getEnvExtApi(); - - // Get the environment for the workspace folder or global python if no workspace is open - const uri = workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined; - const env = await envApi.getEnvironment(uri); -} -``` +To consume these APIs you can look at the example here: +https://github.com/microsoft/vscode-python-environments/blob/main/src/examples/README.md ## Contributing diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 0000000..fb91d8f --- /dev/null +++ b/examples/README.md @@ -0,0 +1,87 @@ +## Requirements + +1. `node` >= 20.18.0 +2. `npm` >= 10.9.0 +3. `yo` >= 5.0.0 (installed via `npm install -g yo`) +4. `generator-code` >= 1.11.4 (installed via `npm install -g generator-code`) + +## Create your extension + +### Scaffolding + +Run `yo code` in your terminal and follow the instructions to create a new extension. The following were the choices made for this example: + +``` +> yo code +? What type of extension do you want to create? New Extension (TypeScript) +? What's the name of your extension? Sample1 +? What's the identifier of your extension? sample1 +? What's the description of your extension? A sample environment manager +? Initialize a git repository? Yes +? Which bundler to use? webpack +? Which package manager to use? npm +``` + +Follow the generator's additional instructions to install the required dependencies and build your extension. + +### Update extension dependency + +Add the following dependency to your extension `package.json` file: + +```json + "extensionDependencies": [ + "ms-python.vscode-python-envs" + ], +``` + +### Set up the Python Envs API + +The Python environments API is available via the extension export. First, add the following file to your extension [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/src/api.ts). You can rename the file as you see fit for your extension. + +Add a `pythonEnvsApi.ts` file to get the API and insert the following code: + +```typescript +import * as vscode from 'vscode'; +import { PythonEnvironmentApi } from './api'; + +let _extApi: PythonEnvironmentApi | undefined; +export async function getEnvExtApi(): Promise { + if (_extApi) { + return _extApi; + } + const extension = vscode.extensions.getExtension('ms-python.vscode-python-envs'); + if (!extension) { + throw new Error('Python Environments extension not found.'); + } + if (extension?.isActive) { + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; + } + + await extension.activate(); + + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; +} +``` + +Now you are ready to use it to register your environment manager. + +### Registering the environment manager + +Add the following code to your extension's `extension.ts` file: + +```typescript +import { ExtensionContext } from 'vscode'; +import { getEnvExtApi } from './pythonEnvsApi'; +import { SampleEnvManager } from './sampleEnvManager'; + +export async function activate(context: ExtensionContext): Promise { + const api = await getEnvExtApi(); + + const envManager = new SampleEnvManager(api); + context.subscriptions.push(api.registerEnvironmentManager(envManager)); +} +``` + +See full implementations for built-in support here: https://github.com/microsoft/vscode-python-environments/blob/main/src/managers diff --git a/examples/sample1/.vscode/extensions.json b/examples/sample1/.vscode/extensions.json new file mode 100644 index 0000000..e6a4ef6 --- /dev/null +++ b/examples/sample1/.vscode/extensions.json @@ -0,0 +1,11 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "dbaeumer.vscode-eslint", + "amodio.tsl-problem-matcher", + "ms-vscode.extension-test-runner", + "ms-python.vscode-python-envs", + "esbenp.prettier-vscode" + ] +} diff --git a/examples/sample1/.vscode/launch.json b/examples/sample1/.vscode/launch.json new file mode 100644 index 0000000..befd8c5 --- /dev/null +++ b/examples/sample1/.vscode/launch.json @@ -0,0 +1,17 @@ +// A launch configuration that compiles the extension and then opens it inside a new window +// Use IntelliSense to learn about possible attributes. +// Hover to view descriptions of existing attributes. +// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Run Extension", + "type": "extensionHost", + "request": "launch", + "args": ["--extensionDevelopmentPath=${workspaceFolder}"], + "outFiles": ["${workspaceFolder}/dist/**/*.js"], + "preLaunchTask": "${defaultBuildTask}" + } + ] +} diff --git a/examples/sample1/.vscode/settings.json b/examples/sample1/.vscode/settings.json new file mode 100644 index 0000000..bf5eb7c --- /dev/null +++ b/examples/sample1/.vscode/settings.json @@ -0,0 +1,22 @@ +// Place your settings in this file to overwrite default and user settings. +{ + "files.exclude": { + "out": false, // set this to true to hide the "out" folder with the compiled JS files + "dist": false // set this to true to hide the "dist" folder with the compiled JS files + }, + "search.exclude": { + "out": true, // set this to false to include "out" folder in search results + "dist": true // set this to false to include "dist" folder in search results + }, + // Turn off tsc task auto detection since we have the necessary tasks as npm scripts + "typescript.tsc.autoDetect": "off", + "editor.formatOnSave": true, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[python]": { + "editor.defaultFormatter": "charliermarsh.ruff", + "diffEditor.ignoreTrimWhitespace": false + }, + "prettier.tabWidth": 4 +} diff --git a/examples/sample1/.vscode/tasks.json b/examples/sample1/.vscode/tasks.json new file mode 100644 index 0000000..400c607 --- /dev/null +++ b/examples/sample1/.vscode/tasks.json @@ -0,0 +1,37 @@ +// See https://go.microsoft.com/fwlink/?LinkId=733558 +// for the documentation about the tasks.json format +{ + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "watch", + "problemMatcher": "$ts-webpack-watch", + "isBackground": true, + "presentation": { + "reveal": "never", + "group": "watchers" + }, + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "type": "npm", + "script": "watch-tests", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "presentation": { + "reveal": "never", + "group": "watchers" + }, + "group": "build" + }, + { + "label": "tasks: watch-tests", + "dependsOn": ["npm: watch", "npm: watch-tests"], + "problemMatcher": [] + } + ] +} diff --git a/examples/sample1/.vscodeignore b/examples/sample1/.vscodeignore new file mode 100644 index 0000000..d255964 --- /dev/null +++ b/examples/sample1/.vscodeignore @@ -0,0 +1,14 @@ +.vscode/** +.vscode-test/** +out/** +node_modules/** +src/** +.gitignore +.yarnrc +webpack.config.js +vsc-extension-quickstart.md +**/tsconfig.json +**/eslint.config.mjs +**/*.map +**/*.ts +**/.vscode-test.* diff --git a/examples/sample1/CHANGELOG.md b/examples/sample1/CHANGELOG.md new file mode 100644 index 0000000..eafe827 --- /dev/null +++ b/examples/sample1/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change Log + +All notable changes to the "sample1" extension will be documented in this file. + +Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. + +## [Unreleased] + +- Initial release \ No newline at end of file diff --git a/examples/sample1/README.md b/examples/sample1/README.md new file mode 100644 index 0000000..ad00b5e --- /dev/null +++ b/examples/sample1/README.md @@ -0,0 +1,3 @@ +### Template example for Environment Manager + +This is a template for an environment manager extension. It demonstrates how to use the Python Environments API to register your custom environment manager. You can look at implementations for `venv`, and `conda` (here https://github.com/microsoft/vscode-python-environments/blob/main/src/managers) for more examples. diff --git a/examples/sample1/eslint.config.mjs b/examples/sample1/eslint.config.mjs new file mode 100644 index 0000000..baca243 --- /dev/null +++ b/examples/sample1/eslint.config.mjs @@ -0,0 +1,27 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import tsParser from "@typescript-eslint/parser"; + +export default [{ + files: ["**/*.ts"], +}, { + plugins: { + "@typescript-eslint": typescriptEslint, + }, + + languageOptions: { + parser: tsParser, + ecmaVersion: 2022, + sourceType: "module", + }, + + rules: { + "@typescript-eslint/naming-convention": ["warn", { + selector: "import", + format: ["camelCase", "PascalCase"], + }], + curly: "warn", + eqeqeq: "warn", + "no-throw-literal": "warn", + semi: "warn", + }, +}]; \ No newline at end of file diff --git a/examples/sample1/package-lock.json b/examples/sample1/package-lock.json new file mode 100644 index 0000000..269e9f0 --- /dev/null +++ b/examples/sample1/package-lock.json @@ -0,0 +1,4659 @@ +{ + "name": "sample1", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "sample1", + "version": "0.0.1", + "devDependencies": { + "@types/mocha": "^10.0.7", + "@types/node": "20.x", + "@types/vscode": "^1.95.0", + "@typescript-eslint/eslint-plugin": "^8.3.0", + "@typescript-eslint/parser": "^8.3.0", + "@vscode/test-cli": "^0.0.10", + "@vscode/test-electron": "^2.4.1", + "eslint": "^9.9.1", + "ts-loader": "^9.5.1", + "typescript": "^5.5.4", + "webpack": "^5.94.0", + "webpack-cli": "^5.1.4" + }, + "engines": { + "vscode": "^1.95.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz", + "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.5", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/core": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz", + "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "9.16.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz", + "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz", + "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz", + "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/mocha": { + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "20.17.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz", + "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/@types/vscode": { + "version": "1.95.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.95.0.tgz", + "integrity": "sha512-0LBD8TEiNbet3NvWsmn59zLzOFu/txSlGxnv5yAFHCrhG9WvAnR3IvfHzMOs2aeWqgvNjq9pO99IUw8d3n+unw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.17.0.tgz", + "integrity": "sha512-HU1KAdW3Tt8zQkdvNoIijfWDMvdSweFYm4hWh+KwhPstv+sCmWb89hCIP8msFm9N1R/ooh9honpSuvqKWlYy3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/type-utils": "8.17.0", + "@typescript-eslint/utils": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", + "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/typescript-estree": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz", + "integrity": "sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.17.0.tgz", + "integrity": "sha512-q38llWJYPd63rRnJ6wY/ZQqIzPrBCkPdpIsaCfkR3Q4t3p6sb422zougfad4TFW9+ElIFLVDzWGiGAfbb/v2qw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.17.0", + "@typescript-eslint/utils": "8.17.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.17.0.tgz", + "integrity": "sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz", + "integrity": "sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.17.0.tgz", + "integrity": "sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/typescript-estree": "8.17.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz", + "integrity": "sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.17.0", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@vscode/test-cli": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.10.tgz", + "integrity": "sha512-B0mMH4ia+MOOtwNiLi79XhA+MLmUItIC8FckEuKrVAVriIuSWjt7vv4+bF8qVFiNFe4QRfzPaIZk39FZGWEwHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mocha": "^10.0.2", + "c8": "^9.1.0", + "chokidar": "^3.5.3", + "enhanced-resolve": "^5.15.0", + "glob": "^10.3.10", + "minimatch": "^9.0.3", + "mocha": "^10.2.0", + "supports-color": "^9.4.0", + "yargs": "^17.7.2" + }, + "bin": { + "vscode-test": "out/bin.mjs" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@vscode/test-electron": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.1.tgz", + "integrity": "sha512-Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "jszip": "^3.10.1", + "ora": "^7.0.1", + "semver": "^7.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.14.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "node_modules/@webpack-cli/info": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bl": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", + "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/browserslist": { + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/c8": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/c8/-/c8-9.1.0.tgz", + "integrity": "sha512-mBWcT5iqNir1zIkzSPyI3NCR9EZCVI3WUD+AVO17MVWTSFNyUueXE82qTeampNtTr+ilN/5Ua3j24LgbCKjDVg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@istanbuljs/schema": "^0.1.3", + "find-up": "^5.0.0", + "foreground-child": "^3.1.1", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.1", + "istanbul-reports": "^3.1.6", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.0.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1" + }, + "bin": { + "c8": "bin/c8.js" + }, + "engines": { + "node": ">=14.14.0" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001687", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz", + "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", + "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.5.71", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz", + "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==", + "dev": true, + "license": "ISC" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/enhanced-resolve": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/envinfo": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", + "dev": true, + "license": "MIT", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", + "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "dev": true, + "license": "MIT" + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz", + "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.16.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.5", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-scope": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/espree": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.14.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.x" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "dev": true, + "license": "ISC" + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/interpret": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.11.5" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mocha": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/mocha/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/mocha/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/mocha/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true, + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/ora": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz", + "integrity": "sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.3.0", + "cli-cursor": "^4.0.0", + "cli-spinners": "^2.9.0", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^1.3.0", + "log-symbols": "^5.1.0", + "stdin-discarder": "^0.1.0", + "string-width": "^6.1.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/emoji-regex": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", + "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.0.0", + "is-unicode-supported": "^1.1.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/string-width": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz", + "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^10.2.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true, + "license": "(MIT AND Zlib)" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true, + "license": "MIT" + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stdin-discarder": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz", + "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bl": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", + "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/terser": { + "version": "5.37.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz", + "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-api-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", + "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/ts-loader": { + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", + "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.0.0", + "micromatch": "^4.0.0", + "semver": "^7.3.4", + "source-map": "^0.7.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "typescript": "*", + "webpack": "^5.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typescript": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/update-browserslist-db": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/watchpack": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack": { + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.17.1", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.11", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-cli": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/webpack-merge": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", + "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wildcard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/examples/sample1/package.json b/examples/sample1/package.json new file mode 100644 index 0000000..060fd35 --- /dev/null +++ b/examples/sample1/package.json @@ -0,0 +1,40 @@ +{ + "name": "sample1", + "displayName": "Sample1", + "description": "A sample environment manager", + "version": "0.0.1", + "engines": { + "vscode": "^1.95.0" + }, + "categories": [ + "Other" + ], + "activationEvents": [], + "main": "./dist/extension.js", + "contributes": {}, + "scripts": { + "vscode:prepublish": "npm run package", + "compile": "webpack", + "watch": "webpack --watch", + "package": "webpack --mode production --devtool hidden-source-map", + "compile-tests": "tsc -p . --outDir out", + "watch-tests": "tsc -p . -w --outDir out", + "pretest": "npm run compile-tests && npm run compile && npm run lint", + "lint": "eslint src", + "test": "vscode-test" + }, + "devDependencies": { + "@types/vscode": "^1.95.0", + "@types/mocha": "^10.0.7", + "@types/node": "20.x", + "@typescript-eslint/eslint-plugin": "^8.3.0", + "@typescript-eslint/parser": "^8.3.0", + "eslint": "^9.9.1", + "typescript": "^5.5.4", + "ts-loader": "^9.5.1", + "webpack": "^5.94.0", + "webpack-cli": "^5.1.4", + "@vscode/test-cli": "^0.0.10", + "@vscode/test-electron": "^2.4.1" + } +} diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts new file mode 100644 index 0000000..71524da --- /dev/null +++ b/examples/sample1/src/api.ts @@ -0,0 +1,1232 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { + Uri, + Disposable, + MarkdownString, + Event, + LogOutputChannel, + ThemeIcon, + Terminal, + TaskExecution, + TerminalOptions, + FileChangeType, +} from 'vscode'; + +/** + * The path to an icon, or a theme-specific configuration of icons. + */ +export type IconPath = + | Uri + | { + /** + * The icon path for the light theme. + */ + light: Uri; + /** + * The icon path for the dark theme. + */ + dark: Uri; + } + | ThemeIcon; + +/** + * Options for executing a Python executable. + */ +export interface PythonCommandRunConfiguration { + /** + * Path to the binary like `python.exe` or `python3` to execute. This should be an absolute path + * to an executable that can be spawned. + */ + executable: string; + + /** + * Arguments to pass to the python executable. These arguments will be passed on all execute calls. + * This is intended for cases where you might want to do interpreter specific flags. + */ + args?: string[]; +} + +export enum TerminalShellType { + powershell = 'powershell', + powershellCore = 'powershellCore', + commandPrompt = 'commandPrompt', + gitbash = 'gitbash', + bash = 'bash', + zsh = 'zsh', + ksh = 'ksh', + fish = 'fish', + cshell = 'cshell', + tcshell = 'tshell', + nushell = 'nushell', + wsl = 'wsl', + xonsh = 'xonsh', + unknown = 'unknown', +} + +/** + * Contains details on how to use a particular python environment + * + * Running In Terminal: + * 1. If {@link PythonEnvironmentExecutionInfo.activatedRun} is provided, then that will be used. + * 2. If {@link PythonEnvironmentExecutionInfo.activatedRun} is not provided, then: + * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. + * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then: + * - {@link TerminalShellType.unknown} will be used if provided. + * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. + * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then {@link PythonEnvironmentExecutionInfo.activation} will be used. + * - If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. + * + * Creating a Terminal: + * 1. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. + * 2. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then {@link PythonEnvironmentExecutionInfo.activation} will be used. + * 3. If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then: + * - {@link TerminalShellType.unknown} will be used if provided. + * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. + * 4. If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. + * + */ +export interface PythonEnvironmentExecutionInfo { + /** + * Details on how to run the python executable. + */ + run: PythonCommandRunConfiguration; + + /** + * Details on how to run the python executable after activating the environment. + * If set this will overrides the {@link PythonEnvironmentExecutionInfo.run} command. + */ + activatedRun?: PythonCommandRunConfiguration; + + /** + * Details on how to activate an environment. + */ + activation?: PythonCommandRunConfiguration[]; + + /** + * Details on how to activate an environment using a shell specific command. + * If set this will override the {@link PythonEnvironmentExecutionInfo.activation}. + * {@link TerminalShellType.unknown} is used if shell type is not known. + * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * {@link PythonEnvironmentExecutionInfo.activation} if set. + */ + shellActivation?: Map; + + /** + * Details on how to deactivate an environment. + */ + deactivation?: PythonCommandRunConfiguration[]; + + /** + * Details on how to deactivate an environment using a shell specific command. + * If set this will override the {@link PythonEnvironmentExecutionInfo.deactivation} property. + * {@link TerminalShellType.unknown} is used if shell type is not known. + * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * {@link PythonEnvironmentExecutionInfo.deactivation} if set. + */ + shellDeactivation?: Map; +} + +/** + * Interface representing the ID of a Python environment. + */ +export interface PythonEnvironmentId { + /** + * The unique identifier of the Python environment. + */ + id: string; + + /** + * The ID of the manager responsible for the Python environment. + */ + managerId: string; +} + +/** + * Interface representing information about a Python environment. + */ +export interface PythonEnvironmentInfo { + /** + * The name of the Python environment. + */ + readonly name: string; + + /** + * The display name of the Python environment. + */ + readonly displayName: string; + + /** + * The short display name of the Python environment. + */ + readonly shortDisplayName?: string; + + /** + * The display path of the Python environment. + */ + readonly displayPath: string; + + /** + * The version of the Python environment. + */ + readonly version: string; + + /** + * Path to the python binary or environment folder. + */ + readonly environmentPath: Uri; + + /** + * The description of the Python environment. + */ + readonly description?: string; + + /** + * The tooltip for the Python environment, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString; + + /** + * The icon path for the Python environment, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; + + /** + * Information on how to execute the Python environment. This is required for executing Python code in the environment. + */ + readonly execInfo: PythonEnvironmentExecutionInfo; + + /** + * `sys.prefix` is the path to the base directory of the Python installation. Typically obtained by executing `sys.prefix` in the Python interpreter. + * This is required by extension like Jupyter, Pylance, and other extensions to provide better experience with python. + */ + readonly sysPrefix: string; +} + +/** + * Interface representing a Python environment. + */ +export interface PythonEnvironment extends PythonEnvironmentInfo { + /** + * The ID of the Python environment. + */ + readonly envId: PythonEnvironmentId; +} + +/** + * Type representing the scope for setting a Python environment. + * Can be undefined or a URI. + */ +export type SetEnvironmentScope = undefined | Uri; + +/** + * Type representing the scope for getting a Python environment. + * Can be undefined or a URI. + */ +export type GetEnvironmentScope = undefined | Uri; + +/** + * Type representing the scope for creating a Python environment. + * Can be a Python project or 'global'. + */ +export type CreateEnvironmentScope = Uri | Uri[] | 'global'; +/** + * The scope for which environments are to be refreshed. + * - `undefined`: Search for environments globally and workspaces. + * - {@link Uri}: Environments in the workspace/folder or associated with the Uri. + */ +export type RefreshEnvironmentsScope = Uri | undefined; + +/** + * The scope for which environments are required. + * - `"all"`: All environments. + * - `"global"`: Python installations that are usually a base for creating virtual environments. + * - {@link Uri}: Environments for the workspace/folder/file pointed to by the Uri. + */ +export type GetEnvironmentsScope = Uri | 'all' | 'global'; + +/** + * Event arguments for when the current Python environment changes. + */ +export type DidChangeEnvironmentEventArgs = { + /** + * The URI of the environment that changed. + */ + readonly uri: Uri | undefined; + + /** + * The old Python environment before the change. + */ + readonly old: PythonEnvironment | undefined; + + /** + * The new Python environment after the change. + */ + readonly new: PythonEnvironment | undefined; +}; + +/** + * Enum representing the kinds of environment changes. + */ +export enum EnvironmentChangeKind { + /** + * Indicates that an environment was added. + */ + add = 'add', + + /** + * Indicates that an environment was removed. + */ + remove = 'remove', +} + +/** + * Event arguments for when the list of Python environments changes. + */ +export type DidChangeEnvironmentsEventArgs = { + /** + * The kind of change that occurred (add or remove). + */ + kind: EnvironmentChangeKind; + + /** + * The Python environment that was added or removed. + */ + environment: PythonEnvironment; +}[]; + +/** + * Type representing the context for resolving a Python environment. + */ +export type ResolveEnvironmentContext = Uri; + +/** + * Interface representing an environment manager. + */ +export interface EnvironmentManager { + /** + * The name of the environment manager. + */ + readonly name: string; + + /** + * The display name of the environment manager. + */ + readonly displayName?: string; + + /** + * The preferred package manager ID for the environment manager. + * + * @example + * 'ms-python.python:pip' + */ + readonly preferredPackageManagerId: string; + + /** + * The description of the environment manager. + */ + readonly description?: string; + + /** + * The tooltip for the environment manager, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString | undefined; + + /** + * The icon path for the environment manager, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; + + /** + * The log output channel for the environment manager. + */ + readonly log?: LogOutputChannel; + + /** + * Creates a new Python environment within the specified scope. + * @param scope - The scope within which to create the environment. + * @returns A promise that resolves to the created Python environment, or undefined if creation failed. + */ + create?(scope: CreateEnvironmentScope): Promise; + + /** + * Removes the specified Python environment. + * @param environment - The Python environment to remove. + * @returns A promise that resolves when the environment is removed. + */ + remove?(environment: PythonEnvironment): Promise; + + /** + * Refreshes the list of Python environments within the specified scope. + * @param scope - The scope within which to refresh environments. + * @returns A promise that resolves when the refresh is complete. + */ + refresh(scope: RefreshEnvironmentsScope): Promise; + + /** + * Retrieves a list of Python environments within the specified scope. + * @param scope - The scope within which to retrieve environments. + * @returns A promise that resolves to an array of Python environments. + */ + getEnvironments(scope: GetEnvironmentsScope): Promise; + + /** + * Event that is fired when the list of Python environments changes. + */ + onDidChangeEnvironments?: Event; + + /** + * Sets the current Python environment within the specified scope. + * @param scope - The scope within which to set the environment. + * @param environment - The Python environment to set. If undefined, the environment is unset. + * @returns A promise that resolves when the environment is set. + */ + set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; + + /** + * Retrieves the current Python environment within the specified scope. + * @param scope - The scope within which to retrieve the environment. + * @returns A promise that resolves to the current Python environment, or undefined if none is set. + */ + get(scope: GetEnvironmentScope): Promise; + + /** + * Event that is fired when the current Python environment changes. + */ + onDidChangeEnvironment?: Event; + + /** + * Resolves the specified Python environment. The environment can be either a {@link PythonEnvironment} or a {@link Uri} context. + * + * This method is used to obtain a fully detailed {@link PythonEnvironment} object. The input can be: + * - A {@link PythonEnvironment} object, which might be missing key details such as {@link PythonEnvironment.execInfo}. + * - A {@link Uri} object, which typically represents either: + * - A folder that contains the Python environment. + * - The path to a Python executable. + * + * @param context - The context for resolving the environment, which can be a {@link PythonEnvironment} or a {@link Uri}. + * @returns A promise that resolves to the fully detailed {@link PythonEnvironment}, or `undefined` if the environment cannot be resolved. + */ + resolve(context: ResolveEnvironmentContext): Promise; + + /** + * Clears the environment manager's cache. + * + * @returns A promise that resolves when the cache is cleared. + */ + clearCache?(): Promise; +} + +/** + * Interface representing a package ID. + */ +export interface PackageId { + /** + * The ID of the package. + */ + id: string; + + /** + * The ID of the package manager. + */ + managerId: string; + + /** + * The ID of the environment in which the package is installed. + */ + environmentId: string; +} + +/** + * Interface representing package information. + */ +export interface PackageInfo { + /** + * The name of the package. + */ + readonly name: string; + + /** + * The display name of the package. + */ + readonly displayName: string; + + /** + * The version of the package. + */ + readonly version?: string; + + /** + * The description of the package. + */ + readonly description?: string; + + /** + * The tooltip for the package, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString | undefined; + + /** + * The icon path for the package, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; + + /** + * The URIs associated with the package. + */ + readonly uris?: readonly Uri[]; +} + +/** + * Interface representing a package. + */ +export interface Package extends PackageInfo { + /** + * The ID of the package. + */ + readonly pkgId: PackageId; +} + +/** + * Enum representing the kinds of package changes. + */ +export enum PackageChangeKind { + /** + * Indicates that a package was added. + */ + add = 'add', + + /** + * Indicates that a package was removed. + */ + remove = 'remove', +} + +/** + * Event arguments for when packages change. + */ +export interface DidChangePackagesEventArgs { + /** + * The Python environment in which the packages changed. + */ + environment: PythonEnvironment; + + /** + * The package manager responsible for the changes. + */ + manager: PackageManager; + + /** + * The list of changes, each containing the kind of change and the package affected. + */ + changes: { kind: PackageChangeKind; pkg: Package }[]; +} + +/** + * Interface representing a package manager. + */ +export interface PackageManager { + /** + * The name of the package manager. + */ + name: string; + + /** + * The display name of the package manager. + */ + displayName?: string; + + /** + * The description of the package manager. + */ + description?: string; + + /** + * The tooltip for the package manager, which can be a string or a Markdown string. + */ + tooltip?: string | MarkdownString | undefined; + + /** + * The icon path for the package manager, which can be a string, Uri, or an object with light and dark theme paths. + */ + iconPath?: IconPath; + + /** + * The log output channel for the package manager. + */ + log?: LogOutputChannel; + + /** + * Installs packages in the specified Python environment. + * @param environment - The Python environment in which to install packages. + * @param packages - The packages to install. + * @returns A promise that resolves when the installation is complete. + */ + install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; + + /** + * Uninstalls packages from the specified Python environment. + * @param environment - The Python environment from which to uninstall packages. + * @param packages - The packages to uninstall, which can be an array of packages or strings. + * @returns A promise that resolves when the uninstall is complete. + */ + uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise; + + /** + * Refreshes the package list for the specified Python environment. + * @param environment - The Python environment for which to refresh the package list. + * @returns A promise that resolves when the refresh is complete. + */ + refresh(environment: PythonEnvironment): Promise; + + /** + * Retrieves the list of packages for the specified Python environment. + * @param environment - The Python environment for which to retrieve packages. + * @returns An array of packages, or undefined if the packages could not be retrieved. + */ + getPackages(environment: PythonEnvironment): Promise; + + /** + * Get a list of installable items for a Python project. + * + * @param environment The Python environment for which to get installable items. + * + * Note: An environment can be used by multiple projects, so the installable items returned. + * should be for the environment. If you want to do it for a particular project, then you should + * ask user to select a project, and filter the installable items based on the project. + */ + getInstallable?(environment: PythonEnvironment): Promise; + + /** + * Event that is fired when packages change. + */ + onDidChangePackages?: Event; + + /** + * Clears the package manager's cache. + * @returns A promise that resolves when the cache is cleared. + */ + clearCache?(): Promise; +} + +/** + * Interface representing a Python project. + */ +export interface PythonProject { + /** + * The name of the Python project. + */ + readonly name: string; + + /** + * The URI of the Python project. + */ + readonly uri: Uri; + + /** + * The description of the Python project. + */ + readonly description?: string; + + /** + * The tooltip for the Python project, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString; + + /** + * The icon path for the Python project, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; +} + +/** + * Options for creating a Python project. + */ +export interface PythonProjectCreatorOptions { + /** + * The name of the Python project. + */ + name: string; + + /** + * Optional path that may be provided as a root for the project. + */ + uri?: Uri; +} + +/** + * Interface representing a creator for Python projects. + */ +export interface PythonProjectCreator { + /** + * The name of the Python project creator. + */ + readonly name: string; + + /** + * The display name of the Python project creator. + */ + readonly displayName?: string; + + /** + * The description of the Python project creator. + */ + readonly description?: string; + + /** + * The tooltip for the Python project creator, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString; + + /** + * The icon path for the Python project creator, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; + + /** + * Creates a new Python project or projects. + * @param options - Optional parameters for creating the Python project. + * @returns A promise that resolves to a Python project, an array of Python projects, or undefined. + */ + create(options?: PythonProjectCreatorOptions): Promise; +} + +/** + * Event arguments for when Python projects change. + */ +export interface DidChangePythonProjectsEventArgs { + /** + * The list of Python projects that were added. + */ + added: PythonProject[]; + + /** + * The list of Python projects that were removed. + */ + removed: PythonProject[]; +} + +/** + * Options for package installation. + */ +export interface PackageInstallOptions { + /** + * Upgrade the packages if it is already installed. + */ + upgrade?: boolean; +} + +export interface Installable { + /** + * The display name of the package, requirements, pyproject.toml or any other project file. + */ + readonly displayName: string; + + /** + * Arguments passed to the package manager to install the package. + * + * @example + * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. + * ['--pre', 'debugpy'] for `pip install --pre debugpy`. + * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. + */ + readonly args: string[]; + + /** + * Installable group name, this will be used to group installable items in the UI. + * + * @example + * `Requirements` for any requirements file. + * `Packages` for any package. + */ + readonly group?: string; + + /** + * Description about the installable item. This can also be path to the requirements, + * version of the package, or any other project file path. + */ + readonly description?: string; + + /** + * External Uri to the package on pypi or docs. + * @example + * https://pypi.org/project/debugpy/ for `debugpy`. + */ + readonly uri?: Uri; +} + +export interface PythonProcess { + /** + * The process ID of the Python process. + */ + readonly pid?: number; + + /** + * The standard input of the Python process. + */ + readonly stdin: NodeJS.WritableStream; + + /** + * The standard output of the Python process. + */ + readonly stdout: NodeJS.ReadableStream; + + /** + * The standard error of the Python process. + */ + readonly stderr: NodeJS.ReadableStream; + + /** + * Kills the Python process. + */ + kill(): void; + + /** + * Event that is fired when the Python process exits. + */ + onExit(listener: (code: number | null, signal: NodeJS.Signals | null) => void): void; +} + +export interface PythonEnvironmentManagerRegistrationApi { + /** + * Register an environment manager implementation. + * + * @param manager Environment Manager implementation to register. + * @returns A disposable that can be used to unregister the environment manager. + * @see {@link EnvironmentManager} + */ + registerEnvironmentManager(manager: EnvironmentManager): Disposable; +} + +export interface PythonEnvironmentItemApi { + /** + * Create a Python environment item from the provided environment info. This item is used to interact + * with the environment. + * + * @param info Some details about the environment like name, version, etc. needed to interact with the environment. + * @param manager The environment manager to associate with the environment. + * @returns The Python environment. + */ + createPythonEnvironmentItem(info: PythonEnvironmentInfo, manager: EnvironmentManager): PythonEnvironment; +} + +export interface PythonEnvironmentManagementApi { + /** + * Create a Python environment using environment manager associated with the scope. + * + * @param scope Where the environment is to be created. + * @returns The Python environment created. `undefined` if not created. + */ + createEnvironment(scope: CreateEnvironmentScope): Promise; + + /** + * Remove a Python environment. + * + * @param environment The Python environment to remove. + * @returns A promise that resolves when the environment has been removed. + */ + removeEnvironment(environment: PythonEnvironment): Promise; +} + +export interface PythonEnvironmentsApi { + /** + * Initiates a refresh of Python environments within the specified scope. + * @param scope - The scope within which to search for environments. + * @returns A promise that resolves when the search is complete. + */ + refreshEnvironments(scope: RefreshEnvironmentsScope): Promise; + + /** + * Retrieves a list of Python environments within the specified scope. + * @param scope - The scope within which to retrieve environments. + * @returns A promise that resolves to an array of Python environments. + */ + getEnvironments(scope: GetEnvironmentsScope): Promise; + + /** + * Event that is fired when the list of Python environments changes. + * @see {@link DidChangeEnvironmentsEventArgs} + */ + onDidChangeEnvironments: Event; + + /** + * This method is used to get the details missing from a PythonEnvironment. Like + * {@link PythonEnvironment.execInfo} and other details. + * + * @param context : The PythonEnvironment or Uri for which details are required. + */ + resolveEnvironment(context: ResolveEnvironmentContext): Promise; +} + +export interface PythonProjectEnvironmentApi { + /** + * Sets the current Python environment within the specified scope. + * @param scope - The scope within which to set the environment. + * @param environment - The Python environment to set. If undefined, the environment is unset. + */ + setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; + + /** + * Retrieves the current Python environment within the specified scope. + * @param scope - The scope within which to retrieve the environment. + * @returns A promise that resolves to the current Python environment, or undefined if none is set. + */ + getEnvironment(scope: GetEnvironmentScope): Promise; + + /** + * Event that is fired when the selected Python environment changes for Project, Folder or File. + * @see {@link DidChangeEnvironmentEventArgs} + */ + onDidChangeEnvironment: Event; +} + +export interface PythonEnvironmentManagerApi + extends PythonEnvironmentManagerRegistrationApi, + PythonEnvironmentItemApi, + PythonEnvironmentManagementApi, + PythonEnvironmentsApi, + PythonProjectEnvironmentApi {} + +export interface PythonPackageManagerRegistrationApi { + /** + * Register a package manager implementation. + * + * @param manager Package Manager implementation to register. + * @returns A disposable that can be used to unregister the package manager. + * @see {@link PackageManager} + */ + registerPackageManager(manager: PackageManager): Disposable; +} + +export interface PythonPackageGetterApi { + /** + * Refresh the list of packages in a Python Environment. + * + * @param environment The Python Environment for which the list of packages is to be refreshed. + * @returns A promise that resolves when the list of packages has been refreshed. + */ + refreshPackages(environment: PythonEnvironment): Promise; + + /** + * Get the list of packages in a Python Environment. + * + * @param environment The Python Environment for which the list of packages is required. + * @returns The list of packages in the Python Environment. + */ + getPackages(environment: PythonEnvironment): Promise; + + /** + * Event raised when the list of packages in a Python Environment changes. + * @see {@link DidChangePackagesEventArgs} + */ + onDidChangePackages: Event; +} + +export interface PythonPackageItemApi { + /** + * Create a package item from the provided package info. + * + * @param info The package info. + * @param environment The Python Environment in which the package is installed. + * @param manager The package manager that installed the package. + * @returns The package item. + */ + createPackageItem(info: PackageInfo, environment: PythonEnvironment, manager: PackageManager): Package; +} + +export interface PythonPackageManagementApi { + /** + * Install packages into a Python Environment. + * + * @param environment The Python Environment into which packages are to be installed. + * @param packages The packages to install. + * @param options Options for installing packages. + */ + installPackages(environment: PythonEnvironment, packages: string[], options?: PackageInstallOptions): Promise; + + /** + * Uninstall packages from a Python Environment. + * + * @param environment The Python Environment from which packages are to be uninstalled. + * @param packages The packages to uninstall. + */ + uninstallPackages(environment: PythonEnvironment, packages: PackageInfo[] | string[]): Promise; +} + +export interface PythonPackageManagerApi + extends PythonPackageManagerRegistrationApi, + PythonPackageGetterApi, + PythonPackageManagementApi, + PythonPackageItemApi {} + +export interface PythonProjectCreationApi { + /** + * Register a Python project creator. + * + * @param creator The project creator to register. + * @returns A disposable that can be used to unregister the project creator. + * @see {@link PythonProjectCreator} + */ + registerPythonProjectCreator(creator: PythonProjectCreator): Disposable; +} +export interface PythonProjectGetterApi { + /** + * Get all python projects. + */ + getPythonProjects(): readonly PythonProject[]; + + /** + * Get the python project for a given URI. + * + * @param uri The URI of the project + * @returns The project or `undefined` if not found. + */ + getPythonProject(uri: Uri): PythonProject | undefined; +} + +export interface PythonProjectModifyApi { + /** + * Add a python project or projects to the list of projects. + * + * @param projects The project or projects to add. + */ + addPythonProject(projects: PythonProject | PythonProject[]): void; + + /** + * Remove a python project from the list of projects. + * + * @param project The project to remove. + */ + removePythonProject(project: PythonProject): void; + + /** + * Event raised when python projects are added or removed. + * @see {@link DidChangePythonProjectsEventArgs} + */ + onDidChangePythonProjects: Event; +} + +/** + * The API for interacting with Python projects. A project in python is any folder or file that is a contained + * in some manner. For example, a PEP-723 compliant file can be treated as a project. A folder with a `pyproject.toml`, + * or just python files can be treated as a project. All this allows you to do is set a python environment for that project. + * + * By default all `vscode.workspace.workspaceFolders` are treated as projects. + */ +export interface PythonProjectApi extends PythonProjectCreationApi, PythonProjectGetterApi, PythonProjectModifyApi {} + +export interface PythonTerminalOptions extends TerminalOptions { + /** + * Whether to show the terminal. + */ + disableActivation?: boolean; +} + +export interface PythonTerminalCreateApi { + /** + * Creates a terminal and activates any (activatable) environment for the terminal. + * + * @param environment The Python environment to activate. + * @param options Options for creating the terminal. + * + * Note: Non-activatable environments have no effect on the terminal. + */ + createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; +} + +/** + * Options for running a Python script or module in a terminal. + * + * Example: + * * Running Script: `python myscript.py --arg1` + * ```typescript + * { + * args: ["myscript.py", "--arg1"] + * } + * ``` + * * Running a module: `python -m my_module --arg1` + * ```typescript + * { + * args: ["-m", "my_module", "--arg1"] + * } + * ``` + */ +export interface PythonTerminalExecutionOptions { + /** + * Current working directory for the terminal. This in only used to create the terminal. + */ + cwd: string | Uri; + + /** + * Arguments to pass to the python executable. + */ + args?: string[]; + + /** + * Set `true` to show the terminal. + */ + show?: boolean; +} + +export interface PythonTerminalRunApi { + /** + * Runs a Python script or module in a terminal. This API will create a terminal if one is not available to use. + * If a terminal is available, it will be used to run the script or module. + * + * Note: + * - If you restart VS Code, this will create a new terminal, this is a limitation of VS Code. + * - If you close the terminal, this will create a new terminal. + * - In cases of multi-root/project scenario, it will create a separate terminal for each project. + */ + runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise; + + /** + * Runs a Python script or module in a dedicated terminal. This API will create a terminal if one is not available to use. + * If a terminal is available, it will be used to run the script or module. This terminal will be dedicated to the script, + * and selected based on the `terminalKey`. + * + * @param terminalKey A unique key to identify the terminal. For scripts you can use the Uri of the script file. + */ + runInDedicatedTerminal( + terminalKey: Uri | string, + environment: PythonEnvironment, + options: PythonTerminalExecutionOptions, + ): Promise; +} + +/** + * Options for running a Python task. + * + * Example: + * * Running Script: `python myscript.py --arg1` + * ```typescript + * { + * args: ["myscript.py", "--arg1"] + * } + * ``` + * * Running a module: `python -m my_module --arg1` + * ```typescript + * { + * args: ["-m", "my_module", "--arg1"] + * } + * ``` + */ +export interface PythonTaskExecutionOptions { + /** + * Name of the task to run. + */ + name: string; + + /** + * Arguments to pass to the python executable. + */ + args: string[]; + + /** + * The Python project to use for the task. + */ + project?: PythonProject; + + /** + * Current working directory for the task. Default is the project directory for the script being run. + */ + cwd?: string; + + /** + * Environment variables to set for the task. + */ + env?: { [key: string]: string }; +} + +export interface PythonTaskRunApi { + /** + * Run a Python script or module as a task. + * + */ + runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise; +} + +/** + * Options for running a Python script or module in the background. + */ +export interface PythonBackgroundRunOptions { + /** + * The Python environment to use for running the script or module. + */ + args: string[]; + + /** + * Current working directory for the script or module. Default is the project directory for the script being run. + */ + cwd?: string; + + /** + * Environment variables to set for the script or module. + */ + env?: { [key: string]: string | undefined }; +} +export interface PythonBackgroundRunApi { + /** + * Run a Python script or module in the background. This API will create a new process to run the script or module. + */ + runInBackground(environment: PythonEnvironment, options: PythonBackgroundRunOptions): Promise; +} + +export interface PythonExecutionApi + extends PythonTerminalCreateApi, + PythonTerminalRunApi, + PythonTaskRunApi, + PythonBackgroundRunApi {} + +/** + * Event arguments for when the monitored `.env` files or any other sources change. + */ +export interface DidChangeEnvironmentVariablesEventArgs { + /** + * The URI of the file that changed. No `Uri` means a non-file source of environment variables changed. + */ + uri?: Uri; + + /** + * The type of change that occurred. + */ + changeTye: FileChangeType; +} + +export interface PythonEnvironmentVariablesApi { + /** + * Get environment variables for a workspace. This picks up `.env` file from the root of the + * workspace. + * + * Order of overrides: + * 1. `baseEnvVar` if given or `process.env` + * 2. `.env` file from the "python.envFile" setting in the workspace. + * 3. `.env` file at the root of the python project. + * 4. `overrides` in the order provided. + * + * @param uri The URI of the project, workspace or a file in a for which environment variables are required. + * @param overrides Additional environment variables to override the defaults. + * @param baseEnvVar The base environment variables that should be used as a starting point. + */ + getEnvironmentVariables( + uri: Uri, + overrides?: ({ [key: string]: string | undefined } | Uri)[], + baseEnvVar?: { [key: string]: string | undefined }, + ): Promise<{ [key: string]: string | undefined }>; + + /** + * Event raised when `.env` file changes or any other monitored source of env variable changes. + */ + onDidChangeEnvironmentVariables: Event; +} + +/** + * The API for interacting with Python environments, package managers, and projects. + */ +export interface PythonEnvironmentApi + extends PythonEnvironmentManagerApi, + PythonPackageManagerApi, + PythonProjectApi, + PythonExecutionApi, + PythonEnvironmentVariablesApi {} diff --git a/examples/sample1/src/extension.ts b/examples/sample1/src/extension.ts new file mode 100644 index 0000000..69540dd --- /dev/null +++ b/examples/sample1/src/extension.ts @@ -0,0 +1,20 @@ +// The module 'vscode' contains the VS Code extensibility API +// Import the module and reference it with the alias vscode in your code below +import * as vscode from 'vscode'; +import { getEnvExtApi } from './pythonEnvsApi'; +import { SampleEnvManager } from './sampleEnvManager'; + +// This method is called when your extension is activated +// Your extension is activated the very first time the command is executed +export async function activate(context: vscode.ExtensionContext) { + const api = await getEnvExtApi(); + + const log = vscode.window.createOutputChannel('Sample Environment Manager', { log: true }); + context.subscriptions.push(log); + + const manager = new SampleEnvManager(log); + context.subscriptions.push(api.registerEnvironmentManager(manager)); +} + +// This method is called when your extension is deactivated +export function deactivate() {} diff --git a/examples/sample1/src/pythonEnvsApi.ts b/examples/sample1/src/pythonEnvsApi.ts new file mode 100644 index 0000000..888262a --- /dev/null +++ b/examples/sample1/src/pythonEnvsApi.ts @@ -0,0 +1,22 @@ +import * as vscode from 'vscode'; +import { PythonEnvironmentApi } from './api'; + +let _extApi: PythonEnvironmentApi | undefined; +export async function getEnvExtApi(): Promise { + if (_extApi) { + return _extApi; + } + const extension = vscode.extensions.getExtension('ms-python.vscode-python-envs'); + if (!extension) { + throw new Error('Python Environments extension not found.'); + } + if (extension?.isActive) { + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; + } + + await extension.activate(); + + _extApi = extension.exports as PythonEnvironmentApi; + return _extApi; +} diff --git a/examples/sample1/src/sampleEnvManager.ts b/examples/sample1/src/sampleEnvManager.ts new file mode 100644 index 0000000..2b64b29 --- /dev/null +++ b/examples/sample1/src/sampleEnvManager.ts @@ -0,0 +1,87 @@ +import { MarkdownString, LogOutputChannel, Event } from 'vscode'; +import { + CreateEnvironmentScope, + DidChangeEnvironmentEventArgs, + DidChangeEnvironmentsEventArgs, + EnvironmentManager, + GetEnvironmentScope, + GetEnvironmentsScope, + IconPath, + PythonEnvironment, + RefreshEnvironmentsScope, + ResolveEnvironmentContext, + SetEnvironmentScope, +} from './api'; + +export class SampleEnvManager implements EnvironmentManager { + name: string; + displayName?: string | undefined; + preferredPackageManagerId: string; + description?: string | undefined; + tooltip?: string | MarkdownString | undefined; + iconPath?: IconPath | undefined; + log?: LogOutputChannel | undefined; + + constructor(log: LogOutputChannel) { + this.name = 'sample'; + this.displayName = 'Sample'; + this.preferredPackageManagerId = 'my-publisher.sample:sample'; + // if you want to use builtin `pip` then use this + // this.preferredPackageManagerId = 'ms-python.python:pip'; + this.log = log; + } + + create?(scope: CreateEnvironmentScope): Promise { + // Code to handle creating environments goes here + + throw new Error('Method not implemented.'); + } + remove?(environment: PythonEnvironment): Promise { + // Code to handle removing environments goes here + + throw new Error('Method not implemented.'); + } + refresh(scope: RefreshEnvironmentsScope): Promise { + // Code to handle refreshing environments goes here + // This is called when the user clicks on the refresh button in the UI + + throw new Error('Method not implemented.'); + } + getEnvironments(scope: GetEnvironmentsScope): Promise { + // Code to get the list of environments goes here + // This may be called when the python extension is activated to get the list of environments + + throw new Error('Method not implemented.'); + } + + // Event to be raised with the list of available extensions changes for this manager + onDidChangeEnvironments?: Event | undefined; + + set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + // User selected a environment for the given scope + // undefined environment means user wants to reset the environment for the given scope + + throw new Error('Method not implemented.'); + } + get(scope: GetEnvironmentScope): Promise { + // Code to get the environment for the given scope goes here + + throw new Error('Method not implemented.'); + } + + // Event to be raised when the environment for any active scope changes + onDidChangeEnvironment?: Event | undefined; + + resolve(context: ResolveEnvironmentContext): Promise { + // Code to resolve the environment goes here. Resolving an environment means + // to convert paths to actual environments + + throw new Error('Method not implemented.'); + } + + clearCache?(): Promise { + // Code to clear any cached data goes here + + throw new Error('Method not implemented.'); + } +} diff --git a/examples/sample1/tsconfig.json b/examples/sample1/tsconfig.json new file mode 100644 index 0000000..e11381a --- /dev/null +++ b/examples/sample1/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "target": "ES2020", + "lib": ["ES2020"], + "sourceMap": true, + "rootDir": "src", + "experimentalDecorators": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "noImplicitAny": true, + "noImplicitThis": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "resolveJsonModule": true, + "removeComments": true + } +} diff --git a/examples/sample1/webpack.config.js b/examples/sample1/webpack.config.js new file mode 100644 index 0000000..37d7024 --- /dev/null +++ b/examples/sample1/webpack.config.js @@ -0,0 +1,48 @@ +//@ts-check + +'use strict'; + +const path = require('path'); + +//@ts-check +/** @typedef {import('webpack').Configuration} WebpackConfig **/ + +/** @type WebpackConfig */ +const extensionConfig = { + target: 'node', // VS Code extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/ + mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production') + + entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/ + output: { + // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/ + path: path.resolve(__dirname, 'dist'), + filename: 'extension.js', + libraryTarget: 'commonjs2' + }, + externals: { + vscode: 'commonjs vscode' // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/ + // modules added here also need to be added in the .vscodeignore file + }, + resolve: { + // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader + extensions: ['.ts', '.js'] + }, + module: { + rules: [ + { + test: /\.ts$/, + exclude: /node_modules/, + use: [ + { + loader: 'ts-loader' + } + ] + } + ] + }, + devtool: 'nosources-source-map', + infrastructureLogging: { + level: "log", // enables logging required for problem matchers + }, +}; +module.exports = [ extensionConfig ]; \ No newline at end of file diff --git a/src/api.ts b/src/api.ts index f853541..71524da 100644 --- a/src/api.ts +++ b/src/api.ts @@ -299,7 +299,7 @@ export type DidChangeEnvironmentsEventArgs = { /** * Type representing the context for resolving a Python environment. */ -export type ResolveEnvironmentContext = PythonEnvironment | Uri; +export type ResolveEnvironmentContext = Uri; /** * Interface representing an environment manager. diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index cfe9924..7896bbc 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -38,8 +38,7 @@ import { PythonProjectManager, } from '../internal.api'; import { createDeferred } from '../common/utils/deferred'; -import { traceError, traceInfo } from '../common/logging'; -import { showErrorMessage } from '../common/errors/utils'; +import { traceInfo } from '../common/logging'; import { pickEnvironmentManager } from '../common/pickers/managers'; import { handlePythonPath } from '../common/utils/pythonPath'; import { TerminalManager } from './terminal/terminalManager'; @@ -197,38 +196,16 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { - if (context instanceof Uri) { - const projects = this.projectManager.getProjects(); - const projectEnvManagers: InternalEnvironmentManager[] = []; - projects.forEach((p) => { - const manager = this.envManagers.getEnvironmentManager(p.uri); - if (manager && !projectEnvManagers.includes(manager)) { - projectEnvManagers.push(manager); - } - }); - - return await handlePythonPath(context, this.envManagers.managers, projectEnvManagers); - } else if ('envId' in context) { - const manager = this.envManagers.getEnvironmentManager(context); - if (!manager) { - const data = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; - traceError(`No environment manager found: ${data}`); - traceError(`Know environment managers: ${this.envManagers.managers.map((m) => m.name).join(', ')}`); - showErrorMessage('No environment manager found'); - return undefined; - } - const env = await manager.resolve(context); - if (env && !env.execInfo) { - traceError(`Environment wasn't resolved correctly, missing execution info: ${env.name}`); - traceError(`Environment: ${JSON.stringify(env)}`); - traceError(`Resolved by: ${manager.id}`); - showErrorMessage("Environment wasn't resolved correctly, missing execution info"); - return undefined; + const projects = this.projectManager.getProjects(); + const projectEnvManagers: InternalEnvironmentManager[] = []; + projects.forEach((p) => { + const manager = this.envManagers.getEnvironmentManager(p.uri); + if (manager && !projectEnvManagers.includes(manager)) { + projectEnvManagers.push(manager); } + }); - return env; - } - return undefined; + return await handlePythonPath(context, this.envManagers.managers, projectEnvManagers); } registerPackageManager(manager: PackageManager): Disposable { diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index ebf6528..685e925 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -19,7 +19,6 @@ import { getSystemEnvForGlobal, getSystemEnvForWorkspace, refreshPythons, - resolveSystemPythonEnvironment, resolveSystemPythonEnvironmentPath, setSystemEnvForGlobal, setSystemEnvForWorkspace, @@ -153,32 +152,16 @@ export class SysPythonManager implements EnvironmentManager { } async resolve(context: ResolveEnvironmentContext): Promise { - if (context instanceof Uri) { - // NOTE: `environmentPath` for envs in `this.collection` for system envs always points to the python - // executable. This is set when we create the PythonEnvironment object. - const found = this.findEnvironmentByPath(context.fsPath); - if (found) { - // If it is in the collection, then it is a venv, and it should already be fully resolved. - return found; - } - } else { - // We have received a partially or fully resolved environment. - const found = - this.collection.find((e) => e.envId.id === context.envId.id) ?? - this.findEnvironmentByPath(context.environmentPath.fsPath); - if (found) { - // If it is in the collection, then it is a venv, and it should already be fully resolved. - return found; - } - - if (context.execInfo) { - // This is a fully resolved environment, from venv perspective. - return context; - } + // NOTE: `environmentPath` for envs in `this.collection` for system envs always points to the python + // executable. This is set when we create the PythonEnvironment object. + const found = this.findEnvironmentByPath(context.fsPath); + if (found) { + // If it is in the collection, then it is a venv, and it should already be fully resolved. + return found; } // This environment is unknown. Resolve it. - const resolved = await resolveSystemPythonEnvironment(context, this.nativeFinder, this.api, this); + const resolved = await resolveSystemPythonEnvironmentPath(context.fsPath, this.nativeFinder, this.api, this); if (resolved) { // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index 379e442..1b08b34 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -7,7 +7,6 @@ import { PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo, - ResolveEnvironmentContext, } from '../../api'; import * as ch from 'child_process'; import { ENVS_EXTENSION_ID } from '../../common/constants'; @@ -424,18 +423,6 @@ export async function uninstallPackages( throw new Error(`No executable found for python: ${environment.environmentPath.fsPath}`); } -export async function resolveSystemPythonEnvironment( - context: ResolveEnvironmentContext, - nativeFinder: NativePythonFinder, - - api: PythonEnvironmentApi, - manager: EnvironmentManager, -): Promise { - const fsPath = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; - const resolved = await resolveSystemPythonEnvironmentPath(fsPath, nativeFinder, api, manager); - return resolved; -} - export async function resolveSystemPythonEnvironmentPath( fsPath: string, nativeFinder: NativePythonFinder, diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 0ef2f7b..5bde9a9 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -23,7 +23,6 @@ import { getVenvForGlobal, getVenvForWorkspace, removeVenv, - resolveVenvPythonEnvironment, resolveVenvPythonEnvironmentPath, setVenvForGlobal, setVenvForWorkspace, @@ -249,24 +248,10 @@ export class VenvManager implements EnvironmentManager { // If it is in the collection, then it is a venv, and it should already be fully resolved. return found; } - } else { - // We have received a partially or fully resolved environment. - const found = - this.collection.find((e) => e.envId.id === context.envId.id) ?? - this.findEnvironmentByPath(context.environmentPath.fsPath); - if (found) { - // If it is in the collection, then it is a venv, and it should already be fully resolved. - return found; - } - - if (context.execInfo) { - // This is a fully resolved environment, from venv perspective. - return context; - } } - const resolved = await resolveVenvPythonEnvironment( - context, + const resolved = await resolveVenvPythonEnvironmentPath( + context.fsPath, this.nativeFinder, this.api, this, diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 7d5a952..2987881 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -7,7 +7,6 @@ import { PythonEnvironmentApi, PythonEnvironmentInfo, PythonProject, - ResolveEnvironmentContext, TerminalShellType, } from '../../api'; import * as tomljs from '@iarna/toml'; @@ -478,18 +477,6 @@ export async function getProjectInstallable( return installable; } -export async function resolveVenvPythonEnvironment( - context: ResolveEnvironmentContext, - nativeFinder: NativePythonFinder, - api: PythonEnvironmentApi, - manager: EnvironmentManager, - baseManager: EnvironmentManager, -): Promise { - const fsPath = context instanceof Uri ? context.fsPath : context.environmentPath.fsPath; - const resolved = await resolveVenvPythonEnvironmentPath(fsPath, nativeFinder, api, manager, baseManager); - return resolved; -} - export async function resolveVenvPythonEnvironmentPath( fsPath: string, nativeFinder: NativePythonFinder, diff --git a/tsconfig.json b/tsconfig.json index e11381a..f33234f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,5 +16,6 @@ "noFallthroughCasesInSwitch": true, "resolveJsonModule": true, "removeComments": true - } + }, + "exclude": ["examples"] } From 3161995ead12abe2fa8843c65ef689ae7ea8cd32 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 12:46:47 +0530 Subject: [PATCH 031/328] Localize all views and messages (#70) --- src/common/errors/utils.ts | 9 +- src/common/localize.ts | 101 +++++++++++++++++++++ src/common/pickers/environments.ts | 14 +-- src/common/pickers/managers.ts | 8 +- src/common/pickers/packages.ts | 8 +- src/common/pickers/projects.ts | 5 +- src/extension.ts | 4 +- src/features/views/envManagersView.ts | 5 +- src/features/views/projectView.ts | 15 +-- src/features/views/revealHandler.ts | 4 +- src/managers/conda/condaEnvManager.ts | 9 +- src/managers/conda/condaPackageManager.ts | 30 +++--- src/managers/conda/condaUtils.ts | 47 ++++++---- src/managers/sysPython/sysPythonManager.ts | 9 +- src/managers/sysPython/utils.ts | 21 ++++- src/managers/sysPython/venvManager.ts | 9 +- src/managers/sysPython/venvUtils.ts | 57 ++++++------ 17 files changed, 238 insertions(+), 117 deletions(-) diff --git a/src/common/errors/utils.ts b/src/common/errors/utils.ts index d04f61e..b7e7abd 100644 --- a/src/common/errors/utils.ts +++ b/src/common/errors/utils.ts @@ -1,5 +1,6 @@ import * as stackTrace from 'stack-trace'; import { commands, LogOutputChannel, window } from 'vscode'; +import { Common } from '../localize'; export function parseStack(ex: Error) { if (ex.stack && Array.isArray(ex.stack)) { @@ -10,8 +11,8 @@ export function parseStack(ex: Error) { } export async function showErrorMessage(message: string, log?: LogOutputChannel) { - const result = await window.showErrorMessage(message, 'View Logs'); - if (result === 'View Logs') { + const result = await window.showErrorMessage(message, Common.viewLogs); + if (result === Common.viewLogs) { if (log) { log.show(); } else { @@ -21,8 +22,8 @@ export async function showErrorMessage(message: string, log?: LogOutputChannel) } export async function showWarningMessage(message: string, log?: LogOutputChannel) { - const result = await window.showWarningMessage(message, 'View Logs'); - if (result === 'View Logs') { + const result = await window.showWarningMessage(message, Common.viewLogs); + if (result === Common.viewLogs) { if (log) { log.show(); } else { diff --git a/src/common/localize.ts b/src/common/localize.ts index 17632a8..a81f804 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -6,6 +6,11 @@ export namespace Common { export const uninstall = l10n.t('Uninstall'); export const openInBrowser = l10n.t('Open in Browser'); export const openInEditor = l10n.t('Open in Editor'); + export const browse = l10n.t('Browse'); + export const selectFolder = l10n.t('Select Folder'); + export const viewLogs = l10n.t('View Logs'); + export const yes = l10n.t('Yes'); + export const no = l10n.t('No'); } export namespace Interpreter { @@ -25,3 +30,99 @@ export namespace PackageManagement { export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); export const editArguments = l10n.t('Edit arguments'); } + +export namespace Pickers { + export namespace Environments { + export const selectExecutable = l10n.t('Select Python Executable'); + export const selectEnvironment = l10n.t('Select a Python Environment'); + } + + export namespace Packages { + export const selectOption = l10n.t('Select an option'); + export const installPackages = l10n.t('Install packages'); + export const uninstallPackages = l10n.t('Uninstall packages'); + } + + export namespace Managers { + export const selectEnvironmentManager = l10n.t('Select an environment manager'); + export const selectPackageManager = l10n.t('Select a package manager'); + export const selectProjectCreator = l10n.t('Select a project creator'); + } + + export namespace Project { + export const selectProject = l10n.t('Select a project, folder or script'); + export const selectProjects = l10n.t('Select one or more projects, folders or scripts'); + } +} + +export namespace ProjectViews { + export const noPackageManager = l10n.t('No package manager found'); + export const waitingForEnvManager = l10n.t('Waiting for environment managers to load'); + export const noEnvironmentManager = l10n.t('Environment manager not found'); + export const noEnvironmentManagerDescription = l10n.t( + 'Install an environment manager to get started. If you have installed then it might be loading or errored', + ); + export const noEnvironmentProvided = l10n.t('No environment provided by:'); + export const noPackages = l10n.t('No packages found'); +} + +export namespace VenvManagerStrings { + export const venvManagerDescription = l10n.t('Manages virtual environments created using `venv`'); + export const venvInitialize = l10n.t('Initializing virtual environments'); + export const venvRefreshing = l10n.t('Refreshing virtual environments'); + export const venvGlobalFolder = l10n.t('Select a folder to create a global virtual environment'); + export const venvGlobalFoldersSetting = l10n.t('Venv Folders Setting'); + + export const venvErrorNoBasePython = l10n.t('No base Python found'); + export const venvErrorNoPython3 = l10n.t('Did not find any base Python 3'); + + export const venvName = l10n.t('Enter a name for the virtual environment'); + export const venvNameErrorEmpty = l10n.t('Name cannot be empty'); + export const venvNameErrorExists = l10n.t('A folder with the same name already exists'); + + export const venvCreating = l10n.t('Creating virtual environment'); + export const venvCreateFailed = l10n.t('Failed to create virtual environment'); + + export const venvRemoving = l10n.t('Removing virtual environment'); + export const venvRemoveFailed = l10n.t('Failed to remove virtual environment'); + + export const installEditable = l10n.t('Install project as editable'); + export const searchingDependencies = l10n.t('Searching for dependencies'); +} + +export namespace SysManagerStrings { + export const sysManagerDescription = l10n.t('Manages Global Python installs'); + export const sysManagerRefreshing = l10n.t('Refreshing Global Python interpreters'); + export const sysManagerDiscovering = l10n.t('Discovering Global Python interpreters'); + + export const selectInstall = l10n.t('Select packages to install'); + export const selectUninstall = l10n.t('Select packages to uninstall'); + + export const packageRefreshError = l10n.t('Error refreshing packages'); +} + +export namespace CondaStrings { + export const condaManager = l10n.t('Manages Conda environments'); + export const condaDiscovering = l10n.t('Discovering Conda environments'); + export const condaRefreshingEnvs = l10n.t('Refreshing Conda environments'); + + export const condaPackageMgr = l10n.t('Manages Conda packages'); + export const condaRefreshingPackages = l10n.t('Refreshing Conda packages'); + export const condaInstallingPackages = l10n.t('Installing Conda packages'); + export const condaInstallError = l10n.t('Error installing Conda packages'); + export const condaUninstallingPackages = l10n.t('Uninstalling Conda packages'); + export const condaUninstallError = l10n.t('Error uninstalling Conda packages'); + + export const condaNamed = l10n.t('Named'); + export const condaPrefix = l10n.t('Prefix'); + + export const condaNamedDescription = l10n.t('Create a named conda environment'); + export const condaPrefixDescription = l10n.t('Create environment in your workspace'); + export const condaSelectEnvType = l10n.t('Select the type of conda environment to create'); + + export const condaNamedInput = l10n.t('Enter the name of the conda environment to create'); + + export const condaCreateFailed = l10n.t('Failed to create conda environment'); + export const condaRemoveFailed = l10n.t('Failed to remove conda environment'); + export const condaExists = l10n.t('Environment already exists'); +} diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 0cef6f2..5a890f1 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -1,7 +1,7 @@ import { Uri, ThemeIcon, QuickPickItem, QuickPickItemKind, ProgressLocation, QuickInputButtons } from 'vscode'; import { IconPath, PythonEnvironment, PythonProject } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; -import { Common, Interpreter } from '../localize'; +import { Common, Interpreter, Pickers } from '../localize'; import { showQuickPickWithButtons, showQuickPick, showOpenDialog, withProgress } from '../window.apis'; import { isWindows } from '../../managers/common/utils'; import { traceError } from '../logging'; @@ -18,14 +18,10 @@ type QuickPickIcon = | undefined; function getIconPath(i: IconPath | undefined): QuickPickIcon { - if (i === undefined || i instanceof ThemeIcon) { + if (i === undefined || i instanceof ThemeIcon || i instanceof Uri) { return i; } - if (i instanceof Uri) { - return i.fsPath.endsWith('__icon__.py') ? undefined : i; - } - if (typeof i === 'string') { return Uri.file(i); } @@ -51,7 +47,7 @@ async function browseForPython( canSelectFolders: false, canSelectMany: false, filters, - title: 'Select Python executable', + title: Pickers.Environments.selectExecutable, }); if (!uris || uris.length === 0) { return; @@ -103,7 +99,7 @@ async function pickEnvironmentImpl( options: EnvironmentPickOptions, ): Promise { const selected = await showQuickPickWithButtons(items, { - placeHolder: `Select a Python Environment`, + placeHolder: Pickers.Environments.selectEnvironment, ignoreFocusOut: true, showBackButton: options?.showBackButton, }); @@ -184,7 +180,7 @@ export async function pickEnvironmentFrom(environments: PythonEnvironment[]): Pr iconPath: getIconPath(e.iconPath), })); const selected = await showQuickPick(items, { - placeHolder: 'Select Python Environment', + placeHolder: Pickers.Environments.selectEnvironment, ignoreFocusOut: true, }); return (selected as { e: PythonEnvironment })?.e; diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index ed19b38..100f9ee 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -1,7 +1,7 @@ import { QuickPickItem, QuickPickItemKind } from 'vscode'; import { PythonProjectCreator } from '../../api'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; -import { Common } from '../localize'; +import { Common, Pickers } from '../localize'; import { showQuickPickWithButtons, showQuickPick } from '../window.apis'; export async function pickEnvironmentManager( @@ -44,7 +44,7 @@ export async function pickEnvironmentManager( })), ); const item = await showQuickPickWithButtons(items, { - placeHolder: 'Select an environment manager', + placeHolder: Pickers.Managers.selectEnvironmentManager, ignoreFocusOut: true, }); return (item as QuickPickItem & { id: string })?.id; @@ -90,7 +90,7 @@ export async function pickPackageManager( })), ); const item = await showQuickPickWithButtons(items, { - placeHolder: 'Select an package manager', + placeHolder: Pickers.Managers.selectPackageManager, ignoreFocusOut: true, }); return (item as QuickPickItem & { id: string })?.id; @@ -111,7 +111,7 @@ export async function pickCreator(creators: PythonProjectCreator[]): Promise { const items = [ { label: Common.install, - description: 'Install packages', + description: Pickers.Packages.installPackages, }, { label: Common.uninstall, - description: 'Uninstall packages', + description: Pickers.Packages.uninstallPackages, }, ]; const selected = await showQuickPick(items, { - placeHolder: 'Select an option', + placeHolder: Pickers.Packages.selectOption, ignoreFocusOut: true, }); return selected?.label; diff --git a/src/common/pickers/projects.ts b/src/common/pickers/projects.ts index 708b0d7..919943a 100644 --- a/src/common/pickers/projects.ts +++ b/src/common/pickers/projects.ts @@ -2,6 +2,7 @@ import path from 'path'; import { QuickPickItem } from 'vscode'; import { PythonProject } from '../../api'; import { showQuickPick, showQuickPickWithButtons } from '../window.apis'; +import { Pickers } from '../localize'; interface ProjectQuickPickItem extends QuickPickItem { project: PythonProject; @@ -15,7 +16,7 @@ export async function pickProject(projects: ReadonlyArray): Promi project: pw, })); const item = await showQuickPick(items, { - placeHolder: 'Select a project, folder or script', + placeHolder: Pickers.Project.selectProject, ignoreFocusOut: true, }); if (item) { @@ -38,7 +39,7 @@ export async function pickProjectMany( project: pw, })); const item = await showQuickPickWithButtons(items, { - placeHolder: 'Select a project, folder or script', + placeHolder: Pickers.Project.selectProjects, ignoreFocusOut: true, canPickMany: true, showBackButton: showBackButton, diff --git a/src/extension.ts b/src/extension.ts index 38a6b0b..8af1d6f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -35,7 +35,7 @@ import { registerAutoProjectProvider, registerExistingProjectProvider, } from './features/projectCreators'; -import { WorkspaceView } from './features/views/projectView'; +import { ProjectView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; import { @@ -93,7 +93,7 @@ export async function activate(context: ExtensionContext): Promise, Disposable { private treeView: TreeView; @@ -120,7 +121,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable this.packageRoots.set(environment.envId.id, item); views.push(item); } else { - views.push(new EnvInfoTreeItem(parent, 'No package manager found')); + views.push(new EnvInfoTreeItem(parent, ProjectViews.noPackageManager)); } return views; @@ -137,7 +138,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable if (packages) { views.push(...packages.map((p) => new PackageTreeItem(p, root, manager))); } else { - views.push(new PackageRootInfoTreeItem(root, 'No packages found')); + views.push(new PackageRootInfoTreeItem(root, ProjectViews.noPackages)); } return views; diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index dfd976b..28fb653 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -25,8 +25,9 @@ import { } from './treeViewItems'; import { onDidChangeConfiguration } from '../../common/workspace.apis'; import { createSimpleDebounce } from '../../common/utils/debounce'; +import { ProjectViews } from '../../common/localize'; -export class WorkspaceView implements TreeDataProvider { +export class ProjectView implements TreeDataProvider { private treeView: TreeView; private _treeDataChanged: EventEmitter = new EventEmitter< ProjectTreeItem | ProjectTreeItem[] | null | undefined @@ -149,7 +150,7 @@ export class WorkspaceView implements TreeDataProvider { new NoProjectEnvironment( projectItem.project, projectItem, - 'Waiting for environment managers to load', + ProjectViews.waitingForEnvManager, undefined, undefined, '$(loading~spin)', @@ -164,8 +165,8 @@ export class WorkspaceView implements TreeDataProvider { new NoProjectEnvironment( projectItem.project, projectItem, - 'Environment manager not found', - 'Install an environment manager to get started. If you have installed then it might be loading.', + ProjectViews.noEnvironmentManager, + ProjectViews.noEnvironmentManagerDescription, ), ]; } @@ -176,7 +177,7 @@ export class WorkspaceView implements TreeDataProvider { new NoProjectEnvironment( projectItem.project, projectItem, - `No environment provided by ${manager.displayName}`, + `${ProjectViews.noEnvironmentProvided} ${manager.displayName}`, ), ]; } @@ -199,7 +200,7 @@ export class WorkspaceView implements TreeDataProvider { this.packageRoots.set(uri ? uri.fsPath : 'global', item); views.push(item); } else { - views.push(new ProjectEnvironmentInfo(environmentItem, 'No package manager found')); + views.push(new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackageManager)); } return views; } @@ -214,7 +215,7 @@ export class WorkspaceView implements TreeDataProvider { if (packages) { return packages.map((p) => new ProjectPackage(root, p, manager)); } else { - views.push(new ProjectPackageRootInfoTreeItem(root, 'No packages found')); + views.push(new ProjectPackageRootInfoTreeItem(root, ProjectViews.noPackages)); } } diff --git a/src/features/views/revealHandler.ts b/src/features/views/revealHandler.ts index 2698d31..251a36f 100644 --- a/src/features/views/revealHandler.ts +++ b/src/features/views/revealHandler.ts @@ -1,5 +1,5 @@ import { activeTextEditor } from '../../common/window.apis'; -import { WorkspaceView } from './projectView'; +import { ProjectView } from './projectView'; import { EnvManagerView } from './envManagersView'; import { PythonStatusBar } from './pythonStatusBar'; import { isPythonProjectFile } from '../../common/utils/fileNameUtils'; @@ -7,7 +7,7 @@ import { PythonEnvironmentApi } from '../../api'; export function updateViewsAndStatus( statusBar: PythonStatusBar, - workspaceView: WorkspaceView, + workspaceView: ProjectView, managerView: EnvManagerView, api: PythonEnvironmentApi, ) { diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index a6066f7..1834ad7 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -30,6 +30,7 @@ import { import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { withProgress } from '../../common/window.apis'; +import { CondaStrings } from '../../common/localize'; export class CondaEnvManager implements EnvironmentManager, Disposable { private collection: PythonEnvironment[] = []; @@ -51,8 +52,8 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { this.name = 'conda'; this.displayName = 'Conda'; this.preferredPackageManagerId = 'ms-python.python:conda'; - this.description = 'Conda environment manager'; - this.tooltip = 'Conda environment manager'; + this.description = CondaStrings.condaManager; + this.tooltip = CondaStrings.condaManager; } name: string; @@ -77,7 +78,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { await withProgress( { location: ProgressLocation.Window, - title: 'Discovering Conda environments', + title: CondaStrings.condaDiscovering, }, async () => { this.collection = await refreshCondaEnvs(false, this.nativeFinder, this.api, this.log, this); @@ -168,7 +169,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { await withProgress( { location: ProgressLocation.Window, - title: 'Refreshing Conda Environments', + title: CondaStrings.condaRefreshingEnvs, }, async () => { this.log.info('Refreshing Conda Environments'); diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index cfa3544..ca48987 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -6,7 +6,6 @@ import { LogOutputChannel, MarkdownString, ProgressLocation, - window, } from 'vscode'; import { DidChangePackagesEventArgs, @@ -19,6 +18,9 @@ import { PythonEnvironmentApi, } from '../../api'; import { installPackages, refreshPackages, uninstallPackages } from './condaUtils'; +import { withProgress } from '../../common/window.apis'; +import { showErrorMessage } from '../../common/errors/utils'; +import { CondaStrings } from '../../common/localize'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -40,8 +42,8 @@ export class CondaPackageManager implements PackageManager, Disposable { constructor(public readonly api: PythonEnvironmentApi, public readonly log: LogOutputChannel) { this.name = 'conda'; this.displayName = 'Conda'; - this.description = 'Conda package manager'; - this.tooltip = 'Conda package manager'; + this.description = CondaStrings.condaPackageMgr; + this.tooltip = CondaStrings.condaPackageMgr; } name: string; displayName?: string; @@ -50,10 +52,10 @@ export class CondaPackageManager implements PackageManager, Disposable { iconPath?: IconPath; async install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { - await window.withProgress( + await withProgress( { location: ProgressLocation.Notification, - title: 'Installing packages', + title: CondaStrings.condaInstallingPackages, cancellable: true, }, async (_progress, token) => { @@ -70,10 +72,7 @@ export class CondaPackageManager implements PackageManager, Disposable { this.log.error('Error installing packages', e); setImmediate(async () => { - const result = await window.showErrorMessage('Error installing packages', 'View Output'); - if (result === 'View Output') { - this.log.show(); - } + await showErrorMessage(CondaStrings.condaInstallError, this.log); }); } }, @@ -81,10 +80,10 @@ export class CondaPackageManager implements PackageManager, Disposable { } async uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise { - await window.withProgress( + await withProgress( { location: ProgressLocation.Notification, - title: 'Uninstalling packages', + title: CondaStrings.condaUninstallingPackages, cancellable: true, }, async (_progress, token) => { @@ -101,20 +100,17 @@ export class CondaPackageManager implements PackageManager, Disposable { this.log.error('Error uninstalling packages', e); setImmediate(async () => { - const result = await window.showErrorMessage('Error installing packages', 'View Output'); - if (result === 'View Output') { - this.log.show(); - } + await showErrorMessage(CondaStrings.condaUninstallError, this.log); }); } }, ); } async refresh(context: PythonEnvironment): Promise { - await window.withProgress( + await withProgress( { location: ProgressLocation.Window, - title: 'Refreshing packages', + title: CondaStrings.condaRefreshingPackages, }, async () => { this.packages.set(context.envId.id, await refreshPackages(context, this.api, this)); diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index bf2395c..5bd00fd 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -12,7 +12,7 @@ import { import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; -import { CancellationError, CancellationToken, LogOutputChannel, ProgressLocation, Uri, window } from 'vscode'; +import { CancellationError, CancellationToken, l10n, LogOutputChannel, ProgressLocation, Uri } from 'vscode'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; import { @@ -27,6 +27,9 @@ import { getGlobalPersistentState, getWorkspacePersistentState } from '../../com import which from 'which'; import { shortVersion, sortEnvironments } from '../common/utils'; import { pickProject } from '../../common/pickers/projects'; +import { CondaStrings } from '../../common/localize'; +import { showErrorMessage } from '../../common/errors/utils'; +import { showInputBox, showQuickPick, withProgress } from '../../common/window.apis'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -398,20 +401,20 @@ export async function createCondaEnvironment( Array.isArray(uris) && uris.length > 1 ? 'Named' : ( - await window.showQuickPick( + await showQuickPick( [ - { label: 'Named', description: 'Create a named conda environment' }, - { label: 'Prefix', description: 'Create environment in your workspace' }, + { label: CondaStrings.condaNamed, description: CondaStrings.condaNamedDescription }, + { label: CondaStrings.condaPrefix, description: CondaStrings.condaPrefixDescription }, ], { - placeHolder: 'Select the type of conda environment to create', + placeHolder: CondaStrings.condaSelectEnvType, ignoreFocusOut: true, }, ) )?.label; if (envType) { - return envType === 'Named' + return envType === CondaStrings.condaNamed ? await createNamedCondaEnvironment(api, log, manager, getName(api, uris ?? [])) : await createPrefixCondaEnvironment(api, log, manager, await getLocation(api, uris ?? [])); } @@ -424,8 +427,8 @@ async function createNamedCondaEnvironment( manager: EnvironmentManager, name?: string, ): Promise { - name = await window.showInputBox({ - prompt: 'Enter the name of the conda environment to create', + name = await showInputBox({ + prompt: CondaStrings.condaNamedInput, value: name, ignoreFocusOut: true, }); @@ -435,10 +438,10 @@ async function createNamedCondaEnvironment( const envName: string = name; - return await window.withProgress( + return await withProgress( { location: ProgressLocation.Notification, - title: `Creating conda environment: ${envName}`, + title: l10n.t('Creating conda environment: {0}', envName), }, async () => { try { @@ -479,8 +482,10 @@ async function createNamedCondaEnvironment( ); return environment; } catch (e) { - window.showErrorMessage('Failed to create conda environment'); log.error('Failed to create conda environment', e); + setImmediate(async () => { + await showErrorMessage(CondaStrings.condaCreateFailed, log); + }); } }, ); @@ -499,12 +504,12 @@ async function createPrefixCondaEnvironment( let name = `./.conda`; if (await fsapi.pathExists(path.join(fsPath, '.conda'))) { log.warn(`Environment "${path.join(fsPath, '.conda')}" already exists`); - const newName = await window.showInputBox({ - prompt: `Environment "${name}" already exists. Enter a different name`, + const newName = await showInputBox({ + prompt: l10n.t('Environment "{0}" already exists. Enter a different name', name), ignoreFocusOut: true, validateInput: (value) => { if (value === name) { - return 'Environment already exists'; + return CondaStrings.condaExists; } return undefined; }, @@ -517,7 +522,7 @@ async function createPrefixCondaEnvironment( const prefix: string = path.isAbsolute(name) ? name : path.join(fsPath, name); - return await window.withProgress( + return await withProgress( { location: ProgressLocation.Notification, title: `Creating conda environment: ${name}`, @@ -552,8 +557,10 @@ async function createPrefixCondaEnvironment( ); return environment; } catch (e) { - window.showErrorMessage('Failed to create conda environment'); log.error('Failed to create conda environment', e); + setImmediate(async () => { + await showErrorMessage(CondaStrings.condaCreateFailed, log); + }); } }, ); @@ -561,17 +568,19 @@ async function createPrefixCondaEnvironment( export async function deleteCondaEnvironment(environment: PythonEnvironment, log: LogOutputChannel): Promise { let args = ['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]; - return await window.withProgress( + return await withProgress( { location: ProgressLocation.Notification, - title: `Deleting conda environment: ${environment.environmentPath.fsPath}`, + title: l10n.t('Deleting conda environment: {0}', environment.environmentPath.fsPath), }, async () => { try { await runConda(args); } catch (e) { - window.showErrorMessage('Failed to delete conda environment'); log.error(`Failed to delete conda environment: ${e}`); + setImmediate(async () => { + await showErrorMessage(CondaStrings.condaRemoveFailed, log); + }); return false; } return true; diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/sysPython/sysPythonManager.ts index 685e925..b44e6cc 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/sysPython/sysPythonManager.ts @@ -26,6 +26,7 @@ import { import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest } from '../common/utils'; +import { SysManagerStrings } from '../../common/localize'; export class SysPythonManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -53,8 +54,8 @@ export class SysPythonManager implements EnvironmentManager { this.name = 'system'; this.displayName = 'Global'; this.preferredPackageManagerId = 'ms-python.python:pip'; - this.description = 'Manages Global python installs'; - this.tooltip = new MarkdownString('$(globe) Python Environment Manager', true); + this.description = SysManagerStrings.sysManagerDescription; + this.tooltip = new MarkdownString(SysManagerStrings.sysManagerDescription, true); this.iconPath = new ThemeIcon('globe'); } @@ -66,13 +67,13 @@ export class SysPythonManager implements EnvironmentManager { this._initialized = createDeferred(); - await this.internalRefresh(false, 'Discovering Python environments'); + await this.internalRefresh(false, SysManagerStrings.sysManagerDiscovering); this._initialized.resolve(); } refresh(_scope: RefreshEnvironmentsScope): Promise { - return this.internalRefresh(true, 'Refreshing Python environments'); + return this.internalRefresh(true, SysManagerStrings.sysManagerRefreshing); } private async internalRefresh(hardRefresh: boolean, title: string) { diff --git a/src/managers/sysPython/utils.ts b/src/managers/sysPython/utils.ts index 1b08b34..35a1f02 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/sysPython/utils.ts @@ -1,4 +1,13 @@ -import { CancellationError, CancellationToken, LogOutputChannel, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; +import { + CancellationError, + CancellationToken, + l10n, + LogOutputChannel, + QuickPickItem, + ThemeIcon, + Uri, + window, +} from 'vscode'; import { EnvironmentManager, Package, @@ -22,6 +31,7 @@ import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; import { EventNames } from '../../common/telemetry/constants'; +import { SysManagerStrings } from '../../common/localize'; export const SYSTEM_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:system:WORKSPACE_SELECTED`; export const SYSTEM_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:system:GLOBAL_SELECTED`; @@ -82,7 +92,7 @@ export async function pickPackages(uninstall: boolean, packages: string[] | Pack }); const result = await window.showQuickPick(items, { - placeHolder: uninstall ? 'Select packages to uninstall' : 'Select packages to install', + placeHolder: uninstall ? SysManagerStrings.selectUninstall : SysManagerStrings.selectInstall, canPickMany: true, ignoreFocusOut: true, }); @@ -280,7 +290,10 @@ export async function refreshPackages( ): Promise { if (!environment.execInfo) { manager.log?.error(`No executable found for python: ${environment.environmentPath.fsPath}`); - showErrorMessage(`No executable found for python: ${environment.environmentPath.fsPath}`, manager.log); + showErrorMessage( + l10n.t('No executable found for python: {0}', environment.environmentPath.fsPath), + manager.log, + ); return []; } @@ -298,7 +311,7 @@ export async function refreshPackages( } } catch (e) { manager.log?.error('Error refreshing packages', e); - showErrorMessage('Error refreshing packages', manager.log); + showErrorMessage(SysManagerStrings.packageRefreshError, manager.log); return []; } diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/sysPython/venvManager.ts index 5bde9a9..fe77b41 100644 --- a/src/managers/sysPython/venvManager.ts +++ b/src/managers/sysPython/venvManager.ts @@ -33,6 +33,7 @@ import { ENVS_EXTENSION_ID } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; import { withProgress } from '../../common/window.apis'; +import { VenvManagerStrings } from '../../common/localize'; export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -60,8 +61,8 @@ export class VenvManager implements EnvironmentManager { ) { this.name = 'venv'; this.displayName = 'venv Environments'; - this.description = 'Manages virtual environments created using venv'; - this.tooltip = new MarkdownString('Manages virtual environments created using `venv`', true); + this.description = VenvManagerStrings.venvManagerDescription; + this.tooltip = new MarkdownString(VenvManagerStrings.venvManagerDescription, true); this.preferredPackageManagerId = 'ms-python.python:pip'; this.iconPath = new ThemeIcon('python'); } @@ -75,7 +76,7 @@ export class VenvManager implements EnvironmentManager { this._initialized = createDeferred(); try { - await this.internalRefresh(undefined, false, 'Initializing virtual environments'); + await this.internalRefresh(undefined, false, VenvManagerStrings.venvInitialize); } finally { this._initialized.resolve(); } @@ -141,7 +142,7 @@ export class VenvManager implements EnvironmentManager { } async refresh(scope: RefreshEnvironmentsScope): Promise { - return this.internalRefresh(scope, true, 'Refreshing virtual environments'); + return this.internalRefresh(scope, true, VenvManagerStrings.venvRefreshing); } private async internalRefresh(scope: RefreshEnvironmentsScope, hardRefresh: boolean, title: string): Promise { diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/sysPython/venvUtils.ts index 2987881..cb25df9 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/sysPython/venvUtils.ts @@ -1,4 +1,4 @@ -import { LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; +import { l10n, LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; import { EnvironmentManager, Installable, @@ -34,6 +34,7 @@ import { } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; import { getPackagesToInstallFromInstallable } from '../../common/pickers/packages'; +import { Common, VenvManagerStrings } from '../../common/localize'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -185,8 +186,8 @@ interface FolderQuickPickItem extends QuickPickItem { export async function getGlobalVenvLocation(): Promise { const items: FolderQuickPickItem[] = [ { - label: 'Browse', - description: 'Select a folder to create a global virtual environment', + label: Common.browse, + description: VenvManagerStrings.venvGlobalFolder, }, ]; @@ -194,7 +195,7 @@ export async function getGlobalVenvLocation(): Promise { if (venvPaths.length > 0) { items.push( { - label: 'Venv Folders Setting', + label: VenvManagerStrings.venvGlobalFoldersSetting, kind: QuickPickItemKind.Separator, }, ...venvPaths.map((p) => ({ @@ -208,11 +209,11 @@ export async function getGlobalVenvLocation(): Promise { if (process.env.WORKON_HOME) { items.push( { - label: 'Virtualenvwrapper', + label: 'virtualenvwrapper', kind: QuickPickItemKind.Separator, }, { - label: 'WORKON_HOME', + label: 'WORKON_HOME (env variable)', description: process.env.WORKON_HOME, uri: Uri.file(process.env.WORKON_HOME), }, @@ -220,17 +221,17 @@ export async function getGlobalVenvLocation(): Promise { } const selected = await showQuickPick(items, { - placeHolder: 'Select a folder to create a global virtual environment', + placeHolder: VenvManagerStrings.venvGlobalFolder, ignoreFocusOut: true, }); if (selected) { - if (selected.label === 'Browse') { + if (selected.label === Common.browse) { const result = await showOpenDialog({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, - openLabel: 'Select Folder', + openLabel: Common.selectFolder, }); if (result && result.length > 0) { return result[0]; @@ -252,14 +253,14 @@ export async function createPythonVenv( ): Promise { if (basePythons.length === 0) { log.error('No base python found'); - showErrorMessage('No base python found'); + showErrorMessage(VenvManagerStrings.venvErrorNoBasePython); return; } const filtered = basePythons.filter((e) => e.version.startsWith('3.')); if (filtered.length === 0) { log.error('Did not find any base python 3.*'); - showErrorMessage('Did not find any base python 3.*'); + showErrorMessage(VenvManagerStrings.venvErrorNoPython3); basePythons.forEach((e) => { log.error(`available base python: ${e.version}`); }); @@ -272,22 +273,16 @@ export async function createPythonVenv( return; } - if (basePython.version.startsWith('2.')) { - log.error('Python 2.* is not supported for virtual env creation'); - showErrorMessage('Python 2.* is not supported, use Python 3.*'); - return; - } - const name = await showInputBox({ - prompt: 'Enter name for virtual environment', + prompt: VenvManagerStrings.venvName, value: '.venv', ignoreFocusOut: true, validateInput: async (value) => { if (!value) { - return 'Name cannot be empty'; + return VenvManagerStrings.venvNameErrorEmpty; } if (await fsapi.pathExists(path.join(venvRoot.fsPath, value))) { - return 'Virtual environment already exists'; + return VenvManagerStrings.venvNameErrorExists; } }, }); @@ -315,7 +310,7 @@ export async function createPythonVenv( return await withProgress( { location: ProgressLocation.Notification, - title: 'Creating virtual environment', + title: VenvManagerStrings.venvCreating, }, async () => { try { @@ -349,7 +344,7 @@ export async function createPythonVenv( return env; } catch (e) { log.error(`Failed to create virtual environment: ${e}`); - showErrorMessage(`Failed to create virtual environment`); + showErrorMessage(VenvManagerStrings.venvCreateFailed); return; } }, @@ -363,12 +358,16 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC ? path.dirname(path.dirname(environment.environmentPath.fsPath)) : environment.environmentPath.fsPath; - const confirm = await showWarningMessage(`Are you sure you want to remove ${envPath}?`, 'Yes', 'No'); - if (confirm === 'Yes') { + const confirm = await showWarningMessage( + l10n.t('Are you sure you want to remove {0}?', envPath), + Common.yes, + Common.no, + ); + if (confirm === Common.yes) { await withProgress( { location: ProgressLocation.Notification, - title: 'Removing virtual environment', + title: VenvManagerStrings.venvRemoving, }, async () => { try { @@ -376,6 +375,7 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC return true; } catch (e) { log.error(`Failed to remove virtual environment: ${e}`); + showErrorMessage(VenvManagerStrings.venvRemoveFailed); return false; } }, @@ -404,7 +404,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] if (isPipInstallableToml(toml)) { extras.push({ displayName: path.basename(tomlPath.fsPath), - description: 'Install project as editable', + description: VenvManagerStrings.installEditable, group: 'TOML', args: ['-e', path.dirname(tomlPath.fsPath)], uri: tomlPath, @@ -437,10 +437,9 @@ export async function getProjectInstallable( await withProgress( { location: ProgressLocation.Window, - title: 'Searching dependencies', + title: VenvManagerStrings.searchingDependencies, }, - async (progress, token) => { - progress.report({ message: 'Searching for Requirements and TOML files' }); + async (_progress, token) => { const results: Uri[] = ( await Promise.all([ findFiles('**/*requirements*.txt', exclude, undefined, token), From 5528fb5b322d49ae9186bbcdc9d8d64783273cd5 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 20:46:16 +0530 Subject: [PATCH 032/328] Ensure we match envs and python extensions (#74) --- src/common/extVersion.ts | 20 ++++++++++++++++++++ src/extension.ts | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 src/common/extVersion.ts diff --git a/src/common/extVersion.ts b/src/common/extVersion.ts new file mode 100644 index 0000000..955eecb --- /dev/null +++ b/src/common/extVersion.ts @@ -0,0 +1,20 @@ +import { PYTHON_EXTENSION_ID } from './constants'; +import { getExtension } from './extension.apis'; +import { traceError } from './logging'; + +export function ensureCorrectVersion() { + const extension = getExtension(PYTHON_EXTENSION_ID); + if (!extension) { + return; + } + + const version = extension.packageJSON.version; + const parts = version.split('.'); + const major = parseInt(parts[0]); + const minor = parseInt(parts[1]); + if (major >= 2024 && minor >= 23) { + return; + } + traceError('Incompatible Python extension. Please update `ms-python.python` to version 2024.23 or later.'); + throw new Error('Incompatible Python extension. Please update `ms-python.python` to version 2024.23 or later.'); +} diff --git a/src/extension.ts b/src/extension.ts index 8af1d6f..a114721 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -55,6 +55,7 @@ import { EnvVarManager, PythonEnvVariableManager } from './features/execution/en import { StopWatch } from './common/stopWatch'; import { sendTelemetryEvent } from './common/telemetry/sender'; import { EventNames } from './common/telemetry/constants'; +import { ensureCorrectVersion } from './common/extVersion'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -63,6 +64,8 @@ export async function activate(context: ExtensionContext): Promise Date: Tue, 10 Dec 2024 22:40:52 +0530 Subject: [PATCH 033/328] Allow publishing pre-release version of the extension (#75) --- build/azure-pipeline.pre-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 770c002..290298d 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -27,8 +27,7 @@ parameters: extends: template: azure-pipelines/extension/pre-release.yml@templates parameters: - # publishExtension: ${{ parameters.publishExtension }} - publishExtension: false + publishExtension: ${{ parameters.publishExtension }} ghCreateTag: false standardizedVersioning: true l10nSourcePaths: ./src From ca3255fad0ddac932086758214aa53a64fc6e67c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 Dec 2024 23:00:10 +0530 Subject: [PATCH 034/328] Ensure preview (#77) --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index eda0b02..0f551b5 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "Provides a unified python environment experience", "version": "0.1.0-dev", "publisher": "ms-python", + "preview": true, "engines": { "vscode": "^1.96.0-insider" }, From 3ce3fbaaeffb267d7b00d82bd6583f9d3da15776 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 11 Dec 2024 00:15:20 +0530 Subject: [PATCH 035/328] Name change due to collision (#78) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f551b5..ae3bff6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vscode-python-envs", - "displayName": "Python Environment Manager", + "displayName": "Python Environments", "description": "Provides a unified python environment experience", "version": "0.1.0-dev", "publisher": "ms-python", From 2f187e2c0f6a310c0c88ebb1eec386762955ed5c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 12 Dec 2024 16:32:23 +0100 Subject: [PATCH 036/328] Fix for conda listing in README. (#80) Conda isn't "the Anaconda package manager" but an [independent OSS project governed by the conda organization and governance policy](https://github.com/conda/governance) distributed in a number of conda distributions. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9d57cd1..4041c15 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ This extension provides an Environments view, which can be accessed via the VS C By default, the extension uses the `venv` environment manager. This default manager determines how environments are created, managed, and where packages are installed. However, users can change the default by setting the `python-envs.defaultEnvManager` to a different environment manager. The following environment managers are supported out of the box: -| Id | name | Description | -| ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| ms-python.python:venv | `venv` | The default environment manager. It is a built-in environment manager provided by the Python standard library. | -| ms-python.python:system | System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | -| ms-python.python:conda | `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | +| Id | name | Description | +| ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| ms-python.python:venv | `venv` | The default environment manager. It is a built-in environment manager provided by the Python standard library. | +| ms-python.python:system | System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | +| ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | The environment manager is responsible for specifying which package manager will be used by default to install and manage Python packages within the environment. This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. @@ -28,10 +28,10 @@ This extension provides a package view for you to manage, install and uninstall The extension uses `pip` as the default package manager. You can change this by setting the `python-envs.defaultPackageManager` setting to a different package manager. The following are package managers supported out of the box: -| Id | name | Description | -| ---------------------- | ------- | ------------------------------------------------------------------------------ | -| ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | -| ms-python.python:conda | `conda` | The [Anaconda](https://www.anaconda.com/) environment manager. | +| Id | name | Description | +| ---------------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | +| ms-python.python:conda | `conda` | The [conda](https://conda.org) package manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | ## Settings Reference From ddb9a8d1f9167c7aa211e63340c99befa298e2cf Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 13 Dec 2024 22:47:15 +0530 Subject: [PATCH 037/328] Turn on nightly scheduled builds (#85) --- build/azure-pipeline.pre-release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 290298d..b4e4e95 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -2,13 +2,13 @@ trigger: none pr: none -# schedules: -# - cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT) -# displayName: Nightly Pre-Release Schedule -# always: false # only run if there are source code changes -# branches: -# include: -# - main +schedules: + - cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT) + displayName: Nightly Pre-Release Schedule + always: false # only run if there are source code changes + branches: + include: + - main resources: repositories: @@ -105,9 +105,9 @@ extends: ThirdPartyNotices.txt - bash: | - ls -lf ./python-env-tools/bin + ls -l ./python-env-tools/bin chmod +x ./python-env-tools/bin/pet* - ls -lf ./python-env-tools/bin + ls -l ./python-env-tools/bin displayName: Set chmod for pet binary - script: npm run package From 41508524f61a695fd28c1221eeb94b5712f5c985 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 13 Dec 2024 22:50:14 +0530 Subject: [PATCH 038/328] Fix bug with `pip list` parsing (#84) Fixes https://github.com/microsoft/vscode-python-environments/issues/83 --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/extension.ts | 2 +- src/managers/builtin/cache.ts | 45 +++++ src/managers/builtin/helpers.ts | 95 ++++++++++ src/managers/{sysPython => builtin}/main.ts | 2 +- src/managers/builtin/pipListUtils.ts | 29 +++ .../{sysPython => builtin}/pipManager.ts | 0 .../sysPythonManager.ts | 17 +- src/managers/{sysPython => builtin}/utils.ts | 175 +----------------- .../uvProjectCreator.ts | 2 +- .../{sysPython => builtin}/venvManager.ts | 0 .../{sysPython => builtin}/venvUtils.ts | 3 +- src/test/constants.ts | 4 + .../builtin/pipListUtils.unit.test.ts | 37 ++++ src/test/managers/builtin/piplist1.actual.txt | 38 ++++ .../managers/builtin/piplist1.expected.json | 37 ++++ src/test/managers/builtin/piplist2.actual.txt | 35 ++++ .../managers/builtin/piplist2.expected.json | 37 ++++ 17 files changed, 374 insertions(+), 184 deletions(-) create mode 100644 src/managers/builtin/cache.ts create mode 100644 src/managers/builtin/helpers.ts rename src/managers/{sysPython => builtin}/main.ts (97%) create mode 100644 src/managers/builtin/pipListUtils.ts rename src/managers/{sysPython => builtin}/pipManager.ts (100%) rename src/managers/{sysPython => builtin}/sysPythonManager.ts (99%) rename src/managers/{sysPython => builtin}/utils.ts (63%) rename src/managers/{sysPython => builtin}/uvProjectCreator.ts (99%) rename src/managers/{sysPython => builtin}/venvManager.ts (100%) rename src/managers/{sysPython => builtin}/venvUtils.ts (99%) create mode 100644 src/test/constants.ts create mode 100644 src/test/managers/builtin/pipListUtils.unit.test.ts create mode 100644 src/test/managers/builtin/piplist1.actual.txt create mode 100644 src/test/managers/builtin/piplist1.expected.json create mode 100644 src/test/managers/builtin/piplist2.actual.txt create mode 100644 src/test/managers/builtin/piplist2.expected.json diff --git a/src/extension.ts b/src/extension.ts index a114721..91bbc52 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -23,7 +23,7 @@ import { runInDedicatedTerminalCommand, } from './features/envCommands'; import { registerCondaFeatures } from './managers/conda/main'; -import { registerSystemPythonFeatures } from './managers/sysPython/main'; +import { registerSystemPythonFeatures } from './managers/builtin/main'; import { PythonProjectManagerImpl } from './features/projectManager'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { getPythonApi, setPythonApi } from './features/pythonApi'; diff --git a/src/managers/builtin/cache.ts b/src/managers/builtin/cache.ts new file mode 100644 index 0000000..b5f9c2c --- /dev/null +++ b/src/managers/builtin/cache.ts @@ -0,0 +1,45 @@ +import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { getWorkspacePersistentState } from '../../common/persistentState'; + +export const SYSTEM_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:system:WORKSPACE_SELECTED`; +export const SYSTEM_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:system:GLOBAL_SELECTED`; + +export async function clearSystemEnvCache(): Promise { + const keys = [SYSTEM_WORKSPACE_KEY, SYSTEM_GLOBAL_KEY]; + const state = await getWorkspacePersistentState(); + await state.clear(keys); +} + +export async function getSystemEnvForWorkspace(fsPath: string): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } | undefined = await state.get(SYSTEM_WORKSPACE_KEY); + if (data) { + try { + return data[fsPath]; + } catch { + return undefined; + } + } + return undefined; +} + +export async function setSystemEnvForWorkspace(fsPath: string, envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(SYSTEM_WORKSPACE_KEY)) ?? {}; + if (envPath) { + data[fsPath] = envPath; + } else { + delete data[fsPath]; + } + await state.set(SYSTEM_WORKSPACE_KEY, data); +} + +export async function getSystemEnvForGlobal(): Promise { + const state = await getWorkspacePersistentState(); + return await state.get(SYSTEM_GLOBAL_KEY); +} + +export async function setSystemEnvForGlobal(envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + await state.set(SYSTEM_GLOBAL_KEY, envPath); +} diff --git a/src/managers/builtin/helpers.ts b/src/managers/builtin/helpers.ts new file mode 100644 index 0000000..b268ef0 --- /dev/null +++ b/src/managers/builtin/helpers.ts @@ -0,0 +1,95 @@ +import * as ch from 'child_process'; +import { CancellationError, CancellationToken, LogOutputChannel } from 'vscode'; +import { createDeferred } from '../../common/utils/deferred'; +import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { EventNames } from '../../common/telemetry/constants'; + +const available = createDeferred(); +export async function isUvInstalled(log?: LogOutputChannel): Promise { + if (available.completed) { + return available.promise; + } + + const proc = ch.spawn('uv', ['--version']); + proc.on('error', () => { + available.resolve(false); + }); + proc.stdout.on('data', (d) => log?.info(d.toString())); + proc.on('exit', (code) => { + if (code === 0) { + sendTelemetryEvent(EventNames.VENV_USING_UV); + } + available.resolve(code === 0); + }); + return available.promise; +} + +export async function runUV( + args: string[], + cwd?: string, + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { + log?.info(`Running: uv ${args.join(' ')}`); + return new Promise((resolve, reject) => { + const proc = ch.spawn('uv', args, { cwd: cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); + + let builder = ''; + proc.stdout?.on('data', (data) => { + const s = data.toString('utf-8'); + builder += s; + log?.append(s); + }); + proc.stderr?.on('data', (data) => { + log?.append(data.toString('utf-8')); + }); + proc.on('close', () => { + resolve(builder); + }); + proc.on('exit', (code) => { + if (code !== 0) { + reject(new Error(`Failed to run uv ${args.join(' ')}`)); + } + }); + }); +} + +export async function runPython( + python: string, + args: string[], + cwd?: string, + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { + log?.info(`Running: ${python} ${args.join(' ')}`); + return new Promise((resolve, reject) => { + const proc = ch.spawn(python, args, { cwd: cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); + let builder = ''; + proc.stdout?.on('data', (data) => { + const s = data.toString('utf-8'); + builder += s; + log?.append(`python: ${s}`); + }); + proc.stderr?.on('data', (data) => { + const s = data.toString('utf-8'); + builder += s; + log?.append(`python: ${s}`); + }); + proc.on('close', () => { + resolve(builder); + }); + proc.on('exit', (code) => { + if (code !== 0) { + reject(new Error(`Failed to run python ${args.join(' ')}`)); + } + }); + }); +} diff --git a/src/managers/sysPython/main.ts b/src/managers/builtin/main.ts similarity index 97% rename from src/managers/sysPython/main.ts rename to src/managers/builtin/main.ts index 4727b27..f2b0832 100644 --- a/src/managers/sysPython/main.ts +++ b/src/managers/builtin/main.ts @@ -6,7 +6,7 @@ import { VenvManager } from './venvManager'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { UvProjectCreator } from './uvProjectCreator'; -import { isUvInstalled } from './utils'; +import { isUvInstalled } from './helpers'; import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; import { createSimpleDebounce } from '../../common/utils/debounce'; diff --git a/src/managers/builtin/pipListUtils.ts b/src/managers/builtin/pipListUtils.ts new file mode 100644 index 0000000..9ae3ae1 --- /dev/null +++ b/src/managers/builtin/pipListUtils.ts @@ -0,0 +1,29 @@ +export interface PipPackage { + name: string; + version: string; + displayName: string; + description: string; +} +export function parsePipList(data: string): PipPackage[] { + const collection: PipPackage[] = []; + + const lines = data.split('\n').splice(2); + for (let line of lines) { + if (line.trim() === '' || line.startsWith('Package') || line.startsWith('----') || line.startsWith('[')) { + continue; + } + const parts = line.split(' ').filter((e) => e); + if (parts.length > 1) { + const name = parts[0].trim(); + const version = parts[1].trim(); + const pkg = { + name, + version, + displayName: name, + description: version, + }; + collection.push(pkg); + } + } + return collection; +} diff --git a/src/managers/sysPython/pipManager.ts b/src/managers/builtin/pipManager.ts similarity index 100% rename from src/managers/sysPython/pipManager.ts rename to src/managers/builtin/pipManager.ts diff --git a/src/managers/sysPython/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts similarity index 99% rename from src/managers/sysPython/sysPythonManager.ts rename to src/managers/builtin/sysPythonManager.ts index b44e6cc..a870c87 100644 --- a/src/managers/sysPython/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -14,19 +14,18 @@ import { ResolveEnvironmentContext, SetEnvironmentScope, } from '../../api'; -import { - clearSystemEnvCache, - getSystemEnvForGlobal, - getSystemEnvForWorkspace, - refreshPythons, - resolveSystemPythonEnvironmentPath, - setSystemEnvForGlobal, - setSystemEnvForWorkspace, -} from './utils'; +import { refreshPythons, resolveSystemPythonEnvironmentPath } from './utils'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest } from '../common/utils'; import { SysManagerStrings } from '../../common/localize'; +import { + setSystemEnvForWorkspace, + setSystemEnvForGlobal, + clearSystemEnvCache, + getSystemEnvForGlobal, + getSystemEnvForWorkspace, +} from './cache'; export class SysPythonManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; diff --git a/src/managers/sysPython/utils.ts b/src/managers/builtin/utils.ts similarity index 63% rename from src/managers/sysPython/utils.ts rename to src/managers/builtin/utils.ts index 35a1f02..6e41a9e 100644 --- a/src/managers/sysPython/utils.ts +++ b/src/managers/builtin/utils.ts @@ -1,13 +1,4 @@ -import { - CancellationError, - CancellationToken, - l10n, - LogOutputChannel, - QuickPickItem, - ThemeIcon, - Uri, - window, -} from 'vscode'; +import { CancellationToken, l10n, LogOutputChannel, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; import { EnvironmentManager, Package, @@ -17,64 +8,17 @@ import { PythonEnvironmentApi, PythonEnvironmentInfo, } from '../../api'; -import * as ch from 'child_process'; -import { ENVS_EXTENSION_ID } from '../../common/constants'; import { isNativeEnvInfo, NativeEnvInfo, NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { createDeferred } from '../../common/utils/deferred'; import { showErrorMessage } from '../../common/errors/utils'; -import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; -import { sendTelemetryEvent } from '../../common/telemetry/sender'; -import { EventNames } from '../../common/telemetry/constants'; import { SysManagerStrings } from '../../common/localize'; - -export const SYSTEM_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:system:WORKSPACE_SELECTED`; -export const SYSTEM_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:system:GLOBAL_SELECTED`; - -export async function clearSystemEnvCache(): Promise { - const keys = [SYSTEM_WORKSPACE_KEY, SYSTEM_GLOBAL_KEY]; - const state = await getWorkspacePersistentState(); - await state.clear(keys); -} - -export async function getSystemEnvForWorkspace(fsPath: string): Promise { - const state = await getWorkspacePersistentState(); - const data: { [key: string]: string } | undefined = await state.get(SYSTEM_WORKSPACE_KEY); - if (data) { - try { - return data[fsPath]; - } catch { - return undefined; - } - } - return undefined; -} - -export async function setSystemEnvForWorkspace(fsPath: string, envPath: string | undefined): Promise { - const state = await getWorkspacePersistentState(); - const data: { [key: string]: string } = (await state.get(SYSTEM_WORKSPACE_KEY)) ?? {}; - if (envPath) { - data[fsPath] = envPath; - } else { - delete data[fsPath]; - } - await state.set(SYSTEM_WORKSPACE_KEY, data); -} - -export async function getSystemEnvForGlobal(): Promise { - const state = await getWorkspacePersistentState(); - return await state.get(SYSTEM_GLOBAL_KEY); -} - -export async function setSystemEnvForGlobal(envPath: string | undefined): Promise { - const state = await getWorkspacePersistentState(); - await state.set(SYSTEM_GLOBAL_KEY, envPath); -} +import { isUvInstalled, runUV, runPython } from './helpers'; +import { parsePipList } from './pipListUtils'; function asPackageQuickPickItem(name: string, version?: string): QuickPickItem { return { @@ -103,96 +47,6 @@ export async function pickPackages(uninstall: boolean, packages: string[] | Pack return []; } -const available = createDeferred(); -export async function isUvInstalled(log?: LogOutputChannel): Promise { - if (available.completed) { - return available.promise; - } - - const proc = ch.spawn('uv', ['--version']); - proc.on('error', () => { - available.resolve(false); - }); - proc.stdout.on('data', (d) => log?.info(d.toString())); - proc.on('exit', (code) => { - if (code === 0) { - sendTelemetryEvent(EventNames.VENV_USING_UV); - } - available.resolve(code === 0); - }); - return available.promise; -} - -export async function runUV( - args: string[], - cwd?: string, - log?: LogOutputChannel, - token?: CancellationToken, -): Promise { - log?.info(`Running: uv ${args.join(' ')}`); - return new Promise((resolve, reject) => { - const proc = ch.spawn('uv', args, { cwd: cwd }); - token?.onCancellationRequested(() => { - proc.kill(); - reject(new CancellationError()); - }); - - let builder = ''; - proc.stdout?.on('data', (data) => { - const s = data.toString('utf-8'); - builder += s; - log?.append(s); - }); - proc.stderr?.on('data', (data) => { - log?.append(data.toString('utf-8')); - }); - proc.on('close', () => { - resolve(builder); - }); - proc.on('exit', (code) => { - if (code !== 0) { - reject(new Error(`Failed to run python ${args.join(' ')}`)); - } - }); - }); -} - -export async function runPython( - python: string, - args: string[], - cwd?: string, - log?: LogOutputChannel, - token?: CancellationToken, -): Promise { - log?.info(`Running: ${python} ${args.join(' ')}`); - return new Promise((resolve, reject) => { - const proc = ch.spawn(python, args, { cwd: cwd }); - token?.onCancellationRequested(() => { - proc.kill(); - reject(new CancellationError()); - }); - let builder = ''; - proc.stdout?.on('data', (data) => { - const s = data.toString('utf-8'); - builder += s; - log?.append(`python: ${s}`); - }); - proc.stderr?.on('data', (data) => { - const s = data.toString('utf-8'); - builder += s; - log?.append(`python: ${s}`); - }); - proc.on('close', () => { - resolve(builder); - }); - proc.on('exit', (code) => { - if (code !== 0) { - reject(new Error(`Failed to run python ${args.join(' ')}`)); - } - }); - }); -} - function getKindName(kind: NativePythonEnvironmentKind | undefined): string | undefined { switch (kind) { case NativePythonEnvironmentKind.homebrew: @@ -315,28 +169,7 @@ export async function refreshPackages( return []; } - const collection: Package[] = []; - - const lines = data.split('\n').splice(2); - for (let line of lines) { - const parts = line.split(' ').filter((e) => e); - if (parts.length > 1) { - const name = parts[0].trim(); - const version = parts[1].trim(); - const pkg = api.createPackageItem( - { - name, - version, - displayName: name, - description: version, - }, - environment, - manager, - ); - collection.push(pkg); - } - } - return collection; + return parsePipList(data).map((pkg) => api.createPackageItem(pkg, environment, manager)); } export async function installPackages( diff --git a/src/managers/sysPython/uvProjectCreator.ts b/src/managers/builtin/uvProjectCreator.ts similarity index 99% rename from src/managers/sysPython/uvProjectCreator.ts rename to src/managers/builtin/uvProjectCreator.ts index c57127a..759b3d1 100644 --- a/src/managers/sysPython/uvProjectCreator.ts +++ b/src/managers/builtin/uvProjectCreator.ts @@ -6,7 +6,7 @@ import { PythonProjectCreator, PythonProjectCreatorOptions, } from '../../api'; -import { runUV } from './utils'; +import { runUV } from './helpers'; import { pickProject } from '../../common/pickers/projects'; export class UvProjectCreator implements PythonProjectCreator { diff --git a/src/managers/sysPython/venvManager.ts b/src/managers/builtin/venvManager.ts similarity index 100% rename from src/managers/sysPython/venvManager.ts rename to src/managers/builtin/venvManager.ts diff --git a/src/managers/sysPython/venvUtils.ts b/src/managers/builtin/venvUtils.ts similarity index 99% rename from src/managers/sysPython/venvUtils.ts rename to src/managers/builtin/venvUtils.ts index cb25df9..69139ef 100644 --- a/src/managers/sysPython/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -13,7 +13,7 @@ import * as tomljs from '@iarna/toml'; import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; -import { isUvInstalled, resolveSystemPythonEnvironmentPath, runPython, runUV } from './utils'; +import { resolveSystemPythonEnvironmentPath } from './utils'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { isNativeEnvInfo, @@ -35,6 +35,7 @@ import { import { showErrorMessage } from '../../common/errors/utils'; import { getPackagesToInstallFromInstallable } from '../../common/pickers/packages'; import { Common, VenvManagerStrings } from '../../common/localize'; +import { isUvInstalled, runUV, runPython } from './helpers'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; diff --git a/src/test/constants.ts b/src/test/constants.ts new file mode 100644 index 0000000..4d33a6e --- /dev/null +++ b/src/test/constants.ts @@ -0,0 +1,4 @@ +import * as path from 'path'; + +export const EXTENSION_ROOT = path.dirname(path.dirname(__dirname)); +export const EXTENSION_TEST_ROOT = path.join(EXTENSION_ROOT, 'src', 'test'); diff --git a/src/test/managers/builtin/pipListUtils.unit.test.ts b/src/test/managers/builtin/pipListUtils.unit.test.ts new file mode 100644 index 0000000..64d0119 --- /dev/null +++ b/src/test/managers/builtin/pipListUtils.unit.test.ts @@ -0,0 +1,37 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { EXTENSION_TEST_ROOT } from '../../constants'; +import { parsePipList } from '../../../managers/builtin/pipListUtils'; +import assert from 'assert'; + +const TEST_DATA_ROOT = path.join(EXTENSION_TEST_ROOT, 'managers', 'builtin'); + +suite('Pip List Parser tests', () => { + const testNames = ['piplist1', 'piplist2']; + + testNames.forEach((testName) => { + test(`Test parsing pip list output ${testName}`, async () => { + const pipListOutput = await fs.readFile(path.join(TEST_DATA_ROOT, `${testName}.actual.txt`), 'utf8'); + const expected = JSON.parse( + await fs.readFile(path.join(TEST_DATA_ROOT, `${testName}.expected.json`), 'utf8'), + ); + + const actualPackages = parsePipList(pipListOutput); + + assert.equal(actualPackages.length, expected.packages.length, 'Unexpected number of packages'); + actualPackages.forEach((actualPackage) => { + const expectedPackage = expected.packages.find( + (item: { name: string }) => item.name === actualPackage.name, + ); + assert.ok(expectedPackage, `Package ${actualPackage.name} not found in expected packages`); + assert.equal(actualPackage.version, expectedPackage.version, 'Version mismatch'); + }); + + expected.packages.forEach((expectedPackage: { name: string; version: string }) => { + const actualPackage = actualPackages.find((item) => item.name === expectedPackage.name); + assert.ok(actualPackage, `Package ${expectedPackage.name} not found in actual packages`); + assert.equal(actualPackage.version, expectedPackage.version, 'Version mismatch'); + }); + }); + }); +}); diff --git a/src/test/managers/builtin/piplist1.actual.txt b/src/test/managers/builtin/piplist1.actual.txt new file mode 100644 index 0000000..7d29157 --- /dev/null +++ b/src/test/managers/builtin/piplist1.actual.txt @@ -0,0 +1,38 @@ +Package Version +------------------ -------- +argcomplete 3.1.2 +black 23.12.1 +build 1.2.1 +click 8.1.7 +colorama 0.4.6 +colorlog 6.7.0 +coverage 7.6.1 +distlib 0.3.7 +exceptiongroup 1.1.3 +filelock 3.13.1 +importlib_metadata 7.1.0 +iniconfig 2.0.0 +isort 5.13.2 +mypy-extensions 1.0.0 +namedpipe 0.1.1 +nox 2024.3.2 +packaging 23.2 +pathspec 0.12.1 +pip 24.0 +pip-tools 7.4.1 +platformdirs 3.11.0 +pluggy 1.4.0 +pyproject_hooks 1.1.0 +pytest 8.1.1 +pytest-cov 5.0.0 +pywin32 306 +ruff 0.7.4 +setuptools 56.0.0 +tomli 2.0.1 +typing_extensions 4.9.0 +virtualenv 20.24.6 +wheel 0.43.0 +zipp 3.19.2 + +[notice] A new release of pip is available: 24.0 -> 24.3.1 +[notice] To update, run: python.exe -m pip install --upgrade pip \ No newline at end of file diff --git a/src/test/managers/builtin/piplist1.expected.json b/src/test/managers/builtin/piplist1.expected.json new file mode 100644 index 0000000..50234f5 --- /dev/null +++ b/src/test/managers/builtin/piplist1.expected.json @@ -0,0 +1,37 @@ +{ + "packages": [ + { "name": "argcomplete", "version": "3.1.2" }, + { "name": "black", "version": "23.12.1" }, + { "name": "build", "version": "1.2.1" }, + { "name": "click", "version": "8.1.7" }, + { "name": "colorama", "version": "0.4.6" }, + { "name": "colorlog", "version": "6.7.0" }, + { "name": "coverage", "version": "7.6.1" }, + { "name": "distlib", "version": "0.3.7" }, + { "name": "exceptiongroup", "version": "1.1.3" }, + { "name": "filelock", "version": "3.13.1" }, + { "name": "importlib_metadata", "version": "7.1.0" }, + { "name": "iniconfig", "version": "2.0.0" }, + { "name": "isort", "version": "5.13.2" }, + { "name": "mypy-extensions", "version": "1.0.0" }, + { "name": "namedpipe", "version": "0.1.1" }, + { "name": "nox", "version": "2024.3.2" }, + { "name": "packaging", "version": "23.2" }, + { "name": "pathspec", "version": "0.12.1" }, + { "name": "pip", "version": "24.0" }, + { "name": "pip-tools", "version": "7.4.1" }, + { "name": "platformdirs", "version": "3.11.0" }, + { "name": "pluggy", "version": "1.4.0" }, + { "name": "pyproject_hooks", "version": "1.1.0" }, + { "name": "pytest", "version": "8.1.1" }, + { "name": "pytest-cov", "version": "5.0.0" }, + { "name": "pywin32", "version": "306" }, + { "name": "ruff", "version": "0.7.4" }, + { "name": "setuptools", "version": "56.0.0" }, + { "name": "tomli", "version": "2.0.1" }, + { "name": "typing_extensions", "version": "4.9.0" }, + { "name": "virtualenv", "version": "20.24.6" }, + { "name": "wheel", "version": "0.43.0" }, + { "name": "zipp", "version": "3.19.2" } + ] +} diff --git a/src/test/managers/builtin/piplist2.actual.txt b/src/test/managers/builtin/piplist2.actual.txt new file mode 100644 index 0000000..5cefab6 --- /dev/null +++ b/src/test/managers/builtin/piplist2.actual.txt @@ -0,0 +1,35 @@ +Package Version +------------------ -------- +argcomplete 3.1.2 +black 23.12.1 +build 1.2.1 +click 8.1.7 +colorama 0.4.6 +colorlog 6.7.0 +coverage 7.6.1 +distlib 0.3.7 +exceptiongroup 1.1.3 +filelock 3.13.1 +importlib_metadata 7.1.0 +iniconfig 2.0.0 +isort 5.13.2 +mypy-extensions 1.0.0 +namedpipe 0.1.1 +nox 2024.3.2 +packaging 23.2 +pathspec 0.12.1 +pip 24.0 +pip-tools 7.4.1 +platformdirs 3.11.0 +pluggy 1.4.0 +pyproject_hooks 1.1.0 +pytest 8.1.1 +pytest-cov 5.0.0 +pywin32 306 +ruff 0.7.4 +setuptools 56.0.0 +tomli 2.0.1 +typing_extensions 4.9.0 +virtualenv 20.24.6 +wheel 0.43.0 +zipp 3.19.2 \ No newline at end of file diff --git a/src/test/managers/builtin/piplist2.expected.json b/src/test/managers/builtin/piplist2.expected.json new file mode 100644 index 0000000..50234f5 --- /dev/null +++ b/src/test/managers/builtin/piplist2.expected.json @@ -0,0 +1,37 @@ +{ + "packages": [ + { "name": "argcomplete", "version": "3.1.2" }, + { "name": "black", "version": "23.12.1" }, + { "name": "build", "version": "1.2.1" }, + { "name": "click", "version": "8.1.7" }, + { "name": "colorama", "version": "0.4.6" }, + { "name": "colorlog", "version": "6.7.0" }, + { "name": "coverage", "version": "7.6.1" }, + { "name": "distlib", "version": "0.3.7" }, + { "name": "exceptiongroup", "version": "1.1.3" }, + { "name": "filelock", "version": "3.13.1" }, + { "name": "importlib_metadata", "version": "7.1.0" }, + { "name": "iniconfig", "version": "2.0.0" }, + { "name": "isort", "version": "5.13.2" }, + { "name": "mypy-extensions", "version": "1.0.0" }, + { "name": "namedpipe", "version": "0.1.1" }, + { "name": "nox", "version": "2024.3.2" }, + { "name": "packaging", "version": "23.2" }, + { "name": "pathspec", "version": "0.12.1" }, + { "name": "pip", "version": "24.0" }, + { "name": "pip-tools", "version": "7.4.1" }, + { "name": "platformdirs", "version": "3.11.0" }, + { "name": "pluggy", "version": "1.4.0" }, + { "name": "pyproject_hooks", "version": "1.1.0" }, + { "name": "pytest", "version": "8.1.1" }, + { "name": "pytest-cov", "version": "5.0.0" }, + { "name": "pywin32", "version": "306" }, + { "name": "ruff", "version": "0.7.4" }, + { "name": "setuptools", "version": "56.0.0" }, + { "name": "tomli", "version": "2.0.1" }, + { "name": "typing_extensions", "version": "4.9.0" }, + { "name": "virtualenv", "version": "20.24.6" }, + { "name": "wheel", "version": "0.43.0" }, + { "name": "zipp", "version": "3.19.2" } + ] +} From 07c8949375241d6be290f50c85f9523745e2c529 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 13 Dec 2024 23:04:55 +0530 Subject: [PATCH 039/328] Fix when clause for activate/deactivate button (#81) --- README.md | 11 ++++++----- package.json | 18 +++++++++--------- package.nls.json | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4041c15..77a9c54 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,12 @@ The extension uses `pip` as the default package manager. You can change this by ## Settings Reference -| Setting (python-envs.) | Default | Description | -| ---------------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | -| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | -| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | +| Setting (python-envs.) | Default | Description | +| --------------------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | +| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | +| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | +| terminal.showActivateButton | `false` | [experimental] Show a button in the terminal to activate/deactivate the current environment for the terminal. This button is only shown if the active terminal is associated with a project that has an activatable environment. | ## API Reference (proposed) diff --git a/package.json b/package.json index ae3bff6..c815275 100644 --- a/package.json +++ b/package.json @@ -74,9 +74,9 @@ } } }, - "python-envs.showActivateButton": { + "python-envs.terminal.showActivateButton": { "type": "boolean", - "description": "%python-envs.showActivateButton.description%", + "description": "%python-envs.terminal.showActivateButton.description%", "default": false, "scope": "machine", "tags": [ @@ -202,7 +202,7 @@ "command": "python-envs.terminal.activate", "title": "%python-envs.terminal.activate.title%", "category": "Python Envs", - "icon": "$(zap)" + "icon": "$(python)" }, { "command": "python-envs.terminal.deactivate", @@ -267,11 +267,11 @@ }, { "command": "python-envs.terminal.activate", - "when": "false" + "when": "pythonTerminalActivation" }, { "command": "python-envs.terminal.deactivate", - "when": "false" + "when": "pythonTerminalActivation" } ], "view/item/context": [ @@ -357,12 +357,12 @@ { "command": "python-envs.terminal.activate", "group": "navigation", - "when": "view == terminal && pythonTerminalActivation && !pythonTerminalActivated" + "when": "view == terminal && config.python-envs.terminal.showActivateButton && pythonTerminalActivation && !pythonTerminalActivated" }, { "command": "python-envs.terminal.deactivate", "group": "navigation", - "when": "view == terminal && pythonTerminalActivation && pythonTerminalActivated" + "when": "view == terminal && config.python-envs.terminal.showActivateButton && pythonTerminalActivation && pythonTerminalActivated" } ], "explorer/context": [ @@ -387,11 +387,11 @@ "terminal/title/context": [ { "command": "python-envs.terminal.activate", - "when": "config.python-envs.showActivateButton && pythonTerminalActivation && !pythonTerminalActivated" + "when": "pythonTerminalActivation && !pythonTerminalActivated" }, { "command": "python-envs.terminal.deactivate", - "when": "config.python-envs.showActivateButton && pythonTerminalActivation && pythonTerminalActivated" + "when": "pythonTerminalActivation && pythonTerminalActivated" } ] }, diff --git a/package.nls.json b/package.nls.json index ac9beb8..d51e29e 100644 --- a/package.nls.json +++ b/package.nls.json @@ -5,7 +5,7 @@ "python-envs.pythonProjects.path.description": "The path to a folder or file in the workspace to be treated as a Python project.", "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", - "python-envs.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", + "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", From 313449944dfdbef5ffdcf4d63c038e66cb82426f Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 16 Dec 2024 23:19:41 +0530 Subject: [PATCH 040/328] Fix bug with setting environments for multi-root workspaces (#89) Fixes #88 --- src/api.ts | 2 +- src/features/envManagers.ts | 6 ++- src/managers/builtin/cache.ts | 13 +++++ src/managers/builtin/sysPythonManager.ts | 67 ++++++++++++++++++------ src/managers/builtin/venvManager.ts | 42 +++++++++++++-- src/managers/builtin/venvUtils.ts | 13 +++++ src/managers/conda/condaEnvManager.ts | 37 +++++++++++-- src/managers/conda/condaUtils.ts | 13 +++++ 8 files changed, 168 insertions(+), 25 deletions(-) diff --git a/src/api.ts b/src/api.ts index 71524da..4f2d170 100644 --- a/src/api.ts +++ b/src/api.ts @@ -218,7 +218,7 @@ export interface PythonEnvironment extends PythonEnvironmentInfo { * Type representing the scope for setting a Python environment. * Can be undefined or a URI. */ -export type SetEnvironmentScope = undefined | Uri; +export type SetEnvironmentScope = undefined | Uri | Uri[]; /** * Type representing the scope for getting a Python environment. diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 1c2b633..8186f8f 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -249,6 +249,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } public async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + if (Array.isArray(scope)) { + return this.setEnvironments(scope, environment); + } + const customScope = environment ? environment : scope; const manager = this.getEnvironmentManager(customScope); if (!manager) { @@ -300,9 +304,9 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { const settings: EditAllManagerSettings[] = []; const events: DidChangeEnvironmentEventArgs[] = []; if (Array.isArray(scope) && scope.every((s) => s instanceof Uri)) { + promises.push(manager.set(scope, environment)); scope.forEach((uri) => { const m = this.getEnvironmentManager(uri); - promises.push(manager.set(uri, environment)); if (manager.id !== m?.id) { settings.push({ project: this.pm.get(uri), diff --git a/src/managers/builtin/cache.ts b/src/managers/builtin/cache.ts index b5f9c2c..08f88d0 100644 --- a/src/managers/builtin/cache.ts +++ b/src/managers/builtin/cache.ts @@ -34,6 +34,19 @@ export async function setSystemEnvForWorkspace(fsPath: string, envPath: string | await state.set(SYSTEM_WORKSPACE_KEY, data); } +export async function setSystemEnvForWorkspaces(fsPath: string[], envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(SYSTEM_WORKSPACE_KEY)) ?? {}; + fsPath.forEach((s) => { + if (envPath) { + data[s] = envPath; + } else { + delete data[s]; + } + }); + await state.set(SYSTEM_WORKSPACE_KEY, data); +} + export async function getSystemEnvForGlobal(): Promise { const state = await getWorkspacePersistentState(); return await state.get(SYSTEM_GLOBAL_KEY); diff --git a/src/managers/builtin/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts index a870c87..5298cf1 100644 --- a/src/managers/builtin/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -10,6 +10,7 @@ import { IconPath, PythonEnvironment, PythonEnvironmentApi, + PythonProject, RefreshEnvironmentsScope, ResolveEnvironmentContext, SetEnvironmentScope, @@ -25,6 +26,7 @@ import { clearSystemEnvCache, getSystemEnvForGlobal, getSystemEnvForWorkspace, + setSystemEnvForWorkspaces, } from './cache'; export class SysPythonManager implements EnvironmentManager { @@ -125,29 +127,62 @@ export class SysPythonManager implements EnvironmentManager { } async set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + if (scope === undefined) { + this.globalEnv = environment ?? getLatest(this.collection); + if (environment) { + await setSystemEnvForGlobal(environment.environmentPath.fsPath); + } + } + if (scope instanceof Uri) { const pw = this.api.getPythonProject(scope); - if (pw) { - if (environment) { - this.fsPathToEnv.set(pw.uri.fsPath, environment); - await setSystemEnvForWorkspace(pw.uri.fsPath, environment.environmentPath.fsPath); - } else { - this.fsPathToEnv.delete(pw.uri.fsPath); - await setSystemEnvForWorkspace(pw.uri.fsPath, undefined); - } + if (!pw) { + this.log.warn( + `Unable to set environment for ${scope.fsPath}: Not a python project, folder or PEP723 script.`, + this.api.getPythonProjects().map((p) => p.uri.fsPath), + ); return; } - this.log.warn( - `Unable to set environment for ${scope.fsPath}: Not a python project, folder or PEP723 script.`, - this.api.getPythonProjects().map((p) => p.uri.fsPath), - ); - } - if (scope === undefined) { - this.globalEnv = environment ?? getLatest(this.collection); if (environment) { - await setSystemEnvForGlobal(environment.environmentPath.fsPath); + this.fsPathToEnv.set(pw.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(pw.uri.fsPath); } + await setSystemEnvForWorkspace(pw.uri.fsPath, environment?.environmentPath.fsPath); + } + + if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setSystemEnvForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); } } diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index fe77b41..596d2d0 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -26,10 +26,11 @@ import { resolveVenvPythonEnvironmentPath, setVenvForGlobal, setVenvForWorkspace, + setVenvForWorkspaces, } from './venvUtils'; import * as path from 'path'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; import { withProgress } from '../../common/window.apis'; @@ -229,15 +230,48 @@ export class VenvManager implements EnvironmentManager { const before = this.fsPathToEnv.get(pw.uri.fsPath); if (environment) { this.fsPathToEnv.set(pw.uri.fsPath, environment); - await setVenvForWorkspace(pw.uri.fsPath, environment.environmentPath.fsPath); } else { this.fsPathToEnv.delete(pw.uri.fsPath); - await setVenvForWorkspace(pw.uri.fsPath, undefined); } + await setVenvForWorkspace(pw.uri.fsPath, environment?.environmentPath.fsPath); + if (before?.envId.id !== environment?.envId.id) { this._onDidChangeEnvironment.fire({ uri: scope, old: before, new: environment }); } } + + if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setVenvForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); + } } async resolve(context: ResolveEnvironmentContext): Promise { @@ -259,7 +293,7 @@ export class VenvManager implements EnvironmentManager { this.baseManager, ); if (resolved) { - if (resolved.envId.managerId === `${ENVS_EXTENSION_ID}:venv`) { + if (resolved.envId.managerId === `${PYTHON_EXTENSION_ID}:venv`) { // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. this.addEnvironment(resolved, true); diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 69139ef..68f5bb2 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -78,6 +78,19 @@ export async function setVenvForWorkspace(fsPath: string, envPath: string | unde await state.set(VENV_WORKSPACE_KEY, data); } +export async function setVenvForWorkspaces(fsPaths: string[], envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(VENV_WORKSPACE_KEY)) ?? {}; + fsPaths.forEach((s) => { + if (envPath) { + data[s] = envPath; + } else { + delete data[s]; + } + }); + await state.set(VENV_WORKSPACE_KEY, data); +} + export async function getVenvForGlobal(): Promise { const state = await getWorkspacePersistentState(); const envPath: string | undefined = await state.get(VENV_GLOBAL_KEY); diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index 1834ad7..f71543e 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -26,6 +26,7 @@ import { resolveCondaPath, setCondaForGlobal, setCondaForWorkspace, + setCondaForWorkspaces, } from './condaUtils'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; @@ -206,6 +207,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { return this.globalEnv; } + async set(scope: SetEnvironmentScope, environment?: PythonEnvironment | undefined): Promise { if (scope === undefined) { await setCondaForGlobal(environment?.environmentPath?.fsPath); @@ -215,14 +217,43 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { if (fsPath) { if (environment) { this.fsPathToEnv.set(fsPath, environment); - await setCondaForWorkspace(fsPath, environment.environmentPath.fsPath); } else { this.fsPathToEnv.delete(fsPath); - await setCondaForWorkspace(fsPath, undefined); } + await setCondaForWorkspace(fsPath, environment?.environmentPath.fsPath); } + } else if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setCondaForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); } - return; } async resolve(context: ResolveEnvironmentContext): Promise { diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 5bd00fd..5bcf691 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -79,6 +79,19 @@ export async function setCondaForWorkspace(fsPath: string, condaEnvPath: string await state.set(CONDA_WORKSPACE_KEY, data); } +export async function setCondaForWorkspaces(fsPath: string[], condaEnvPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(CONDA_WORKSPACE_KEY)) ?? {}; + fsPath.forEach((s) => { + if (condaEnvPath) { + data[s] = condaEnvPath; + } else { + delete data[s]; + } + }); + await state.set(CONDA_WORKSPACE_KEY, data); +} + export async function getCondaForGlobal(): Promise { const state = await getWorkspacePersistentState(); return await state.get(CONDA_GLOBAL_KEY); From 4619caae3a47fad0a1f6455a684f6cff856236be Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 16 Dec 2024 23:20:23 +0530 Subject: [PATCH 041/328] Filter and remove folders from auto-find already in projects (#87) Fixes https://github.com/microsoft/vscode-python-environments/issues/76 1. Fixes bug 2. Refactors classes 3. Add tests --- src/common/localize.ts | 12 + src/common/utils/asyncUtils.ts | 3 + src/extension.ts | 12 +- src/features/creators/autoFindProjects.ts | 95 ++++++ src/features/creators/existingProjects.ts | 30 ++ src/features/creators/projectCreators.ts | 21 ++ src/features/projectCreators.ts | 123 -------- .../creators/autoFindProjects.unit.test.ts | 276 ++++++++++++++++++ 8 files changed, 442 insertions(+), 130 deletions(-) create mode 100644 src/common/utils/asyncUtils.ts create mode 100644 src/features/creators/autoFindProjects.ts create mode 100644 src/features/creators/existingProjects.ts create mode 100644 src/features/creators/projectCreators.ts delete mode 100644 src/features/projectCreators.ts create mode 100644 src/test/features/creators/autoFindProjects.unit.test.ts diff --git a/src/common/localize.ts b/src/common/localize.ts index a81f804..16c7313 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -126,3 +126,15 @@ export namespace CondaStrings { export const condaRemoveFailed = l10n.t('Failed to remove conda environment'); export const condaExists = l10n.t('Environment already exists'); } + +export namespace ProjectCreatorString { + export const addExistingProjects = l10n.t('Add Existing Projects'); + export const autoFindProjects = l10n.t('Auto Find Projects'); + export const selectProjects = l10n.t('Select Python projects'); + export const selectFilesOrFolders = l10n.t('Select Project folders or Python files'); + export const autoFindProjectsDescription = l10n.t( + 'Automatically find folders with `pyproject.toml` or `setup.py` files.', + ); + + export const noProjectsFound = l10n.t('No projects found'); +} diff --git a/src/common/utils/asyncUtils.ts b/src/common/utils/asyncUtils.ts new file mode 100644 index 0000000..4bb79f8 --- /dev/null +++ b/src/common/utils/asyncUtils.ts @@ -0,0 +1,3 @@ +export async function sleep(milliseconds: number) { + return new Promise((resolve) => setTimeout(resolve, milliseconds)); +} diff --git a/src/extension.ts b/src/extension.ts index 91bbc52..c23ea9d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -30,11 +30,7 @@ import { getPythonApi, setPythonApi } from './features/pythonApi'; import { setPersistentState } from './common/persistentState'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; import { PythonEnvironmentApi } from './api'; -import { - ProjectCreatorsImpl, - registerAutoProjectProvider, - registerExistingProjectProvider, -} from './features/projectCreators'; +import { ProjectCreatorsImpl } from './features/creators/projectCreators'; import { ProjectView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; @@ -56,6 +52,8 @@ import { StopWatch } from './common/stopWatch'; import { sendTelemetryEvent } from './common/telemetry/sender'; import { EventNames } from './common/telemetry/constants'; import { ensureCorrectVersion } from './common/extVersion'; +import { ExistingProjects } from './features/creators/existingProjects'; +import { AutoFindProjects } from './features/creators/autoFindProjects'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -87,8 +85,8 @@ export async function activate(context: ExtensionContext): Promise uri.fsPath).sort(); + const dirs: Map = new Map(); + files.forEach((file) => { + const dir = path.dirname(file); + if (dirs.has(dir)) { + return; + } + dirs.set(dir, file); + }); + return Array.from(dirs.entries()) + .map(([dir, file]) => ({ + label: path.basename(dir), + description: file, + uri: Uri.file(dir), + })) + .sort((a, b) => a.label.localeCompare(b.label)); +} + +async function pickProjects(uris: Uri[]): Promise { + const items = getUniqueUri(uris); + + const selected = await showQuickPickWithButtons(items, { + canPickMany: true, + ignoreFocusOut: true, + placeHolder: ProjectCreatorString.selectProjects, + showBackButton: true, + }); + + if (Array.isArray(selected)) { + return selected.map((s) => s.uri); + } else if (selected) { + return [selected.uri]; + } + + return undefined; +} + +export class AutoFindProjects implements PythonProjectCreator { + public readonly name = 'autoProjects'; + public readonly displayName = ProjectCreatorString.autoFindProjects; + public readonly description = ProjectCreatorString.autoFindProjectsDescription; + + constructor(private readonly pm: PythonProjectManager) {} + + async create(_options?: PythonProjectCreatorOptions): Promise { + const files = await findFiles('**/{pyproject.toml,setup.py}'); + if (!files || files.length === 0) { + setImmediate(() => { + showErrorMessage('No projects found'); + }); + return; + } + + const filtered = files.filter((uri) => { + const p = this.pm.get(uri); + if (p) { + // If there ia already a project with the same path, skip it. + // If there is a project with the same parent path, skip it. + const np = path.normalize(p.uri.fsPath); + const nf = path.normalize(uri.fsPath); + const nfp = path.dirname(nf); + return np !== nf && np !== nfp; + } + return true; + }); + + if (filtered.length === 0) { + return; + } + + const projects = await pickProjects(filtered); + if (!projects || projects.length === 0) { + return; + } + + return projects.map((uri) => ({ + name: path.basename(uri.fsPath), + uri, + })); + } +} diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts new file mode 100644 index 0000000..25c8b15 --- /dev/null +++ b/src/features/creators/existingProjects.ts @@ -0,0 +1,30 @@ +import * as path from 'path'; +import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; +import { ProjectCreatorString } from '../../common/localize'; +import { showOpenDialog } from '../../common/window.apis'; + +export class ExistingProjects implements PythonProjectCreator { + public readonly name = 'existingProjects'; + public readonly displayName = ProjectCreatorString.addExistingProjects; + + async create(_options?: PythonProjectCreatorOptions): Promise { + const results = await showOpenDialog({ + canSelectFiles: true, + canSelectFolders: true, + canSelectMany: true, + filters: { + python: ['py'], + }, + title: ProjectCreatorString.selectFilesOrFolders, + }); + + if (!results || results.length === 0) { + return; + } + + return results.map((r) => ({ + name: path.basename(r.fsPath), + uri: r, + })); + } +} diff --git a/src/features/creators/projectCreators.ts b/src/features/creators/projectCreators.ts new file mode 100644 index 0000000..0c52d43 --- /dev/null +++ b/src/features/creators/projectCreators.ts @@ -0,0 +1,21 @@ +import { Disposable } from 'vscode'; +import { PythonProjectCreator } from '../../api'; +import { ProjectCreators } from '../../internal.api'; + +export class ProjectCreatorsImpl implements ProjectCreators { + private _creators: PythonProjectCreator[] = []; + + registerPythonProjectCreator(creator: PythonProjectCreator): Disposable { + this._creators.push(creator); + return new Disposable(() => { + this._creators = this._creators.filter((item) => item !== creator); + }); + } + getProjectCreators(): PythonProjectCreator[] { + return this._creators; + } + + dispose() { + this._creators = []; + } +} diff --git a/src/features/projectCreators.ts b/src/features/projectCreators.ts deleted file mode 100644 index f2550d4..0000000 --- a/src/features/projectCreators.ts +++ /dev/null @@ -1,123 +0,0 @@ -import * as path from 'path'; -import { Disposable, Uri } from 'vscode'; -import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../api'; -import { ProjectCreators } from '../internal.api'; -import { showErrorMessage } from '../common/errors/utils'; -import { findFiles } from '../common/workspace.apis'; -import { showOpenDialog, showQuickPickWithButtons } from '../common/window.apis'; - -export class ProjectCreatorsImpl implements ProjectCreators { - private _creators: PythonProjectCreator[] = []; - - registerPythonProjectCreator(creator: PythonProjectCreator): Disposable { - this._creators.push(creator); - return new Disposable(() => { - this._creators = this._creators.filter((item) => item !== creator); - }); - } - getProjectCreators(): PythonProjectCreator[] { - return this._creators; - } - - dispose() { - this._creators = []; - } -} - -export function registerExistingProjectProvider(pc: ProjectCreators): Disposable { - return pc.registerPythonProjectCreator({ - name: 'existingProjects', - displayName: 'Add Existing Projects', - - async create(_options?: PythonProjectCreatorOptions): Promise { - const results = await showOpenDialog({ - canSelectFiles: true, - canSelectFolders: true, - canSelectMany: true, - filters: { - python: ['py'], - }, - title: 'Select a file(s) or folder(s) to add as Python projects', - }); - - if (!results || results.length === 0) { - return; - } - - return results.map((r) => ({ - name: path.basename(r.fsPath), - uri: r, - })); - }, - }); -} - -function getUniqueUri(uris: Uri[]): { - label: string; - description: string; - uri: Uri; -}[] { - const files = uris.map((uri) => uri.fsPath).sort(); - const dirs: Map = new Map(); - files.forEach((file) => { - const dir = path.dirname(file); - if (dirs.has(dir)) { - return; - } - dirs.set(dir, file); - }); - return Array.from(dirs.entries()) - .map(([dir, file]) => ({ - label: path.basename(dir), - description: file, - uri: Uri.file(dir), - })) - .sort((a, b) => a.label.localeCompare(b.label)); -} - -async function pickProjects(uris: Uri[]): Promise { - const items = getUniqueUri(uris); - - const selected = await showQuickPickWithButtons(items, { - canPickMany: true, - ignoreFocusOut: true, - placeHolder: 'Select the folders to add as Python projects', - showBackButton: true, - }); - - if (Array.isArray(selected)) { - return selected.map((s) => s.uri); - } else if (selected) { - return [selected.uri]; - } - - return undefined; -} - -export function registerAutoProjectProvider(pc: ProjectCreators): Disposable { - return pc.registerPythonProjectCreator({ - name: 'autoProjects', - displayName: 'Auto Find Projects', - description: 'Automatically find folders with `pyproject.toml` or `setup.py` files.', - - async create(_options?: PythonProjectCreatorOptions): Promise { - const files = await findFiles('**/{pyproject.toml,setup.py}'); - if (!files || files.length === 0) { - setImmediate(() => { - showErrorMessage('No projects found'); - }); - return; - } - - const projects = await pickProjects(files); - if (!projects || projects.length === 0) { - return; - } - - return projects.map((uri) => ({ - name: path.basename(uri.fsPath), - uri, - })); - }, - }); -} diff --git a/src/test/features/creators/autoFindProjects.unit.test.ts b/src/test/features/creators/autoFindProjects.unit.test.ts new file mode 100644 index 0000000..1c45c7b --- /dev/null +++ b/src/test/features/creators/autoFindProjects.unit.test.ts @@ -0,0 +1,276 @@ +import * as path from 'path'; +import * as sinon from 'sinon'; +import * as typmoq from 'typemoq'; +import * as wapi from '../../../common/workspace.apis'; +import * as eapi from '../../../common/errors/utils'; +import * as winapi from '../../../common/window.apis'; +import { PythonProjectManager } from '../../../internal.api'; +import { createDeferred } from '../../../common/utils/deferred'; +import { AutoFindProjects } from '../../../features/creators/autoFindProjects'; +import assert from 'assert'; +import { Uri } from 'vscode'; +import { PythonProject } from '../../../api'; +import { sleep } from '../../../common/utils/asyncUtils'; + +suite('Auto Find Project tests', () => { + let findFilesStub: sinon.SinonStub; + let showErrorMessageStub: sinon.SinonStub; + let showQuickPickWithButtonsStub: sinon.SinonStub; + let projectManager: typmoq.IMock; + + setup(() => { + findFilesStub = sinon.stub(wapi, 'findFiles'); + showErrorMessageStub = sinon.stub(eapi, 'showErrorMessage'); + + showQuickPickWithButtonsStub = sinon.stub(winapi, 'showQuickPickWithButtons'); + showQuickPickWithButtonsStub.callsFake((items) => items); + + projectManager = typmoq.Mock.ofType(); + }); + + teardown(() => { + sinon.restore(); + }); + + test('No projects found', async () => { + findFilesStub.resolves([]); + + const deferred = createDeferred(); + + let errorShown = false; + showErrorMessageStub.callsFake(() => { + errorShown = true; + deferred.resolve(); + }); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + assert.equal(result, undefined, 'Result should be undefined'); + + await Promise.race([deferred.promise, sleep(100)]); + assert.ok(errorShown, 'Error message should have been shown'); + }); + + test('No projects found (undefined)', async () => { + findFilesStub.resolves(undefined); + + const deferred = createDeferred(); + + let errorShown = false; + showErrorMessageStub.callsFake(() => { + errorShown = true; + deferred.resolve(); + }); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + assert.equal(result, undefined, 'Result should be undefined'); + + await Promise.race([deferred.promise, sleep(100)]); + assert.ok(errorShown, 'Error message should have been shown'); + }); + + test('Projects found', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + ]); + + projectManager.setup((pm) => pm.get(typmoq.It.isAny())).returns(() => undefined); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + const expected: PythonProject[] = [ + { + name: 'a', + uri: Uri.file('/usr/home/root/a'), + }, + { + name: 'b', + uri: Uri.file('/usr/home/root/b'), + }, + ]; + + assert.ok(Array.isArray(result), 'Result should be an array'); + assert.equal(result.length, expected.length, `Result should have ${expected.length} items`); + + expected.forEach((item) => { + assert.ok( + result.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in result', + ); + }); + result.forEach((item) => { + assert.ok( + expected.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in expected', + ); + }); + }); + + test('Projects found (with duplicates)', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + Uri.file('/usr/home/root/c/pyproject.toml'), + Uri.file('/usr/home/root/d/pyproject.toml'), + ]); + + projectManager + .setup((pm) => pm.get(typmoq.It.isAny())) + .returns((uri) => { + const basename = path.basename(uri.fsPath); + if (basename === 'pyproject.toml') { + const parent = path.dirname(uri.fsPath); + const name = path.basename(parent); + if (name === 'a' || name === 'd') { + return { name, uri: Uri.file(parent) }; + } + } + }); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + const expected: PythonProject[] = [ + { + name: 'b', + uri: Uri.file('/usr/home/root/b'), + }, + { + name: 'c', + uri: Uri.file('/usr/home/root/c'), + }, + ]; + + assert.ok(Array.isArray(result), 'Result should be an array'); + assert.equal(result.length, expected.length, `Result should have ${expected.length} items`); + + expected.forEach((item) => { + assert.ok( + result.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in result', + ); + }); + result.forEach((item) => { + assert.ok( + expected.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in expected', + ); + }); + }); + + test('Projects found (with all duplicates)', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + Uri.file('/usr/home/root/c/pyproject.toml'), + Uri.file('/usr/home/root/d/pyproject.toml'), + ]); + + projectManager + .setup((pm) => pm.get(typmoq.It.isAny())) + .returns((uri) => { + const basename = path.basename(uri.fsPath); + if (basename === 'pyproject.toml') { + const parent = path.dirname(uri.fsPath); + const name = path.basename(parent); + return { name, uri: Uri.file(parent) }; + } + }); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + assert.equal(result, undefined, 'Result should be undefined'); + }); + + test('Projects found no selection', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + ]); + + projectManager.setup((pm) => pm.get(typmoq.It.isAny())).returns(() => undefined); + + showQuickPickWithButtonsStub.callsFake(() => []); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + assert.equal(result, undefined, 'Result should be undefined'); + }); + + test('Projects found with no selection (user hit escape in picker)', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + ]); + + projectManager.setup((pm) => pm.get(typmoq.It.isAny())).returns(() => undefined); + + showQuickPickWithButtonsStub.callsFake(() => undefined); + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + assert.equal(result, undefined, 'Result should be undefined'); + }); + + test('Projects found with selection', async () => { + findFilesStub.resolves([ + Uri.file('/usr/home/root/a/pyproject.toml'), + Uri.file('/usr/home/root/b/pyproject.toml'), + Uri.file('/usr/home/root/c/pyproject.toml'), + Uri.file('/usr/home/root/d/pyproject.toml'), + ]); + + projectManager + .setup((pm) => pm.get(typmoq.It.isAny())) + .returns((uri) => { + const basename = path.basename(uri.fsPath); + if (basename === 'pyproject.toml') { + const parent = path.dirname(uri.fsPath); + const name = path.basename(parent); + if (name === 'c') { + return { name, uri: Uri.file(parent) }; + } + } + }); + + showQuickPickWithButtonsStub.callsFake((items) => { + return [items[0], items[2]]; + }); + + const expected: PythonProject[] = [ + { + name: 'a', + uri: Uri.file('/usr/home/root/a'), + }, + { + name: 'd', + uri: Uri.file('/usr/home/root/d'), + }, + ]; + + const autoFindProjects = new AutoFindProjects(projectManager.object); + const result = await autoFindProjects.create(); + + assert.ok(Array.isArray(result), 'Result should be an array'); + assert.equal(result.length, expected.length, `Result should have ${expected.length} items`); + + expected.forEach((item) => { + assert.ok( + result.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in result', + ); + }); + result.forEach((item) => { + assert.ok( + expected.some((r) => r.name === item.name && r.uri.fsPath === item.uri.fsPath), + 'Item not found in expected', + ); + }); + }); +}); From edb90eb691a139a37a1582ac382b321f45ce5027 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:36:11 -0600 Subject: [PATCH 042/328] Add gif to readme (#90) Once uploaded to the repo the URL should pull in correctly. Modeled after vscode-python readme --- README.md | 3 +++ images/python-envs-overview.gif | Bin 0 -> 906792 bytes 2 files changed, 3 insertions(+) create mode 100644 images/python-envs-overview.gif diff --git a/README.md b/README.md index 77a9c54..a51eac2 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ The Python Environments and Package Manager extension for VS Code helps you mana ## Features + + + ### Environment Management This extension provides an Environments view, which can be accessed via the VS Code Activity Bar, where you can manage your Python environments. Here, you can create, delete, and switch between environments, as well as install and uninstall packages within the selected environment. It also provides APIs for extension developers to contribute their own environment managers. diff --git a/images/python-envs-overview.gif b/images/python-envs-overview.gif new file mode 100644 index 0000000000000000000000000000000000000000..591655f4187057e2c0abba866252b7d9f1b97482 GIT binary patch literal 906792 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%0D`E9!_V>4_^F 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 z zV{+8*5ex-v)c40j3O*^j{H)Kpk*f4t8}daJ}d zQ?{R_O#^S6ull@^ofn}xQ2NM66@(8NlVEVYo@izi<c_O;RC4u{cT|H`d}uWg~nZ*7QguTAQF>nwi4e*uAopBnYFOLGcZ)Ig}Q!Q-2I z^A3ApMl7~0E7l!4NAzR_CO=w779l(9TcHm0Eg78e&Ml?veR;lu=DtB$YqnH&n+aRg z9YLOxtox@B^leqUgL|{JUuJwDob*?-M5O#{^kVA7_dRq~TOPk;>bT5G)`3h#u#g~k zk95(XKk_QdgeR}2y(!n5$(So#Y*@Idr!9yWcj_+EPT^I1cTy2Q>cvjtzBz#HzyiN; z6#WxtIYeZtfQt-Ly&1B`6%h!*8u(7ER1m{x8!I|RI&_OPDJVh<2W|(!>V){&4aF4ggx?K{RXRZMN+YQb zh}EUzkrfdL=Lljr(uX^Q7AKx@6G}c6YYGeNRDhq@A>!ln!^GgU89RQ57%sxyYS4fn zk6U^?-Qj_{@x@b-2a_>=II;d}5z+Orx~7OI)u^A?h#x^QbRE#)_?QyvB*ljKhWMm* z-LPJ@sCJx?vB_9Fn~1=IU}f%TOSQ0PCUGXx@wK;-lOb3~`7sUDI1#G}>8ffbE2MsP z(f5oK8^q0TeT}9UiGNHT7N7>NRZT9IM#ico)b}C?VEFiIaSYJp(#b>{7i13{p12k| z)l2HNMtZ6iR=X2Esuqv5Ng0sJnCXppwVLv&A@=@M-1Et#^2(4j7qUc-;Cd|G!j;t4 zmj;I`${jV~eNvHoYVjr1IQv0yZ*Z`>+V2Jpsiqsc#F;rKnKs0o4q*-6g4-Tsi4xLXixmw^+WkxpC?9DEQ?U62zql@cG6)7cwDKJA~fMsw3Al>@0CvaItS zD@!1VutzoY0|HNjE9rCzTR1<4P#S-+A&s~J5wnW;>>SbCn^JHz3jvbBqo%p04JTy-sZR#zA7^hwKIleon7y3=rlCt3C8T z!N!*@ERrGp1!G0IpIQ)ZNd50<#5o|rPW}tDdPYb5c5j;U{Iw+1gGp!f*5B{2{>$*o zpFtQD_4=z&2pBaDEhQZj1p_-76AvkiAPJi&5r-5Zw;Vp-Wjp~jTp=wSQ9W#NBP@Ro8Z=H6G)WLN zjUP0N7c`3-G=~QVnk9hG62fOl;8SGqN!s91wvf95VSUo!H!nxFX&{>Q5Dg~CTC1ok z`{)Yim@@a+67Sd||F{A;_#2my7nzU~m6#oulm*<+GXpd$IW;>aH9IveCpA4MEj>3q zBR3;6FEcA20Ajhhh57kKg@q->C8cF$zyqzUuCA`Bsj024t*fi6Kl48u8ylPcYJdLf ze%`owtEFe4v3IDhZ>;+EROP^I*`0-wyZ4F*9~2HgEErnNA6m~F-pCtylsEDiD1Y>E z!RV91vB$+@k4wiNmybWHns`(j$gvumsG!Ks7uh|A~C;NBWIu!_2N09cCu zUDOL8V86JZ*d0D+80%TMg)r^s2>MyL<>Uf5#X6DBET;29Q51w*2-KUDr?YBjvIOj- z!d~mu%_oa{y-88?bDS^5a~>%0>8!sODIYY0L#~}dkbR|kpp*$CXTgLp(SVt`UQt#6&u^z zkvps~1oOxs0X|Lf!S`N|7tpGWSS9Zvm6x;V5<%a>q@M^cikl0BJ zIUWHH`_yI}zASf{uLvbcso(#i?k%IDZr8Vex;uv)W@w~4r8^u-Y3WAk?(XiAE;J6veAltYVVF0*IXJKLJg?7@NMFVj#~^56 zp@ozDbSbiPA{-va7`joQjUzqAWGp1wv*9dS9v;pivy@MSLM+pjh0cR8+Kzp;UYBkq zC9ppxdPxwHf@)RLAxHMYw*DSFjjz*fH0=r2m*fQb0c2>l@x3Y8*Q}#aSd1@PnU%09 zhoeAt4v*9df&*z3h3RYbvC#4<6UorAq+2xrj`~2086wF=UWG}(AC8JItnoX9+5x2; zRUZZ1@B0e|@_+i^KbjoU8i7F~m&lMAb6~R!*eBS9g(8ttNcI%ijs=^t%x6O0ZKj|? zijtaz3c^YaVTI6e)6lZf(gVs22NUc9GYbzp2On5|1x!gHApqDH`@f6U|F!Q5Xw?7Z zCO`5{a&Ukrav3BfGAJxII3h7PDlH@?D>^`6Dey{8S&+I{u?7?fbS9at8cz2Lf~ZLvs7V^LnH6dtwWEl8QPqN?LMnG!>RNlvLK0SJzb5R#(?m)izYt zHCEO)RW&qMH?-C^bksF;-K_1tRn^;G*4JG!Fia3B)nIwm+7QGB-n)@&5Q8b1+i2WO4XrYN-PUA!%bjP=@DHZ> zj^SYQK7V^^E8~HSdcjtono%bQiLst1ym1lKpdP}b3w3cW<%C`~>%sYSNnVqB6i1<} z1CP}uFW16}&A;dM-2irj<3EH{q8)YFbsekhjaKTde_5b9l6bN9XNLT(f}Zy4kCKpOidlqYt} z`!DWYJuc5y4)}h!lZO9&u#>`^qN_R_i)O{1irapVijs*;&j@yzp@%=30B*ZcX3X8i z@iZD9DME$2dc>T@DHPvQktAKpibxi;?nDdPo7GitlWD`DPFGK1Re*eMfoKz|_vKS( z`AE#FCLs*#Z550JMJ{8(@}JqI?Qef#&Wdr{Qb=*=a!f7cPZT%B7IY_PPr92vf=FKU z2_KgX@>EVt4ZAhDB?}dAy;G|1ZkcJAbjmzN6XdC{P|cFCrCO}NGEuKe6F;IXW%xN_ zw~kra3SER*dh8$;C$&{W51U16G*RTOCHW$w#Dh69Y&g9-I+5va#P6}_;GOua&d=n@q}^lMEq3v*^l7EU@o3O zD~`kS<;xO+g-IQC>L-UTJAQaYa61b$$UI0YQC1!7GA7 z=0d`@LPAbLLT*BW?m_~df&$)x{C)!b0sMSH{CuH&e32r&F_OITGQ3F&yeVqDXbyzHeDMnWvGRh^@*-h!5<&7ZJ_?E+D(bFU2wQznMmp$QdFa{)s5*ozILFF5CrZ1d zNV=wpxn>Gq%N4j*z<0fv*S&<-^9HYX8INBDPf!(iXf1bG-GzvT3z0W3MBU_$Zsd+> z;*Pz=6W7ce*UT5!%pcz@n%F9x+@_S)shQb@$nG)B?KR2kvn(92D;{(%9da)p@vj~W zs2&Ze?2RnDnN(byou62m?Ol~_TbE|ukZRbJta&R*xg}Y(Ek&y%4bhdM*PCTHkZU}Y zZ$4abbp#A3ifl)V?Z-=&h$@B_fAdsOiy>sOm)so zwa-qr&Q3PZPBzX?Hq1;l&P?5!n{1hzYMVzUZ?-Q?buLVIFU<5U&J8RrjIXWCZroXU z{NUcRt;ahrcHX^tfAA4_<2f7auXgx1KRI_z3FH8TDJ~4_r)z?|;9uze=y>ct{4<7ba%$*oa5PZuzE)jK#;N@%^Ltv|ni(yFhK ztl(NBNBLmwrvWd zwz^SiqqN?pw`Rv=DHFR^ZB)BeeNV3qI+W(Bi3W zb3{W0<%*HVvJ_2=CSPI=R`Y)pbu5E}8xqcXdtEjUL5)I#0x6ecoUib=?05jY*T?9#58J`vS~s(uQke;LIQ>)z93&Ck@;*Vt3A zNs}r=s^hi&3fykz<=e=I8Y!fI_en#jkBs4$tjtKt%&0ggq|qV{y9C_0&@@FvnjD6}nR z8ujLBH!EBj?q}iks4l%Yw?3__OQK4{erjWY47)dP14Bpw2oYk_f!rIjRrHCUo+|cEoa)E4?eU! z@-m6ek3&dK`--exF9*7I)p=;XZ9`w(d+qj8fuK?4h4RZ6a<5uzT`g)wAJWsK;~Tt) zD}VL}JPn5VN+q%Z4ZguHA2ItS1+%Xdv z@10istOaEXCm$A`Sn0=y;?%mbd%e|bA!hCVAUE5IE#M+<@7C6V@RGLe^1l7DZMHtM z`0&(9=pI4a;%(;#?>p9-TzX`8G4_Qdu_51XY@RThBeuyO-ffCiZ%A}+#=9EAJ?!y3 zq;O(5=9KI{krP%zD^@3Ip(hn}%|@`J=exbuhjw&Kq8X3BS(Yw-86 z^&v`whXjopVr0s9P*k8Z;)D_RBGcmBsfq4u&02nNnj0!JWTs;+SL+c^e$&D}{@Toy z`P9;5igSVlqrFU-XQed(lcEJB5}^u-inwPOi$#|-Vo7yT%bH9Vo3xsLk`uA|Op^=| z&d9Wdf=7bmgEc-SI%NkB-p_-)7@L%6s6m5W5AZkkR;3Gkqs)P zA!wPBYx|HAmu#y*z&Tq_UqptJSbS1c)?dIv3P|DC2fMB z3Q;k;crEat2pP=Qt+MEec94T6CnwQ%U&RB%vUoqaR(ePMl0#v8aceEb2=UVB(x{vQ z$|r(4Ic$v;kInYNWBMr5uM)AS6o=&`DRoK?0V@`_^-%0~9V9j-R#O8HD^Z(vB^)?~ zeN$1(n6&FPuHb2#n=p~_r(lSpD7J3k#;m<}F z!bum#LmMeb8zV{+FGZ6iN0XvTld3_RrbU~sLz|&Xo2gHmZAg=Qg(lA!QeXxtx(X?_ zf|S}pZa6~9T_6?LAeHWrYA;BQFQhI2QWpfN4?Yuk69lOXM1EN752^7(excf%rqYw9 z!h^Q#I$f?SYmyUhguS?*jr=uB4NFU7T`MOQ8($f_Fj4zBeuoq;hfG%cT)1sM+`a(r zSO|A6hPjk5xt7A*ZosaU!`&;Gy{eggYgqj2*aI85LK^uao5f<=<&%3`Nz|%BEZ^rroP%ysBrsYi4}GLPqVZf8A_A z{cK?UY;fIFXzfIJ%}8X;P)v1SVpUgKc}r$#Lr!6NenC-jeokdUa(!WRb5U?-p?6<_ z%V56UaK6=Wf!#=v!)U4Nc=`2-N{^{(ujzXK>88-hj>NIv^wFW*!O`OWiL&15%C6bk zj=B2wxrVm+# zEX?&REe@`%jIOOs-Mzc;@WI;V<|7dOy}S43-TSlq*dQz5{6;o%XaDze+P~e||C=?+ zkFS0I{{8$Nc=PM9_m{*WSI4dJh=ku0hbSCJQiR2*Rgo~4>iIl=R>u6U<_8h^;>bPQ z_8nP_jn5&9TkUnLm1>t%(z3`S^JH00tsW!$T|Z$i#?3gz7iH$VnjUsv z?;JaaxfrcUDu;Iin2W&+G)52sZaU~fc){Y0AwPh*;4`bFhkK%v5yM?hUqg6Nb(b+{ zHDheroo1a$lV6E)$w#8&@;Y49E^^!H!X*(=oSafd6Dv>d^wjP5e>|(*4CDbG;z_raczX({F!R_ zuGCg`qvI=h0?Mw2BZ55}h&%A6U9l@nxE7Q*h#d;L^Yk~E(ibn@+ovoGHh=2yaVXTl zjWL4-tqo5{)f5=ISHcZZXR0!vq_Ev3eIP4(nQ}z%`!@9x4m6P-7F^VmXXBYk8*RzK z4tPqN@Xq)=XsGM8+Q+^IFOD4qtD`?ZhNF9^8Zs>_%{^u-kASepJk@TP6O2!JDj4Ez%*hwxsu?w$#&tZQgN)b{Q4% zTai*^f1og1M_++jPt{EpBdRF^*!+Clb)Ea>g&}em;7dVwiXy@{wkvOaZHe!Gr}tVB zwVGqMWQwIOh{bX&kuscL4&n5sHQ!{iI>cLarnYfghW6=vO`ql)wyZfV#(|3u_}iz{ zsm!76eC#w9QTux8@AA~=>qk)CMyAxF;_ItF-3@koXw!M;6vsiZGTH1-=9=DQyP*r; z(ZS-J$qSK0wP^-!Gfa0u%u_={jeNVd&m!FIDf06s>7%N*7QLQ&pPC(1D_(W>-cp6$ z5>C}V(B^G(_VRE-TYS^L$bsD=uW;A2c8NOGAo6Y0J^Kn8o`-}(17#^){oi(*1z;Oz%eF!!qyn zi;i_vqSp;_zy1;Q81ikjIVt5T=SZn}&{WBloUWtPe!TXVSkn8XHU3tlD|3NLWi;CA z(u8Dd?MGKQ@FKbO-M_{>zO{3~U4k#FTaw~MF+cxJvs9<;e!XbX@+J)V*J4jr3IzyI zhQEAJj=ZAqD0n}cUtHjg??xIXy>8WD-4evOVyYw;47*X(?|RugU4BU)jymHB6H+VW=z zlF$g;Q!E=|C?>ROoKiU#ov$gQUUN(odfbBI;v8GJNx+U9`h3CJU#-|HBT>=|jXIiT zgksb?3hk~sfVt>1dw5Hzp@*(5&=$f`zaYz&M3Qa}+kzE;=pSVJD3Owfs2%tlJ_yMA3_2Cd_Bqzs5K_(@p!kpufLy3;>vlrz)<4IK>)Jq;}b zEiEH09iT11K);5bfrXwCKxNpWOq@_SH;6Vs<{EGaa&U=oaf|WrN$~PZ@d-%r3rY(L z$q0#D6c)WGC?+p1Atxy%FLP1hqO780GqZm}$C%sN8{4~HcJ$D5@zrq))Vv<1>K>)!87t?NDC3hN z>6}7=En;>Rd?gP(W*&2eHnfw#=rw3Y0~8CMxiwRSvaH z9>l(Y)~SfWt(3{L9OhlY;#a{QP;nu+f-kI6D7->6yj(i6QX#rZHMUwat_G1%V~|*5 zoLpy-Ty2w5<&;+GkzO8U#U&+R)K>aG+&KJOGq=CqI0STs zvy75~;U5tt6XWBP6O&VulhadEGgH&E(=&53K(q6+vkS9xNX^YH&Ye+Z<`)21W@%v& zuw|APmsXaRSC^MpS5|JXu7dg7I=BgR=gwV#klWa}|KP!SY6-IO3@$gH&EJsy=HDi8 z$V_|CZ3d&aUupK|)ypr=!g-7NKNcsy*C6syd7;G;$V~f4(KZCR;*0XhBs8e)0d*?Y zR2m_)?tq;SZ6*s7I&iS_9(6A7J7bG0E_t<9F0a+;M#2ZS#XPAfi^F3%l~soCp_T-5 zYj9n}d+FKqRfSl+YQh5R5H;@?{n+&T27Qb!Fu8+n8q?5#=l zmvRs-{z_kG8-F9s5W}vK$Ozcn?ClmYvjF}sZ+gRCnSvUouT;lZH(zHCX5FU9d zUL{I?RSE%h3L#B$VQq2|9dZdnGKFiD5*9R)rVKKd;W7wzSp>HnLP$wZN*N)iicr?j z)zZ+>($?43G1S(%taIs#4#MaX!uXP|F+$e_p=*lJGu1`POjjQ%J$-XM1ElnU49yJ; zEetMO7+$fsY-Dl8*uu!g4R| zCx=SHQy#CD(!3FHH^78VEii-c!9fZI7 zAu`SSe@mQMSX^3MT3%dUSz5WhvI(0}wL8RL`uHkRG z+<&yeUtjpm51B@3v7I5v0h}DIMMXmS)0T>H^t&fcQkJciqv)F_8P9h;V8Uii7ZVS5 z(rncurMKl=s_V8;b9t^(ZI4zO-qaHH=vzNdtG!f)alMVcLFnZ|p?VCO1PS`ItSM`A ziR&cut{y-JPsUrplheblbA5c1Q}41~ePNP8?FI2|f;Itf;q7wA0{U+BoGuEyC1^K# z!3nHzb)Qy5S(@38Qmdf48~w?Nj}4xF+s>ROPxDAU%D&EWru-j5FcZgdh8CN7Dp!1V z^NcJrp_6^oNL=^@TD2{nBk0oeX$j)(CZ>E@_fiY-qcU$M&+R!(!Da51B6`d_n0pqN zZk341ZxT(Vw=Z45(tQ0q@ASF$cg163A`HsI%ltzpUk?|jO>qdrpQVRw;_P2yMG=KW z;EoD!KM|!D*kB4LX-p?nJe8;%38B6{tw{2Sd;2OIQMl0)qJ@r)X(A^Um`>QKF6yW! zO54UXw$uP58Qoz;+(K0AMbBK~XmA-i9OKSWxcnzWYuI%umR@v-r8o1Ye~fSo-Sr%L z^{YA3SVEBm^N_e=vFpO_@`?t6?KWw)nX^$O290FeNbK-5zOxa9Lz2aM0ZUqerN9I( zHi6YdQDm$?Om|1!1X`V=k+`P-8~U9t{0W#J*AM&z8X6iF77iXBF_Jw&LQO(SM~XyF zFp^U+06fi4LJg8PaprkHn^O=lb^GCM=O`@*sPB->a~Lfh3oSh>Ej=3@13Mif7af$F zj){*JE=a>H3SkkWVw0lexJbsONX)B2D2Tul(#I7x#1XlIEsET)!W1*b6bJW>{&M9= z#va@>Iv1v>C6=%ij-U-Lza1X00|B=a5vL0=n;RLkJ2~8gg2|JT$%_i=P0ffD1nNx# z^`>R=qKA1hv3s)ccyb7Oa!GjeNqGp#x{E4amsE9=({fhSaZ*J%Xz1DN7~1L^SsR&N zH8VplAe?1k|CiebzCQi|J^{hrfnnZ35njPjULi4Fp|NhE30`6G-r)(}5eYsKiGGoZ z{!xiR(Mh2(N#U_cQE^GJ@n<<~-gyGc74MBcUKOt|%+EBrCQwJN8CS+>P9X z(!Au7{Pg02oWGdgzr;_})YjM6HQuamZfa<2zS-G&v%9^qx3jUot8uWWX}Gs(q_1hT zziE7+X=0#ha;vi&K4z(*sL0L(8)x%d_Jv3sb90v$vNQ)>oJBtgYPxX*0-xnKRthUwB*3 zo`FTI^RSt7;?@~2{nLNxi@(fI-2KP)LC;E=Vk`+Wm$yH^H6AG^i$YZoGaQfi-cZ@f z20x{!Yco7|2CNw1X5xJlKG4sA;dq}ufQ1(z?1e5cz<7;zmY?X9Vi109%_W0JR;XmK z8A={ltwmf)V$AuvyxfshC|>jR{->*V>&(7;n9YCSMkBv|skqR5PUm1N+kC6@v00p_?OG3@k{Ej@B~po% zBBOVK`T3eZaMbl?F5?~1E$_Y_F%*SQe9`2>I!U*e%QvwBw1bzFEaEM4^v)OR61_Yv zh!`Z%Nv^1za>uXqi?1K-R{CBqm3tuTQ>w=8UOII8ap!dipPCp+NipWj`+l3c$C%x6 zkhdg<3%F=C-G+)Ce5NLyz`>D>B0p`;&#iuP!yOFIg+WF zdZ?Kaw^`EDqj}g+HAU_iWKJXzByTMy)0^1XD3EK^*|1Wwz-H4dj!3cbUY7ZnvY~Kc zR8X`;Z#+yZRGSH>QZn9KrXt|RsDNsH{cIzWb=WmRV;}guT!G?fwYq35+Sm#cpT+tG zm9fGhbC!<6UR*LM_sXOMAzZIcX>4B{H+zY6Vg&cjdfXBnzFIn!A^}qiCfB{0s@v66f~R}F0Maia$%z80rWb+eo_4?rWcv?@TxI=^39B>@FS8CW zv5zQnjx4+undcdm>l2mjADtBxof#UF5gwZ!9h(*x2O2h`Uhr?TklVao5^u?axBDA8xT@`Nv0-zdpJ0gaS{z z$|Ol(>q|H_y5a6(j6#LVHg6GRKb#fK5XV-9`EQ?)V2fPF7QKQkW{eFs z@R3XSrsu*IH^mV*#T7Tk6F0^eHzt%YB9^#9CV7QY>N2ggAyh`6O-_$b0U@cPqo}T} zrm3x?qjTxfrN190@oNS3zurLo`@uNK18`zoRBC)=W@315QdmK9NKr~~Now$o)S&XT zpo;XM%JksMjNr=5(8|oP%B+Zr?5Ogb*s|P&8+j?E`57ezxqm(Y|Fs7E>kj@u7-YXM z;s2cjFi0;xi!Pp+oSd4P0(9va&=8!RotvBc1(;q$_5l}`kbS_#<)x*S^CsZh8t4E5 zYXiP^wsyJ+sD^;6`T}(N06co{x9w7pPYh6FKw$A6;G_Z75bWNcr4=87IVM;(1p?tY zXVc8{fhKUhW1zDK9GuV3&i~p6|6y`1=QSXUW6RUAID9(B=yEiyi6pY1kr}kbq{$>w z)`qf|#B>v;M%4AHc!8%UgVE{;wnat~&sWz0^_DiKf@+*c%a{n0 z$c~oJccz*cvMsswV%ehf@)fI_;!iPTc5y{8vB?=x32-6Btt(OYv`{j9W0(#tb@aDA zR;`#UM=%X9yfnbU;%Dd@#h+_*T%vRQj2O+iCv-)*CUlMAO%f22?I(= zeTbwUt&}c<6oN_m5{rxu*F`OUIZa`C4RHkx86|ZE6)>{^DXC{Msej450YeKtJv{(m zJ-;;cKZSRJG-fL+8yg!tTRR7P`}3Zho0Ic3XBT%DR}WV=WFE8IHScTJfqbsH`?!1f zdU*PIcn7%q1bO&|c>0BS`G@!h1P25Kg$4(NhXzE31;#`K#zh4t#ssFs1*RtiW+fw) zof4Fj8k7r^7Mypk^x(YokbI;<^D}_L@-xEoGl3!sG9wGJq6@NO3bJDhvf~SK5(;yY z3UgBm^U@0QG79sv3JY?I3i67O-8yhf=msdkic7103814(ZXksONS9RuXmnY5O<6^4 zd1Y-yRb5qe{SP>FeIuyRZZ_4fMhwL7=h0GbTw9?<%o|7AGp{RfX8J_6hGU|$~G971wgfr-5a*{E;d zy?+1U^@oGk2cO;^e*W;osenhF!xDeE6LLxZClLRiinV`u6yn^Ygl7;SWF5;1QTCyw zLXJVG4RRnj{!G!AtL+=J>S(2+FZ11R{a0?YDB*oPJ$Bj4EKAK5a)A$Uy4x!W6ZAQzQGs_A~+^S}Si?22bzi>=szH*bt);ey`+ID0|i&CFSmZa>?^n zL>tED>u6(i9A?(LL^VzxHF037gxCrV5Q_o^c9;b)zCo{pza zL*;WAv$_w{<#W7B5>yF<7hm^jhP^bhA*s^0F8;DR&c*bG3H`BO*bRP`^(_{A?=XEb z&Ix`t3HPw)Cn_XZK}UHA&spt=JVge}5oJjnmG~{jkH%G__@iq1k0f0i?J}__wd9io z_H4(K7&`Y3iLt2=Th^GgEueS)k9{pF)O1uP6z-pNR?s0s$H2tI!okMI$H67UCmtYs#tW2T^Mu4Z6<35*9olg#4Z zU(NxMfk@!9o16Q!YaZ9GdtP__30<;~vF+c(GW z-yMJ0|9bH8k58Ze`10lC`0L3Z|Ku(I<{ZH_|%(S*3W`jJQ z48N~s#sfB$jFx1yF3(Fa4QIk;YgD^k1#-zTJzeh$yc{lIb(xyjyIrAODyh%4{&d-X z`3AF>C&pd{=SnqMk*GPUHKuYQg86pgS4>(6B|+=g?4CQyan7f0J~%hMU6txdHjbn2 zg}Yr!mCXXXtv*7yhjY>H^Wv4=q_$!HDG_=fzgE*xt91 zhveQZn7FO?sk6e+9>0|1Kka#ri$}6$PagT5-v);97H6AS%ByAMaYS}bO%%jxr1Gik zKo!4L{C?B37$(eCba>LP;cXm@vh|wst8cuSR=GkDEAsr3jP^u$GzFrlxEt%fMnYU{ z3Gx_RRf-R+^8GV1oyfectTp0}pDSYu6kv_g2w5LI&9#T4>E&A}As)Jt1h?wQTYc46 z3y}1z9}^7tcr@iM$tEt3ZqbOgC<(CC*wHZ>1`+5a!YkqEq$|0)zZoA5YB7l6K=SUf z3Bi8@ADW76|;;Li;aB-9?91J89f zK0w~YKD&Sop{1q)mv@+G=$L63SZNtKXrWxRFdkZF0a{jJ8V(7X3l|}LN>qaC6v8^> zB9}--bV17$(WK~G^My`N-1kfC2LA8YX*@sqmeVC1(G+T zlQ*N6H)Bvhit$WPMKdNvGnk?&T+x(S$&^*egk9N$Q^kZ^)r3#YSV+TIT+>)m%UDLo zSniUslCFuWo{6S`>7~o22F7N_rsn@Yp9uj|EIceMB0M}YA|fg>G8&nciuAqzGGFMg zzW2Wwing~S3#_g#kS)~P*WW)dI50RoFf=kSG&(Rm2Glj*OHT%{VSIOwGPWb6!cGx2u13tNn)w0_w;Ri!qv{k$;@*Y4B4=AEL-XO_p*@(2 zqLTz|uH$m9HSDrS0bf;Nm@!1(M=Tn@mhZ~uoj#HQvrsZjJdPm~me=}a_dyItL{RuF zv;yC&>1(^x5x15n@zOE5UpCX@F(1P3%(ZCjF(Y;`Y8`?6kIP}UQjR#NCM|L%G51f4 z#P-;Y2{>-mm5q!#Yuqzr-u+m+w1$Ugcb)E&UQXn*anBavYe)JMsiG`aB3{B-e6=$%$zAAaG%huM zhED|5JF{*~EP@Q>Q5x9Ob+EZF5s#xL?q-E*&wyBo5nmWJn6YD`*-#L|DESg=1{?f5 zLUmJ)IaQ?Z@B^J*voilEIj#H3uzlGB8=4aj1Y##hF6eah<~}QW^HW^j)1ndwsv-Q z_V)G;4i1ivj!sTa&d$z%PHp}Xyz!H180a4m5)c>`7!)2991$EG85|N75*iH@8Ws}< z6dsEt=10UKq4|;VfSVr$6rB(qodB9tv9XDWmw(~GF(4|^h0$%i|3hZAR5y;{A_uFcq4}adoI-gg9zSYmJ6>zB^{i?H$)jy7b ze{E3xs=&lo;?J%}pE#_jrI3nHX@D+OY_6k4v{tdBJ2DtZ#WmY;KU^y8D?zfE(Z^ER zFs>_X!gU|*v`7q43!oa4h`$eQqvW)l%pmPFnjD5Z4!*Lk%%L z#ckE=M#c`Nsts&}uhx*1Ne*$kSaL;tWiu3gV5vk&iIdN0?xf$)681@YP!5sMGI5uZ zWP)y2hluDQzS~7*5|t-%VLjF@?~LWAbL4Rzrv%?WxRGjfMef+_&8?9Ujd~UPfvMx$ z^iMU?4g8tk6BoY4!*_1XIwsS9K1OisQPC;cd{ie+@#qb)5nNjev_vf>1}c0l7F0B| zmMjvVQzlR76@r;9f|&K*0~HfN5la-Rn@Z!UB4fJ(4}C$r*$67uL{GTMpPYvQ6&d*h zT2A29hlz=ajg5_qi;IVcM?gS8L_|bFLPADHMnOSAiF~Ne9_q6x;dz7md^_U2)By)S zdTMIW3TLE3UR8!u0@lKLeEgqY*(j;lD5=?~sM)9?NI_`WXn+8TfsUP?o}Gb#0}ADY z!MIphF0lQGB;&hqfgdC;^6?1?3W9uP5VR=%Pl?JPkwZpKK}KFlMnU zNEbRcBBU3E#{eVxncfi>6&)WFlMox12+Suj5g8hvn)?4zUOccH@XY_av)>)$dhCCi z{eh|9uX*1YkLD0`!GWQix0FDw^KXirfB&oBoJR$p4#}o*WX2a3z@gUA>KQAPb!TC7 zrr@Y39`=E6x)yW5ONPT>su~ne-&e)MxTxE_afR#^a_L~L@lg9z5mkVI^&XY+hZklVTR2ute}Vz)on%4!t$LNfnA^%i<` z&efDI?k{6J3H^cxq2?Z$&8DP&P{i)s!Of=T%io)dvZ>LqC>1Si%T|21?uA`_ToGLc z%a`>owYEfg-7B&?$MW*sr^@mjwF$^XW6;~QD=Evm<<{ccG`#L9@!yrh(GtscQ(hRM zysLued*wW{M)_R*BBs0Kd!fryl#{gknDozmts4}E2B7SFt~wIyr#D^*2n;%fBc6m} zsc>mWpoZZqr$<1x9jnx^Ff=gau|&Ds5fUM``*KnEAL1gASwMsmcQFp)oKHU0l7vy& zmdRt&I);zNur?SxOBRY$wMoYKz3_p9))NH^1xhVM;VSi+XcVs^rCYbqGoULY8tY%%VW>uwXRikQEdoDGrS~aU0HR~F6>uOD#DlOZJOLk?t_N9hSMJ6r< z7H+vV9+}QQ>F)k1zQM^sVM$?;iP5nM2_UOIF$tt10_Oqy1i*Yi*^~Z16+WQy`G2qV zba&(Ky@wkcn-A_kefZ$z;|F_B9=?70@WZo*htD5<*?xGu{qXCHhbL$H_TnMXDbUMb zdi3oj(BqSrn}6(VecgR_ytjSy8g!*ze}4Dw^Ztj=2Zx`LUUfdM`}!3uDIA@g9DVzC zbb5LWgtVXQDBr)4%P}R6M&S^WkubSij>X~9;DxJwV3LowTewqhL{d4GNFj6$;~2p* zn+d%H7shSV8qeeZmeM$rX^Vz|Te04lUj~aTp&&iNz$0Z_jZ@KAc!QI*tq`RxuaQia z16Pc=5^}0I!i0wva|Ipkto?fy&cy{nxqQ&8QES1U`tygJoc!nC{NMiWpOKpWyyp#a z`;ZR^+d6**Z@|OwuOG(0etZ_r1p^NpWGtTvge?PsAK73qei%#~22+5+)L}6FvsXD7 zTo?xDhQXPUUqR}BdYD-SnAzl*Idqu0G+21$S@~qx`NX*e#drmT`2_^|1pwv=`S9@} z1@geaD?k7FhXVifh>A*yic0^In5eXvs1)*5?1z5-N=`&nNkm*tQcC&aMMXI|B}I89 zWqGAbvI-`$iUx|xm((5#0P~&hK7ZM=LZQsCMGT}?#wZOVIVyN z*hOY$W>!`fI2aY=14>>I0OjQalgP_0%80!YaH+&qq}-Le%9E=;kh?KlxHC?rKh1Eg z&}O>o+QLo0wGO|>Bc3l8++VG_zh3v>y&dv+F820#>cVjLcU5y+V?#?zRdZ)< z^KeS@bZYBNcGqml&~(-0OvB80``pOD{J{7^@6klyN^T_MEK}}i`0$Y{0F=(2&EEalNpHE*ZxVHZF`dl`(99aKZ=xyIwE>lcm z)b8up1M5Ekv)p+UU}vRL z^M=k~->26bPNuxUke&}`nDy?&6PtT)cGqrRT|URG7cst}^H}?U#H@!Q1XW+;&$9oD z#W8w#?a?=1Xc&maf!SuViiK0+oyFq#?mmrcHy$lP{VXH?6vW~<>IRrPp*~CEKa0h& zu2r^D|5o!XRr+&2A^_HF^gJEJ;%sLqZ*G)@Tom1_N|YmFV#zc>GSrPKYHd@sF7Ca^ z`>HI#>QWf)IalCVQ~$EiwQKKXk^2cHEQ@75uv~S?_ki+7C>0H)=x=~k^>-?&|uBPEtLu1z~F5^?z zaQFkRx}$_St`aBGk<3lESFf8BeZJN^*A6(pX`Nxa`KE0_^z|E)+V~p0vWD%x3weWR zH{W(q`X6za2Of-EMN(s<`=n=;ZV3_dV{1 zq%$KJ)UNxZIP8rrV<97?xqW4=uWS2@_U3LTe6nx!kpI$^d)?^s$%T(IEP1Y;W@vnk zALqD*PFgzFO@cm53Ez7p-~x@J{5UK9<;}tJP8av#3it59wT1UfW(T)FZ5GqekBGxR zt?Q$sV>?K=vpdEkE*JGbiRZ%IXw3 z-3b2j_RACJ3?A`S`!F_-8x$_~0$q^qx8nKNrS!gRdr4(}F$%gdsR<8%=rb+gxBp^F zVChizGJGIC2WMxFjZBNCWcuB`tqy8Js)^Y4V?0@}gM&HF=IymP&ZDCt`)36_jMty1 zi9NC1&c1Z**xvZzc#_Z(3wfY%QTv_g*KPAY*aFvDV!j&hq;-DneKO8?`iCpc36boH zw~hOUlU?$~(Id-BPwwN58)GOOBN3EKLUB@S?>0SZjtAlXP5yBgWBsHH1eO9I!DNRO zs@;1|HG%bOV+@Cux$l~)L-vE_kLJ2_KNYZsSbJFYBJ#&*3#%=gM^u?CT8Y0Ca>t$G zzkc!^t%n~i_pL9#KKaFu8EnB@%>HllEsN5zFWC=#gf<{Cbq8$tkH*lR&X49 zEfM8oqK5G~vK;44jt+Mv9kbEY6`VJ%yr~cL89sm9#j=)rmTdhrhFNVoNjw&TZ!fKK z{Pjq6seY9vu9#Wi6^?of%NX@2!j}F5r^3esewrl&i_zEcK^vSgu(ru;Otu%R9m^l$ zhhoRiG%6`{*E7Aj{e_XWld7h*Ubf|^&F<ft29KUWF>&8@d?(k@%WXITc5s zWOPD7)Nr@Z8&;%WBg*^7y`cB9V``PaNv zcwICl#i(xgSi>58qnyk(;d$9G9bT7lL38VPQEs~dM-SOVvqw~GDLbF)oaXl*D!%jY zf$69)DqNu2%p}Wi@Vb?eLT4_l(>>uCT~8bJ#`wKLUO!W=AiZ0%IV@?vL->*4snhC( ze#cvs!&nd5WIjGsbhduZ@Z6x;^pmDTB&z5L7XAMH^^Os&uSAh=H`r~y1x(^d(Mo4k zo7sKJMOZ8tbxAQEq!BY*eu6L-_A{Ei$9COv(dTuvDzWpgE8ag zkW_BI&#*Z&kK5q%N`d=(XbR`&F~`d!UY=Rin-+oz9{zHkL&Rn5fkiH=e?*UF34L7G zAIxFUqWABTcLL4faUpgDAB<(A0(pfB65$Gqlq2(>bSd&j#?gP#dceg9b8 zzIZ7`8I>fK>EtoWlP|mM%hBJ3Q1G88-QE}u#qYhTpz5xDy3zgg^A~9RJC~P#__qZS z=Z0eVQ@-9IeJjRYuPbvL7q&~TQ66VOlpnUAC3td0YPQp-=bq2(fzN_|IFmm;wviQH zJgu=}1V?@(mk|}JS477e|7ji#ia$Hr(IuFF6y*m|{GLeZji`$dUfLd-4(kg&&n!jb zqttLnB^@JWH==cpq8rGf3(Gk&^kOd8;bo0Ee#wnCJ7Q+e4{s*rLWsxO8pZmOUby$v z$nsu{t2l|KKdqe}ho^X)w^5w0f1H1QTwqUJ@J3vWCx_E+gqwIg)`wVQ&-l~${P@J4 zc$1#k=$V+1I$K)5;vv((KXD?`3?H&t#LJQ#q!MLCKN}&%E_C`&MfvPd$w~O;)mamhk-` z(E=-4ELuw3j1o)Y&vL|HX40(pGORdrsc|u0Gv%&Wrpa06ek#i-8cmyL%0-pPE?C7q zAR)F^&pqBH`plmf#F_iqJ>&ml?=6Gs+O}_BAZT!cEhI>A_n^Vu-AQnFmjw3^+}+*X z-Q6X)JAnj(W#vthv-jEOf8?HbtKO}8Rd-a&s#TM!d`OBuM{i^FU-RWkKu-n{+$DZr zN(creewjit)kHLvj9w;A3IN4bZ6=wRqe4lNR3WEBBJL3a;@)X7!ND7EG()y0v#l1bat$uEl&Pkb_Vhe24y>B7U21?I`u zk_lFlN%aB=Aam%kFG&T(iECV_Y@2Bt#h@ytM1tb1^Q_1uv@B%2)LL`Ymk3dC&!Gdm zkj4~{oE2hv?qZT5W89;V#`n26bj-v$nvEbRi8xz|kTgD0slpapx+RWH(dC+X>{1 zO~KQy<;G02t!dhup_Gv?*wj;|?+1art?~px` zK~v2j@CtR&^m62^c_eID`Z*J_IalJ$QF^)p3R_n+cqkUfJS*@yw7*s~?0r${ zhM;Cih*tDhu9BdUqL54Y7CF+%AcvLGk*L&;6gcMRv9l|2iYvLE3h;{0p*x<#$)%(c zkAUP5Vo00gbf3pYyvw20g1;Ea9jt=uxnrYCj$5-R8(aZhhE)Qic|0kgS*`NUFXi7Y z3cvUkx*wZ)hQ(%I7RG8Nd=bdrlPt32D&__yhFK&fY9{7BkFJy|whB$c(X4JN0byx_ zqp?1NUfd-cxEF!VO0r8p-gt2dT(xB*#l+#&z#a26#nMKpj66_si&O?-D`>H!|1<@`ln_9Ch1rn}PAeXope$XN=A}gEzI8VW%f&^6G#8qgslByma(-YQkDpk>= z07o~1M12%THInBpP_`Bpb4OE1q?OlA(=g@}<6>E5q*X3CT%n(m1OK@}eYEOqs|poS zA6;5A2QrRE35CRNr?6Hjar*L`0p^}J9fH8q^4u|F#2^uEcA zw)tGJIUZ3nk=8s%G4e~!gjqvFKHWl&pKR^LPO3m|NlJ7efGX#06tYiRb(10s)1xfOSX zKvkLIN!hR#{0vQ>9Af!yN?E%=J1kmwu)j|~M$#xdZxrcMvV($FLa*2%17i{EAQ;5AU=6&hI-1WK3VJ)DVRoz0rk7}3>l)*9pd&`&4XFsOjky*k?SG1Vxn;HGteBy^N%1;(zd%^{5t zLT6ADGxQRd@9WUZ8H7xX)tCGTueMJJG#=ZJqbtvJqMVQb}r(^Z1K6;LgGd_6Kzb@_5- z_j1_yV%FO9r*Y8h(B^#ol`-FyH(b+UW2;5XpDU_A7lF|mXRPtYKjYORuQl7RX@*ZX zTuzo$e_kE`T(I@o26?sn$4qZKs9(10{qboSr69b`QteZ5Ck{~a#gS;Sywch48%4e0wUEP_?RR+A=ii z+U41Kv^T9HekO>q#T&Co8D(r4uwXba@@$g6&$rh)vMSjV_h_15IZ&l-GPK#w_T3II z-##ASuD%5^zFEmeZ;M0Tg})#9D3g^MR_Z&Fu<#|h{CR5N^JtNW<~EBge)Hlc{GuW2 zO3ARsJ+B-p&F#&SJej)~k=6WnEvYoRm7CnyB?_u3@)1kR$cHPyC^^&NW9qZ;iWW219dKVu`f)9C(7eys zJsRW?8Yr|Xxmymu>Q$KOl%Lzgl$Rf4#ex?Pek@mfm^~>6)vgQHgEJcSHiC*z209Wt z){B~7?y}e>Il7;&442ZEMk0O65Q-eG83Eyb_%gqO=(%|TQC_A}TKRsn{p=*491ni^ zv2mW@DEvc%EMk)iV@@C5fY$S=wvTyo=Hs&X18-0Bzn>QbjAr*&1K8;+t|eotp9Kczn_35#nj5E4A!VR%5LuyWR#upC6G|B{H=>L;MlOqrO@B77G8zvCmGH>XXwhi@Y`F-N_)Yezc;UbdFeg4m-LBEp>CAmyEB z7$zf}G~nYFS|q003!jr($)67oL|E>h-s7YRHS$sV*K)}lPd4)7+w}1`k{Eji^ls_# z-e34`#A@%;={%ZVwjefsAk_T%0sP~~PdFw4NI0^pE=VA`BRdceuUHU{D1b=_fih1a zFGfzvJU`(kytp96X2q7y^YC)7Fw1OeIKyK`(t=th1u6&I^OOWGA*UxLx}@<_O)w?M z^bvuML^e%49b{{CBJQxMXxUe?kX$|3_*_2-bZX!z%e7LKTQ0>=T!-thlD~aexlI+d4%iT`Ufin5GxK>m2Jk2FdZ3M4$gJrlJyi=E23!vx5g$eWQ<|wn~BSvh`9%mUMSzTEafH{ zCQ+lRh+RTEDV-pZHE0+{igIWgql-w81idL@(lRg1Z_u(7Zb2iD*Vsl)^59J?e)$ge zG%u|LRwtO!c!S$s_vf*bYv&u|c@{mWv%1%soM^pAvp@HB7dO1%D4O2+qq>A@!eq8L z=m!%8ac+OA8IRI-_q8W8j9`Z~sfXyssKO>hu))!f{gD1{%!^K$3vDb}rV zs_nqtyTEi~1%pg)Ff6wj0`~UsFH}-&6^9lvK$bqLZqQmk zweQC%Oufi>7R>7~T+J@2-2@usbsT?v(DrqVP~6jDTAWfhr#s??*LhyuwB30z9H!lA z*);L-+oJ6tpX-{dJg>`&H=LgJXLrgDx1C7wb-fLL(~i5~VEH#5M}>uN?)K6L-#k3e zuI%u<=!DC>JgKMb^g^Vq#Jz6Z>~hhbYD)1-rls{3L1f=~83G_+;zh3k^ zZ(`hJEIiskMy{|Hc<2U$c5zLO5l|P38d03P%IIi9yxNGv_ZNgzXLwy#xD88b#Hdl$7D8X{XC3n^0Yq~ea9(n94S zW@$(r^%y#Jk_hrmrN2Bh+1&^GU~dt03i3EftPQAq^y?m9X=R*O;W1>?$N}P#!YOT|ZNa zO2%6OQh9eaAVDh6R2t%a&CK`Oh;aF1PJIrvFO5zfZh;a!uLpeGQVp`^<0!vUV z_>xntY)Pe*xomo!r*)j}ka9Q$!ucJWmT#?BK9UNsex`}0MuYk>XTv#*H*k~BP=++_ z$e|3!dB?^P<$#%OGK)uNZrTgeP@JHVPdR*5r#6&)l#ea7#84z9`xr(qNv&!C9wvAN zdcRCr!6{tIx%`})9yY=Plc)IM)Le;Bl;Jw3&43))x~yVUbW%g)wICbfQYDcN8U#Rx8<|B0+bYJg0nA&RbFW^<{Y0Gc`H$ z`PqV{Z%~Yte);~0koxy-C7+zCrOnxSUyj}M_s&VGgd8Y|D5uX2=F^OMO2Odq^iwp< zPaAtv2WAYk^>bQ3I+gf+OqpDb@Af=4j)`yc)5+Q)*w5<5Yzlwsm`*(2Bq4!>e*O=k#T&>+?c39D{O{-pk{k`EZOS_s zL+d}hrAbuuKVWbVJ?o>rPF(pE^r@xJcEH*{wP%WQqq945*m;eQ-VO@yp*4`>5l%n@ z^YeiZnFvG~dK@oXl|uy`j0QO4>{EjJ(CNDym?f5t?ophISg3nGy0) zK61usWu`vOX49oSmne*7rotJFywfs}E{Qt})ZMHxCOtrZDKJrKiCCT1pc)H$zGycU zXDK`HfaX8E?OK!VIN|isplYfA%NsXcj7~E~l9%kEmn&s79|_}$z$1zs1_QQN>-8Mt zs~#<8L6zhB3^Hc##rOx`ujH%-8>B%BYkV4mL@(-UGk>A)(Y}{^nPHiBreuZIu}r9I zD?)#0fcHL4h;HmUGUH(V0mJ{CACq}ae;4xh#4_`N1-5fre9e(P*J?hEpYKTCJF?kL ztm>ihleNSa#+Ta;h;PY_AP6&U!X0TsZ+)an-;}%9jQd)C11(5h&fvGbLDZYj?h4T+ zXk92?8QHX5@R;4`WZmKOCPP`dy*>X5ymd zOzKrGTC!fa;qDhnehezT?57!weIRgm2QytSR~`Y#G=N-(Z3R4_A60fDU!ihin3cDGONTc131zXE2zB3Zu@ zTfeeMzlut~s!_k1Q@?sZzeZfYW?sKmUB7l;zfPGbZIT}eXNU=8pCqPOOct)RN+_g& zm=ThXvC)8u(}0NxBwW;hdES6U-GF7^fYsc9_3nVpw*gydaZ4FLN#a2VGI3dfK_`_# zXCrahr2yA}LASU;_q;(@GC#Y%L9cHEvI+qb3PC1dvmmpnL0_^VKei!%k)Z&Up+F-E zn~y%hPJICiArb@wVRi6ib;5?c14g?;pT0>LLHh+`4o3s`ZP=A|rV!Bl$)n1x_P{0V72^ zlHwxpp#gmz)k9@$=~jXWB15RUu0b@gPWBqkLBagkI zeNyFfW5HcRu|pD-(Bo5>vXx%GBW&ZdBIDpWmGOC_@dc;x#engpxbfw@@s%%*ji#$t$+WuOjkSY>@?;Wz4}Fslb(4>~lVA}) z?WVvr%qhqYNA@)xp%}*ikO`%**p~6g~ z2KJSX$sEm%QGW^K5$Ks%oxt9kKo6Y8jh_bPPvg~3ec)aC&BS8^j1R%LJor+XZVL z;*Y&K&89lbZamB3Jo`FumNR~qD}R7ELy?u@+d3}yO^V*U&*yDIItQo9ON zke$C3+N?U(tW8J|OV*rL{k(Snyw3c*?%urK_553yg?H(5yyOeUDK$b$(Am;+#-ekg zSPQ0s3p(?@lDJB;^=h(bb8;~A)}l&E*J|3Fs&wNssy`q&?Nl{H7a99uxtV;;oEKdK z7v16)-SgEw$QL|+zyvD<@PmIS>!Bf-mM{8XsgWiHXhsG4w=V>Yt6A?YSpQH{LSCeq zR|*PwW-YN8z6Z;VwiL0q^a*Bx|I1R;-n=LIa>$T6Lb4yJ3X~4#QiAAGK>b1>`%KV} zx!}O15ag*f6{z4M4ZAPPnLn1pf52K(`Nxo_3oxzZVf7h?z*F48xfTU^Yrt6*NhCNg zmj-HD#cRsvYm(P5r$%V31;ATFtkhtw*oMI7tA4IG*0$K1^|sS0iq|T^8jx(#DjQ$X zT+*sITOs?gLfyZdHa=cW|2d2Avu#v~v{_(-@#=u{>R{mNQ2gp}{_05m>S+J!*!=4F z-s;5l>LkqC6xP}_`5JhJeQj2BZBBJ<-gs@nd2KOpZ7F_jIe%@Xe(iJr+Uoq;+TPmw z_1Xr^`X<);7Ww)%`}&UP`mXBwp7Hv=^ZG&H`eFR~QU3aI{rXA&`sw`o+1~p3_4)R#{Mg$7UvK<`*@VE} zgrwMn;@Es9wh67a31hMe>#_+Kv^3p>HVMTxDaZCJ zv28N7ZE}-s3K#G;WsrdYiyu|NHci7e?Z7tO!Z!W>Hp9&}BkT?n_6{?}4hzQ)tJn^k z+77$P4u{Lm>!2OZgdMJe9qxu5o`D_Sg&n^Aoi{f-{II(M*t>!hyFwhh!eYB3YP+H) zyJ9Z8;z7F-3A>U7yHX9i(gV9P3%j!WyK*Op%N3459ads+>9+5>w!3wyfzdwMr}Z(;Y}Vejix>>F_G8;b24sqGt^?3=jkn+ENh zCG49Q>{~SKTMq17E$mzG@7vt$+rl2$VISC295`?sIEo!OsU0|*9Jsg~xCR}#B^+{J3x!v48mK<}ecWC<^;1n&K#i<0w|_C{FDt-sC93DtEf<`v0C&X(&Q=%B*7ncVZ_XO{{5P@B zw$A3}{!TV7DTBj;S{+Z*8bw+i)`30O!)X34w&BcGf;I=#jP>hxSb3Hp~Z( zI~-q4HlJen}ak|D- z-U0sv@62F%IG?>S3wkHusK0%LkY+ zK}%iSFG&ZNT{v+z*=d^Ec|?819(44xeb_&D^;UQ0BXVmjM3=;U@Rtw9A&QomymoH7 zV>ETb`FUk}VXs}}X&D*AjCuo?c$?~N*R^>4^1?j^&IRt`Zh-R9J`xUWeepQn=wc1= z-h|S9RQUT?l$Haq&uTbv|E5E^a?>e4>kpJ9l9%SJl_9&yeN$Ra$!FTS1GaKvsp2%}^ zGP#PQj*)G(U?N(ed2LEH<1LlQVtxFLdag*RP^sMFnr5L)tI^>Me0)v2RAn$2LvMLQ zw^H{mx+Z;hf=WBF`ZU_#_<}*NZ7FJ|r1VUtz)f5fHsJ z?DxxLXK(#z&n4F?`rI@k*bHS{JKo+v=~mwN`MQap{(m{h-{_6^ExtL=3!U z>gf)(Usd}ty-;=1RNxxfq1y>d8#X$MN#pUHh?BLclIA$AQS>gp;l2NMyjW{{0p@$W zy*jX@x6PzaHJUnI$%U)YWEte_QG0iYo1keLknghewlZ58MJ9<4bJ-{!$f7f;B*)e8 z2TiE0n3FIx$@%5c->$r^4$aGvm__$Tv4ufi#9&4g#nd4M9~td_WNnoUKw%!M|Arw& z&&?Vof-4zJ7FgP>ye!Q6zA6rS#eOke!X_F=kIrt*752S;7#Bsdaf&-dig`)#T%xsD zk~-gw00<}4pV~#8Zw3gsrFZBEU1Z06BeI;ef!v}Q>bo|-8SEEYwBqNw5_^yl+Wd;r z`RijJu0!+#Ag74<7jGaI39~iqJ)$48IbYkmb6BD6n+n9QhJL3$+P-?G( zWMt8KX7P~`+n5IlJs+8e%p`ePhRIV`&x#R{-D@PQRmSG}S?aUxhuA-Ru}*M(A7z>3 zdwBdhY}2KG*>A&H#yTTO+s-z72>F9;PEq=YF}^IiJ_I_0GSVPEE72O;l72Yf&60BJ zdyW+WVNq!GpJ>zlAae;Bjy31c?_IkfA^(n^A%ql#kcM!9ETqQ4p~Jypz`OInsY; zmOjzFQbNh`|9KV@_1YH9(fdCj+$dhg8N>RY}wuzF`;{m#%@ z-_Sq#fK2U;0hu|Nm^ql5JD6EGnp-+rSUFi) zJ2}`{yE_;=IXl|A`PzC0+j)Pq^^39%jJFL*F$>Mq56jaDFVg&2su5A4`Kekbs_tEE zlU{6#PF$;YT)S3WhgMvt=HJw%5%-7UyEJ}DGrsG$wBkFp<2!ZYJM`i^-X*jfCbXF( zwpb)J+a@@%`K}fs;Dcks;jQ8tEp+Isco#S1JqPk z-wdd}p#@MwV=JJ>CO~aX&27ys?JdA4bbDueM>jA8-PPUO)6@5a!1@~l>j}#@GBPwe zI`B(_V`EPQ24IZ?6oy~xpHU3J5aMt8=)WN|?*KpsVA2^tF#rS3zlo#3_~GLpD69WG zX87-Z`q$Y5L4Qn?zvV(hzYqdu4-AAuu~{wBLhONrQy3mUf@Vds;aE)B93A)Q{Lx^V zw!+*>kNY(v{3Zu~-sVn|-_F%qLqt@adqQd^;?19fS#HXmRt=^Cq zw7+K$qFza7$TZjNjV7`F7qbVBC+p)p4bUj>$REKp-5Xyj`Xinlr08%tdQYWWTBH2n zR6CweeA}P#!{gh{QPUwl_`=-x61X-!OR3`~c6r z_~b2qrXIkxI&RZZW$?cQzv^a&#A_r` z#mI784ZapA%yPqU6NrNDF={eUBPKKb#6T)1j!bJVqQ9d?q-1AgE5mWL8>=8jy%+a; z_Q0fgFG0rzm_2wGM7^J6lwiIO%pRDN!&!akFK|I^zbg=ML{X&_b(nFdRPY=~F3hlo zoi7x2=;5N04`zrn%b~(LKFoYhk9R2l@g*5`8lS4gRKB0w^XaUV4onNdD6n#gd~VEr zQDI!o{ZTI1Vu0qPtZu>Lq`YZ=WDd3M2ADnI7lApg>U<-5THVg=Tt+)YBTZL3$jw7n z*C&NYSKq7kK-@A?T%J70n%-v6Zph5yv74YtLF=*o07*EV z$}sY)YZH=jwpId((#C9z0r_67P{mhVbbh936An1(V~gQ}8gSbeg8of+i>-WhTb3s2M@ba?pR z!azWH((~sSPY@p@Ok@C*h>V4Tf`y8TjfRGefr0bl1uhmA2oON_{{{C4rq+M4%6@&~ z;{FP30ucbO3SfW@5CH)&t_F;(J?Xz#L@!?g!)*U)5fc*wgKn>0y&@+kr=+B$p`oD% zhT55#0hl!~%??bk3keDRe=)ND{}z_v;Nb9oKFZ|(z|80qz^5JHBt9WryL)vNe=naf%I=j=zw>|SPIA6|FiFm zRWyO1Y6w^_6vVDfvl*~VT} zkMByBjnC{xZvx87&k_Z#cOW3L_@ThcJ}ltf9eK!~x-dRG8OUr|{$MM^P1R=*Rf2*r zj~Ms?dhe(3c$%!1R3T@}lwdK5JmLi*QTv9LBRKbqc7S=c!<|S0SnA#1^J)?l#k(;w z99#>i?7W)7ar%N>#_`H}ck%I>Hp#|`y7qU*NpC+j$0r$QXqu#GW;dIpT6Va{r`k_| zOw(1T-AyxG&$;3=-h-D5GZi7Fs8oWK%n!2cTtW*~bx^)hWrl%Si`5bhMoiRACjJ^_ z;slum#CNko6hcEIK|>?|77PpuAXr$`--3ffgNH{$KtO-~936nhA|t;*Ma4o#$A0kw z2NM$)(C;b;)IXr?{VI4*H4i9wziZw#lj_Z#5x0PLdw+(`fD68Pta`IfN@#t;4l4PDXZW=}Bmvs+8} z>YTn%6k3|L5a8;WH!+XLM_dfD{%9z!AYLw|y^)W2x*b-UHDr7VXvRTa!H(GzQRf~M zkD#kGg&6kO6rL28Vr2)J(1bah^CFd~`_1~#1)HxHoXD|42x%8eJDnhH%F8w{NmmeI zgg((u-IR5EBgWm$9@s)^ho78-{YMu!I9jlC6cl-s|y4e9V^L}K72x!f*~ROfw( z&*`{3nM(VSfso^RcA-*UeLeNzYQMD=BNOFkx`X*@?a%1Uh&S(@L;l)UdqRc)Pz|6; z{4NWBDG0#+==T=s1+Yc>y)y!;0Z;>D z+UQ^C`@>@({0+cHpPmB9`-}5)KwmB{E&*L$eg#U!*RKHY{x>=U;M+eH3P2A}r2?oB z!1{AP^e?{rtxEiOwkePWU^P&oa21%ch5aEOnZ0hAa{7WWvF<-}GQaAJAYeABgRj|< zh$0u|CJUX}m5QTRwFqdg&KON*`_bP@9YsFw%KLss#8sJU+>Rk)=F~)qTIT&KH#bbN z{Cca^GY=)>MF*e7N=-OFBe+eqVOXr!G0p-t_&#-(KhYKTNGlGaok2cW<+MIGJMiu>lvddifike)1{ zyzLdE@@(i{Y52L-(C+DCyVR)-r_Q(PbU8Ulc=G0x$M@d#NohuT!q1M5#|Y&cCht93 zzMZdjLtDz@{!Yb(hxiFW#}A1LAqN!)QTT)f1Oy_+!zaQgAR-_jA|(9VYyQudJ@89Q z3jDs30qqJEB@Hb#9X%5rJqH~5Xy}FL z7bZv=(;g+v5| z#e_t}g~cR9B_zcpB*i7AB&4K&Nk&5INs`ikmz4AqYePm>P8P_(P*79^xbkXh>KdAw z+B#Y~y8li9?-a;E(*C;ur#-{w6LQz9K$F{-LN(kFEholvMNGWqqt#V7N^~`K?&u(+iY4^zO@XYIcU(n@U*yCH=6Ij+4 zQQZ?)-<{ghmDkx>(%V@v&{;LuSu@mGH{8)M($O;74!|~AN84M*I$OrNTgQ4@$NO3* z23seG+os0arYGBHW;$o*y65M67ZwJVmWG#?$3B0aTw9x2-&ok(THe`N+uPqhJlqE= z!Wj^L@h9x`Z>ZB>UD8v^1yBP1s{-&ZYQoc_KX(sLt&<<+A9mYQ>ja=ao?0i1)ghpD ziX;{eBamb<=!yA9)W_G&;S^5C zX8@=VT}-xriTZf5+gckhHoAVHKAJ9fhGJ>oPW&V4qt9J=g*%IuvCAdK8iN|kT?!E{Q=a+Rsg1&*;XL#pQsPwAgb*UvIMhj z0QFI{9Y)u1_y_7^!EEP`)@kV#Gy(MgXr2C@-DZH$%`Xu2%WnHC>Lbp0;$NUXuq_U= zLnulPbAF>f_Lqf0@+ua^`NrSSjtbITj*kkn^fZH*5kbm9F=PT?<*9o_apdRrVs zylbFM-lA3_ZPabWGS*!?E#;NhE2`v0-YWL;@qEyIpmnNE{E8Hf#eK>msN^Sv)fIm= zHm&riFoWk648a^JS{1<;hp>{oynEEi&W=^98d}6}p;JGJ{lAXhu@sB7LMvM`^$=*# zBtCOn&iY!mnZ~VnnyQ$I!<RmtiP_?B+G_Yd3`k}+3Jw*GGx}NWIxG+ac zI5DOFNuDdT>2qY5#jzd%-bVRWnn7s|5q>0_u0SwF9sXrS(Bq@Y3KK*k>QA_AIj zwP69{=SF&I8WvY2DpSs{ruDE4%4o)EORQXKOcBk>p;KUkRLpQtr(*?cMn`Wz&j2N# znQx@)w>;f9#S{$G9r9lAjvFkmnuo(2V$?fo)JsjMkVKupIr)DuhTx1-2C*FQt8-#bwyu4(wTDD{{D^u}s)#)gfNUi&*^~nhUgR&XxH6&@73EOQLN`I> z+LO^eBcVB#J%6~w@b*(fnMKx1I4yCJSFno6QX=5(Xdy&V?tS0Pc^M6}#-%y4H|%xt z=_R<)Qo%uDDp^)4XHkCl^S4;`1`=bh=9efMKIkDjowIIq!*lh0%$^S)AI~KeEF33( z4wX}SR`GVxlDrE;q)M37iaK>cF+G_jpZ1{)KHEN+TBaA#UO`I=PNz&OZX4$(v3|{I zI8yQil0Cd!m1H0$&qTzH;|`W7R6q6f7kgC~HN*q8RtN-XqsU+=Cgl%y3&)f6@?O&@0O36DW`1EP)y?(2VBg*o|t1L*V%^ z?tJ%k|EwofUc}6%?QG=Ie(&}TZSD6lSv*y6vD_X7q)so;^T1piU6v~HS%ih=>6-gwF30paCj65|3>XCHVc<7 zI1DSpx|Y@OhQ3~sm$}AYvmnQ@C91&MvR5(kX*-CnLHrZdVQ|o1yX28~!;0%U9~wOf z?95!oTt8T*FcKi05Z|$gb$v~rTs@%05O^t7ahQ`zaKymk1EH|>E$1u#F#{e1go@sE zlIPB$hWs=HUR6Xzq7L3WRGu*CC@8z6_W3f2))jd&2uiE_GX>(VRb4V4*0%Tf4jVjc z2>LEm(0X6UW4N(4tZGn4)*UN`f$k_^0@cf+ixoK!!>@$k2BYw zKAS||ch5q=*NxuZUn+mXUUvROg!%x1O9I8|vjgY#v&#$ikQhG6XQ*&6p4Km@AU^(+Kl!x&2_yJVhUGs#_|t{>{RL=io;n*+ zQfhK?CJM^eRMb4Qv~TDc1euuySy=&wA3qlt4-XG7FE1Y--nV0#SzGCslvQ*9 zsi*?dRaMhfQ`c43(9_V+)6~?{(tfM0^G;V+|EcMCinjW1spkKygPQk15AxxIH?ROa zpRcbUu>OSf1qB5GoW78dkpJJoJ%Q7GVEq}s_pe+CAYI|FxibG1TNsF1*xlU)ED6Am z_%l%y@Ew3|1F#$Z7e>Rs=`(&m{!6#983>K@95~!p*o0x2>LIg|uqT1C1osdY4MlJI zI)WEKhZ0u;+}>c0m|ZsrZl@D(NoYk_&D5*2clrX?74Of5g+UlBsFl1Z-Iut`ZS;k!r``4- zW|z3sbBtKiAeNrBUImAkhq%_~y}_pTL9LC@nDfDmzGnAvxR}`|!Iuypo7V$15;H&C zOIG!=WT$@}cy@~{LF`0C#?((Um1HQ(^uCW+P#pD*M$a<@0v`w=WQVz}Q0NM$-luMZ zG@Oi{c;_SA0@W*Fsg&(j z5m1!QMb90VC5%2tDGvFU+f4kB{D8f}1X1|!sHDG{rT_3rN(#_SiAl(ah{*|GKE=r6 zfB;eB;?aTd8A15W_ynAUFNKJRWl2cYNXfLxD0C<&wJ50-sc0mq>G-JWIH~Da0c+-; zMMKX32zdVc%U?ff85kJ=1S$&)GYcyVa7@DnT!~@_uKCkKg zd1ymLX(FVlBjuLsKPZW~YRK8@X_^@tm>C(FnHZZrQB}==w1_ADvU03# zZ0zjpfOBsrU;%JdXJ;3e-x;RvZcm;Lusl6Hy*vSVz4rpjDo|5>pGxXq3o1}ke^u4L zm(?e1@-JNbZz~7jCIj4dATi>Xg9A`e0W4}vd~9@LTx5DeL|$@OacXcydSHE~Z)28s zOO9V%c1UH`$HI)5-1LO3w4~qO4GkX~zQ}B~v({|-lQL$sOck#25{ys@^3qZ(KvLzy zBQM{mRb1(iMer3$arEF`P;FYuiPe-7aM<3pcbHK5q}R}mbw|7(5Seau{y2NJK1=fe zmc_@-(eANaEf0-LGBgZmr2POk!!yKJ7d80Sa7Z;ju$IBvN{52SGQ82vio!TVQ12X3 zqW;Y0mSnZlX=)vuAUQ}G)KD8@sDkLC$I#vMb3(AT6kPV;hq-wdOS!$FbGuvYD);)b zTkxI7j-cbhyKrY$Y$hVKTV3~gI$TBkJP9#Pu_=VcEzx=7fHc8Z6)GY$d03b$j$P(# zgn}e`l&?gW%@R_k=8O(c%~Me8%Xt6tTN1gKLrsxG+T4suW|~h8Wp?)8H+3UuD~wi+n8^&eWGta20P?@j9SGiZ)KexXp=v3N}pKp|MkZmz&C zgtD;f0dtvZD7XT>{SM~#b_X^782P4~(+gsiNf6@1liZ*gdG+0EM_sNYLAgyKO2N!( zJpVK&Y#f83SCbZLcExm3$=NXmtvO-MUNkI@RIWpkt+kw_tix%z7HR3zisEJCQTbOC zshfD;YikA~%$7|Fv0ZB`#}xMKUeMvpvDzv0>X?l=pN|aB()UoYPkpM3mLAC;ku_af zZMX%2N0jk(O)GRwN0;pqF2|h0E-7C2wt3HoPg&kxNsws$!1!j@_pKO?WDwF+&bJ4V zQjJ8*LDH&a_aZrWaNs7{Ts^=%-&ElvO^!8)+B#16V3aafV#+W$>nuCltEB`!_tPq` zrrBVF*~(SV&jM4U?Dwsn*}-BD%VA^5YVS?@D3zT}=27ta>C#9qYIBwnh+Z$#yM(mb zjWDCG7Q4RTKOdz^m6mrghvqi~|jbVAIuOEs>uUpVhG zgQKVPr_*NBCi22n_nvW}(SDkS|HxQUB_z0PVQMuuT3sR2vn#I4AYChSul{b z0K+9XaMvFN3#s6Sc|`2ulN+7bis7*@TwSYB6GN%<42Db~$h&HX$d+r3LYs=@o~|Hg z0}?I<$|6CchW7Y=cFhn9 z>Vjq<_VrEkA;Go`{i!B2$FtoR#HUXx#Eprb;}THkCrd9}5);2*6G%!D2Of$^tBV>? zBG$jnf?$3WL`0D2f{Is_FzFSVW7&tU6BVow%A&@YE4gVVE1nX@haw8ksB56)-Qs&> zMt#oNOH>l#V^{bPUrukK&aG&pkQKNdM8IB1WY6Gqkc#=)WRd7P%ZKk#5cT=g_f80u zDtVh8%m+Os{p%r!LmE3xNS@pOhq|{8t~%|qMo-+`-Q8V~xO<2vK-}Hk-QC@t7;z`= zMhr<8wnARWNici3sJ;n}f-?&~;pNp*7iOZlC(g z`J^OvTWXBzQ+kR|Q;OI-Y0mb#02FC+FC~C60?}lmE&E{Znc#y@3%(2O#UJMmu7CNoK(xsd&LjmVwkS61 z1#K@UnLm`j@_9Kmxg(jaG&(T!4b3iY*eKNPg$$4CN-6f;S_QS2+5}{1l`WC=`UCdb zv~cr;xZ_pd@t8Usdsjt-!Fpx>)vYi7iqDEy!!T#hFOvp}NI2ZLa6BWZb84iQ!~fis$ickDn>) zm_MXt@#=x1#W@qbb$Ik;g0Fw)wKJXyEy8K7NX>E5YwyD^JB)8c76MF8A{crOWaYL%PM@a)nzX=@p_B*hu4p4G)}JzVC0H zG_x*zaa#5~GJ_D!jA0*|9rxZSScSUE<7+NBw$V^r^Cu16GETOT4g7k5jPrSktJ$?e zg!%=R$mz;>B9dle?n_OH)-@H?_jJaO#tb%k4?oU%z4oOVXR#3x%pIt_RvR$3kUYB} z*Y7TfMT@019MjV}k7Nyze&6WRw;4c9$=vWbA?CtqVuI-IjbS7KcQ;pA-Uzbh zT{xUv=uG0c@%MzdN%%82ty4I}K!ObgM10G=w_1%)KCjWpF;))wp4RMqt&@~^uM+5X z^mZ8f)W+@YBxbZo5DH7kN=^`ASI~wCI_72&!b#B9$IuiO^Q;y$Rb8~58dpWyAkvtS ztFB?HLScI`fu}L3IHI0}if&ZhzKbz|h_-GUAKmC<-6%vMLZqR3`e+*p!8-~;grfe^ z2G&(wu~!mD4hxcld0|}BiM7uE)xpKZl$PwlXj<)a0?U83=@$7yn&{^ z?o6G**HJvlMIrMCZZS5&cr4}*e0(c3(F{T{?kfc8kof21V9=nrDVll_lK59h2HX0^ zKv8^RgJUDOMa{{(Vr2AV6={P7N#o!QVzf6rBuV_KCu5lO(AGA>@p6L*HeA(F;tg7Y z&~1DdSzHrE%&$$xV4@&3YlbzQd!lc6)Uw8l5r%&`2rRJ)qlxj7?DCWGP1Mwj3~`HO z&W@b>;Inh;O%zTV9;3zC<@{(EdwUA|00LLv5&#`WA{gd5LQWbzaAD0M9)b8L`TAu~ z`d;NlS2PVuB1u%-4Q)C{jUh?c@Cj;mMco&PYo78|kMWA!^hKMDA64{%t3iBN<4XQ9 z2uhklN$O{y@3~}?_ANF%ZZhJVD0=33_%ul@4T`7EL7G3SYY9v2d8}VUcN*O^G`cMm zBZ(#KJBuq$Zm^zBI=i1QAxkW^sHee3*thPGDc?-B>crrYM5gD7&o(0&s+|{}Gu{5^ zIKg6$v5Vv&=|iN0Zjy~P)a9rl7JbMX%}$)i*cpd*5MJRLP7srFzJd0|*0p%b524Pj zRMYQ%m#`7prdVoncl_&GH%gzhq@1+3it%VQ(JrFqS8WrnkOi~Xg(LgK$9(il zIgCe}&V8>K`YHw^#m`SP&o|XDJ(Dc_`j#toOf(*Ari@LZqF8}ab*9}&CgbzO*!SK| zBIdSdQ7B&K916;e*;sD0@T1R3-b2vDmLN@&PJLpK#kl0~u4K08Sa;j}M)0>)&6XI8 z8;ZaiBWn}m7K`d18^ao16iOOa8k&Nlq+GVdMH@fv7lBmgzS1HI&Aj=vwr)uVrL+cUm8gkNKiOA63ib@k zItHS?0tgF464PPS$rQDL=Drz5e_5m?qa`#;2fQxG43KG zN=F5v_+TSt5k-+Y+Gw?tgk9?nyuJ}gC7vcKnkI`DW{4hqeoqlDpBOp7c!qs{b6tjYa+v;BgrQ*EQO>&P2TqwO2@8k>>r?vOZl&&2vqG>oD* zj*>U6kY{zEJHOuwtLbg%ByCy}Z+iT>X_vhDiFor3+L2GcUIr)QD>MyOd6m9fZ+8B-7zQ>z07qqeWwQ)W`ZsT@n`*j%-0%ZE+ z5YTCfiAewo#Bp$cEfA+6fEDM`5)#wFn&L?4i7!AxN>4({Ktjeq`X?Ak$r#DV{{*bc zl7f)}fRd3CfQpd{fSQq-1_l~h7-(r3>F5~g=$Ysl0GJsVSs9qv7@0YkSh$#2xtUmb znAmuk*!Y>*1(-PmSvZ7QxkTBx#W;Axx%jT|2wdY6y3Q|rT|h)aNK`^ZTvGh1OzM>i^F*XvM|FB_*KIvaF(_5;Td|)YjJ3 z)ipFUG&MFhH#N01H@Duo)7IMB(bj&qy`!_^Zr9z;?z>$*o!vcMJ-qSU)Az<^#>ZzTCT1rmW~V0Srl;m+rsig+ z=Vxc;=Vs>TL8Z&={KD+Q!ra0l!2H6}{NmEW;_|}c3Q+1VF0C#tuK_GCudS@CudZ#Z z-QT>wzO}xwy|KByx%FUc`{DM3M-Lu8e)MQ}XJ>DBZ~w`Yr~CWQo<9dF{mWf2=-mZU zl+(9wfeZ!o?Si$(N6@uXus@0elA16AAW9sMKzI-h+xffvF0j5JZ{9w zI_IVZ67E8vS2MM$!zS~ zqTlYl(=L|qLstA0AxMuHjVpSi%@XbSwm4GmS2}jQ45mJWH_#@GytgHZbr|KHM=eW` z1rk@LUUEfc(*Y$k2~%A9h*8uiP9)?HB)+r=x1qa!>0xvS;VqF{(|))FGP(ZY-|qLq z5sV{BA%63V^n*vJUENkpO>ZwVW1Z1_EFFCIQ2=GY^Z>~yZK zL@nEy>AdWH`L9N{@$luD#-gf%tyQz)Nl~oArMa=AnVFQ+#BBjGdy$H&G{lZ7IK^zHVsP_D@6V8g8rTI%uH;hRrU^U(F@Zge!iiC`gf{KNT zhKmlQteAwqR(9jyQRCv#;NsKb;e)H^`z#Kpy1`B<|A22YqFf_I@ zHnBFjWqa#3%tC5v?r3h|WMS!SY3*WV<7#c|1~Y)#x!b`!pq{`3>fq?*=;Y<-?Cs>@ z?d;;??CRqJgRiR_3~uheZXSN_9)2F4{+?d`UfuydK7qb|fqwo$0fE6l)&^Fe;FJ`3 z(bN6!?ntnPII!c)%*e>f%*@Wp%E`*k&Cbco$;r=!^*|No4q4YHDh3ZoYHpP77$rZ3P{Fl0twsE5s_logJti&*q|qtR8dbwj&_%=$kZlqiOFdYo1*XiyIA# zi&w9|N}R;DSaKD;?(4OeOHwi@L_{^)iJul|x-kH^oZ$-BXk|lJbWIPAO_buzA5CDH z2_j(hJL|e@<|Vt#rEqFuelu9jUe;khR`UPCBdbqGC)k2j)?P7>OBVhq;A7nw@`8Yb zjj4^`qaw^Aj^M|*&mT*M^qW*h=lS7|boU`epSQrREv)m)_%7idbq_fcqZ(m{In@kV zlM+Vnwp2V+3&|B$hb*`GWsJd!5QB`n68 zH1bi)WNGDOW$kQj<7{K=VrTDS@8Ig-=;q|? z?&9j<=I-g?3A?ZO`S}J0_yq;}2L}ZN2M7IesD`o2FL#xgKkn4OwNQfU?WEMyr1Z3; zjP#_;jHIm0?B-1NNMjQqT;g8ZDqf;?CU_r~Qz zyS!BY>Z<{K^Y9_eQMkLi3yg%|MEwtZ10$QGS4S|ufdL$7E^r~H|BZewjW=L~xuBgt zb@Z15%b%kPZ}dg|HlghjZVM>}1GD2)Oe9(y>G$zrL{{_;4n}@?!P?RMAs0efZb3qX zdsjogP}b_$x=LRUfm$xe+G;YZ7hS=aILW&~N|_`T0R3VYn|DJW_hy{VXMwRHTsHF- zUSCc6`ytqp&)yP_M#SKMjg2R z_+i&TW_33<{BYL2`N1J;Y1XkYoENc?84`uAt*OMyPcv>2 zi~z4b?)9HHcjb6BQbPlV`A$M7l~_eW*c4R%huCFx8g!w@(zM@Eu6Qv>(~4}o z8C_!&TkaBH;*(eqoRk}$oE@E#6_=WskeZQ{mXVy6o&u1bo_YZwx4!_m+JcD&oNto> z@uZ|Cq@>2Bq{JkrL?tDMB_#zVCi)~KxW&iY#l;y!$H+%SiiC!71cxvL1=9qFP=th% zg@qG`M-W9s5=KT5Mnw@sM-#-v5X8pf1H{Gs4e|JK@%Zua1V4~Kn2<=6kVKT2Oq`TV zl9ci%l2b{40ZB?KNk$q;ZU#wFCP`&BX>~q%LkU$&6@6C|TYnq(y&l1-L9vA~$@Mvf zt!35iHSNs}qpdB|t!?YAE&Huaw~YyyfM}<>iLum9~|Y-j&tS)zz7w z9JRT*@!-MMqet62I}i8v9_{Zxe)eql;9&2?i^oStkB*MEUcX*{^JewxaQ%_8a`0d$Q6+Gp7bQs%s1E31u-O$SYYrU+||~|Cf8Rm)P*|N)=D>MKkA*bd3A9 zYt7e&!hbe%B5`;(&2~Ef(ab5iw|zeW*31dgG2~}*ocBg9(lHF)m`x^Kq+__ROuF$I z!{qulXK2b1d$ z&GgBKz?wNLR=cc+fLz}v??F2>`n&pI;Kx(_<$~Lb(C*Lm#}8&p?ofyWx&GpV#l<0s zv-2BphdZH&$jrMpP>6wCKlM`>GXl9j^ZMFtw5q3jF~7?7b61qf{wCM2 zFtL00Pfq85lIxQ_O*W0TGfFYfwzIafECzD@*s5vJ%(?x{8Z>jptrvPfudC7XeFK^~ zRo=#TOil>UoDFlerYR}c%8kjJZ+n37$fWIlR2I&%a@o;e5&j(-Le+sB$@IG z-O(9m5i4FYK&Rfdp)rgl+BdjV^%6-k)qg-o6PPT-M-!N+MOWgV*K~i?*7B@gPq6ia z{Sp5(FG6F-hTbTC`@`(#M}~dM99#{}@d4-pW3}~8T}R#@oDBE!uQ>IrjBcykdDYo) zY0oj;cfF{Ph>7>0(PMUI<;cTG_%_in+ZB?gx1AC!*YuY3 zsvO^~a?dutTjS!pNwlD8)8xLW;}fJ?$@^7nYSS{~8w#erLzB?Ptu8Lz$`F(N6`_#I zCgHXG?xv5>8)?Mw89O>=@OKA{j-7lb3HuPcpXl20pYs+proZ3IB)I=^M_0@uac0)w zLH+D3E`qASNbFhc-I;gNv;0#A33EK_%r`zAN#2C6Jkh?^{)qt;WA?q|>RL&Z_-uLB zGcemB?#i1cD)Z&-)vX0l-Dpw)PCkx`FAaA$Ey{6Db15s%S_e28pf3+t;JKJ#v77*D2sm+PC$irK86gjU~@*Vv%PB4R$=Wn|2wlpb>CKk zJF#ShLAFBl#9RsIt0>Irdnx9=S_DO!d!%Rv@(qZkvAi-CXhZt_=I0iq8ifp0A_h4S z18Ez7S##)GEskHROe$w%#nQ>Sq@0m9O-<+|16_}_5;~UU6Xi+?@m57;$Mg&>M#fvb z&(O3KITB_=X({&IuyxY4vVy|kn1sz*Z&>1mLqiqB)$L|==%3@{zSMy}g~RcwjmRB8 zV&tw+QXBSd%inyuD%d_f-(%8Vu>16Z@I58<_Q3YSL&_Pk)#-)&r1qkd#u@Q_C5^nf z_TqDuHPh=KKXv+?y)BXGVUc{xwiLGBUW%N=B2BQp5XCQ8gdJon#=ySps@+lksGn87 zy>2;4Z&igBt4>itc_lsnT_vkpowEMS3d@ft4;jn}_;a+Nre>g`W&mqc@CP7^{Y{(p zN6Ge&UtUPn=;;}N)Bj>e0{aOp|F9hiD;q0VkZ=H#ASY0qadUFoH8 zCxzPIHEaLoH(>9=#>sQ>I1*&z5MkxG!pbhe!Y<9iroh6c!pyG8%%aD@ZcfePMJ^Od zES^9hk%cE+h%H}%q1uF|*@3FlgRDP@WH^FgGzM=x4re?8Z!&>!a{}?!B=YSk6w@hG zvne$5X>^NebjulZn^`pbc~s{`6t^WLk7Y#96$GypIPd?@W*gtti&AdbPdMLIc;8h7 zzf~mv6%_v!^uQJDpk@5vC6drZ%J2pH$a(gdIsW*Wt4UMxDfcu}2MyDD%+fn7(^_qk z>g?jm?4$D?!ZRI1Qyc?g9DKqYJOl0Bd>x%#ogD3*?X8_{&0TG8yV=}yw=wpxG4ir8 z^tLhZu{H3sGw`=J3Uo9HaJud9V(I5*=L^EYe0+QZLIQ%qL&BmWqT-U`<1!}GHv^K)Yh^HU28vy01MGrO_6@o05xXYIk0`;VU8e{^vF@!|U87wbDO z*LPoT?7rICJKEkqdieD9<7aPn500N4p6tIkdG_-3;MM8j(b>z_XRnUm9-Y2>{r3Iw zyAP)yKE6FafB)&zN8l5_*rNQpi~akbe;+O6hH;JlGzd&PW`q+Sn2n574ha5 z_d)45v1)y;fVP!!U(hv}6VQfhWY(MFqroEwKLnT)P)ECxlZYk3q{;nYv)$nU?WVZr z%g{Se7vKc^I{aoeCFZ~plzyKc4mEt|fDU~7(y&iq(>G{p^A&=eYvkGWY@J5xI~vRh zIH7aX=)Dkd0-j%s)r%wqPC#$swu#5lw9!+0Vf5Lyd}8v*}>JIU?+f(SmmpQ(#6g z$0TP?^nlW1{%T)Uo1Qodm*=8v$$JkyX_h39Wz`ffK|N)KZ|RA6#;RrS*Nt69 z@O8Cgl4R~%rYN6D8G1B*AT-ut>Rhv$yhhaQ;NTP`oMHRA6S|UGiqZ8jlts?x(b(5j zb>bUGMS_fNvb<7jVG7P`yY|LsIM>n+)v}oSTO5`8mRsQ4nK~1tlUUIh-R1=614AR2 z1~EOjyAG6{`!q8>%I-3L`f4$~u1mEl#@Mu<8o9&s#WYD`7j>8eJ1E3d>F}Yp#N6x6 zF8@v`BjXip#+w~)HTX>Q$HlsuJLc}-wP|DwLXOS_QXm5@jYnZJ zqR>5TkFN-nu?UZ!`$|O~_%(a*5QJX+x`zYTf#KQMg82RX;}G_?rRz=H7|DlwsCRXr zkzi8Fe>Rxl$wdndCyF$k6+9Hf_CJZ{E;AvSNyAZUoM(p?wacC+AM~P*YC>jkA7P42 z@l%SQ(qn$+;;Q4;QWp;F0^ zw77l@h7?~}-*W^i_@yWbXFP~%`l+2Unh}G(l9V^}KXYl^1Bn(1d8*33u@ktnF4klXf*m|bl1cG%V=S8*YT z9ccHQ>G89ktFjE**DZK&BNe?#thv9*w&-7tRQw@eu14piZZWt#z8H$hs&~$|6b_9n zMOLd-$E{zAo{22OPO?>@WnYfRjw~l`VwD#lUruuGD5L&nD=ovm5}w{s33rW6`3o8x zM&r9Gkyc4$Q{@}Ev66^F^Dm@iX(4!)!|_wCuVSJ8 znE@IO#|T-4$UtiF37IZIK*R(O+u+fE^kCPkx-Gng+dsFgBeAFnMDHG zME$wMeE7vZM8#diuQ*+~=6GGgUQ)_dTGmER-bzu)LPga~L*ur#_DwxKV;=W|m`TX;zsn{Bq6&Wagf47Ce{Nr6qk{kOypx;^gzPD)u=5V= zzLRnBrDo9nIZ$n|iyN`n#J3dm4v&8;AQENBbM@0Sq*Z_t#JK*G&x6PYg8x zOb$0r4mVAW05ngHwoHw-PTy;r9_yGH@0^+FnVRgIni`y%8JV6Po1L3nT$uaaCiK_s z>*eb8V)+V7Gy(@7aOVN*RIo$^N1My5@82hi|Ks2MHj4bNnm0I^N?{=UBb0!E#4_x; z9Nbg}ER>+9HB=~M2eqY8sl8e)1#a{c1IljoVu@q~6oYr6WC$Xi0Wv`OLYFI4E0l}k zm+G`Cb=vK9?TKEl-!XOY#ww+igh%<#8F_Qod*48F|0Sk3q!(ivqlET_pg0o$_Vpc$M1(()t zLoz`SdJjTRWWHyb#MwCvA)z)`Kt;H^zA1^bU`nz;f!VETnZ!yPD#x)DX`v<%blCDF zL$1CB0*^?UI*g$1{v(t?c6jP!H2>;#1{*q;(Jgvrr@_#)BF-l-teFFWSEw{B`S1WE zk~n{_Oog?654Yi}OicyZpy`XM9Ow;}sspo^Y}NVhy^m@t!`bUys;d3j>+8~c?H#+C zvOm|`)2+cWK-a}znRVi4zPi)(re41p9?qe$#qZnal-6PT2gL15$ghr!mi4Z18Q&)l zKor=}E_i+Cf%mJ|U0u-}&IWgzSK?R+Jc0QJP?acrAHXF3oLopq1aW)ze3 z;|B+KV~iTrV*!qsle6~jc*nQ%_v|tG7Il8Tqe;L)fd5GsQbR|lNk^waM<-85ca4sY z{U0Bd!1wfbFw@b?!HiDyhV-zXYV`C{^z_&1>BZ^kh3V<}=;_)2;B$~P$IHtL(xZTN z3Fck`x36Dfq<(d8{xom`59iNM`r?xXW+pi~1qB5qa3NDxhDAvM9}@_S0ahk0U}n<3 z0diwNh|~`+6U@(~s|P}x4Yl=6G!4zvjBM0Q9F%UkE8X^zH}zF9^U^eP*E4rAwy?it zVQXe#WeJG-cYt46TUprISUK9;x;QzwxjK8eyLx)KdxD$T#peYxAi+FH-hY^oz?lsA zk3gmjaC82o=*t@!IFns|f4|1ZU4F4KaWRqck-_odz6l|2NkR6>{^qGZ2AQ79x$f8V z-9!uB1d4&6!=1a-gS*_DtHPJ7Du5fHCRng8{Axp#Tw|Hv*bABHK2SyEbzB*UE;Mt40?Z z$EG{R$GRr^`zAVv$6Lq7TPDVur^f;A%uKe=PIb;r_bh<7=fe2v%G~<;>gMJ;SX}Sy zfR*)=g98vt_h$eVuzmjef!qCm;(PP@&B^QI)7K|wZ%*F6IemA0`tIK_`ET(u@n_QU zgskpQCohnHx|{ej&AC^W{cio`zS=*X{lfnQ_SH2T zZMLf*UdH?NR;Md$U%lbD(hK}gk7hUa9t^_LoUeZ1xkz&+HmX~B0^(&<m#Hd5H;nsXU$IEr_sMP!H58GFptuKIh8JEPq5DXgiucjwYrZV1E zTS@i2J!r=u3{@ZS2V3AqhaGG`ikHWmD9})i`GNjV{f|d52=74qzkEE||IfwCpziVz zD%+NY(OBm0MNuNx?nP5YPwm9e#M+t%GZxpH2eCCD(g$)4vRe4@E!bLkF$SM&#EE<` zFiDntbGV<{4`;_1E6a@bAWfeA1*3y1@~5Ynm2!CuSq8z@R!N55c?Mj;=Te$np}CUu z_`$7&O`Zk2{dlE4SGOpx1@kFwyGqwb;LyAiV+L^EUd%5!~h^h3d~ zUE`m@vd#ZALUrrN?yx$LuAa3-UN4`nTIAu#i#p#&k~KxQRLNhmLOtN?UsBeti<9I= zyzF5vuz{yn=JK|Vt!Wx-yK5C)9xUqEI#=%H*cJ=Fa@1kvgw{lIw^8bKr#Te|Q`fHZ zGp?MyY~%agiutpIy+@s|-t?VJa2)r)TX#4fIDg)7Joxp)tK*^LH>fAWh$N0DBd9Em zC!?4mM<@4i6*y1F2=yIL$4PA(PbVmSj!q|OV>r*I7;_xYrdewqx)Ba{fPM9_Y}whI z;07RZQ315K3tR!OW?5)t%jOxV815-8D6%xYTfu+(@JwXY$|xA@SqeFzUW=`*Cff7yeI_zuM=hZ~m#vKb`4 zKK%V{|6PyW1i!vmie}OMGwJK~B*+D>lMl$X2k$(46Rg4Vsc_@?^}-mcXX31?9#7zl zdJ8H@sNO&YoQCg2yX1>l@4kxnT(*s~%LpXrVS}&DZSUWs6-f5J0`H9Lk4;#-6gzPj z1zlYxHC?B!Kebk@XIk|Z0X*$`XgEQ`s5UoR{cy+={*qQyQ&m#1nfqg$31 zJf%#K7q}!d;g;r>C7qEUP9!3@u;-99noas1aa?G{PR%S{mmn*4RPNTx*vP^?azsNJ zu`^{y+rmuRE>>Cj?c)q``#iqSe3)kM_G#vQ$ug)7Mj)TLWcqk_-|E@GZP~GALsxP6 z+35yCP>;hpzd|78TC)d8tJxiMnmdU4*YK&ia+*vESf6`d7l-51Pgs43T~k+fCDjGX z2bI3WH+IaVhezhBrB_D-?Pj`Fvwsh@|R-(@n@(RhDUMto;U z>Er7-C%+@stv8?b1gAB19d9s{FizgPxi#&WnL)V)pD;MO9$tD#V2SMoL1pvi55yaP z-rS$6FAz7==&wzGi)Ch<|Fu{8QwOtZ!44Lw>^g0eN@&@p(RtWHv4&%^6{XoTamB*$ zHmecR7|G9cn5EQlSyPse_)^$a&5;Qrmm-T#6cOiYC*IVzjM)n&WzSlNYv!t3rGMqt zoo4dX(a+<5XtazL%Uk%d`L;m%O}P9z<@^^NRc)EK_ZyZv*a=%tbvbKE6SSxE)C!U! zEu7x_&tG|gd!tj1)pARPO+s^hu!gC?9xFy{^LhMTtXsSkiwSjo?l;^clkT|aAGMjj z)A5{ODiVMmVCuVP^(ay8onWH&S!#Dp4$d~G-s!V2TOjRSFfG;h$r)zI>nKo`mHv30 z7e&I?-A#k~zQ{ea*okELxUcPbRFw&}E~vDQLKw ztW)hESs=37`<&>@2dhzD9{@bp|$#I4w8!xc4?*u%HsXv%Cx{@+Atp0|x zI)|?5(-SWxYU(2smed#Nim4ge6i&vv2SPpQ+ajz@HVi`XG;cJU&n;b8Dv;{gszqeF zvl_%71>T_Eo^G{*cP)~58KZcOG{~M(sB?yKt9ymF>Z6mZnZoij)S(;=`>z&JYM~Rn zd?qUpxk~HrYV;l+ZrX*(_sfEW6eGlyiz<9Yx+A!(>=(qiCLYI!>pi%u67nh6w1LVX z#O_tgsXXV9SorPC&&E7OIbRRt&9|m4CYleD6SBVg`^|suJIqg5v=A22mVE!rqZF9l zhcRAd8+}WmWw{nEa>WMs=KGdfV@zYqoljFcK93vvzP)x$>3evf{;~JLw>Q2Lxx;4* z9|ymDJNSfMOL2kjDbjR%rjowujw=n86x_6{J9eh*wT<_u=9KL9gHg ziO}E!GyCNSqF?|1!DKEM-$f|FMJmA`b3Mq&2Wl5E*MmqFkjDbXcQCwzy!^|_T}4F& z4DV`cK;!l==l6>s0+0X+^!LAQRzTXLsi`T*Uilx}tVBgc{o`gODJkji%N5vseKA~v zsT$1Fd3kyH!2J(m016BLGn^4}<&1h9mvR zBM29yS1uGiEdz0n81cAitrZF}6cX`-WIvMf9dq5ENkFLeI!(}MrRFjObm32I2v`(y zkbKVi+3<0wOOdF~jnPMEr(zXvbKfKni&U&tj8bp zg<;2y`__yO#BbID-Fa5L9DM8t`f)zO2R+!>*|{6`0Gs>jdn(gtv&#Ec{W^~rcW%XlT)Jd+XQeZLsnwgpY^`0UIFcMTGor@Gta zS>W>l`wFjZ`AI}e9gSwpZFzmw7M-iz4@GF@sb$-h$uzIFn#!yA(nbXaPeRE+Ovyw<$xJ}Wic86XL&=3j$%9G7hfXDkN+pa!C4xdNiVTC;1;ml5VL+u7 z$Dk9#rWeCw6eVO5C1DmJV-cZb6`^JqrsEK1;1p)!5@zNWX5|)U;}PQE72@O-;^GtH z;S=QL7vd8T;ujPa6cV{m>i;#Z{&IWpE8Qrn-%!vtk=M7BGqRU8cD`=nb@isN#4T^7 zTdrESoeWIvZ<^YenOa$xTG*OexSE-Ho0$cenFX7f`J0>jn45c=o4Zx2C8-t#kgC1Lh?puRy+WVC4bdf4Io~{h1HprUWr3W-<^oD&@l1rQ2h16vCRBsKX_4QTVXU zZA-;u0+w7dqutU|rBqDaW=pZ9XS2};?k_8qmY&Z?Nrs~%jov6-EJ2RJ=JF?Gld4j& z6Mip(^K6(0ls09(Y;Dl@fwT~=DHC(d)=@v`!40^}X_#(%t=M7YL&<|SihX}h1^wNd z{RHp*F*iQ)n8t*Ed-g>>r;)_P@{RjDIDp*hz) zmRtDO<_kkO1PB{E2c!lF?TJX4F2GDg#zG80&PqbgN=5+#IVB4PB`XCL8wC|RB>*)C zB{e4%4Hp14EjKkC4>cVx0L>5Z(9m(y&~eewanjOp(9*Hf(y`IfvC`79(9to|(J|2h zQxF})1%8*t(Equ+{9_~e*Z=-`Sb|MNuz`r3gPW6+my4Spl+f|=3G?xb@C%3v2#N~| zT>)-G(aVy!Ytq*xWF)2Jq-7N3z;vSwR+1WjUq=2{hZ%D_=bH}R#?C>yu92GV32Gi` zN?ti~K84qOtAza;dHmbi{kxe02519@DFeoUT9!CqnlNA%KVS|wU>-YQ0V`k;D_{xp z0_XwD7y-+e0n1o{%h-X-I6=#}LCbi-O9a77M8ONBA@h_Wvvi?T%wZFp;bZ)fBUhpZ zWn+5P<2rQ`I*bzA%#!ZdrZl>y)%#}Dgl1L7<&=Xn(J!-1N$I~n6a7BSG+kJLE*(G} z?d^9vIy!*^=N7B+{51SrT77;URQ^MP`N#j^ch>ng;Y#FIQ;>#mP444_szf7n$BGzB$|3^q>p7s4_~W ztNBsiEx0P(OEIj)%SRL!RdFKN%!S>pAiJ8RM($lo5|S`>l;lNr^|UEo(=_~iLVk4q zHLzUtXSHpJHm+vM?gti$WOig1FVUkOU3 zj2_zThJ`)r+VLx`+@Ho%V04w``mV{3>xF7vTV|a84dFrf^0k}=NZolw9JwuJXf)Gz z)9$?l-seIYk~C+NJ7Q4J)qBj$#m~(XC6USQn<9Qfev$?sXCWyD4P70Uut9}Y#gWa3qmpstKDSFa;>*t)YU3S z4wJni-NwMpuQIQ?TefVSbN zqliB=OlXmMJF#QUd$tx{!8gOnr$FcBYmj>c8TZ&%*MjdodD-)_d)<}dc)*mnRH^d@ zYv}RN?P5&`$?i$M5*&m@l?h&&Gont^4z>PdOqw4uOxPfakSsV-E5$ZWi(wcJfn;Ka z!bcGQAZtvRywDZ_9Ri|HK>-Oe1~LjZ3K}jNIzBoEAqFNfCKf3sHW?NU1vV}f&ZSus zI5i0`d{soiqsd4>%me_g|1gliGys<}fJ-F+%vyC}2PdZhszsn(qz6g>I&e$+<-0iQ z|2XXbxb1^iDKj&uUHi+^6ud~mEA+xuA#~xY`0>cRjQ+ePA$3JkR$NM6Oj=1)T17-g zO-NQlP*zJoR-0c=hfhwIPfm|lPM=5KfLq>>Pr-;^(MV9ySV+m3U->q-vIU2_1CypF z&5b}3-6$f1M0}%kT$3Ek+ofpcH7J%%$kwe$HXVqzod|Z_2==}34*l?sgYb?+@J;~3 z{}Rq4@XjL$&LfB}BSzSbz^>QYySR& z`SpkM>yM|`cNR8x7dH16xAvB{_m;PxtUP$K_Hcjw(UYymPaf_(*?~Pg|Nim>56>6i z9t3-Do}8YZy#?>hx4^pz+*2Q6p3R?B{;!^$fWCi{_4ysNl4}=atw~qHjEHhpM^JN7 zG;pi&9!vS~HFBBwj_%2QiByIg=A19^s%COH8F~Zr_?buY1m(6VQO}g4IK*V$eD$?L z?~v9Dx2E)O3-1WoW7nZ1(lG7Ua+CKXAe`L3U&Z`U$M)l5aYW;3qwYI#^IwJX}m z#`1;QaCo+Sj*tAE`_ImXZ=6Zf@vn_&mWq~ldVfRdy=xop{Y**m{o;)*HuCB~vgynh z5-7T>y65j)ZV)~Hu55dtv@{}l{Cyj$>-*8ANT+CfHAi&oTi>uZ9kL#8#H|7Eg5B?4 zzBJ#t{qg8xQ;XF)F=b5*i%qLnQOI%eMv>_B)JVYd(u}>viav&cMKAx(JQ?086fK@DdU9X#${8y>N)1GeQR?;Z zp%yB+t-*f!_gn$EESgBjLZ-~;)wwJk|Ii3=ljnzvEMK%frJ!g{Ra7QG72(43;qN0` zriz!NV&{57+eesvko{{2so$|JMMO0+92Vs}nzBk!ZMMvnzou;qLruYd7lx$W2tO~r zf@l#Jlb4S;icBoZ8-_$}T5tV}iQN_f5181&E)D{Lz`?=6!@TTB$jB&YXqcE-_}Dlk zxOfzJ1l0J1wD^Sd1Vk_p64MisfOHH70Ac_TjR6bDpeH5!0WxxW0CIAASQZ8q6EzJB zH7y$r9XmBW7c~Pf1+yp_yA%nJ3ZZ}wfrttIRcl;n7i@VyOyv*^wP-Z$WE6vZB$IN) zTh)lBb%^Fo2v)5KfQ@Xs5$t*Z-~lJu_rW{BfB<0Mi(n6a-;HS71$Ya|x)sH;8P%d5 z-K+-Fv>f|Z5uQm7kzp#iehi&XFsqgazlO~`G@%Vhx!ME0R#kw0|W*|zz`e} z6dVZ<91;~A8Wj>66&e;D79JfQ5fc#^6B!j79UT`F8y^>!kN|pEKx}793QXk$J91}d zW#_=`>$&;4m)`aK;tTtFNkL(0VG%%CQ87SyaY=beX$3%OS!G#yWqCzaMP+qmRSnF^ zeqm$(zi49r4|j1F&i23T;()*XcZ2)ic5&c6eL3ucLgWu0K3tmGe-h-ckLjO`D5@EA z;W7PclZu2!jKM&^)=G~d$ivQPza|B&rLGKu%4>Xdk0pXIWaZcPb{|WGu<5d|;Sp5N zmaEJE#32neXA&+h_2Ecu?K9G0Brd+Vlydgzt|D;t41RT7V<(?=d6o$e7n>4+jxQGaY-MVPtx-wmQkC?W?KBWmS58Esf_v( zM4XhK)8G_!BG=>B@@PNBCNGZd-rXy~DI#|YPsKed8PH%543*^4@`@aU-yg`6yiz_N zLOy!PFqIHFw?oTKDs8J>IkfX#(zdksEuTFOxzX`En`XFCZ2JD2PApvq*V zre&d`W22&7iDo!eSE zW?H%yT6&h6`qml-wi*U@Y6kYIh7Kx*PD+N(ibk&TM(#4ko>Im>*Ny$Im;{QNgb3XX z=errjbt{hTb`sO=R65g4D$`sN^AdcEN^HwoY|9#4%W6D}N&<@tLd$Yu%Q8~SQgW*j zDyw2z>mmm00v4M*4%=KFyKDjbOi_pQ>yBwMPAN(*Nt$j6dhW3|J)^CBBAxugy#hin zAjjo0>5;c2TT81s47nNg4AC^9zd$iy&+rtmM{K*Y2;~U%$V;vA(gnvAMOmxxKaZ zVEe(ti)@`8u;vF2_PxE!1wV{YK*G+!0lo9ld!4mUXXB zUcEVeb$oUNaPs!`9{^gLopa^ef1JDwih7A7Vakk9?NSQ4I!PjN1D@m@xoPJGhUMx`1iM83vqaY8$m zUHa9pewkh_sTf78`P~NXeF?=I_L`#TH+F{HIC;Nak$qM@jQRmuXK|YGY&sH$Hr{~Z z^k|3>{$N0|+xwmo9-0%Dr%^h-G$x^If9?_-k1Fa2^aaRT4>!xfIcoYUlA?jw#mT0a z$Cp;d_4BXmhR$)ktKygYRYK6MxU z8{Kqi>L~S7)H_0{qI;q!a=waW~74z#SCW>&*^<0L&^N598;of&gX}6m&E+Yz$1ii!d+1Ayjz3 zMPmF2*}*4f#wTILCuPGYWhWqIBOqlZBw>bSW59wjV8LEwFc_%X=AEZaGZr_g`w**3>grF|bfDwwEz+1q=Qwrhy`6;ezHdyp{=ERw?XO87$U0 zOg8xpwnenIB{X*BRCX2Q_BAB-^+XPhgbvO44lQ_&ZMcqY;3t7&3$bG}nPVfRV?C`? zEt69fn{x%Ha~ZEosgP^2m|LNQd!DREjSKQ&(Qdwh`8wJSTK{s z#wEtbCnY4LBqpXNCZ#7OXC$X&CZ}emq-Le0Wv9ZBlbW8BmYxekMs7L`dFh#X830-N znOXT+*#HIEIR!bng}He}Ab+Qzpt!K8q`0`Ow6wge9AxhN&jjxL^Xu)$u5B5{CYKBT zzvN+nBn;TO5OynsC1C�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%0A0nAg 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

fDl9&d^$J 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

vkby-UCboCUwzTM$SsJ zP754_nj*J%W@>9M*v+tWr3yEL~_QY^KUe2X`)W*dbMKpGYF z>(&bDOQ@VEXM*|r>u*`Kg>qi$G;MxX57P{ZIHDB2A<{f zitP`R?QfdUx3a{k+vuymGJ$`+l0bqlLTM&AtRO;lIQ)j2P1lb1g=hjGK`xaV>=YJo z(A`Dt8LmrM`14yW&r3?3D{sTcTDVd>mt?wL4&7ds>EgNEbzAXT;e$5K(lB_`WLFMt zL)4JfyA9(3Q@raEEerYG8oS*(d_6%Ws;75rf+3B^>urpl^?caqS)}R}Yi^u8(;H#r zqU}jPkwW69*6>k~=nACE!MM}iv=z3~*%#V3Bv!9sP~V&wT5!x}J*>Tav#YwUO=GT& z90z8_L|{DJKQiBgQyK`b^NBU?mEqWz;Ewoj-SMxFAwS!T-+;&du3?(5++}`n*%aQl$k)a3toL0? zr}4z?jnvYu;h_$(r1s(*toL#JiMg3Pne*HC&ps&;D!Sj9On>uo!?xjl_PK&!>&)Y6 zxtKdc_djMjTR&ia8dn=wCKpPtQug5O-~%%8iW650;|(gXl2!Ac;p%-#AE$Y6>Uk#Z z&_jc=Tl!+1rY+ST;WU+^XT^>eT1KP~t5n*R-OPWV`6(&0`$?9bHA1vZz*d!M2dtFoW9jvB=qM!w*j^ zB@08-ZY^wQ-+DfwBt~CU_SBuQO+@{X7|}#dOHK#P`0Y>0x6c-)5rxjfsUNz0D!4=X ztn=!qXN#@m@`R{P>64aBZ8g;u_T#ICbQ+cWib} zy!61~+Rb~(+W+#S#xu`d&QJW4UPO~h=9AAfCecTp#y;o7TA1vi=bMgz9vtDOvV&5W zbJH?F&CSv1Be_4v>E#~={p+h9GPB(CuNjH48aGJInab6)xySQfXWzx(@P17=hM~9g znx6E{sMwpEW=8y#XB)9-s)F9|*_rdBVd*g$XfwRkk$S6p?ya8pTmAI6hIaa~r>EFl zw76%eRU+S*Jy5a8*EWxvwr-uac`+@sPBK6-RIO*oPR-GxF#W_J8j;p!TfMG53P99vC z_FkAxU&zN)=WvNF`3#{ zBy#<-WaO6%x&rcGjPfA^| zCrVmc`@$shk%?`jE_<*Jm_&02Fx3E)C~8eyW`jN!`}q>?!wZCO1UJuQU^{7T@@ua< zRp3V~Nq9&T=Kw2SG|5i;&4AAm{)aZxCpYY0Vw8w(24}c9y(Efj--!45c;Qf9Q}xHx zmmkvsfrxSY`wB8+ySQz;^yPN>=j}>xLn6IXW3p50vs0h3)7ZAt{Bo!D^G-YCZm0Ba zr_W>jyQN$r!o3-geiByny&NRw1F;x^Xi{heXlQ5{7#LVsSh%>j`1tsQgoMPz#1IIC zjEsz&oc!RygOrq%R8&-8Hvni#C}I+diS%uz|HB-A@7Lc?@b~_Ln&yMQsDVBp7@#z~?0{;}9I;&R__uYU&p$F+DcX zF($bn0(xsYm8#rt93+&K*neyRu;@rJKF!j9?a-Pg$H^zJFI_vd*F~CZKbQA&xu^(9 z?kfS79A#x?<>loS6&010mA7u)s;a80uCA`BsrhEfQD0vVTpAl2QC=Kh%s7AtM|*oa z%6j9!JC|AdP`O;FP4t^w)=3#9@%1GMyS=%*g1(N{iT)hD z02h}G75Mn%goG3%BnKf7Dsplt1qC&Tg9m9SDQT#vXn<2ZH8mX#4LxwrK^o}nWdZLk z#fZ;<`wIdr+F2MFfJY8HGB_9+xxao!8RxJ7vsXqIFEyZzJ zhQn5#P+{o+#t z5>f*bQ-hPzLX*=XlGCD7(qdB6VpG%NQ_~XD(v#BClhaaC(o<5?Q&TfCK%@Z*Z&p@D zc6MfNZgzftKFIIVvhs?`TUFJ!Z`ak<*4Nd6XsEAm1cs|18XKFNnp(bE>-^hu85rsS zAD!9R+4t|?&(9-lbWry2tE+3E<^sRfztcTuuMs@z^XJc>zgy~n#k`-3HutkCC1xH$ z3|lY%mC+!1-F)TYtgS1(>||sI<4F_kU$wR6;5(J3QQouw~`G!XV0e zQ+_~A{_$~jkE!(BLaathx+bK==TIs=>74OcS`xffwTh>&x;qZJn4g~uI0=t?A~~iw z_zd^pkx%oassq8V&UpSqi}`0Rnan|SuCS~iCJ(OHAw>T5%-6Z{MKiC{7tX#8+qs4N zCj6)e=YzadSkVVNSkPHw`*Ioy>zV8I@$2Kfs#e96CFlV$sPqlj^eJ{wfW|K=E3} zljGe?79|D^m#i|r?rdg=B289ynAp?V90S#2?toamQ11AYphnYzFmI2%!a@dR>!SRX zr1vFoco{xPYFQ)xT-nF6_ax#qkCM5|+g}uvNYAYqUasuNpBt?jJ~kJ1yf-;{zGjuE zX~^+(2TAJ!k62J>%>Ureywcw$*lw(%55d~N`4F#qN==f}32&tWrV zoBNhJ*^pr6Zq#Bvn=GNfn?r2*`rqUR?_JD4?*EY+j9kq3_ep(O%;Tu^%h9Yvf0g(Y z`_2tET!~2>&gJ+ISnBktjO?}4@jrRtz{dcI8E!4wEl4_sP8O%+hj%01+p8I9M1@}$ z^SBy?dl&PZs&`R~`9ejJFN=AiB4s7jdohs^)m`W7QZoZMwAmCKym6e2dlAMIItltX zdKY>D0Rb5S0l*gI5XeCa3Mjx608G%({Db1)KVpn8-}m9aB2Si2K*ifqB zp!o-9dcVB$H~!N3duUkuDcgj|+eS)Xi50U?I_8irefTz)<+CvLfi(3VFM(veo|N;Ijn~Y)?pXnpRJi{A&D8<%4nJ%jut)Zlf+x9|5L)>nbitYNZ!#F1q-@=L}n0 zJkw`B<*6;kf7;pEGU?qsvyg$Fx$%~B(l`CIg{jLczDFrKnBeqJapz+Wi70+~!HWQ> zIrOgg_LvZf2-?_2N)TK8)~LmH`>E$9d{ve}eS~L?S_18v96cIVH&7qJJgJz2p26P# zCi*bP#+&Pd%7yxo3df3=(N_4duj6g2<7D5|m)d%aj=9b>9HDN`JsnU@D0o)9K2UTz znMh}HnCGHQ2YZV1v%v5!1&!9AtJti`UliU z>K3-=D*FU>zMuXrd{rO$&FP=WB0_!S>*?RPMaAz={}AdU$kV^2zJIy#dt@k&9TzSG zIQ^sEXm=EhJx^o>lcxfwf9ig zW%Ne$0z5o2e0&h(1OybIeJ3P5NK8ygLP73^<$0w(}Mcb|L{YV1ygn~Vh7`OZ~}k$@DX9*W1^y>;^N{`Qc}{=(lRnKva z3n8whprCN##0em=rKF^!tgQS+XiE)9ZK-Q$X#5|?>K85`^sp{n0)kj5R}5f_VP$O% zoG~tclg7GoeZ{> z-rhbwKEA%betv$yI3pk+ATTg+uYCr}IOFGj8UNpp)j_32mRUrVML6Rk>ntd---_!N z;(bJFc_9nz&rEUmw(l|&T!ep6TtmY{1VNelBJG73tM~F*>3qMd*9tg#8UED~*PoC_ z_sd)=JfhgjxD|EAHZikR|x~f^@)Im6vTdQZv2jB0esYBV{x(? zZr9h>Aa-X#y{p8e!nvu<zizI~&iPYiPGuo6&#!fGqpuL`2_)^{6pDqP$a6)6>v^st$(hEP$&9#4mYy z5fn5~dy#^c$B!SEkdTm;l$4Q@l9iU0laY~^l~n*1S8{TSK;TkdUP(bg8N`VbAXHER zR4)}3RZ*d&q^hK(20~dGgu03f2n|(L4K+1QpoyuWp{1#*t)&Ha-=}nR5Q}fH_14!n zFf=qmt-1|NFX@`uXkBnpyW}os5h!LIDReoW-!`4gE|={}5rab|)UlS_v6;lFjmW8! z(77Amr5DeoAJ27wz_pLqwTH~5gVLpy&ZUvnrAEM|MA)@J(luMjEmg-o-ozuy&MU~x zJK$eclfj-Fyx*?6GcqzVGc&WYva++YbHK~Z&CScp17q`of`Y=r!lIw8$G~C?Y{h^} zJ=lk#mSHGc`X4r7sAU++hrS2-diOlA>i+h?&KtG%9vBz^n{V)bw){r)!k`mI=w?27 zGBGjn{P|B--P6<4V73lQF(|~K3Zoj`FD>rI2BHKbAF>XER`+j~;&0=1R82yr<8;aovg`zS5~&*S~VzRA|;W4_OQrqFm~Ehl;Sv zJWz6*Cp&^PLQz~dSKTJPf@g@4x};j&!b7A>{cv@KNhgx)c6X`G!;BiZW*Jny@mXd$ z16=Bbo(+ATwAug-uT^2@=d2;TH=yCI^b`|)KlV(8w%Tm&#U0Nn+^56?R?&xf4HkiG zmKqy+b5^T88x#A1oaRQCx5GtZ2{=)-L{|68flEEfPTht}yHd9{w2bQG=F;)t%oZR3 z@|2h2c{W*Fo6q2>GV)GJ(}*`1oIallCjC9BZ$}=;f{|eyh0m@=5h;)NOa{@lV)=@r zUA!^OFN~Hsdh%Id=J{a0+VMDSv_e67KJ06i1h&knmDynu8;Pe0ri+Bs(8aecr*5b= z*x%tfZ=5A}Ls^mgt!B_Tr28hGX3^Vtl-%aeU9)CVogZ1vq`{_(_8Z=>a+_=SwUzkS zALyRhAE`4DX5sEAMw5}{;t*U9z&`^GK9)EV$gYqjr(Z8e75Rnh){m6iRQscv+{0tI z9QqsAtQ;^>S9IuzX0l4eB|0%PO{?=Jc$;FWUEhR}QTP?ZyGXBR7OXjiAtT zP^dl>ss)8AL7_rWC@UB!@1>T1`HVOuqoxLI#LrA^(C8;Hxtf>Ij9}L!q|R)K)Y!muP5AX=#n==*}=OXfrdbu(8Q- za2)66KFZ500OrQ12TsRO?>p5SR9xf($7Dy5PZ;^YVHtQLA|jv<788?@5SNjZRFIZd zl9N+Cp`f9pq^Y8!35w~rmiOBk8Mq+>2V{nZ2FAul=gu0Nnw+~}W@>)X%+ma#wZ+BD zmX~a-&26nM>@Hi{*;qN)m^)oIbFn__W~J|Lq3dm-9$;}I*jzH)TsX@7@C|c;o929R zm$>3DaU@(~OS;6GY|ffu!J2BtmS)4AZp)Ezg)_^MBhQtqz=OBws$hw)NclCH%Ik_% z5$ctZx@A$u#nBh@qiwUIoztT|lB50OZ(NU!4vUEnkBW?l2oDPn3k?PRZ%9aRa1iK; zL2nEiWIz7^A3uL@KmV(K{_ehk&OSj`u7+Ij2s`Z>t>73hd?kg)HiN|`hyHRd&ET{3hlMn z+|!7dq4y*W-l0b)#xymV>V%x}4}A__38!N`=yP+9$Y!cpZcP44^m=_A8#-U>(nvIB znl8q5mZ|%|6fA(kUVHsBowTG@0TXLGZ}rd>ZJa5l&sqo8ZeI8dZ!O6{<1-DD;p!#} zk-=oMWP+$&ME51?c(F|rjish;&!QcTd4Qg!W5l+C>cuHs-aw^JnXznF^5(Ri>=|;5 z!48Zd2rmDcNc0(|F3RmWU*_!1(DQ_7zHoZ|7t-hanu#Y_0uOL^vUD>+xO8Qi4hAyG zi|IoipIG+bv%w`|L%-&8(LR9Gi*ZIOL?J-C-I?v^OT4Qv$=#16V^ z6eO6BPE9tR9JYg2GckNNuj_k%V$_9`?%VUF4v`p>Sxi@E=z#jt$r~uiIv(*bgB;k|P&%MSAsb$Blx^ptimaNcRyy%fthR2$)$Hh1(-Vpj9_CnywAOmu(&>9E7fZ}4Sd)3> z5M+n%E#x|m>PZakVsthfMn@}2&uJa^;ie*1^zqYb3>0K1LM~B+nc~q<#9lw)i+ONz zP)@DzUT7GModPO*#z^i#Jn=4$%#|52HB8qmv;ND*r|`57@%Ufo{J^E8)i~D9LXrRI z{@bbA&9EbsfxaK-OlSt~609HWzPjTC&)__*Cc&~W8nT))b?Pi`djbA~h?+Mi^gf?& zFZW-M{&19ypJza-S}ZQ2fMRBDcKnf#BWWUEw}MPtBGzFUXTQ(Ud~4l;cY7T>;`B-{ zE0BkT;B#olU0=_}rpFx{^gh|DEVF3zPVDYAb9DSr83ofbR>$upKVm9Z{$OqKI5+@u zJ8>g0*S1cqJMZ_Or{D+b8tBT=@hn4FkJLu41u}$OdH<|H?^bNNnw<;t z?3sDFyOlA8oi6;B@k|;co5xmpO)eWe@kF;vFnN(ruJ?!4Wh0Dgs*C$c2l#k}kgjFr0-J^J%Af`R=#_Cf{<=r^{0}Om; zPrK{iA!EypuQXLk8dp_UcfPgx$*dTw(}35=;AX$4ARBu@(*f4*qRs;hl0F~$M5OK| z7X)An#PUF%wJt>YJu~?{JNpVdGoH?KjU(kI=OgJRlKMD4=WEOEV#Ooz(O!YK1W8nN z6vksRrSKbOBL~_COj7R(i`C~ zXN@1@zj`N2>FIk(u2Jj;aYkSrvw?#GeAfCgUp!kYrpl!aJ)Oq;pIBX5HTwfuSw>FMKf2*c{nx-TAcW zOVT`vqqWsZ3ttM+YJN>My45QVUyhDyp5oN{IA{c4NgQpS78(6G;t5~PBx#vd(%Qb4 z0$(fCYI%QVbo)^ge7!QNW!^$-=jjA|qkgny!EJQs#SVP4ouqXsSZnt+?dPq2t=5%< z(cNkB&mYI4TGtA+KD{^kygfeJx={xo{j}iud1sQOZL3cUzLN5JcUG%y`|&7zqv`Xf zrKq;u8LiLT6QAK*qiyib(a-Q5peF-r#@@gTdcAbV)AqiC?Rey}Sn7?v39Q6KCz z9_+mp>cN@fY8^&?FgJj)|V!44B!-9br z#fFU{88{>OuwgJ^{$olsZ#PQI~7o17?^7olyx~I z-8nSnYItIBRO~+YW@ZK)qXADS>+!!O-Swy*Af^=VlQ(U7itskz1Qa_ zW8=EPEFVn$ga6Nen0wP^ML>d z{(qEv(}3jBvD|43z$JNY&~JY}DsT^v?i}FWWOfG;G5%5>9jhAl&`DF`7$$0l0i&eu zw>Ofg81Qhvk2B3cHedg-G7}IG07@(=DJca71&R#&Qzqdio!T+>l$VsON4d)nDmpCPtBpKHX3AbDkw?YY6z6>l^ z$vs2GBSYOIP1`f|v{$mx)r9lju~t4e9Q-0Y{6qH7cMvDCsLR-&tqQ?}5-@SV!th^N znd{NiaOw0}MnE=`z5vrBi0MnipME%)L%n2FO^4O4vk;+QuKXOA)ls zT+eU~PxXmRx*i?BPjUb8@co~I*^S>Q?zrTjG()sf_a?I$f)?8oMEI*qbGl7jPP;I> z>=Cc5$4Bsn*@O>yk?!f5?f299&ye;%n$AG60_xfVL@Ov;#b0GogT5$xo9#NfDt;@)&7W7EHNzUx;H z!C2Lvi!R+!jv}};na4L)r9A9*aWB;N0m-~S(f&u&q`vjdCKk4aRxY}iy|ios)azLdc=-ry>+*;{jEljW`7FZ*@djq$7 zt$;_hut%k+XSsw|sf<@K(Bf0`&OhmsbH+FGoPU~mK=PGq@ovF4{jNvt(_UV^dIhvA z-n;?i(tktW{6$R)(KnOBo4P8QyBP4lt4SfCw&{srV&-2w1=|=r$rKIx=J#dlua682 zyX~E52mSI~2I@1+ER4*oj4W)7tn5sz987GSOzd1t?A**8Jj|RtES$WoTzqWY{OmmZ z9J~Tte1~`h4)Y5N9XfJUNEn>&iHS={{t^n?el9nE)1UdDP?J)^r4uznOti@vnn5nh z)9lG*d zvXp%SP<#+{%;j|~;&3cua;lPGXJ32`bXL9ka)~7>yT3ck8>G^OBEPygOoi8MqzH9 z3s8Wp?ZxhCSWeGN=4cB(u1*thkK4q^$gZQYqs1 zFk9-k$;{|lPvhD`<+h*92pTGq1~ZHzw~UUCBK4U5O5(WajzZ1WXe# z&HhUyGni&aF)bRuFly+Y4oeco*`vsI>whkprR5cWl_J}pR_6U={_EoGI^;>G8FB>1 zv+Gun)fGhWZ8dd>jLuT<%`e|G3)#`ZW?uINNvvs7>OXn?R$OB5YO4OfFqaPc^S3c8dCxR&v`R&cphv%1wYx`ETL22NNl zAFP_+z50-Q)e(_HLBt6OU{C=b6%ZW(&c7pguu)vt7!C;cdpI5saJ(Mj`%MsCdjSc3MIJRp88<_n zI!BkYz*xM(QoX^}w9VeO!``vW-nGl#{fWKj6MOI10H47xox2>ZI~1cLxRFDnb6X)z3GCE$~dcqn}nnaJl)g&iR1B6j7)5-<6M5 z9Tn707sl{t6o=-^Wov&|XEda{g)w@sLUp+mR(!kk3Bu~~#3Icnx3L>n=72gQ zXN&AT>tpTI@JKUM|!QS;s;*~4D(x|Wh0MN=`SPfx~~DniW1bwUnXy^Ygf zaLzGSdzkn(!88bu?2MM<^-z7j(4y&N8?uYBq(c4=b+N2!f%36Q)s&9Au+3 zd9t{+OP%~ZxcgQ=`(}b!xJt^MWXVf`Txc6M z+y;iuZLcJ>6XpvBs|=gbtS0uW=O0NJ7&aGMO&SZ&KU$!2$J%f;d3-qkSlz%KJCD_r zNx}lrFJ^+%j(J?cXru<&_aGX&GkD`4A#N<45K#BOWBX_O*#2LK?WL~79>0<#;_!v1 z^+TJ^?pDj<*1!&{+sF2QMQo4UY;y^s+H@qg7nj7q--piQ6H0;J0o zg<-efT#zEreFOsCgHan$Cj!z$0Ja0D4zT&(gyjGDKYSmn{T-iBlefKNHx3RCZf9Ny&eo*O=b9iziKO)Gs(IUGkE*2oSdj6}ucQY!iRjE|vdE zHn)8NyF)39V2n zx*rP!GJ<%2 z@HSF={ps+a?iX~=8&|4V3yeI0*VuwW2Ep=E;5An9vQ2A!`U4&?^6UyB_hFllzV#Xy zd8)zZ63@RKNEEvK!fU-sZZuUsj6oxrW7e-gtpwpU*7M-AX;ZpJ(}v}El`Zf!nW&r` zZSW*u)b#qW=-&~>YckSYJW+KgM=j&U#z)on0NvwQf7%9KV_oo^`E>2(kE^r7u3Dq5 zEjzsiFNZQdr?W>H49w2G9Bpd@nyUzOk4b4c>4(cvIO$Iaj64Cl=Xw=Lp=bH(8q~b- z6|f2i=$NNmop zj>_QhuZ<~C*{aI9Ze;vxhFePD_svL#FK_n>>>KS%e@CR)Ce z(WG{Qgo6`iR4ve;y$&XG01^j&-&|o~Vf}PKcJSaql=dGOknLS$q3SJa9QFsr^^a>O zs%(P4{}mL;vtR76-8HOzRcwM4Y$GJDBph|fI8dk0xOhlpW=WGD?@_fBSyR&LKmL9bfTt5vezW$M0#I(~Tu z{@LdPGpvGA9fA{)cGx!}BO{}tqN1at_r-Ysm6CrbF_hTv zA@N5?I$R60{vefIu!S~weMv%P?-qI$}F$NVMhiB11kq3D%dy~frbGa&@kX)X6Itz;AZ9IVdLUu=jP+&;pgTP;1v)Q5IiC% zBz*Lk$kF2x!s0T=B;}9GoRE-Hl9E@FRZ#kuxbL1hcTwlOt;PixWpgii%Rp&s0E%xM zvrRZ+mj+a|c^nEj97}<)HltGwoijq~4`^#sxOR}b0--;Iwl)$MgLEGLp3Zx68K`O# zz=numgCwv4Qulre_g*UZ9$JL3b_XjG4)b4aM8e_QQodCReh4^xDzMlnsNh0Ku5DozqtgO6s>lX0)tFErDsj0br`}Y617;hb#G%np1I_lOFmCJ|s z<}zvv{cCginj;0*MUcyJJDTul_g9xBci$`yNidj|&xM@L5|CnslTXB!tUbJqZ4*U(dLF=t`nRvtkPp8j55URSSP z_4fAm@$vEX_4V`f^Y;gie*ycN+P^@9q#8xQKpkx(iO$!)E98>{0tO`K*ScLikHGL# z*zJelnDn!=$>)aSD9L=!W4!%5{%3bb|5P4dKjj*I&Mj;|kNI->dOII_~7~Vp$DI_AE#+JtJzJai%E>;sf^}nOy;R9 z=1H8FV)-vb2%is-IDb{%)K$aOPUpOhzL~YjMazFEi(On?TwPt=+}vO=n7g~Xhlhu! zr{{h({tKyS-$IJwn<1+)$Aiwwta#q&0c~I{W z*`6$J1*_kusKZXgT_*+x)`0^!n3%X=c#ULU5Rs6Ol9N*$JV=EcSA)GU4Zzlae8%~A zrZx(9e*@IN|L}DO%)-LT%ErbH7Qn!;29Pd(SOD+MVre-Ad3pK&7^(S^wcQ09=hN06 zYL-4KRspIu!RmHlT8_~gPB+zo(1=^6tb5^c&s#!X^#WI0c&>JEdiOAS57GLJQv2Mc z^0`mt`+&;t5!C-NP2dyypl2-CU$TY2;fR{%zB$JozsQ}m%ALFl&M&!BSGm(xxii+d zGS|4W*SPZ5xeC@fi#IsSH#w^|IqJ4Jnm@9)ZL@cxV(06JZT1diw14Di`^eGyk+XS= zvuTs7VS}f3jjv`!@YbSm`Fn|yDW!s^r*g*3(z{%fszMTSqY}~(JLInq?2=IrY?M(i z`RhwdO9M;gtgNiOyu8A~!qU>xii!#_8v|1@;7o;`c{^5wr=Z}-!uPr!2!$g!(lQ=NLy;8YMv$4q#3?_p<6;oTewc^Pe?{^oVdYU%0?Rd0t9g$%V1tP>LxFw3z%aF~haQcqma?;mcwJ@>fs0@by#2k&0o z#<7Z(ix8`tf7u>Dz$hgV2q_e^Cnr37O(g%=;B~bO&6Y-&3Q8LBxN5O%EahfuxJ#R6 zD`NGlW+*zZtGxEs7Iu>+qZJ%>Zrzb@zs%L3FWejJ!q*DT63(af!Mdi{{blTTsEW3HlN!GFXmclkS$cZt^cMpWMX>4c@ zw?mY|GaEn6-y9V=&ZUlh^ls`c8{UVQ0g6W->as2ma6Rt3B)zuvrb=3bj;VSW_u@Q0 zaffbKSfV(gyaw+jCa_NDrm}T*F}_DGbNJB9%y#(;m1FqAy_k2WdX+57ZabggX^}xc z6m_ay{%GZx!V!8Ays!bIx(^$d4|{wXMZdpwKT2AT&C3=Z*qmr%2I-ZN@0|#w(tLup ziHY|5vD?n71`&1=EJ#L0AtdN%*SzW0bn1>vI~pOxSw`p(ixN6zYwbPD2eEE$td3h$ zeA;;Cw)kmtGWZaDYbxOi{Nrpv1$=wHZV|q-)OYCf?%LxkpFeHQRD6c-ZZ3l31Hw!+ z9OZTlnk8Rc^-K(^{&sA!B|k`bCMG9X{TeR$Lx(f5Mfy94J(dEP2>;6tJ2MIMxRg`| zb&^+N3)S;@&I}CdHLk=}hUf8Fs0{sU4m)Sn3&b7|jJP(grY(gRNX)2=dOTfC-+~Vp zNNo;`dT+00pb-_y;HZxI)2wCUY81**4UPqgtz|(X3Kck2?}i$#Wkc^2DvAu=jr3T{ zVInG0R#Lqelf0J8rBS4MX7FBo<653zM3K6M>iy)WYx$ygiZtB@@279C703`3YX_@7 z$fj8@RMsfgNf>;PFScH!9Z{@Xp!%@baJ^XnPO)Cy;KOo{^%7H}68%2aM^(w|rIs2c zhK~my)i$n|*+-NZ&!|3be7ar^yHj#*bMSHN_IiacQK>18+IT0;MrDXbsTtMKc(2&T zt>}o-i=1jt1`Ri=67Q6niwr#(@z|)&Br3C1QhRzYd84LKqs;ou(9=ha8@DSX>dI^^ z)Fz%j-Ked{@-MUlZy*cy} zzP;IoMqKHOqdtj2yVZ`XS?NzTJc%v7)d7jD4CGXQg>SUg2_2~n5*dC)?77v&M0_hm zN&Pih%2qd5t7h$cndr^*$Hbjy9m3Aq1n)gPs0S!+26ezkhKEN+KtN7JL_tDwkc^Cy zf&xlKMMF(Z`&;0Kxb6Gt`(YaTx4!-!t?m5KZ)YZEUZl|ZH=w$ z4XmB?E&~SzH!Yj1YPNn#cGnc_uFGBtlfDuuX&)_Ne^bmMPShb$*dg_ZL&jl;ETG^F zWMBE6OZZ(Y0eOcPR?p+!#O>Y;f(sEX9PVxGz^u#zobmNAdG#?~9c1txrt=vE*pJr# z5nadxL-{*MP1uL9o>j2bom9BH;uW@It@}#WrCLlr}VNobyPAuWA zY{E;`gz=LJ_Y4zSNlarsH51?9caWOz^<>lpIpNRr&0IdP22DThsU0nd1fo%qAp#d}>e|RXg zw)ZbUZm0*ur%?J+pgVi`@F5bsO#r9CmoFz@y#h7~z+DjB82~G?x%v4I3kyq2ODiiY ztE;Q)YisN4>l^Fqn;RP-wl+5rv9 zJ4-&`Pf;8=;QP!bxRezfts&>(B^W)q#5|m_=YWsr?BG#$9Bf+_mt@t`rn$!mp&JT! zYmf(gq4a9C;D8VNcsrBAZEIOM!I}*PwYu^z^qj}ph9_(b6m==wcptZhkny zB68hp7vA*Wt`PcN$H5|O6`^h}fFkV5Q&d=fz zpy#aQ73It4rMU)Jm#S0-u%uuX21mj;06nMSU4w=E4J^f^OSZQ~IIo497r)C7JHB0L z??Mv(Q5Sw5dtdVc4ey7V2iCE3(yLswsd5A-j6T#&2Jw#F{@h*7EHIjzQeHn_J7*_5 z1wW;UR$N%J(6lwJX50KZJfMrOQnWjOXPeSSuxuB;dWXcu=2~wDM5)=ba|d>zs~lsM zWx1E`=D?!VT6?tyn$fF!0L5)4PD{;h2}Oqqyj}{Bk;HnXHYhsdbv}6((|)xc=V+i^ zyBI)m{(2kXGH4hdSBVC=2wUFV)jdO$9<5rT8ZNyhtd9% z6KWe1_K&Aof{)@r!lhw2_P+23oV_15UuGOO%{$(T*}nO}m$MvZhHe@#M6Jzazx6uy zOzY!&*kk;+-=?}Pe4NP)7TBK6O|aX3S6EQK{l2trVSBE!Phe-h=CR$*hx(cForUJj z1%Tpk4(%>=Q(f6z?&qx7T^SZx++7`0I`nDn!I>+c*7s4|N=)K#E{Dj#fTqXF&3zR2 zpG0xC#6$u94EnjGl@WHftX{tQj~Z)Psv`JpPyaJ0t^(Gl_F^S@vw2pd!sGGKi;c$3 zmZgXaFO`9(&+*ynD&NXqoKu7B9`h$b-$RAsK|76>jhTW`z{q%(f#CuJ!$k%LQw9b- z1_lLsdP#bEQ93#S8X7hL!2lzgl9Kx1K`1#n75D(AXg`HlC?v(h$SBCjD8$Gp#>gmz z{0lyVU%>CI$p3)^SqNE@y^r;054b%8>IATQ{`~{vv~Lf^tq}a#18PM-JV3z!4+xTh zcl7H6q>N+7jsaeVm>6Qd4yYL@b_O75NJ~r0%E|(9Z`1?$?r*&lCr&6SDXFTes;jGO z?0K4do|cx@sZ*y63=B+6OaRl`+}y&_(#pc>@&zk96DtP;OIIxmuM_40BA3GXFT`-1 zPhc@kW;RPH!mO0tKNuR z_tmT3SG|0$diq|4`FpzrdfNwkTZeg@Mf(`UUsXwS7s+xJ$adk$apuf%;K+C3C~)H_ z^5iJ-;Vuspth#>ucDQU^luAR)$;Mc{rg-D#MAO#fOYP~l9hnZD*)Cmqu%1G%o?_pg z(tw_dke-^z-ny9HhPd9Qgx;p4p5~P9ri{*}thUDdrux$Q+KSrSx2mfvt7N{>v+3Q5lQPbs~cR^^^v=bGLC%WC$>ZSyMZ z@-6KRs_YA|>ATs`m(bLg($bsW)|=JQo8Q@6(%oCx(_P!$+1S<5*45F~-QLsN*5BVe zFxW6OR6jJ-I5gBcG}JXb+&?@#gbD!nz?AOElW|~xH8(d8P#g+;(c{r=Rb+M`?o0j- zZgjEnK-Cxagu6YHZ1Qip(TEY6@=XA~YKrcEWl!uKp>=%$Ur28Bw-MSm@bz_srjBAy zpuiV`J@IvfcKO9u@b!foeG0*zK#tIc0DA(#jdlX;iKel_k%E!0oNgAv+ne#t^30ACADOTD~{&1;V?FScw=mn^pKZp=mM(P?ip(!{L6rEGyD84tEcZYyN&)zCn_uo@3g%nsXG^eI`EOxQ+)wP7 zt89C*-E!+O@y`6p({g~o>Y8>Isn=Qsmf8t21eV)qeFRo|c(oQ5@MIU8>+dO5?5w>y zHyXV$?m5&V_tLG+b_@5$A@6EpK8VCtt;j|A$04z3`1aenww6yz(sRDjt41bGJ6l7H z+q=tAaQa-2b%IQ^H%jdo#fSVp2bj)N7PeuFMSFiXJ-5Oo+8zL{WTMe!!nt`{I?zin zkd%)30J)wwg>FM%+$FXJr81D@LNrYNTeYEKQer-BaSO;Ynj$XFd4OTES4^xVPz;krnr=)<8m=9&>f|f=y1q}2=19;dqjorMJ&Byu z5yO>JXrJiXi6vK-V;=dVF+D!7qOCWCzU>>tw34ZEN>43@*fNiIe}wjL9ihSh?<2Io z1-^bhLSvl^`1uG8qiLxViv5D%*zZSZn#%-7hF?=QCBoWEE5j|+-_T5K^%8mCij*&W z&9Jl8Cqujv<)%KxVp5+Vs#z72Fnp1g_T#{9@~YSZ^|w3;&_VqXNBk>KrUX1c4w*b! zxml(@eI(^cpP8l*Jk|kk`dHJ)I|ucIZj7qWh)pDQIgYGGHW1E8?R*@S8e0upRG*bQ zWiS?E?!b?JXI9bk_+7qZHMyK+X39oSgKC^>@efg zGpz@e$y!@_GLe?}3Ln>PIe)p&@Zrlz*R%+Y1-y}%@mWm~{|NtiMo#}Hbdl>Nl6+_u z%AQ@Xrk9Rce!@_i+@@VEcQP=YS9PJKdp>XHR`u%nhm&nPFG!+9j%zb7dWm>Ky`tA8 z?KLc_(RN~RNRAi4$;+20ly=+0}<$ftp9yUOl@ifu`f>H+o&oxMtp15BwPcn7g zH<4z)vYr?pxlDEMxpaS>$+-tBXzQkupZ!LXarLQQ*X^JU^K5C&WUwx==U7?P&m-q- zckN}*2ftT-8<+Vf%Ot&LYDWGqJMb<*+C9~U*9r&UalWRU^~ls*oyZ@P$$Tf_3;2R| z1wQGU|FLyaav@FI^+kk=;cz(#nI`0lE8FzPiCQ2$9o{u*#A}AjNV<=@0V`esNKt{1 z<^Z@oag411P-dVgULXdu;46fVtW`mjXmWDoQ4SdrhY<6!H5Ly5O!MyZq#7=%HZpafKlR5 zDTPp`%pj4>KsdTFWg`Y#CS>e1A z1>@B&qPBG6p?k4N1Bn??iE}IA7O26`GUH`0LS89EZU~0@SH|+|B{k?pZhObBpvDsW zga}k7blMWm>VeO`#DSvmUYAFGk4j8{M$3CABcEQyv9QFm`{1N!LSfQ@NPAFDND!WP z+1Bmbe$inw5wg9e4d9dD=FyYc%Sv zTex)=I8rECFDb?0C3LMaey0teM-R`{hj4Vy-G(IPzF-<1oGXfXR5UddWgshXFAIw& zK4C7L_bXwyx47e1na?&6Y2$e83K?WunR=(Gr}bzRL^yl>=;1cet=3R_+{B3GD6@-< z7#nEme%NT1J)dG!s8Av*3vmNlj!FkT{1tV!t6QGpPM*RW)G!j_&3);&K5XyMr1$mN z4uz!N3$dLjN}iIiePogN{FU__P5kRi*6%F$E<0GSqs8E|SrHCIkx0qa6myXWvWT}b zzyskQGjn+q(^2gb4ZOi%`@~m55EOe+if?3PLixJ;xY)kg=k<?@O)Oof9mDOQJVq3|=J@)tfCvh(G&EEP|stJ>Yd zG8M~}qR_X1F|b^Df;@KCUR6#|qM~p11#=|^T#-L(nl>!az>XkUI5<69xW%4Kp4lZ} zHL=UyzThIVrWK=WBC%ouys%e{5nMBt8Kv0nFyC5!kLPJCOHR|*yqEeE!orxVW!^B^%_lHDaXN7z%NX)a5MFR5;dVeU+1xPnJ-vP+P2=>c*Dvn5=ihu$|nlr<08A`C+5c(_RjmHlE~O z!>9QR--G1g`{LKqKX&1XlLfPWZ#eI2IAvq{($#k{*$e-wuZpbS!=c~pPX94m!B@Zj zrp`u0%>L`O22}DUVk4P%YoyvA2B^sgX+;O=jRqP02bpsRS-S_>Ukz&a2ap^!;dDz- zII`R&7Zy-q5&9t{!p+?8n5jIOY0R<-B0TYX3wBoGCTREqa!9@ag!3Ru<}-ndi?A@ z-tZ;SnW!(yJ2lqXxzn(t@nH5!8v2=c-&I5)B}% z`Z|Pa9aIs_!|A$*;p&1IKaSw)7HZHb68ns1lZ{k}oGfGFW)In6D77Nd+!%ET(+XU((V8g{3t;<4s)=Oa{R@2Ofc^v@q0&C{xi zzQLU3JfD^v3$OQ>6QG!vWLn@cUI6z*)ep@clP{(^&KRj$@)piG%^@FjPrCn@r>^xz zxXi(*_0EZTq4s{-3r*xT;{v+Vi&?v})}>j~C-Ys4%QCI=?XQqwL70|3Gk74_eJ7FE zA0`#2m+m}SY(QAX;8=bTzp!S#tWV+exK^ZdbUBCv_JVv>IAXd@WhEPm77;%s0fGyf zvge}^VVqu4dh!y(_=Qj&oJQ@MR{Ro9?aMBN*-{Evqv$Ix&#CIT)mVSDr+HJ)uwbo> zFN>}^Uhu}hl&45TdOy9A2glws$EAwR@npHr$$^jJIfxny%<*dUa;&s_gM)tsW`-3% z^(wM$+|Wv^}zHH^BE?l|Bs<>aEML#Oro z#~J5#*rj062)jHyi!$+3U}`uH+TF;KU2dKotKM;yV_HWOL62j+^B=oam~bXnZ?Ckm z2QXg|?Z>@~7e(-!c^7#6F2M)o2!tx@hBEGof(3^f%Zaj?*|#wi4d2nj9cY zVp*u~)^Z#T1?*uwLLn(c^D0EkhQcM!?9CP)pJJbE&tNb0o>I*2Wq&wD8n{Aw?)rXq zQzpjbIHUgT8idLrzE4+&GERMr#B;VB@R6$EuR0D8=GoKJgoAa? z<3+RgEeRh{c+Rx@=Xnc3n6E#ePf2#teS#z&sGEXYuFl4K4@;kcvo~dIs6LaceM!te z{A_X{5%_Ty{KYEpg9#$)L_gBkXJ1gazI5fEIJ$hey!VMQ=xzJdj?J;~aK3oM_DN;= zsdM7F5Y<_o^uf{9MRCB#u3ee)nfH~?4r3~g6HY$AJHF^j$9y7j@;LFm&o$;-?Dr4C z>=jPV)1AK-6@2Zy!Zhl~eDVRF&vi@%grpaQ#5ec0-h{4^Q?MT46G{JP#jDwGDO3k_ zbYIVp<T3d_dlN(RHq*roeEfc6BuDqe zr1!~XXO9<7d3pa)GL})aI*oMXb9e-XAA%*rW8~r+9s(cScLS47#I8zybaaZLNmbgCx9`DfpH)_OM~cx`_uc6{k-(wSi$@19 zw5ms(jlX*yulEF^P?`MjK3i*e+M|@aB^!6Zn~xGpROkQf)1=|!>(5y6oqQXwP`LZQ z%rvPFumhK!3cI?k#G}5oC zhdXLgd6er47aNti`Ve_lcyxC(tH|ACc&BN(EEg1M%EA_=vDO{0@P`CS!cwN;woBb6 z?iM&Ej|tNeXtT3#3qP9Tp44vEkf#dg(^MR>_|!v|G)yoq`uWGl`yyU7bMh=gEgsWw zLWG~>H4Ya&##!DXo-Jrr)to((VG3{1H1c}eqH7vxrLL=`wyvf1(9hDnN5@O%u8vNc zak`pzH2I?!YUinU)hul;p-&ChzY*!7gcG(IdCbZRthd292v*HstKQXi5_^Kb$hXhH zZ)hcbw{=ycF22P?<7;k;Az=@CMs3&&La1>BRfM2L^b;!q1!Wx1yW1A~{zU4kr{S%$ z4`LZeHj}nnh;v4aBoUNvn%2dTE^->bzpxylma&)YeD#ZOZvN zn`{rSFN=Xr-jk%uv92w^&!z=|soQl3Mg1n}wLLt+|X{p29j9{k)s58(t|8okk4>))7hkCmdQENTdtYD%vcS%+`;wW`?A*CeW zJbo^H3F93CEGc_$oKQYS?(8TP1%C_aS9~KB#iwzS`2#X#dg?qFNi;UBcvy>>5mDMj zW@?-tWhp3S@OymbCM`S@vnUYVDG0Wvhlw-wGr6B|S{5Llw#(o9;>LM27iK`OnVjuE zOb713TKB5)g{f!hK{fyjI8K@7ulngzQX+?Kn zJY2AFE9W~&s@n9l8pXKwMk&+;1EqZO;|Zr|5g5-^tS`G2Qwa-jpE!B>)NvOQ< zo{t>AV96wKIu`Cj`$?u-luW!OSuL$~v26CEjloQNQTQ9{l-S^M5)ZwJaN*{nC_ePF zRuWBgN|{s`#sQydC%%foJnMYB3_Gu#TvY0(5-cf}K@)Tuc&8UnP2){f=Fi5L%o^h; z^xyJEKTnk}e$IqBZEYk%yI2Z-Q6v0fh%rg{s#r5Qjlnt(ONTEhB`+u}J*(7G?0xbB zvqplN#Blbx;h1!u!P4?P7S;Rss~Sb0K2^A5san%_%6Jm(V%MtJYSu+TnX*$tiXJc` z3p|xsqI7FIx1D%E(p+%$gQ?NmV#y_3 zDn2jwT_d>$A&Hv76R-56$hn3PcDH}!Um5te<`TvrYL336vTr{0DQQwv`dC2)DQ{VT&u$NbBCAIA0l)iEvLX6MYL$_i{p)6DOsm+X`Le>$o=#C+ zOo=b2T_T!dXGLv8pM7>6hH>SgDQX(CjTV|kmUUH2k@Hu-EImX ze*)wKfI|SV2k7bPfsG~rIpCH708ILUfxdu%05HfG5)%3~%m4q>X3@y#KQK|Zu>ofM zwsv-Q_V)G;4i5i7zy809Ie@VV@H2rS{Vf~w|2W+%>W!(4g1XtQC|v9&IJ7`{pf4bt zo8ZtUCN>}@HX$Z{NK9-^Ol*4#2(dMU*c?J^1R>Ug5Nkq+6-bDMX^455iP^Y`>4b>M zq=|`Df&Y@6*qWNyjgI&+1H_*d;>!T>qJ=!7hPaYL93T)Y2t*$OQHDUoAdou{2r~pi z1-P*NWe@>T0!Z8diVYAM0CVP7WN>nF{!*R+VF55(BqSsN5(_|9QBY6-_$tcE$^c~r zV5tD?l$)cjeqU4TzP9dtT|-rU6J-Mnd1D(XGiPy2Pf;5`LHiIM`xrKdBo>EM2D@}7 z$4n;YY-YDyR?h-Q;eN=4QxMc1mwKGRL8GlDi)Bt5f9 zu5nJO_DFl`lUWm-Sst01ADfz!n39>CoR$ntP6CY0;uB(HVk3bQ5g7p-V1+es0K`4#Cjox`0lt1ue0-jGdq45=4Dxy$;`J!X z+Y#z#nH#8E7NYhvT(K@nr6EqeB}u;{-MBl)swdyJr_iCN#HFYFQBS2;ZCGJ;C>$6l>mRJ_ zAAUMG_G}Q=FbHcJ9B=J|b#{;Sc8v9RjScp|hWf`xZU7tYfsJ*KjdhNV_l&{%VB^E% z<0IqaV-pkOlQ)~||Lxq6SpL}q#1L?P52N3`NdaBj#>U3x<|aUc0l3Y3dwT~52ZsP5 z=IH4Cdw}44d~$LEkep9XPj7k7pKf{10Ll4JdNV+6zGXGvGMfLSF#llMjN`MrE-hzCeBSEuq&%lB(^foExk23(Q|v+O36 zlgaCR)jfqbA|Yy4bd31a&)xWZ?$XOFrJuW20#g+9-4xP^V&SCzq$Iv5RVs!)p!cLH>grt+i% z`skM<1v1}p6<(1JDM%APA^WkLA)&j;M5KpZ_9)j9d`y58Ko#OT7?eq3q3{@CdUFg* znWfyo6Iuk*@OmBY^)hzJTprioYv4^uBJ{{LjU5ke0oA3S9(hYVC%2zC*!gaGj--_3L763^Gvl=c|ZOpDJM9I-wdFk~P`z*0yY zOx)&@Uc4u$iIn0&HqHB}FF1$gT7N8$yxi&Ew{IIaQ#es)|_>ZY&9z!vhjur(iAMd2!~plvp0X41$X?a1S? z-M8T+4?+8qS%Sr2zb($UL9&6C`gV?Qev2}F#T?-pfhz&w39g&3U_(v1-{>WxV_whb zdV@PJj$qA|#N53dHw`9b6-Le|=5ug!)ur)L#5f-Fws-*6VU7OPy<_JdFM_Q+2`iU) z*Wyc3yk}i{hdDYH*LucT;Cnd9C&m1pmyhQ!uA(8U;JehLbjX?`$mD(yO(_|73YLsl zj#vuTrk)?mjns9pOYog>oqZlUl_Ld^vFA(3SP;Y#Kyp71RChzd+Ga91^y0B{AH7H{ zE2WK66gCJ3sSy~K);KXF0xAn{*I;Aw z(x~d%@JRJiR?OaSY0WUly^t>VC}NeyMjiz_x|uf$uXCT@vD~j@h*?wU7`>2hRFHGT zna8JM(gf$ShtcsaD5MkFHN7P`qf;{=WZ(&bxqP-uk#n2G<~SRGgaAUc9R;Q#?@Ddt z-}YcP!coEzgQ!6jC@8o9P*DNgsE*Ll@i8$0)e#XcE-@Y+gn$5Gx&nMxQetAVUw}XW z5-j;GNJz+UK}t#ifQ*dd)^QvtOmFdb$+5qE`McuiFFpfR?d|#HAAWm}-^#~1I5+@` zD?nboEpl(Ka)6!+5L5rs8xgqARaI2fR8=+Z-`BjarlqE?t*)W1q47Xd^MRI@j<&YW zg9kdgy1IILdH@sEz`(%J(D46?G8S+}1k~Mtm^&vY=T^fF$b$eGHy{uCZSCzHot=QtsJEvF&>9W& z_YVyY4i62D0HUMe;n9(iF+di6>!@}sKl)FXv4B{7dwcus?(Vz2z5Sa@`SwQsbsv8` z`}pbO&-?fjAUyg4;2gM>zW~Cci?0`7zXACA?fbXyKW-F9z}@_(Qv8?R=;o&02EnOZ z$k*TSUEwexQT66hffy7@^r-z*G7c`ea*Mx=~qU* z^du=}_ma4=mJTx)sC(kXu<~;ti_}8VvRDxwna$LFE?7BN+ct?Ct$|$kLw1&DHiPQS z`g&nXxRxTIZggxj?pCKY9jnW{JWwIEAjo;W)q>yS7z2Ky{EDuh|0K326$HbNO5+p{ zS^GdLCkhHe3VDcz%BJXjhgS(@%=scSA;Yo}Zw)VMsTz|2!-=;wPeKCjs2hLXf5b1L00eO8zU*e+%V*@8e&D^}qMSuUH4T??9m6MmZ4T05koTjebi-|KI0p zN=nNAh$rezy#F*%92gk94fkKMJ~}o&Ha0N^n}ES4VdInI<5S}kQxg-@6O+@EQ!`Tl zre~*T=4NK*W@qQ;=KpYg0knlnOUr<~@a4;we`~+?s~86=ai9PPN^c;}zW}nrpMt_) zV#3?N{uR*w%!lji>)Q$)PT`NZ$7f|n?eFgg?AI6(H)o56WARvY{G%GSCF9A&V(3xt z?7$KjRP(3y>dKU3+33n0(Rj-Tv-pHof9y3@hO1PfY{M!d<%kGamQSBe3(~xQ-Gh6DOxeBZ`er1N?xfb=XLENZTq@DoL-=#rQeEQI zvvs=jV@MxEXa;k>*VNh5Swo!sJTcd|Q$9mBj#saLyg@wKZWH(KJN<@;bXzcB-#qQp z;Shm>feKWCh=>E=XZrZJ41$b&Q$_qThlm$0i6)@6UpP`)>;d zBU{?-ffyn#&rb?GJ8~FwVj-Ac6Y0j&h|oHxP!~)GvhW;;EF+tWW6{stS?cnabg#L0M)*iew26bM4Amf*%ruO$IZyGQur5V}TE#GwEk6A#> zPRThD3K?1-gPk6bFf(fjbg!979d#Csks7HqQlD%f!Xe;r=KRsmL%s?6Fd*pZL3}sW z0`@JCk#PY0EEvG3s9-cSTnr36z^4Ex7=WEa`1rRWP70I?Km+b)od5{rZaoVAz4Cza zS6Kh!4?xfZ;SL<2rFUB-+?q+!QP_@Am4ehd0O;A-vf9~>9} zUI~CN!L8}?2w+d}uevV(EEQJQ*4BWI-8x`MaB~1hDWG!)oLgV1H^6gY8}KN&F)7%6 z_wJ^X2lVj%wto1-gy4@?!5;=ve--P$e!Q&~fQ_Ly#!`3;n1Ct{NZ`yrOKlMmVZwG9!uDr zc{))p5na_@(?&H%px|m!@UEq5jCz&HgBZ38?+uqu>U^w204MOHZXhS1ZMj zMZnIlS|2TsrsbR$toL}YUm=O=9+(Y=oU`sac%Pd120x_K!Q^tE7>{|aPZX`+&^b*e z!X}5ZT5LP=R!Ls8N5E9@1*ZP@Nt6@gRs_cD-G>zyK_{~WhrfW!gh zi(5w%pydyA`ft2UfKCF?L-_hfXa8sK;6KO`ztY9855MJ&Uus%&Nqk0frCf!E;*kh2 zoyku_x;RoXVAJq(Y8aG3tGd}6@9jheH*V`Ak|xHfEIy|L`e@#FGX-RR-w>6wi|2}D zQy4{Kw5t|^RdVh`B@fPbzcuY@jZJz z)p1`Ey*qZ9Lng%k`+Y3-Oy~8%P+r>GO~e0;nl=uOJ7^sY3Vzv42>-!L#A|T9+wD6i zs_2F5o2z6pan5@0vyG`dapGgcZ=bf8>U4Ey)(b@Tnww&oOi`{{E_Mzk+U^y+%Ki4@ zC?&(MKsdnN?UNeH-i&xhk1NV>y-DEu%b^6}H86K!;GU~|e<=7~d!hIq$Tij-k-eTG zyz#x4DQK*WVkIDACm`Y?B;q3^5+)*+A|_UWK(v2OBMl)CV+e@}gv5-5 z#GHi0f`s%2qyWgw$;ge#$o0u7G$|-mD5>NrsimlB#HeY6XlVIq==f;pcxdUkXz4iU z=vnFLS%4`%;F1Y|;Rb&mpwjvC0B;`7LxIVrCcroRZ}G1F-x)qIul!e=pFmM_+x7%f(rxbp7(9Ob2zV>q4jli? zN&j5!@+%qr?T6d+`#QyQZ@k%YMGgUfG_79>T15Qiw12GgBjcmXo zbo^}9N&fe%t*#@z@yfb~uR6U;Hl`p1s6NYO|G4X3Bp$%I&i47hvw^qwSr6;^vG2eY(-mhv%h$7jdHj2I zz0BXgglwHZ;ksFb{vV6|1?J_qWQa@zlOs;uF0>*j`4KImRFhT~q8MqzEMoW?ywhR{ z2W=N(?mR~=iRXL+D^6fJvn@`fhbJk9QsS{}{~xw0u~)bs&8gY^zViEwC6hI))>Y?mr#AfnjN`O735Hf3yZ6zCZ^ZtbT`!8s zTsl5VP1dxWdlsVCO=NdG?M3+f{Rl)sKwqDYLZ@<6-@A(rfybc!zzDA|u`LVl%xM-c zzRtbLi16kjC1K2o-!(z}if_{zfw`jFeUdc;^W!A5Kw;1{(hoXNHv2N>gitL-vU3Wsaf+~UiL-G@v2rQ0a;dX&X|r+}uy9$jaN4qP z*|Bh1F>@F*v8yn!h|)4}Q`50gP|=Z*Q<0F80^1I6i8jE$fG0i;85uVfjRXUOIvcYw zH@hV-huvKcX8}$R0ZuOoEj*k(37M&iXe)>*%ZMw;NXSY{N&`(gDJcml=^IGP0FacCm6ns2l~Z69gb`KZ}FQMM0Jv=5VUh?aDSyXOEEbxam;NauIX;&;mtbIX)+OOtm` zQT0gDdYq{18E@znYvmo`;uHMXH^AHXiI1K|P1Bi=H01%%5Fn|&h5}^r+Nr_3xNy#b6 zDXD3xDXHn1X&G7RS=kx6xtaO-nT3U!Ma7vVWtrvGnNJ(C8rrj(yR+N+ayt6+ItTK* z1`B$I3VVl(0Q8L%_l=bFkCgV0ln)G74h~ff4?P{}uNm!oHqui++}S+T-Z{|N+gH=y zTRGTMI^10}(v?5jnK#;*GuD|s)&U^vPh^h)Uv}k=b>)rq6p!{*j1AR}k2Fn=cg#%p z&p#i1@nYiT%bE4{g*R_j_TRmJf3$P@;qddP)30C8|7I5Vw-?mE@Xc?f_NF)<@?YO& zu@GMSuqfBxyq|+9)c!E8q0<`7Rcr$8G8(Hluf~D9EL%7b9k|PEM+$H5GGT(7yR4+~ z5o=5Ji>Jg@7QotHHpyC(p_p)VPrx-$YO>gPGQAwQ%eJ%q+1j2N$3HqbSf5M+yq}3a z!c$J^a&HYi#-cNs(&5=2dq^SupEs^?%S=wpxc|(b@8fP!f%G-|6W@0SO9BsP^L<3l zCpY@8bg{Vt?tDEfj%!-sp)&tQyJmuL{_w*@hD%gS73pjS%Oq-w=u&wl&ghI3le=hE zI$G`wR%ryr(Pc6Q&Mz}E9y~^~mbOT++sy*JpLeqzTlaT!Tt`{nn*-A zw9bbA{=IJC64}3g5dKi)Lpqkc|C|k)_Wujxn!uxeie}r7iTq<9`X%PojkwUI0fmc<*)8?E?zdn ztlrhSk=yx^U#vti1@IvESeAIgJMLJ-WAcfBFnHY~yU#J)$V;^I=dIQ)X4SNL&ccwj1grFZa&0c-R$E9ch{YrV*&`@8z%KriC0B~o)I!g zjP;OlIZix6J*Qn&rb8VQYUp~Nb~BV*P) z8yKkgK^6TAi=(M;4V-wN%Pj~@SuD{Tr;R}_f}#-^a=M+6)w&9j^vU6c!M)NfRmkw)HNvPq@#Xkl+LQ2Tckd*bH^V1}3dz(uN=E0qk0uSqLP4Ck= z^fkWVdF-W~cNwrMe|AM!tND3d1V0;Arj+PQfkb^xx}x^hYN`PKMTJC@K}0CJdJ*!5 z%O~fjv#W#m@#0abUCQ>l3w-H9n=RMUQ^^g_pjWba$ksW=o)4B%#;f@qH8)Cp(UWF=}z5sPA_6p`i>7_UOQCsabl0~(2&G2SJvC)@ez2>#{H3-Vli|ljCG>sh0}w%vpdr7)R;!Yq zukUmkX_UC?f#$-|tUs2azv}dXPS>{=^$9ICHmZjPYu}c{yE2}6O&^+k|F&FehlEcm z$*O8(PG)s6P$}Gx73lvEt^|HS@P|eMZk#>h&WA|x8jfmQTfepCEB-d=w@yxpWZG{x z_)+Bg;n06bBjhQaqv}aw>$nCXP;W{gZRD}|*yNDYxrU2Nxt;i*tZAMRd9@DlglJtn z#3OIl9-OXy?-pgY`erX^cx2iwFs=mQ&4%CztOYA1CiK-SDCq#IW%9APzv1R0r7Vo% zEQkd3Od|~@`EeZIZCH(&QvaP`(X~n$l?LMtY8TxiWfiW31epfa*n-gO zued4$glk|FfvBRWVn3y~^^uq1e{4I2+|1orK|XNoa7v&GQep@Ivfn@g>~Q%@{N+zS ze|gi>A|)aQT3M8YL{x-Cv;+`l0ul~9n%p-VA zW7$pOnT(TYjZ!HLGsq1yNe#0|jj~CMa!8DFA;x(S(*lTDA;hAX_+c5LWhK6KEv{W7 zj#CG=b2pxQAA#o(iSICN;0SBzC{OsXK;+Q9=mGio0oBBQ&7{5u$$fe$efp_=hH1UV zX}u=tz2+Ic4>NnMvwH2bx?FQQytC?qGRh;;3Sv{U6H_x1QqmKWQWBs^aS4eradA=6 z(Km$tpN#%nHvbKw|CY}Wu=#_6LV|-rLxRFW0wY5MV#EEDB7JjWAD2U2>rxzB(`~yl ztoySpZ;)*{kZn1bYc*V8GhARdT;euV9WdAsGuWCk(2>>KUDVZE+0kFyI@sJa)YUlB z(=gWCFxFQO>#v6m)WZfF#)s-)!*#Hcde~?aY_u6R+6o(MhmCi@#yepXo#T_;6O&z& zQ{7Y3z0))OvvWi9^P>w36N`&8OG}GDGks&@mZh@`5cJ-?1NeEsq#YpY0F(BgES=lt z`5)Z7f1#NF^G|P!dMZF<@^>3lH%0y5UFh<&L3O9w6x{yX!2^96Zz56c^ijft&6{xk&`e*8>k{_M=SEd~f2=qs>vy-*d8m1FNG@k4c z!g5R{C{te?(9=X)U&Eg~?;@lzXhDBTl)JUBJ)o7Kb*EQGXev}o4_k-kuJqRK47{OZ zad%btAW^=GmZ(*S1!S`B^}VRcr>sMm$?%689Nvxt0?Sj$?WNKU149lNT#RYHW`y^X z)M93S6oy+(WefQ&QFaOusTHDKS;*H4?_g>^z#dKD$Z35)JQgFW&gVdViQ@HZs zz3Bjakt|x!g)u%v_XpY|N|su&4+f7I&Cel^k)E^~d+$70eicTVj`G}RpQPC&)MdVW z$Y7xIae>5n60}${@WTB~fMHU<$`c#~O)A&WmwK;hjV_aPLU3~5g?m=|Y(a=pt&%q! z@{Qm(EHh+AcNj_w&->G~$^`YU;Mm6D8e9);?=iiG*z zNxN2_p2%gXTgDNx$#yZGij2D6(fTQBgUDo7U|~XCF5Yj1uMvVU8KLwIn~}tE*;fKP zIy^HM5pggvb^AaTJTzL*E4{E_q_8I8J^F_PA$lW>`{rAgwb&D+`v^n{`elV(<;(C) z58_@jGQCZDXB~;1pKR{9?bJx`?XKhCK-eB5P}yo2GG>xwfUSKPWiCgU!F9qAM&|PA z_|2NcQ}i8LT&v5XDifA+UwgNpOWtaI#9+avg9#dT&JGR6Um5DDixu_LW{4J@2@}kT z4khY3qVq=X-*;dx3<+UoZUGFbNPUj-*lZ(qcog#{uxGhxA8vL`qIP4y7)jT?x3ZEU zIr@IBE)K3ZJ6+=H+j6x#T8Yh0az)s8{i((;aU_0(Da_#P4qqvnv5){!PYCVUDz`7A zi{LvJ+d7qxc}uA%pHD!6{T zUps6nc%WzYB#heXrXSlAwB?YuBq2ENh1hC&E5XUx!`f-wFj=K!( z+DW6g5_r8CrNa=sRjFXsZ|e-5;IORi3{4$R{<36Usfs#dq3`>Aq~4X`74EQJq!LaI zkpjD#D{aUyEk4unqwbKfA{)bGy!_47>|EKCF!%wL*X&EYd<~32VIGU)%=9@~x#o}? z2X1@4q+=vm>nl;rVz4Z{Sf!aul!6Ma+T$&c6$&G)2B$H4Q^iDW3SeKK z(^xai63Cds=$-7-I9rtx(q-5vf9EMsI+u{YQy3FoJx%bQDxo}wjotfpnizyxN{ylj zlOjEXMyZt25|6{=gwK+oai#Q3isMQKe{BU$dAWsS76tI=U(pLne2Dazq6HSZSkX6u z;6*bLh#RNMIB^w~!TtytU6|$Emn)N|*dH@t%@28kv!<+tJ>n<*%lRr4<-mFi*^5)< z{9Yc@&KCHHYnV27dK70|Vm{_}uvZ8-M9+BMNk$;q3?f|y_N}bqC%Ig;!wb}Zh~WFS z^>d-iwa;t_-WmMH2NXe0=x7w=Q&CWNkkF3-?10j7DelcyE1Y0 zu%3mZ201JnHK);*h+is`o_`s$H+`frc*GHzk4<~se@T$-;7ZL-17p#IPqvf!W-b3Obks248)!BBFH#GqBL*L3NJ9qCBpeGNI&^uTiFn1nHFo z3IiW?_@vT#_k5YN+1W&Kk6bJD`t-iJhJ6CJ5vUU|2q&h%GtD&!!aRyP=2nNAeySFz zLfb!4<4{N6zu(-y@Sa7PFn0k(F9;9JSuez{v~_Wx8ewz#gU`so7PeO#Jn2P5RM})a zu-m1bP#sQ4C+@kD-sT8;s|2C2(l)C)XiSI_A--?Rf|_a>K2Oh$kk!l*Nx2_hj~OLQ z+HIRrYXzQV6WRCB;Q^ahJ3Mh^2zR>%wu{0x0cm9;UWTd)9EL450;F963EF9``n!6= z98>~F3!=MGZ{VP!;i94Aqhk_cU=d?tL$Gj2vB6|Gxa43wN?d#@JbdaK5K!Y2Pyrwy z1g4q*fbk|UZ5H}#DEj*cN@8LLVqz9z2rJ|Uj1UMlAiVr}ZdMBZ zWO@N?E`X+Wv+55RQ?j!IDh-}n0w%!7`qxFsx9W}iK$}!m&%?gaq4NNQuf))lR6^Er1MW+=( zGYiwQ3$t_c3-WU-3bU$;GHZ&{>q=6ZN}=s#v7HsM-IcLDm9f25F?|54WBPw$;A!l@ z(>MTq&k}p_K*{dYOI@eV`oDH{s5U*WD@zDTaBj7Ey7iRM7rwdck}fU6hd@MQeO?@Sn~Q zF4vFkLtbgPIZ;~nRQBxmp_)&5q>2wNa#QOVUwVxJ>qQY_aZ!!cp%v_l0k=r7ce zm`ZiGLXjSC2Sr?~P>1qU?aHb1(tXo~A`1AY(E20T;RQcHR^1F!j7;Dm>8Ji5ZRFXi_`4hJ+*Idv; zRUVIKuW~6y33F)#EJ12XZ>m2C=0CZnte`UB%}Wcaux96QVCQgV=Wye?`KKd0hb=pY zB|C=+JI4cd4kdODL3R!P99s{yJmtydZJ?5;!>JY^4hX04-~ZYm2^$y zjBF$yJ`%PGy6X_b1Bg~V3fR4i+5E~lf~&d1Yk4D|2}IS4#5736HOeJ4DMMQ{lG`4n zb{M308E14GXY`n4-T?Sul-_NS)~TD)u94KDn%JZm-zXbXCmvZN7+S&er0|Y^KA&$6 zzjvmnXOg5xjI3LPvP+PLv!9Nmmx1FWV+S{L2Nz2RM;iy=C2i~EXzS{1^T@^4+tuoc zt68wKez=onjH7bAqg=9sREmQ{s)KljqiB|saIT9`zPnK2W07KS(NbU0@+bEy1I4RC zB%X#z)iH3)Ay`q;8{)YvzqR@r=9iH z?G06}jpeOvC9Pd$9o^O4J=J}{Y^(p-z(B)Lf79?l^XNd^cz@@3U(ZBu|3uH=WY5r4 z-_X>+@YL|g)X3-*Y;0;AHZ?guJv}i!GdVLmH9I#mJ2yLbqhwiFSbVX#w7j(Pas}X) z0SRymcnSk~?-$?vU)87FzIoMd-n^U9f&bhf%X4mSt8_Ah`{4v%R%2-x!}hU4=FK3h zK+M73G5DxpKClYYlKUN(F>;}LNrDkvL=Lclq1MxY`g8GIoR&LX#4VA2PZ+YtgG!w>!|}kl5`-{WO)ofaaY!vPPt4(;MpMIBS*1q zo!S@F-S{4Seteo-FG|6>uxLVubcca!R4TbC*M^;N?HVl5L+v(6vS|p$&gHCtBx?^! zvsr7jd5uAf1qm)hSxsdEqXEY#shs4UPDtFyCV2xs$vr;h&rVehSjs&3nM;YD|M*P>wo(w&lmAl=>F4U0whq8sUuZUjWS5kypM zR3udFK&kIq;O*`Gyw9`Wy}#M>&E7NLHOH)B#y_1oe`g%gH9_7J7Mkf#OvF}&4&CEi z#dn$-AWiv_Q=o<2^E|mK^xo72E#=)g<8?*CN>Y1+2PwFTc1`fx<$3BCn^$v}(KOQS zG`OT67oZ#5-ctHWMOm$^dGD?nACU^$4&EG6Yn6qD-bqbBb4=|4#hny0_Eh2-V@$?@ zOOqucT6%*V7n%-?IaH-?l~{|a6FDw5lntq1BENeh$FWJu$IwOd${|+87|^hZfRp8q zg?zMx3LCVN%dfah%dp$7KZcIoeYga@Il7Qh74%Tc_1X>Ml!l)E_HdO_jQwUcWyVVQ z4xZ*zz&_sHV>IjJNEO!#=GEJu+Eh2t9%?FQd1%}pNr0&t*NGXFI>r}Wn4c0X_xVZK zl=9$3mLLPPRSlgx%#NW0bB52VY)$66Ru>w2`ko?vx?6qQyu}gMO}Zj?%ARHFE!ysD z4l-5cP=a;utC-G@_JbaUq~l!0n9kk7i&$D~B$w;aaie#je$9nQSbOAggZqoV(3;M0 zsCiZ{toN~EJ*fuEc;b(jde}1u6pNS)ZeuDunW^Rl#^j+O_a8oz};cmCP%W)91I7&*XA>YczG`<9n!;G(A|Q*fE&`a3b?7(w5NuBvVU zuUI97XVHYg$o(E+&UoK_r#PlM`!`NX=?@}%Z*$zH2Rn?k?&^Gg@;IPV=~(g; zZ+3}(1v(W$kFtVL{(fb+60@}6QybVSONHt8)vHz6X5xE3GCyBmC@E*P;1nuJ5?2$* zAII~**ZaakpnrJ9exo`rPQUfCOYO}a$2M3tq^e> z{B*NbG#;L|H$-*1E@^ih8}2F--gXF#NU=}W>ugl;cT2iJ@N5MkA*RsAn|MNLbT>Ko zBaFgdRq~@plIx&K36*d)wHE&zMa^@ZZ*`5(h;W3E9S+$;EEjS#wIvAW2a?z$4h$l< zywvXTa_j|f3-#t)?7Tc=+cAgs0>xZD=Ilh_w1}QTK6Sv{1w0!v4IMTe&BPfjF~)5# z>U-u+g6z@+f$sd)_kXg*BX&oXjrTEiJEz5Z#|bRdRH^38tuzm8`gJE4c7YCK7 zHQ~zS_K(MC7sJ$N47S3Bx-7M1_K;;23B|rfbEFP&gx+t_Nj3cD@ZZAW#dF>4YU9)5 z8M%}QUPlRM9UXzJPn44vo&1HB8#QSMS*|&~s(9?S62lmvo7OsoOMb#ypoD8O^MG;N zQ{!k$r6Hg5-ty-v+&(T%F*s4zgBlFHtww{RAAJcR#1yw}N9}^$7}~dLbWG8g1}EmS z86d>e>voeG7d$!i;4>Y66_2@^wq8C6F=gJ%(L;rpe&fOD`mlqR`0x&)-DVRAF}?g> zLrjgPm9V|o*4y9ZGpXxdGwb>z#PlHtp>S`D+J27A1fNM=_g^8Vrj-s#=zH*%OY`W& zL-(jKqJM>$zN5rYHA}X0Rb{cD?QhRI3o$isbz#LzDiMgz_cI#~IS(;iNlBj1{lcQh z>$Y!TiV86e=}-#ZSJbk6sPGsSV*1XwZwRyZ5;eRVB&ec7Og~XV_&;DmLQJ>OSuwPQXQVdliM@`hF|-eG2nzjEyFx(x)v+K%6d6ZFY2W`5gqTKBo@dA7 zpiT{!A&sEvVuLhdbJx zQL?16rnsu1sHVB7wzaUnqoARyps_cb6Rg^wT|Vq zjpeqD=eCdMwU6g_j2Co_7j}#nb&i*GjhA+fmv@g}?HRA`9jogbYwRCu85nE7KGr=n zHZU?aJc`ozjGsw^e`|csB|h`>^S@(A|5v%NzlA=3QuTpB58&yaPnKs?eblw#e|~EG zJwE>V#~=Kmsxb=GD9NL*hDnA=rtPF@V3#VeIBVvCs3EKLDAQa&^n@z}8{CPGj zZa$TVNb-Alu-wZ=gU>AbD+71u&5?aV2sUmN;M@mPDDr=8EQF)u_bOvl zFuF0TZnKWr!7&U-l|#w-%vPoFt)w=Uh*LIolbMOvFQu?k_l}WlRcTf#7YnmGU}MW~ zV(K#SiDA)}S`Ct7xXzg&CGkFxLE{NUkSQ6WC!*8n+85?mg>3x{vT~B5#xE7n5l$~@ zSRHj*p0$tXAh$N?z-E1=|*02}}ml7o zX5e6UW?!avN%xBGWfMIEv&&a3^bM`_jjRkztPD)8u9#b0v9LC@urai>F|@KZw6Zg_ zwllJ}H?je605G<71TX=xb20_6cQUhgHg|BgaB#77bg^=BwQ+W}b#ZfXbM^9c3iNRZ z^Rtf$utfyfB!^h1hgoHXTOuPYawE<1qs$7TObeq;i=s`6V@yh7%}U`GWpP$z2%GYF z`|<>*@!#D;%sD5PEldr)q;Y?!h$A%yn^PU!fR(} zDJuL6MJ>g@(E8UOEhWXjP+HOgP*&PfR@PEp)>2X4Qd!Y*wX&t^YD;Bxdqr($d3|?z zV{c`1U)8m~nwGx$w!WtJzShp(j;`LGp58NulYSsz23g9(L;nyjqg0H4Nf`ejUp%XD zfa-t#K#@DIbN}Kw_B&1)2pB;SJjed&I(D`|1GNsgouKSa!21=p ze7;Tl%Mt-B&VDA4QH;nf`2FroTyQy38(7zCoJHrb*80A%KfV*PX$j%4gB5 zY1o6rH(*t=7Y4ZqSOyt6h1+V%MXdHGs`|^e5|~(_%k(ljJ4%?_M-MQxKWOpSsK!;u zT_+oti#;hOh9>rSwkL>jv5%GZvEFZo9kW_7ggiHEwZN+MRu3?!QS;wucRuJB7{9(O zckS-*eL-_fC~3z*@@;1plXyICqYWD6YvE0rDWqhtOhg@)J&1DTN};mgn4&ePE8lusfNGPs1m9n}0RN z=j+ZBy?vx}76Z|j0$T+B#P>1!Z(FmAL^!z@%@aQye^z40;kwI)cx8;6s>Gm#Tu9}n zcG81Tk&BJvKqkUil^;X(Ih4uE;h9-X_+Ks&ko~y*1V@^PQkis<^g0K}6*na;;fScs zG-ft>N@WUDEiGzFCbz13X5_(z+hkrTsZlL;PEJ8V zK}khLMU8s@;$ZscvY(deZ)Fs!ojU_4e*mBq0x+F5ek@cptW-2?XJDtK=Afj3QUTC% zQUlO&($I0y(sR)=aM3Yv(KB)}FmW@n@G!ITu(0#8aqzMO$rBe?;PG?u2ypWX^6-IV zc~BWqM0S3#>GY7o{UXQ{;%|V`cG{huzxBq zF9!}#ARzwg)vM0XH2|8g1wX zJAs&xAnViOIfDf8*vCq4TT&lYrDMM-WI(Tfz>tqUIcak$`GB!hEb30)i)ZMfR)H1% zVx6`tSFifiC`zC0r8-fHqKn9(WZ%|uY}Ib~l^pg&e0oVQ(kC0A_-@3y8Xm{@swAd% zNXOf7;=X4YBq=^&b07=dd5n0a&~(VH=WH9NNm1y@w#t%%i{yZ2l$+V%$E7pGrU?A7 zMZ>3%BIpy>-&c&x!}iHKdXK@o1uDNiJwleJjDRC^h{fk75uhK{)w%*8>`znUC6L!J`?ta(^JnveB5RG;( z8vAo^a1(GfLf=%|_GcqbKBfGWn8qJaH%`2m&-0Xlp;P@177I$n^1{sVnXdwR@HqC8 zNV2jk!Jn&t1xPy@Bg%}9gp8GxoSlq<;|%Bh80wdTisKAGjLG&FKznx9p@Amt3};g* z6E$en&aLXe_8;5;z$Jj5jgEnXo)L-y6DI=`7XvdFBMTR(Lrko^%xnOB04(e%uyUZl z2IXhxL;(~hC^vurCjgHC7q1{UpCAuE>TJL#AjA(75)=}K34^XoOiWxt9A&nQI&%J+ zLjP#Yfb>#JOY670?EmBpYH4X@ZDVU|=V0&Pgnp{<>v0=?&0g<>F?0YmTOlAMO_r;SUfP84wf&5EvXC1P~Gv91ez|8cb+2&b@)sKNX|?GNXbf0 z$x2DhPEE^BOGl<>ATu&^va)ltk$E|}`FVMT1!wMbrKP3+#}ub?|Jd`^?7TLu{O|Ns zJ~xd;6|eoX+J(A$f<_HgCty1R>eBz9ES*oHzl)Ppr#cR`G&wmqXR;LutoD~{7S~o! zCrW_Pvj`4colaFoK5MMNHIURqbDwus>QwTHh&sK($+uNX1guSZ!vh=iD&+&ygjo^l zSqxO6HB%4B^W`qHD?}Z*a^Pguv6Ngp;$BhWi!Ibl*=4PHt&?Pd)t~WQ$QoVugt4HB zuD9L-1N|8%e5b>DwkP=GNzdW?inQ?)ayzr~wZ@0di6lE#8P8dg2=e(w`|2eMlp=~r z8LF(RRmrG`c|@(X&6R~?Kg!*J!|lcAZl{0074=;`Zof63EvQ=ZGfPLBfVpUrQd5|H z-vYm57-Zr4awsMbLGSAG;DEAimmpzFV{wdYawtU=c&@;Ar?p$OkIFY%2&+W1>8$L-eRR1PB!bgw%vY zfK9RLCGipP;=ye872RoAj!c5i2@r1<$0B2rus#?I2$EV)C*J> zg)-JdxoM&RhDdtgpovScT_0*U#6J) zx_SnG(<%%=lVogc4BRly&CD##EvzjpZ7r?rtgP*=tR1awoNR0XoNet~0PO5t0qh;z z0300M9RZx&ot!$OZ7jA7XQ)}{o>-DGb{d*j{n;p z>F*{X zJBy#HpR(yf!=)l|Z{qTjD;F`TU^bY2^P=cYp_N8;nrKEmONkdRkESCRSn8!%7S=6t*B$&z%J*TqBOGe^W9cSUfxx% zz?%9ZlhC7IHwYiML#f)lam+`sm`HA%z05av*^ZQYu6ky0he{;cq-lI!tIQBnNoc(a z`*6Zbs3B0p3Gfx=3V53KanX%x+lE?6JOM;r0g)|LBGz~>Hjl?v~B(*GLw5;W{ zY!tNY6t(S@bsSVLIjHG6s_QvwUUt&H?4)bpq;KeS#n{ov%)!*$!Q9Hx(#Fx+&e6`% z(b37t$=TW2#l_{^H_yw<#?Rj*C`dOnR6Qa>F)~szDoP|OiZ3b}8X3hJ70nbA%K(p~ zMZ{AjCXy#6k|idRCMJ>qBqfm~CzGb6lBcCpq-RoPW>IHm)BGo7Bmdn$A!##zfi4}% zkeb7koXZiP#{;AqGO@ z2cwb(;i=c-Gp{G-4rLY(=U0xD){j=V-UJk`-r>oiv8l0t?4bUhyZ&QM`4=}FP+$J* zejO0{|2EJ%qxFM&^XARV{r#u!-#_^HasAV$m9JlCzJDJ&IOzQGqv7zd^6;?e=qUH- zDEs(0^Y}RZ_&DwOIQ8f#>EtBkH-7gvn)+3QFw^#4|H;nf0>No~V1?7USfE#V!Q=5D z*M>+M>*>5(PgkAROne$92~7NE~H>+$GIOsZnk&ew}$(&-2K+(7JywEW*%9}PIB;vV7m3qBrp zzSI3-lDfmTTPO_KcliBXlU>jo>Td)s#xFWu8H6kdO?Jx1UHSVw#2@%_8n;S38ZQqI z+!^lp(tJ;HsKau(1#%qM(tOt=y2yI?I8d8~Z`4QQNyw##Z50)*&+zZhzNYkl;==z# z`RUKMJddhBlkwV^dcYvWggr$_GgQTI@3&=4ueSzT&VQ9LXv{$MsA@-RKNOs9%? z*X0$?(-@!q3#8WH3OMb;Vm6-Ru;xP@OqfKP>MQ+!KDd|068-qO1}hnYv&a;Aqi-{` zweQ7BQcM_6vYNnL4y!r$YmJJu)_mdH1odOaFX5YA4J7if;m`@j2xxO%u3{2R9p|S5 zwH$1Hf$L6rp_shM`D{1fbp-_1a4XY3clNBQnasuE< zoSc#zP&rmsHQPfO=SOXo^M=S4&3M?)7tLl;a#7eY-R zOvMmL$?Q)G^&${-#ul@~l(fN=0&J^NeQ2J_#;7E9IvN5KtW#g|wsiu`gil~ES8 zNiMZn0i|U*g-s2qLo<;}H@^EIuJ=vMfO+)b6-dY$B=pX|N7x+*3TtR#w=u$Q;f2mn z2KO@rwXpfu@_7{rxg$m0(!^boB%R`Zr=8DoZOUOUWrq zN~?>B>xl?k3h;Swu==quhO^Mcu+hfx&?bq}rpnT0snO;c&=y(JmDvRX_l$y#l>eXlQ77cz9G)R5W# zpa_J7#Kj>H0KkF(k&qadkQA4g5|fY?9-k2ykMu+2dL!~Z5QT1tVi!b-OMIDYLb+Sw zRrlm-kJLJk^d`^DR`={q*PI^b+RB=7dv!dhW+J>{8s0LS z&_0viGo3p)T{t{ba$~Ce=ET*p@!E-rhRMmM$*JbanU=}f=85UXn^Sc+CTfPqs|Igg z?HeuY8YykPUfk4QSl^vn-H~^-C8xALr=&Wk=xT0ZSzbX2FgySoFu-fb%gxTu%`C`G zE6PhM&yTAvjA|$fYby=xDGwMd_ZcboyjkHjQROpP<3C*=Jl7O5-yE^f5E?Kfw-CT0g`=0@ihCl{Azmwr*c zmRDDAt*x!D-@UW(;NI4&m+wEk2g|4PqUQOZ^+}#bkLJ4mFdaY{=={q0u*J_fGaZl$ zeEoR-&el?;Qas9ZV0ZN@%5-3%msh_|uU5N4JD6|%8YpT{=s)w_?=ZN5%dwq9Yu;cL z<&SQ;#{XzQ{RSb$OdExvP@!`m~PGOq~9+pQ-Eijt3Y5YKT>rkB^L{xy=J<}2 z`n7G7V|4^~_HugO#*3uvRKcj9wB8Hzg7^2E<3;x@=B-WH z0&aNsmIh4aaI!jMjRxCk6756MWeK|bHr%G28%@04PvbnZ4leonIO?AG_nc@4>0B$W8ug|DeMDb5+>rt*6uFK%Z&bAkSLLdiXV-7 zGY)44mr-BeR+*SqBz7<{pMG@p7x(83IE z?M+=_)p?oa+nb4K_RtR3Lxnf^m5*CUSZZJ5Kd@Z9>~+Z2_-<+T^&1Pm zxqB`A`75UR7}Rf)`bN_VTB8(rSOjnn_?72;%t-VT=R|MDMagFK6x*kM4A|uDYAs_HA!yCMCjKC z>9-HUCba}f)>B5suwb5A+qriAK5SyoIPH;#RN)3Voa$ZFJfH7k#$ly%#(WINiejcF z>Qusju9}jhB+$a0WiiZFAuh-nW}-0(g2(*o!Gk`j8@1gWVZ(FgG?Xdmq5=g_d72n|wpRM|TT=j0p1ZwDGKSzx@;)bJ_p zGW8yLsQy}b)`mJT6C;ZCJA7}ZwJ- z^A?t=N#a#{o~{@dNIW|HGJ#+rFC+eKo+ zt7}moHPQ3nRtWs78N~-oi3OSL8hH-#jMWp>uJ-;Zu0jD1&wK}U4O$WR!d7O(w=X`e z^Jv@+Hu8K6f4Qx)jUj1~Lp1PMP&fMSSntnoS)=5Wq8Sg9-#xtrp?hq{!tS49o0&(x zYs4-4|<(|!k!CvEM>~kNZbi)nLm!rm~&e!yOT+o z)n63uzH~cBw$ov1f&FdIx3u=fip9BwpIj$S(}^xi)Gg?xv@>$I*l@+51dx~mCld{w zP62+(NHkhF8m4?}_+6cq#en9ypONh)2%Uj~L*tt#RD1lV3uD;AZ7Mm>vz_cNqs1|c z4K&QSIm#cf{7mn?W_kmrbBKSZ^qWR2hCX4e6h!dikx3?67ICHdTv@u9xG@`HkTPaK2jJ_lZ1wv}v-txO# zu}o|lw%yHqk9cJHjFAol6J2=D?DO7p?Ch{% zvZpytYODpsJ9$%*w|vq9k6yB@m|QuD_)2y!?r2L#ghr2kLCQZWVT)Phx<=GpveE&} zxm%=Dis-!9xe!lIi4MFagP6RqCtCrh$QMgQ`T<2k6?=!oKeYu8vemwgLnT;#YSo?4 zwySDC8zqP9Obn5UKDzy?v+3F1NtaY-iBy|IRj!~ZIjW11 zWiA`;Y!U%qn@B1->auTiRqB0mxL&!}!*bjabh-7BtfxV$Vw4u`N@N{D-uAo~$6G^@ ztggF9Z*Pv2TQeL)*`^vIo9?&2eR$%IeP8It#~zZQ1JCTkr;7@2UP<2EUpf7(8TVw{ z*)O%j4Cc@#eyjFQoumAv*_`RV$8XoZt40q<)h7kk7DdYi8$HE|6uuubJR3P88Fald zW(X&a3^%wdH1734-At3vKvDrpORxT>&=GH`!I6TNvWV&@{exhh)zAGYGC!EncPb* z5ln%o!u_;McI+U;)g=|&Nu~fN670(6WW!xsjWDLcdt^lU@NPuZY9Oxxa+@vpEjFZK z49O99k;Olo7%OL=6+dJ0gowdETWBvRVm6kA4L4`Zkbw<5txEagxP*{$?wE4^8<*Ti zqU1IA$+RVtE@&yjxOKI^km#xv+}{klP?DEerNK~*3-8pGDGY?0;-=+Gz(XZYnjCNY z;mR~x-`dPpNsPQLYFFCc&8?OUc%L}FvlTxdn|)pIp;Vz@4i}e zb#h*7Dk8?z2=|AsV`om_bzQ^T5;gp~5 zkXxxnuJa&PPov;QLAJMA&S6uA`5sy0Y#BnSNa>qq>`sMzgYuBOa+GCXya|IM>m-w zU%T^uyN=CSoy*jf-?4W!xHF%NI}pRD%&}SdSt?SZuUf7#KC8Z*l&=^F{AuYcm~yIR zU8|Pem6^0_UCe8)ye1QVh?6>9usL6|xm82A9wD-jCwfhz{|;GDNv+lOz}x!Ov1_&5 zWJ!hxBxK>@>*mtR2<^Jwiv?yc^Ua#;9tM{^3eua}NMcxs-ow+g&@R98gKVxj{vIB# z0&meR^X7M3%?_L8QWC}9gXMk^!7qbxZ9Qs?lWn$mTe$dYWn2x*JgTidu%TL4112!O zr;?uxWTesO!NQXq50GC(L-zt(Gn(p7k%l*37p~dWGL%*(Cm<8%3uSO?a2`6+KFF)! zErh!lKEQX1X)d(jtJ(BuQ7O5`=h0%%TjZM7!u+$%HL!{ywdxiGFXuru-UCV}nNI9Q zio%Fa{78xr_X>h^s$WN-GaVZ02t)@F08AMQHgeSc<{aRb189NgXXrnV(crrC2SxBq zO#2sE<{xaD|D>(`y)OZ4UDO?jj){(rnU0>7o&h*6LK&I37?}ZOhL@R@kA+Qum0ggH z1I7*&;@}j9a*1$qU*O^q<>nRRpbEP!*C?7n0V3$y|cTT^5wT zBB*F0pll(aYQulgfnU>=Pur7M*N<1%pI0w{S1*uPFNn(^lH*DY_mxO~{U8DTAVK{g zA%j3+gMbTH0>lmdC5`-KjC|#dy;V&;HO$;DnY-v)I2&3znp!(p+1lIL**Q2kfVC~y z+5R)=#LLSIC9w7J@$>QZ_w@_#^9O4Ra0B|k_z2X~-O<<6-rw6k(APQ8-*ZNj0W86h zkr7nF$&DK~M@PrbGSMagTktINVCs*wq+cuBb58Vsdj$HIh3&b*7OZChY4CSS>3O^X z(3_o8q0i4g=ND%b9q_*#eE$8-=llZw$M5fjtrRjLO$(EP&&bX1iXb@w2ba<9T{g8; zTK?RP6tdcjSxg*0jC5DF=F&MSD%DE5H??yGL`KVh2sJE}NO|KgrHZms@<_&j-G*3A zyzuIj)F$2)do<6}K`J}^oGm5D*2#4YrC{gcxIIk0eVGfFmb#p@ik(vn-#$dgAW#aQ z?s0jL={L=#$vT6HM(J8BlT@|8BXTsrS z36KTPwj zW;p5!N3SB)bxxIp$7~dKH^*}SN@n^coE-woSbhj_fHmb6FgyD-;pI2t;Wyys)8pdN z;pEnYa;dSh%P_HuGBCsF8F^{xp=W$NZhA&;1|}X*U)Z30fAL)a&E*$C`46$|Z?ZD@ z<8KIn+cXGb6coGwY-I&u5->qs8NpyZSh6WB!vdCN0YjR>vW;Qsmtjd-uvjHnq#P_n z8Wt!G^OJ^oOToM(VV;sO4+#|9#bIvZFjsMyi@1=pxR8^Wu%no;y|{>-#048kF>5Jt zOKC|9S!pwQIb$VdBULp+bM7Ek|x0@r|Es*V&$PSy_PN#xykD_kBlJ3y5E_iuILV0US zc~g2>9kR4CzoZ1%x|WsXRh48mmL#{7BDzW=`^v)yDnf@UgGVZZMz03ltO~kW9WquE zI#wGtUKcr0A3f0kA8$$+yOw&hCF4eG_E3BN^^T%}&a%Glt37>nT?5S>*W22LyRVH5 zHjmtBzH#H)=#6V*qb=h%TPJR|P2OyuyxB21+C4ekH#s;s**`qldt<75Y^rNws&i_p zZDy)8_>e?xmTY<(b~)+5Y9(!R5K3<@w=T3pZ{p-dtIl zSY4jFeQSDcb@uL^rHy;HA3wVPeDm4X%a_0#;5Xg**X0^T^#c_QRl-ozX5e)G2e0|B z5C*{O1GVel(3<~+J#%Ijl}gTRHP>1F&(P%z+#1v}R{4m4H}~Al{IAgE1(XAlRghD)P<=GEy8(m=B>Jh zY=s#qmCmPh0cJI(W|_qS-&M#+@q=B>ZR#Fs)xF%PFTfBRGKBrkx;eDD@>20vcuK&0 z`m+^nj7V$5e z<5H)$S*hQ&$>&;egI-JUaW9xWBKwy0^z@{8jgw*OOKhKV!p&omP>t_5U!G$6wM5OS zwQsd&z0N^k;IqoVNDJ=F!Kv^oUuw|tPQ}GmVS9jgKivy$%Ao=pDehLm@nFux+>5>v z)7Hn}h%AvN_HCTG@29@qHNWXNOh^4RgH9|-JIF4XBT!&iS$u0YErTk{pf4i6-fg(d>G~uWZua1h z?c7b>?G&Eiq%^jmF!kA;1ktC-+yy74;R&2IX%}AawlVQ` z*olrCM4M#R$#$K8O{olVm+x|~MQeZtgz&|p#rl*ujTZZ)WnsU3{m7?Vy6&9a7*L%} zI3_I|scalLTKbtK_0!wlD+*V&E^vM_Vpql>)b#7cz8tzQZp5ZzEztEzN@-CMe#x)z zp6$T?Hywj`NKhB_=4TRVVyjOpCoB{r``_=-NwXeoLTOI2Wr#aJuSf^_ZXLWtYQTPM z<(s}c*hDa#tUP`#z=~8PGK2lxtt;~RxtHVEE{%a6d=mb$X%=?)w)egb+4C}27^yHu zMMd+|lLL(5{V5vXqmTKrt4fpvPVK|0<0RQfU)D{1qm_v%U#`d&7zu}cAi@$l`npx* z8?#T;$uTMuiVHhYexVV2a`ffCQ25B#DMdoukKf?ZHrWRl_d@C1IC<`nx=Um_(;4fKq;DK6}HBoZU&Xyw2xN=41j zMoI(g7^%u1aXXDzN?C%kiC9+deY%@k?Pj|^flv7)!}Lb{_cdS^<)9ZFyySTN%aHNc zP%sUK0${j`*}tPC+OajFTJ2$pho! zg>m!2Pz2Op98^G)KLZSq<%I-<&iSaqAovg!jr@x&CUGW?1nS7YxbsR%z*ZgTBmbn& zqu8lBmo8nptfvP|b`13mj18`sUNJN?G_o)<247SwV-ss*6B`p#09#Y=X+?cq?aj_$ zZs7o6VTppJmE&)&n5~_YoxQWYgNvghAg_YSz#Z5&dU|@EPX#Dm*xBjw{|si>zp&>~ z^!bMR+NQ>uYfUw+%{A>U)g7(XU9HvKZB;$(RlOYm)qS1S{QzAx{av*K-E{*!^@BYP zgS}1H`>tK@ZyOru7#i#z9_k+%zK)s=&eK!>gGzF4Zth=(0>DjOTe}1J^7rrG2LY*P zYz>fk_FD=0^2H1AHGKtWVIb-ZSndF_#`g9u__*%u>;Zsp>=|AIuGrq*8$cI({rc^j zH~Rp9q6+krfTjwP(SXkA-MbIq1N{E|$Fq+xifa$P!QcaYHbj80F6y)UFW*=x;Ur}Q zE(Mp^oPM=x0wIY)Ijy5wGMNaM9%IgQ2`w2ti$}^gl1B+hVvhC0fetk7EW7SfViAr^(j1!bX*makgm!_iB8m|ITl$Q5*E>eHX6GF^p43X z6E_Lnn1(0^`)%SQPhW^D>4fr4^qoG;qLr$KJsHN3$88-5wOc2M!TUrXR`3dnV3Z-G z`$#Ehldp{UF}X9ZmOxmfsyDc^^6X|r0DD5rZijNhg+pzEw_gJt-o$EP7Dz<@e6?@J zsI)(7?i;5>z$CU9^P_E237_MdAjw{bIT3;^q_fP2;SOB_Wue9v!>xzU@(A!a>K-gJ zJb&lWf~BrBHL7sPO~&Yu0^zER{+75UNrojM@Yz=0*RP%oi%8BsP4uH0iX-+UD9)3} zscBQ`*S_J5bSev(Lt{XZPO))_aq-Aeyi;O2ViLwP-YKBNv!NLAWZA4{8`YDvNF&j{%dLZACljJ z{@MtTP7RF!?-U4g{?AqBWThwPW+W75Axg60<;d8pInmX*QMI{Ib$OBX`H>CzQH=#r zjfF9dg|Q7qaSg=@^(D!5rRlY0*)`?)RTU-w8GQ<(xw(b; z`Nf5Wr9}|Cya-~KSC&ES@-ixR`PQx504pnNf8fsQ>fgA1d;J`1Yj*+e+_|^D4sah- zpL_QGcNn8SCC^Qyb`s_=3+PBxU<9A6N{3k*z|4z-E!VgB3)?SK#o?HGqe%!{v5Ym$ zN!-!$FQrtqP>N3Pef5-rIP8bx_r1hNx40CaMVIL5VXm`W#_b`+e!3WY-Q%%dTg#dv z0V1UF@Qt~t8GBX8vtCPHuLjDR=yzf}V+Ug-f-}65;Y)GC&oCs7wxkB0up2%g5R}s5 zeX>PKmVjp=Wmx%K3isn3j%%0w7LtxIbL`M)c0ZV=So#?|jT23I72RSe<21XCLw2bv zO>8%4Qir7h%`F#~as*o$lL6lMClU4BU#kt$NWr6whMMKL&Lj#=s{?+{t z7)k$&_4GMa9mY<3Ns!h}gf>c;Hco^#L4r1hk2ZpxHk^evn1$AlmCl)k-jaz?pPf~e zhf79)Ujzmd1`rlHPbWi_4Nx_JQ0DA`@*ycLBOxs-E+r=_B`+eSC?u^SD6PgXqbVS# zBdl~;OwCYQ!&pJfNJYm`{n8aJUHwaXzzh)dDZin2`Hu%|9l-nT>~LOI0Hgi$7Kb_H2RJ#?H>(-X5$o!7kIy4fssE|Jksd_bi}o`TP0#fhNY=*Wbk_ z$jU2R&mAuBntZ_}liN9$$+?)`sg%y4l-8w!#h*{xDT$D|p)ySUK%b7IFn=r|rFfW*}Djc^fo^URm zbT6OuubvKTn2m0pi))=r>X=LKp3Cl=%N>}@zdlniFkaX*T-e%OSbweXYIR|0X+cqO zL17^Z1qJy4`9Q3b2V5k8nM8JWc2-taMn*>Z*-J}HOHEBpNl7`gs!lq8z^59#znrS$ z0J$tCCI&?{17x%4D1g|Q$V7Np1|qN^(YrR)zAM{oB;RPP$b7uma-!6B`l`!Jjptmw z|7=spOiRRUYxGPze6~Aju0LyTxL|Iybna%^%*55{sp^U8+MBcWqjQbJ3)gNewhS+J zj4pPMFZN9XN9x7N`K8&JrTM9)g~_Fb@ukJFrKO3brP-yW`K6_W<>e(%>~7x%+f%@A z1?y7aN)3wAc^7lO*JMC(w(R2nt-qGb(d>WVY&lL)@}PoZ&Ny2=J6fd*XPm7jgBqo5 z6lbehD^*XG3xu9sGp@wYa-otjely-;H<{*q-Pq|tHi2d3SDF4c%TDVwt^Krq{#-jQ z#s+9g?z=}f;mI=sNS_xM z955@2O-Wv?{92>jB`Fkg5*+)P>+r?;X@Cw*Q{`d0#lxEcnAW+{Uk+=hDI>>4+THKB zPrst~y2mtC9Q>eUmey71?W{o@(6fy!$t;i9UTNNx0{4RGZ2uvGY7DFFN@NY&xvbDrpL9?+F7@v3`cgecp`+aRK60 zl?mc5Zg>(zN6&R}BZ}{gJIW4HTwzc`>> zw%YqBiT~Z;R^g%k0BIaS`*jd{_HMYJ{Y9Jdn+ebNHx9NRL54`0Ti)M<;0PE%KKem# z;h^t5&%mPi*m8eh%ZB&E6s0NU7>^CUQ!>w{9c#{HmU1~6T5V9mD^+q^hR1LsBa4rV zoy5Xve6NCp_0jT!FjUl7MYn{Mx%BPy(K0#JAiVTqN&#X#SH1SD8-me3uXpGnbRpst zMoQeP9|U}d*a_4=iK;w{!joj<2?|;>cX)uOVTu0*N5e+D6-VxprOLp`GSTiaiG(J> zmv4%fzAxw8!DQm&%r%mXAw#R~^j>9tEFAUj{&A8Za>;r{ z;{}+CwLyIDp$O-z(H(icQ;v7qkuSECajoE4I5$b}MKP$!smV9i|JbfY9!pDBr&k8O z!8D%;;%+B#(vqyD)LUiQ$PkoRLmQjy|7uO`yINiFv(f@XbG@eF!xw^}D3$NB`6DWd zG-43ml`+gO^eWw1PAk3%mX=>n$Rw|qT#D1?upPftSRd=;6%ENPeJ>MO^D~?@AeSHa zl|ZB7l6-~@kuV$|?*hbt5DBlP&|GNcR@k>!4GBnRIPfr2AliB#3DN}_Ut)HT&syM7R8~|&xJrg$go!{nKHL+?8M>S3OKGM}M=VGtsk70JCMBl%^Pc2X zVJZ$@53SzOcJkDwf4f)ZaKfz-u8X7kIUHDn4ulL!ow2R)l!>1o6++d8ef6uIPNk;j zv2h0Ls8*5m#SB~&HB#)O{xmn@E=IlP8A%VHB%tI`Vv^bxQ9xwcVC`zMe*UVODV&sF z2ZeBP6=x-iFD0v50Fk@Jxp2Al+YlgxN4;679TPi<#x1IA|8IOoI1IpMWup382$KsRp0@) z=1;s;1icXy{TNr7WMMU)Yn_9@yGiZ%$7+^ZPz^1U@kQx?+ZhpG42<0%7?cZC>Zw~k z^io>fyK$M>L%mSr0}eHvpR`16oY8FN56Wb&u)U1J%u3@mu$OSUcD49Rya_nO_&T>YMJ83#|DBSWb1^>J53zbD^64NO_?Vgg=$aIgo!k=6{$XDoSN~< z7aH_@DR@u$WsX7KY@zYS+Dkf)uB8kWs9B58c8e(QYqL2%uAbai{OdBf%D50&u@grx z6AyQ*8&3Db$}>VL>@1A#B-O?-ig+;Pd*u?B(T!HEx;_j#@fLNKwS3rqmmL}4RmYClnYS&R5zQ7uUDoJAc$&qnL|tXgUg|2fZ+&{Y_*wU+ueq~Pmo2sw zHGM0YD8jtbl=!34R{Dxk1DWq&@YgFO*>6lEyxe=Aan40ZUC`jAZ7EL2t9%9)R&k$C2g{J0P&g4#|jr4U9T6&mcB~xdX?qj;X@>EDbig`9}!F6kSK;gYNUx4yb9Jv6XB91R-bD1$bWk4X8DNg&O6P%j^+I#r!tO5@A?P7rg}Q< zU`8?fd>Sk`-j7XS;M|2REXcjefgNB&8|GgRJzIMhdKLOq?Kx%atI)da(#Gb~gSRJ1ruHKfk^ulCKK(SNtW!UKzjn?nk^5KI%rQQ)@!iSb) zY0zg(AEj*$(rI!?m^NO8^k0Hx`IHAlbtjR6r45hn%;geMczd->w&Gy*au4sWB8XC~{xGzs&1%!_LuV z(`OfHx=Iz1G(?HP5Dd*_OCtWh56_qml&qVeYN>$ZuX zWnmVa8w?89(tPvATQGODO-I$)I=n0VtiE&k%gf81z>fEX?mm9DP~WEU&f| zPe<=`ocQ>@b+LD)0y5D^1~YkvM$zS?j55k^u4vv;v_7DY5l1~A}K zLukn}Dbf84fszNa}6iC76U zTnQ&!@vqgbbQ*$YP2sc-q4I-cv(-FTpe(*20=3xMr*sLny?Gb?nb@f}lza8l-eSAPWsf==V9*!9&=_BPVVr z#Wz9GrQ#N%ebh~Vj5Y%zo-w6qFcg;2<&v=w#<#SQ@l@l=CO736R_1_9`dvxNyF8Sq zY}!e=%FMS7?c6f&NEyD`rFcY3sX!iQ{+*WuoyF{87H&ZX%s-^mIolVbKOrw#bV|HIy2M@6Bw{i8VDQUWrRba!`mC@5W$QX<_s z628sa&o_oOU<9^=#`>yAA&ikJAUFV#8T?=QkmVda{n(Myq z>r?yb>Ku-t%wCkWX_UBO*=o^k_k1sLWk7OMEjge@V?J@$jJO`AcXOsN;9Zo~@N-iM z6m&Utih%j*)td3S1foq}w~%0x=_WLL=EsqcN$Qfy~CSL3$P=ZeZy|%mdK*1#jgjBWxiM>CE9Fn0cg@Q$N(W+6 zPfDWU;uONBC01aWabf{APUwU(C799TPG{lZ#dDq{Gi78CQwAi@dVGXkY=&gDzNBiz zC-211?4E^k7i12eB(+0|+r*0}3b=cNiWf7A=X%|y){B=lvq$htW=@Ll2PKk7#jKtt zB(HPj^1rv<>$Y4i zi40NBDpP!478A}%bViQpY8~?mHiMK~Uo5n6{QNg6B6{QKGSV@>VAMDfF&nU)Ce&4Z za83?*0>9)`ZZzwp+3Qp+RS?@<5Sqx2zQTp;6xoa(7qgKNr=2^Oy__t=cpPmkuzg^2a+#y)4VL?dSFi8 zDrrgTn#HD>5Oy34cexRLLgqnAB$I%(vfQW)q*blWSxPPGA7oEx$hBsyrSP&O@^90O zcn6wF2jyS?Mq}8{#4vzM`_zlZqfOXKvXDK10k=nZjx5`(8*yo$UEc9D@_QoI-MQ;j z%7q>8<8&mMn7_~?-Z##?k1Hml>)*kg9las)4P(~;2Yt*3M=~`{xDlU_+&S3S`Iw`Z z#ZlS3mQ9NK!XD<{TzQ3|r((RH!v`Ef@=Kga)ePlO>SLT6Ji&@$(ASW7>7c5{U4}y@ zZ#r$pZly^1YefD@Sd_|)5f)wFgb2OKp!nXV6~c`VwaE!}vJU-X;PG+}0cqi#mHGMI z{x4`Mp85s46@FXJd0LL>B4c<0Ytv?C2_p2h(l>fujtElj>o%yQh`Q926fC>WNX}Uq z*v815N8k1hlL>?A`EEBF4`;F)`8)2;FJirSM*<9j(()T>p0-}5JC&wS*zMgxPxE^3 zQ%M+4SwUx$L=Wxht9#)$@{JuxW;>FoueCs=Lg@QwGdm9YThIqoGVLZpOdZBLY%>Qq zY}GRnxOWu=y>Kn1gw`L^t{p@w)ja0LB>`}(L9t)OG9Y(`z{XDesw6dn(TZgS2TaL?dCkn|8xQ(W0 z0`Q4Un@ytlC_`Wltzq@lZ`%nh{KkxO+J~4f$%zrNG$3|t3*W9?9}J+8uO7_*+O{Z0 zSmES}IhNHcLr6|OOoGv8;!6LSr`xh|n2DTjjByH4n~Xu*NR;M18d=OWN!C3LId?ui z!}OHV`oSKa>hH>IAi@TWJQfxfKEP-Z5dn)T85v-+2iDvFn;wP#^e6(SKm|o51tk>) zWmN?gbp0vPRA_W}ecP0g^Tml6KJ&4)Nj+u(L`KbNG8XCW<*G z{8{3T2@;MlP?C-?DaUx3oAGit;}o3Yl$>K#oMY5oVl-W2bljq^+=@1Ek2bm;W$GDa z=@n(;6XoC+1s;>PgQI*xql3bu!=ce&xdZ~yz^(}_oxth|ETF&|3aq2RRw^YW1+1sQ zlIpkhDcD?r{S{bb<>uz*<>lq)=NA+d0Lz*Gtt_$raK!rWS7!g469m|Fz5ByA>mT_v z=S~p6VLjABj0g=$4FS9vrD(@rpf?Z74(0b31lW)K?{q<{2FDbp}UN6u4)K zgYPv6qmh-B1>b4_TB)h2p-?J4eJul14MS@+V|x`-XC?F7ik9B;)&a6MA=0+sOA#eu z9|yh*B96(zH&X?iGWncycwF+hT?#o}i#S|M*j-E6T+7&8;jE}CXZf?-Dp=gge;2D; zIjb9-%?-}(R>tX8#^qMZbE|~^RT7~i%Jd!-evJg|KAq`v*WQCxh z+gKEI3v4<5v-2k<9ObBZmb-+ql?8S{XAmv$ngxXt)t~vC0mCyE3My6#DmGA*m)Jp3 zQFBm1I4?l}iIW>b%MGF9p`qucW#FT~EWp4hc$ryh=wqAGwS{%_tMC{DS}5bwYBxNbq#fOjdh4dM16C8!<~kPmd3`G#-`S$rncth_U1e7 zckXnwv~;wzcDA;4wY7D(w|94R^mKLgc6axI>gnn4?FBW^*EiVTKR7V(i#C2v4H+Mw zn3|dfbda-)V}9Z9mj;L&Sy{P%@7@Dc@CbltAAmxkv=1Jx0igEbDhjJz1!*K}8|&+v zfHktQxwW~qy#p4xn2=AwMT#o_h&_y8{?50{REwUjn$~_XY7MO8bwW z|3wuijY6?PKn&A4^OAjjhbej@21mpi71OB!gLDWURgBtCMPCLo_>-k*v4|(K`LeTZ zHF~)WTPI1lb~RH)iqYCw=y%J8OX;sFlLAOZnN&UPtLn=R?(22x8QzAjoo@P#*JSn} zI=QbEWUcQ7V-ZGaT8RAIS2c7cC0wm`J(70V#Ao0jrn}~uet1VwrH}MA^Hf8(kW!c0 zE>!Xv3Hi>&=u6DT$!o1n&|8({pYj$l*&|@$&Naw_w@!D<+iCo8_evD}&B<fPf|vAFRvZHhen!`d`xhNFSe>Nvun5pnCo;V?ugy!m?Sd9v!3dGYV?n38$eH2 z$Is`vPk;Lfe6-KPpm=!scmXB-EFMbaEGG)&2wWB9vlHbHkl+iE=8Kf$k5%GNP~}h7 z;7`@$Pu1d2(L{YtQssv!@yE*XM@#cZO7Q!O3%ZF3+lYvoi;5YEOI($Z)RvS|mzGwM zmQj+CRY1K46oB!zJZhR&R#a9|R#j6`Q&&~jP}9&<*94`dp{1>DIujngr)F`yg9!$62YLSk}K@>zU9dRBTyc4j89)X2-q&d<&%$jL3t z%`3{yE6&R=$uB6)DXhpTs>&;=EG{iCE-NpAmzScdqO7a}URF_FR#6EruPQIEsi>%{ ztUy$i*H^(Cs>+(Gid(A-I%@K|>vH-K*@N|&!wngu4JqTzX_I$Sr(05IT2toQl9BDn z$c|K0b*3S^(ve*m$nH#JPZqK_2icd4?9WFI6d(tSki#W^uTtdjpH+q&0R=~nl+TV< z&Wu%0jn__2)J;s)PfP=gk*0~6=E<3s@tKa%+1}CF!O_`~vAOXHO7`_aCQ>*#QFReUB)pNVnPB~Jyis{7$8Hv_@MmI;Pm z-DO4xEhQMm%8rgium~;>OFsm_&QEFLq*_? za8LBM$EIimJPXCJONc2eaG4QpT*K8!ws4?4ho?6nGV1p}97^$}H3|hOMv4 zAF1oGN57-qNl=KzV?;yW_`G?kC&HFRpHr)TtwE8|m7uzhtIPDY8Cv+IM+4u2BoYR{ zhwHbE*=sel$(*L!N3xt^F{90e2sIY;i7KWoYNUy{uXD7ugLWk=!OzMtqDc^kXh}P_mCr-8n(ASQiEV81_^YT3oCE4~cHTfY*epTUTPbxhQ?_$p*9L2XM zFLWTJ>axKWN2AY^1Bk!AYW(6b!VuCQ|MgLQ_w8?Qgy?NX*xD=Kio6}cP0K`&`LcK{ z*-3ck`v)4Z+>xAmH>mev-o#^21&6}x%0~rh>6W($axk9Y#Rd zWMu_jf1F$#+&rio^uJu9|GF&yIdOs?I2i+DKoBt@D2&RN08Yl>c?>w6fXoTr0RQn5 z0C23%j6=;V%~9T=))tmGEUj#;Kv~<~K1=}p z7D$B!1x3KKxUi_CsJOJaq^zU_UQ!A#Eh{f8D~H1?&YlB+8eUahU0qXCbLOiKY}NlG zU-dIn_1?Z;krKaV{-L4Kztp1Rzty4>-~})R7~$XrFh9Src=zry82j%7@AQ8er*E7w z!cl|$_M^v-9_;`V^~XD)_I7qbJpuGgFzD}|GsFQs9B{({F&t3B&&c2)YU0%aAcMa? z08DU@(fTW-^_=&O;&6WXBT?e~A@IMx=YHRClAiIup8zURI4ttTl0w)q6cm@#W%FBE z#wg6P!<2T(_NFp9nFNpWE?{UwX#)m6)`1%#h~VZ_@wx#zh>!3d+M3O(zZGnZVE zbAlbLwYxno-DZilIo+BLy2ivL{psjllh2L2k62vT$FQ18jlofH<;53_#07`;u0Hvaj(0qOpRQuTS|qWt ziIw&paL7C}u0+SG3L1o8As1C5orZTW(vmr+lf~PT8;)XJZ>-Rjp2xa}8|40+D;=9? zz7{Y%>JoktM$eMLE}`EC$zULml@v5Ga>if1>{mPc%iZ{w2Rljve;$$ZHzMhu9qZTU zzhc2qSvepm2c+b%&|hX{U}Oi6fXhsrjLfJ4aXDv#RBrHYVBveqopb&& z05K8g0XirZ3_r?`9jIW=EZI?6IcL2LWy}r;rxJi{iju$l;;93Q`mdGWKfAI6`snq) zi0Q^)TL0gfnEwCl^&b$woM%fv2E7d^UY;0AH}~>R7)$k{3et`}Q6amMCX@ z#mZT{hfBgB-*L=QX}6G$lR2d8gz8_6@}9>#%FkA5Y{S^aUZicJ>z~f-e2M4p72b^Nq^6L{OtlOPDwbG;Gv2H zkzafQ1{Rqq{Nl^(7h4p>6i?w8PMW5hV)GY#nV7f8B(O1w$c`g1EJH(XTgREJ)nPx~D($O^*l&(41}T;@gXBl!5wj=@?ot45l$8O? z1w|DlWpx!5Z8cRr4V7zJ%BDIBHhMD7S0%izi3A()g&FZh81q1lxuZ?EV@$YWO*rFB zIbo(8iKc7`W*jgxPM8@Ns?53L&3WU@`Qj`DVl9MXEJdQM#G%$wk=C-|Hxz?y)B|jF zeeDc`gnTy`uO_$2L=WPhlGRzayK~V=Aq}4)j2u`W-EZsp(ZP^Qb+(> z1pq;yq6xunAvrlMAvHTLtso}7I6AWonp*?SZ-5pyMHe>46(ExGE7J-patg~pVoha9 zeoa{(0-oDgk=;_6(NUG!U7g%llQ38lKU^C-Ru?@{2c1Gh%pk(&>O+zBA*gEj#|oWq z3`I7Ep{gky*&Kmvjzr#pBJV^YTcVMzvBLUtu1yHn?SGiLjZ8WswbyvCZ}trW)RbJjWfvR*@af* zV#oYa_u_Kj(!Ifz2c!2_Cm*iQu5T`EK3aLSySn#e>)G?YmoN8GK@cd39csKfhvm+Z zIiRvT7uvml{{a+`+kv)qu6jQoy#55}{?}vId5ik9LyboNUN4Zc0B>cmUWg$g7wq}N zhLky4Y-Q~h?`&K3S!6UtKD==F7T!%@L)u<@H5YI3Bq{HxcDYhBi$U&iv1}Mq8)ZY< z`2@Z8YJ=P-M`igPo|T$m4k7$pct40+`dahL0&rp5ud`}>Voycy}IiS@~^vI_G4y!r)&#l zJaQcgQ+Yuj*5Cc^@kq4B)T^$NVRt-+lY?cx75ZN)R_@a8KPgmw@Wr;$W;{n*?~DrK(N#E zBv1M?9%E2Nj{2&?LJVG{$WO&+8(e}@7F^h6`PSzwKX0v!77&%5+$~a@^I9bhAzFsg zMD3}K(_c4!S!aXW$daz`q9;Q!)h6yGi#5huwGFg%QUr_(Qx;>tlxVErW{F!(A)df# z#Van>jObb0Dk~lFpoYw3`Bx3r1TAED6-?PwRBCJz5ljXB<+*s#iTf_Ag&r7+9I*TT z`mc)a`U|?E19nw9SAS^s@5Ncf&7aSY@Ap0`RB&l3!3 zrS@2eeYT-HRzLgDNViCNKCjuxuRP2Dfc=B^QLG6A9j2Bj+h;`^ZZf8)3b|TVh!ykO zeVzmzts(=(?_d`;Ty&bviwR3_%e)G^H6&@Q&8xT_SMivC;0+~b3yviAo4V;It+)!` zk8(xQ$3?Iv52jKUBnW?e&T*=mU|os4t|#o}=|W?%U;8-I{sLz@8U{XViz4=`RgYoA zs_i>JPt~8@{rM9uS<4ASa|9z3OBhENjv@6SA6xnmO6o;~#i6MbBUlqfJHKvSp8W~#!!y|^9Y`NwVqyYUAQu-G zxaYv-c7C$~pdDOmBI43Q67m9)O8io){L=2wno^1y@=9v| zrbho?N=Euz+Fdpbb&!p+kp96dmT!Y~D1J~WZjp%3QE?>`Fs{W%@`aiGL42DpAC`m=UCH1W8u_;lAAXL9%=}BI#9mjjMCKMr9qf>}=bbhL<@_T~4!R%#bF)P2* ztdj>fda+-8&nQBWzB12tNA_|SinDEI@mzWJjOQ>q?jpvU(vAmh+%uXnLA<1UQSlJj z!0%mK^CvYiHm56L-UdqUFYZa~cJXp(L_P06wecu5V@mE{7`WX?A4o2KtB(@P{nX@k z_sH51{!bYLB}1J@OYc7Lb9mdtVZ$?MB_4eXluS_}i@o95s@H$=##Wv48Imdm4_b_IMsD5U?NW>46$L!qOq#jU%QpCEz?yDm?()HY(gY>+x4Y9 z3`dl%Tq^Zc!UD7R1(2tE57$M7l44JvT6bpyliYMfDbR25cu!e6F5fuqwH!8U>ctD| z%o-{Loh(-_@&B1Jd9E>)K@lRrqz!hNzZaPhpeBVtK)Mm?!GD>N4W!|MK((_pwX-PP zGvp2o%b>uv^6$W(02ePPAs&7q9syxq0Vy5>3X~8Ik`WD26c5*wf?k!0Hj<08 zkcZt+NOzHe*{Q_ZX+rJwLmkaRoh?ILZG+t%gFIYEy3`Gf-Nejua_j|h*51Qihh z1qM@4XmnH*&|JpGM90O&#K*_NU~vfv@rjA?NlCEe?qQY6dJl3zm@$%g9a0 z%umQFOv)-tOsh;vu1`x(Amb=xu#g; zpVb_TY)1WZwkd9^DSo06Hrkjx+>qW^pVN)VZ$lK{sVi-)tEjK7s;#ZAtf?ugs?V-$ zN~mZLFYgJ0_k~ps#MBNZBKp%C`*K_Q^4t0gItPk+hD!Q|O9zI_21npSBjrQG6~jZ7 z!-G|$gSF#Bh>5}aslkTnfySBsrkUR6*`Ah}zV_*XuBn0EslooK;lZhq;pwrlnemC) zv8mb7nYrQFxuH4az#OuF4%s({>_wug4~de84xH5>5;=@SjsUeN5;=uL&LEL<^C)TP z;u30`3U;aMn_G`iTLqM#9-u>jKqWA&gW3F_o7C5{Hg)c&hw4?R^JhEy*XQ$roC~Ef zWsLntjj3x4%=3?204V*{U%3D**T+y+R0~B+j;<8%UzOdBC@$Qg(>AP%H{8wyc%SHU zOa-Oi&BoEXsk;#{xa+pI5Vjx}(O{I3)Ki2eg4)gbiNBG-1WhjIlIFwMhV4ST@o=O4 z@_2;pHXMRs?{AlE?RWR~$CgUsQbnk)-w}e-h>4we_mQ3{OJTO5yd16WE>E-K(ofZk z9fjuFF!S4&R=A83NywqTa~<>j>0cB{0%NenS)XgBT_5j&T)e(kj%R+wp6cV0B^;N8 z$n3@sgfr#C`5K8+lF)57RVHY|SXnAN(l=4}K!}jlO2WwUF;>!dEf#$|2-I<@b<>1t zBGXjq*g%m+c$?Z@lZpW?BhhnRQ6yJ|slzTIG%YV2R|MgN{aM1VcWA3WhGWM zcdeaJi;krT%%i#aIVexhPE?m_fxET5t5R9KPmP8#YgUs58!^GI@5JhQGd&DvA&}`p zu}vJ?O-1%>oCq8yB@Hs(XO7WAxP3jBlS#I|{fS4Lzfm{lza(Sf_)Or8Y zzM>U*hj!s9rh!>{_EE`Pl}iV43>Jej1qCDajcfXdPaZ_Uk?3PS0r*M$FWU z`M=*&INhj!S0iTq>S1m(`xH%MYdyy$D?D- z?{N#1KYDqo428`-?>cgCXrjO$JJg|SP>OEXa!xq3g+J#0xY1iz9(X&6VyWJ&PVL64 zM<$<2yFBV!rOghEa!D=U<=!Em5D4Z?)Yj*=y~AFJq&S#6Q1<-Djm4muoiWwcg-_e2 z=&~PIboz+*PQtj*!?8yAe9W*86!u{|vPRq4V8@4DNdT*mO|3Ez&&lz6!X1}SbKJ&5 ziXS#VA>X;adFU2}C*M~Xx5?wD+$3MvHN#5#@u1nEQ4dNAU3&l7J@BYxQzhuf!eM7@ z`&&*vGy0n|+9_ADl)2;JH^J2X$pF^}-(7oSz{>nppQ+D-2T!UiV$Jn~ZxPV>!4I1v zJnbAr%7+fxEg&8zS~6QV7=wAD(Xds~g)$ICfsrbcaU-~y1w@YAmE_rPB_z4>>-ej* z5}lf#C8?0sM8zMCa^)J5LP#r#mJq}}^4EGh1sfUVqLv4&voDxQ@_{_Og|w)r%`rr8 zE}zN>Zx8m33NC!-x%DM0$3JuhyXM3}6Z<+W+?fS_V>d+%AHPWhyQD52@ns~jvd z)lr#@MaFQUIB{t*m@OIx)fQ}uqldBg_AMCOa)aixK6v6KaR+}gvu&**c5)GERr?X1 z1SYQ@Ql=Sns=56bNGfAGHk}PR{`*Ks?oy`gwHOW)t~}KbY-D+@6WPpUkF8S2vW@*& zq{+<`Nr%v}uy-c11kh7l8OT)_zZ%Gn#3Z1P?WTF5?c|Q?)(AuKBYlsf8KwvD`SY|E zT)VK)-W|p(RJdfhm>(7G5aFYB^yKb?d;v~ zuSaEQ7wQyowU>OK`xIg8)hS<^TZ)r5EXTzL*^H!-5kx!X)C+a$5_8KD>KzpCIAc}G zKt`HrM5EoN>mqa$wrdCt0 z{@V48>tU`U^!TRn3QM+;)#jh-P1*J(f41tC$@`(pFVve(Ya0jN?rhjl9WfaL!KSU8OR^4iyjLtiOt(G(TQs1yw-GLBkc+b?chLYk&xpg~TZHMsEl z=_kyo%2O5^Z(brmL&#HJNc=SGc(H$drH~4a#)&CMY(Yfw-Jv7?!s#0qC!Nhe3^Zbx z-n5%-!`+RqpSur4(a>PQYunyNMblxgETPD)=U-XT@FIDoZn$l|%#B80T;TUXZ;ABM zHR-so_f}zm$>L4nmkzY!5vg>-N1xkFs$QhLyM-dp`z(PAx7W&)ao^cBV&6z%`%V{cp#_#5fH2B<>Pfu`@CGBLMi0_CgXLo=0^W!wG8qzQOwythRi?NwSWKox2NlW{SWY%h0uYQ>}4iKCRTP3 z`OCp2#LXkh%P+wvASECqBPb#(EGj1|E+-}_Cn2RQC8I7QrywIQ`KuHpWz-~Pv?XP( zNXh6+$r?z=nt-2Dvf#6xl&rRtteTXpqBJPfUs8~jSC9iz3?*eH)T>ubO2S;7~pX; z$kPdgK)L${y7`B>1w?uTLH$D_BSJ%x!hDm%eN!WR(;|G+BmFWW{W77b%7Xf3NBydt zD8FA7?Uxhn|3?Mn#DEISi3!Sy4MtU5NKSlMPJDO{EFw2CIxi_cKRK}=HKi~uy(m4a zI3uSxGruIeur#N*EVr~Q4-Q9Fd3ipliV9E#m6e5{s;Y{rs*9_uOKWQ2z+(+jS6Pp! zZ9qL{o12F`ueLv+#WteA!}0F4+kCL71Dk zK%B^n&1{H)yEH3^qf5oefa`OrV#->eYni#k`Tp7*N2`NG9;YL>n+BOwQ|1pH z%pa3qF8jRUJWN%1&6y7OpA_0x z_Ba*PAM-n%oL2UDW4Tt0@m48&6pLF{w3P4t`j@M6g@&f8sw9FoF@)a?_Vq)5PM8#X z(JEId3Z9Nc&k+)hbU(?IAvnI`2@K!)if ziqBlYTL8%*AgW>}&0p$_9?2!nK|{wJeLcgj`Md{WfKSr1b0JGgiiJ~^Eqe!z^k85W zAM-~3{W?sOnTrfmB_CZ}@QISWN+itpq&Vwx72{(uQ@D*Vur-N1M~QW^o!9CcQcqiS z)!+1tD&ll2_3}h%G5+lma9u&p7sr@e&((iO);9~z*oteh{;Twm- z^-*EPf9tgWwTJ%x4XT;`5l{-cDo7>;7#Rl#;3x6^*A*ek5$fDY4q)^slS%;7%brW_ zfVNE$#Hj!O?JD;_yCQV)3bgl$u=b5L_e(JGPciaO*9*wg2`s!CRA3sEWf7cd6Ow*2 zG{rqE!9P6qzrtt#uNAie3(Ir+IG{oRwoG6>_#A-wC^Y|f6McQ=O^E`|&U9>`p`HU| zD1__`BLm`ub93l3tn3&Stp1nB{Xaa&e?w!Eha|*`z{TG3*h3er2zLaF^GV~xBDSni zD?+Gr#22t441|{|MBu7lk^QwIWY~Xy%~m&CF7Q5U;E^I>8I9P`YyA4sT1sxiM!dP! z+Sy>-YbVhYcGywXtXEHUxUQEfc;N}2s7x?73^)CBC^d{9DN*ocHgSEH=*^duixGoxfWo&= zzW0;&J7!AplkNj1tem*I5j%@7DGMV>BxL1rz1ws`d?Sxey0U`DB(97`{FCS{H9Rl27+XAQPSQQNkiRbI`y@m2TFleTAAA!InRIeedzvvu zE{?V`dBH!#;_ zWEHr~CPdFBO2;8V%PCF6tw7DIN+qB}DX2#&tWP0wokG;;qL|4=akGmO7UYsv~Aqiw3FYpQm|L|fnZ>NVg~hoTt)1|^vOehaAnZ3aAdru&~H zP@d<5{`abIOHoRyGB_M1rm6r3MW3uf5h!bG>kx?g1{8wP+}wQU&YjklmbTW`_O`Z; zwzkgp_O3JC6iPbP*$LEBKswdm(=*W9JJ{DZ)ZafmFfcMWI65>0f;Iqka&mlpdUA4R zYI<&FW`1t&-2QUu%>EMPeYyDC`|{lN@-M&3W#D%S#8mel-b0D0fRYMmsMZ1JXmxF4 z4G5^#x7IhdHa505Hn&0Z0{g=4?VZPucLBo^aFKwJ3OMfW?*n`T)wj-RlxJu@%0Bns z!2I9TqkruQ|M>K;M%9vtdlA*BoY|8^1dOP(4eKz96uddvT`AU}+rz>5;;yoc?*J^% z%)xM&cZT6p=1S^EO$?I@VMk@Yc&QRkeA$yKnCouY0A}rXC5-pBDi@2n%-UkU2v}jD z7(}qyOe>6lpATc_PwvLt$I`d(H`P31Pw2pRyCBQf@~A3CR$NtRG&){67X$qprtIN} zK*XVJ2{qwSgI2`rr-J?kjJks(r~ZgYGbSiwRJy%C4t5`#3?>GT;@Tn4b14!`9$7&l z;^#p7M%$?Wh5TZCOj~XCEiJaFu|+5IR2h9+TPIa6glIk|6MCK>4I!H|e{0k&$_Xlt zwvg+wQJU+xb#U)4;>|nq9ESU@*()J2nE1r|9*od_op)#$b-!8%HR}1u4OrPen9Jz3 zASC@C&&9Jtads&GI#hq0bCmP<JW;&&H0zn?q7@{z!o|eT??K40e=2l{bmxKL#|?C z;!={*vNB+10_sgQWo30mMO9f@B`GNdNlAGL2{};W;-C~H#N|M#iOZOY$=Hd@T8S%M z6IWD_P$QQ#$3`V8pVzN|Wo$`nLU9{XK|2b*o8zX0ulrG_rE^eAGekD;%H%9b&xY+d&$!h_sCZ1Q#oh@u#Y#dx1om^dS0o!m- zFAw(s52r{^%LI4r>|4@B9%2=KB2@t*wP8{SsB(S0L4A^Wd6Hu~EHD8U5eJKnPmE7U zN=!~oOHIp6%gRm9$xq5IipwsI$gYgYM}!tO1r@gkly(P{4+d0@hSW@i)lEgzPe(US z$2CnS-kDBnnNDjN&uSUXZ5hdL8!71;EgP7u7@DmapGQnBAf^^;rk5*bACw|DOBNrM zE$^1!e_HckuW@y+d2O$CeYa!%anHu~(E9rL#>2Zin-6xj9&9{ZybIiUXYVgeE}lUX z0Bi+kc6N4ZW_n_JYIJ&hbaHHLa(H6Adu+UGaI|%BsIjZJvAv_Vy`{XTIeVx+eiRWs z))4!>s2#pgwnU? zHFqme>LL{VhubiPPL5wwF&dW54IC}cqt%@O{Ri3AwD}L}qL6CR@{FCz6+B22H%eXf zWcpIU?fYNTW=I)jgxwy^_qM;d3s*T;7oq4s)(d@|2dgdi$Wp!jt~Z-K?wAner)9g< z2~32SuMG6OhndRU2AE;@(Tk-@ow76f58z(c^2KQGj*q6DCSATdB>Uj$Wf!9L#i7A( zUk;xj%dQR&y<`#%XSwYX3Y?|0%E<2d(Vthtg!6pzJPZp1>m_V;%TO?c&|g+V|0zD*@k`24j7u!h-bN${x8`=^iQd+a~yKb9_5(1`o~{} zb-a9D-{9PQ=?ZGLCDl$)to$UTN9a^xR5EON8^V%-tN~Qtmy+jw`Q}f>bCV_v8Oi=J5+!F za90tRPZTNSBYxB<&f$J@wxGl^_O6psW@1PBgz(1)rcM`pmy77>+g5ByW;>eYRN9d1 zF8OR?7R58(admEPd|$SFE#^CKT0f!veELWr_030VW0PI24adnQ<4uov*TC&$iMNtn z0ZzFRkF#-K2HdSrcbr{^PP>2RzaHIr!rzuWr1RW1MV^o*>K^&rdU?__e1Vo|woU=( zEa*4>hH3ZU4Tmjdf;Uiw+uz>{{Cwi}R7ThO6205q7reA2B*tkH;&ui;`2E#m25tZAHbkFjP$lG zJ%UdwqG^%Xv^PBZu0M_6pv4y$)2_-b$eH^gqdKa|o*rGzM3!_)FT8Y<@y8ejzLBSX z1YUAEk&`49b~vF!up68>?MN{Z>ga#UzqP%-<*&r_mYK={%?5XTb+nycD5guLWZ&*Z zf?4sXCtpnYskJHgg(3ZDQKCxf45#ssH;2hjUoy>&T~p%UxE-x6`uJOJe$PQHNz6}s ztIt(yljP=tzI3{~coxT#Ybo#3Ve{q?+PEooDvgw@I>lc{Of;zLukxnjJwBFQ)7b13 zNHrrOB<08-{BCe9X%l&afv{l4xX;^d#;%IR>4aMITAB~9uicND8W|4qw?5nBB@`jO zgyx~w(#k2=-du5#xxT|6ad2P-QgFwl{Fl@3%-4v&q0*sS`B0QZ79|-=8pDV-iYqgs z)O>2(H0ch|hKWK9uNKV9XywIEPAM=XzXUN92dO$8yf%|*h1`vz$#&kZf+$=Hri`fI zf#0LuSK`n%Na0&4B3f{Epd--tGx}J`c!A55zg|D3kV1-XyI?|fZY6grt4dP_p^Nlu zPW>=nExEwOZ2Psd;H#k`*Md>4ulD^4h9x8Xl$TfYq|;lQ5C-}w^@g?D59(29!$Q4r z_uK;+Ic|iUWBt|X&(&>(pBkO@+y-x(UTYQ3X>?6#umpa5w0uiV9v57#zRax-ef^{u zFnMrw_v`8y&F2W#>2kPoh@RgO|-8WMY_0iS~(mG>Fto4j{w>*a-rEXUT15M=1b2E8=rgs z&CQm*+;ZLMTi&%g+po;O^sOy4`*$O^XZuE-7Z!GX${SV}e7_9r>)i=nMLzo6x7x8I z_9T$j!g^ug%h2({o$xQn$ER`PLv6)(v2Ob|HoX@SVIJA+ut zp>m9Hu_aDoewTQ-Yt%jLP#M2?T^`0lRdPX9YQ@uxz=C=_`%|olwi~{)X~k47XOl?i z?k>Z(<7vg)d@v6lJI_q&c6N0kC!={gWZ&^vZjO*swWS%|6Vqu~;*g2JcLX7t^O$6vJLw6@7)=4UC~<5K1w&sJJ+> zC|q8v_r~?-!zCEIhn^AlE_vDUWEMXzHz)mDb{(p@!qgAR(dDkr-1cX!!QJ3p-%gKsr^qY5byM8&hmFRc7C2~MM@?_u ze{hJMLvo5|jY&^4ls`4cv-q(_=11G5>7ESAg?*1F>rd(=17f*SoO}VOeU$ooF;6Z9 zqGR@WE>~#boBO+>ia>25-{f~>#HO^3VD>YO~5@}HWw{qZ8?i2BW9i{Dt%+gH6LmiIlTI|T%X4>gkI zKSZVtzQ*P|9_0w$EUK4Iyu*JxGh%DP>$7CB9`Omaj`i!0i+)QUd>4#lRGt?__>H*H zxwo0H&@AbTH-w!o*!yF$tga|ZBhpGSCJ%6bD>MFmFkhC)X-DMNL)O*Wi}`X6QA~z|Bxrh{m}Z*Pbxe~H80V*%kOPY^^}@}sOMvgwl&vL{G9@PM zLppje5okC2dJ%u8KaV^lxDdVrkPLoGYUp?3zdji3t)6+i5!T; zD+SqY`}u!fc)%%a7v}f7eG2~vccvK!zHC=Ef1{#g2>OV<;1`)!S3S`X)kS|rkP9Y^_>m{9xlBjYc-_#u@Df zVlkFQ^QMOzj7v04qxEETdrYfen|7oxU(=7{W=z;96u|s&Rn>-Zccb}jFg=-aGrwot zi^S%8^$hO{?|dboS6RaRFqiU)n}4>vd7XoK{g7M;c+o%tj9 z=KY<%pI4({&` z-Ruq{#ENWa<2`5-q-_`8n<>+qZPA+>(wkq@TiD-QyxCj& ztvB}@`VCL~Z2i7$ef+wjzWU9MT+&Ycq|O$?{(_NC_ZM{? zf9@uJKb)kEabU)xxBsAj-fe(AeIWOMa4=+G$zt%~X~^JMKW1eA;MV5gqi=&d2ZPT< zhq(LORQ0j=EPCP(S|zh66O$+oX@@@~QOLtvKZgt-7Y%>yAO5~MeEMw|jcx=(cH|o^ zRtY0Mo-97Wz(|%&AMxvvdfL&PrM_m`ep4jAjm`+oz$i@!?m{{VBi$Gi9U+_INU1*I zHyeyENPK{G(tRKMb}-7!JN5%UCfGQfn@;i-P9U*0F26O-Q9LH6JEUqkp&mM+X*qGy z(Z;*kCg9d{Ak+Rv210KzX&gFfYB{M$ieb4mY5jfDhHlDEcFMtW>SpMabMcfb(G)iv zJChXOlWrO>8Q)zI$6*IQe`F+hYlI}UkG!$(w3(;VcoSc(WhyRo#xfN5F4|bTK0)j& zBBpr)*T$KX^fBv3e7@wFLf)zDVv@eYS-31Ad&_K<$a;zlLpB>m~CVOTgajB$RRqcXVUW%mh)4g^E1Wsa|849Tl0(G=a)j~<(BYM z^%ow##>?2j7v8}z-N%sI!Ow~u!5^3o-kPrYHjSX|%-_KmC0%&?eUaM}cPWyDOLkt7 zl;~LTF8ks9hsL`TTev4%B!{v~Gh25*=`P`wED;PYeV4t9tGCoaw@fa#OkuT56}GIZ zh?O5na@0cNVuOrLLiRQyb)l3ap)135r&vdQE4F){4-4nICCmwcB^2ds@ zKK|;hh0cSOd*7!#c^6gn?mwL$c^#)svbzm_<-mb|@|`eQAf{{LX_Er6{De4IYMs3cLCfZ7&^Ges#l?GCn4Cj?A3Yd5hTJuwk8h_|W$2TKrZ?59uBf%=D zClV`;n5fOHuWUiDt4UX)ua+63k*19>YJ1*r&LB2t_eHS6Oi%#-^N=|yP@CT(Kazjj zaDX&&fI*iNGIg->1@rBk(c3cTx3Aw~tQf69e?mGidb>pmgN*+6vU150gbHRw!Kw;5 z6J1|AScR_&>Aza(sYEtdg75Ojc%6+w1zu|Ec*nB(jt%^dWA)vOba=|E#X`F!0pq3c zx62}{n_}Qi39{Fg@vmch;CR-TvN4wxKOrizE$2JV7fudid_)q*e6On-=E;F}R0FL1 zAXT*V_W!Ku{s%^ii z?MLam0jk@<&v#oWFdmViWK--oRINpjBIWpEyo}lPGu{j8T60$2e#rKws_R2*<-4X1 zq>CdI+fQ}F94IEL800ZX4xfYvOm&?s!t;5(T6=--$hXmkI-=$(XOAr z4gbLHW zMKz5IbB$hgv;;;!iaIzXe1So2a`LkB2nGWs;tEl?It2RgB!B8?YUYFy_2ioEgogZ> z{>8~@%?a!EN&54Xa}E@x>%&iz7!5rqFzkDr{zx$57dpxosCh`>K$5_&r#;W_qUC46&sIOyD>m)w%#9mMuwLHc|YgoOg z>Olm9>JzIE8rU#n)-l$>D&I~`9cMlvLme)N9DX)FR5xBOc}si^6@5@s1igXOKZ9O} zfdY+nc_48Kov?Kf-`A>!R_O!{n}AfehF;5o*~flaPJtOmaY-hM$ptn=tvke^r@$Ph zxSSBfY+A!W?)}!kc2zZVS!dGU%8pideRa)&G>h^5TK&AP8oAK~7{sA?c`oaXVzbwsb)A|QLag`6u#JxN?cjd6!)klX zcQD)=`In}BAqZ-cS^CE`itd}5_wn!5S^Cj&%dFZYYFO%XQqF;syu3(v(#NUVsTf%6 zWRnEsGDYyd>L@EFELw+%+~cwjd?9m(22U_mVc}E+jBVug-fpSMs?2!!S&qZYYxC+% z$GWq&l||u97QB0cy_5UNQB}6C1aA9vcEbE$?|tAow{Wq4|Mk#jLUyyUt1yy3qrkO7 z0tQ2x<1QTjX&EbsFqlIU@oSp{v(g1Ji&Q^fvLz=5qn&bJmFwIA={-v>$LvjWl+pS{ zb4Asn{l`g8bUQq4szS35`L`iXyz9sw;vLyKua}p5U49IuV7c6@hWm0o6=dJT((zctOhqIl5NM zBsEzkP6 zN3(MDosZ_!<#d`tB#6r{%<-ep$5XetNzZChq%n zySUr;@^Dz(?@B4g*YElo!4w21AOVdxk$~r$3BU+8g{2j^i>x~nh(BNo zAeru>d&~rp!9w%0FO+?%pCrb~Y0x z4r`7XA|OqLHybV|ZGI=EMVgLpHbO1f9H&q~hDmoeQg6T46%=(}CZ-Ko(($$`sCv9idI4+2AS0-#nffxhSlWt7r&Uq6>19fF zuoa7yppwC>m#NJIR&4IAO2%g|)4E};IYPjK%I0`;>BG|2Tq&)})_ijr)4|p}g@P*f zx^vGK2dw!TTU8!<%w?{@+6W8^s=B7mWo=8_2raa#dNj>t9|qfqYzeA)znXh~K42sE zrB%)MZ0^N1tgQr`ka{5Ad=7$)tt4)ndMMv~E=Gv0G_8gW@?l6Ju`nhWh)`AXRqdq_y_G&-P^RDpUoGG!`Z8c2x;fx zEtKT)*lVV=X&3P=l&Xc;Yx_iMm+CH*=?&WJ0zqkI4;RW!;2iV^y%(w!7qF+(C&XTI z=r%PiREjSIi@qAuQ8#YHx^kAzSZxFAb)E5|x@0q}@+M@)_axt`Q-@I>Ct8p#$tO+P z4KuN8L-mt?Ri^{TqQ=b`(-#U<>{`N@eB1PkC86;2pPXaUT6^{4HaKSnX_{CEOQrq$n%ZUC<9%pl0OFC zquzmNd+HJ4>g0n+s`7}(A0z$#ycY!=YRA_7C z22OC=cx68MTI{X8nQ9owhk6$8$#}!l^X7I<6`O0e}@btq20^GbzD4Tcj@dh1IWiv{#c1Xg`XJ#kiSY0)Y)OP~$ zI$34x!-zvE_RaCzN*=QEI2vyho#BbgI@wP$?-_y8=6Y~t*rYX9^|vMGDnIO|z==F# zx^{2n73ETWfof$Ze~;k0(=Os13)#j}ko9yNJ?~+SjNm5 z#giLidVHuGAemu@2GKGFC)VdD#@PLN({}aH>9dI?1p`zWqcz z(ztXG7ji#JU+;V^g|Awfa%$H=f~513t!u(nU-B29kH*tDtsfFtJu(dE ztUAnB>}DFh-l1)$H9skGj%94w&D>1w&U#}WYL_m`vM2}B^j5CgZDQ-bqt}b}p59h| z<=2;orRN^arEu=?W@TSAo4w!ROg9vbm!qg(HsKidz%j6h?Q&R(l=N2F@gy3~(eis0 zQ{oHOxh>QA6=W&b*4X*2i>zhHrA{_q2uzukxuNs79j?OFw$5IiT z5i=t?=0{mrS1W7Cmrar-mjj$a}C`*G1n>3WwZ zBwgSSv!tgb`1j^7eJ_d}626dYk#v5za_n{NMhSKDE;4ZvHjL+8$>(ii=JF`#=G|;b z%r9lI5KF%kS^^`uk;K&PRzWgeYQ<2KbRS`PSp=~k{n?3dT2jqWel>JdM|vCAVOhsX ze+RyF!)t?(N#Rz#cvkkPQYsiYLuY{irAotep7}W;L;1=zzlIZ0j@2%$>^Zyq*$!>{0&^^PZkV$^NpJ&CSc5&z7N0{rS9i z5Zc?T)!NGH6`A3c`$c)mE;sv&``X2Eq{pfH=IyKR8kR{&56D;!$l^3{JQ|Qs9#BAq zktrBZ8jv1!Eme6xpn5u>20N&ZGpIo`sL3;^B|WIEJ*Z=R7$#FF^w zBN|_AVn1C=8h>fx0BxE;9^xQrnqV5@5FVOP9O5t@ZJQ__49!*ak%_tasRxzrMe7lKpGcL>o;sOHW zGC;*>XxONz*uWYNb->r&Hd~pf-L+WtK%_o<(Po z$!MOzVw%cr7%ONHCSl+wZ{VR~;H+t2uWMipB- zFfw#CxaX;_{Zv;iP)8v|M>G+hQI!YKRs=Ct2D4R%@zh0$H^j&^$0@ZY zsJA6)x2NcLq}}hxFzLv$=y-0^nPcCP=hRW)+F9t{S>(}G-c=4PZ}q zcNa1p{F7Dw1Dta+Zg=swyf0wj4mh`a7vO*I{PR&70MrWypA-K_IPCjD5V6XS#a#|; z_@gwg+i=)m!6drjY{)2$VuPvL3mE{^JBIUKqd)~RN~4qCU9RV#3y^fmCyVd-c|%5N zL|SJA7bJ(3clq2=xSEGke@yS`!$EqE_;V zY^>XIj;D86WvM-0aLNEcy-#QA#h>I1CK^vJmu)RxESK)%Pn{q-n~JX6h#BpNVEV~fI4aFWod@Y^kP6IMk1o7PaYo8?H3iXh&F6{*&zM z*NC5-Z~{Cr1GtUwA0X3b#cM)$7d_cH#xHWNkYY?*%<||JO7e&5!HPF^W=5jb92XCL z?|8BLT{Z`m6wA5KiM5^_JkAeV#Tm-0c_E1l3?s0!F3 z`Mbk4&7Gf~Vm#s_elZK?g&iq$dMeJmboD(fitJ1s8!Xf!^G;}|diZNDR4~A43SRUd zc1LrT3zj*Km*cB-uXLK;G==ZAmhMxTCG_Pm$4**g#{!q*$-SXk^Olp@B18`Yzk7cE zJ*4vv9|c@qy2XbviPotUf1KpGH~0+ONQYMm*v~ma&gh1bu)mGtSb}7>6xHDmb}4Z3 zb~d-^^yDWrrd-kd3uqdLISHXz?0BV3U=0(bNQE}ZQ+9e;pDan)@x(ge&1d3W(%$7q zpK&4*F{B!35f=YAlWv)8N=$4zWE?p2*h-mt6PzH+`%USA<>$pK>+=b}LVp~l0*h@; z)5!7H$C-v8n{MTe5q5vc5Ft!B!7KU5DXS_dSMc{V##O>Gt|wX{v=hbXBAlIyp_)GM zZ*7o|1cqZWPE7QO`&bEPBX#jUy3|O&xyzIrz-z1?F-AOs9kktHj6CP@T6+~S;bJU6 z+dN~6g^VZ)afsVs#-x{qjE9{;fF<;x==&IbukwcI(bHU1KiDntOC9)0vxlgR9maxC z3WBQ6v95FN+b9|raDvDfpc#fx-PL{4&K{{j0$#&FV}Z{Gqm)>Ep4qfMt>6dUQaT+OvgCz zplU&8S(5c_uhm2X1#d$!}0MfD+hl<_6IlRp2jcG^7yA-;53)dz&HR?x*u zT0W?{QTWbKLD$>K?kFT;XIq%TOd%mp%CN_Key{y-5iWm7DwuFukY%tqDzBLel`I9% z_291Oh(c&$Z{ru*UDTR zFgIgtW=#9Ps>$M-C}xss7*1Cbo(Rdv)%xt#lLIfnMIP;suWFai-^n5RnRDXlbB<8~ zl|9YOZ`OIfuS@kN_jHrk76jcID{P+HKjnO%?9cbCQh}>K>cE?(1ne#!$oe2&y<&;V zgFO!n66R6mos%sZia!wDlAwB!Bvdq1F#-Y>A|gacNOzEt@1Oun z#}KQFgMopIg@p$|ig9uA@$mk}>H;vVn*&)dxj8rE;Kanhus6WH`gH&%XDxst*IWZse!2WPpTcQ zs~v%;ZloSi{cuAAM2(HZO-;ki&BHA%!>w(@ZSBJyog#$HI?&0+nnaps$y4yVfiP@NCu14G~ zf>7zX$jjPpmjp(KRm0i3ZfA(M73D79odbUgKv8LPcNjlku3Vw(X*^iDj$f6sG4MZJ z>vBOMkHI1JH@OGLK``~5S9cRTJ`iT6L&)aY%r%;R>hhZZ)~kLnH+;>*{GOe2;FGQE z$`lI3f=S}fvhR6*fp2r{N32b+=^9v@-x8g&wrrsDu(fVIk9yd= zS9Ra9{SzOGQ!DbM61(Ke>b`o{H~aQ|@!_-fnQjmUvvX(t9h{@yOQH$qepvC3PJMUu zZpXxbdfPCTlM$MA-7U5C9ong zGdsxD89yh4LhA5R8$Skf{@PTuaURXAlDEQy_&x7pZzwC@>wEcc%U{FY%Whh3t$XXS z;5=;9EcvLv;vBsCxsw3v_$x>4=vi%6U!TKf$>HkmY1(L zS_jhtze69MwW&AKUEQ4gi9RABUtds)x+(ofJ>)NqeLjux#_TM5sQtYC4;MJ@^H=Di z=Qs9Sf8n?X7H84L4B{Oy#^uzLtI)Y)(I~CYd#t1ONC)RWuZ*sai;kYQ4xUz{jJEr+ zwh508ffBE*W{Qip4UP_xRHLkVPC5a-V=?uN7^*Ryb7{9t{Q3D+H}~B3exT;>MwY-8Bll?B~x70i*dA> zU>X%A8c)=!PqkPsd6dK!T-BQAwb(v4D2aSIQSENf;@Ia=7Q%H?9ZuHb+H6o3;Qg#J z{YZ;vg-3-?$4zBXTZ?b5L50Wtv+^2`mcTfVDp!h|@-~i^P=A9eN8@Lu!&6O>b{;jh z1vjO0jCoD5`UW+YFP{~!8#E<;OYo2cJpm~~^+OfI!C}C|V;~@40{ZC_umGQcih2jA zhXKW~J9lugvGIPHgkRfYw+;cY2ar`UVq#z+>~-(3W>Ho^6JY@Y8vU>_Fp8l5OSNt=_uk<#@ud=kPvaB3P^Q$Va zsII64R8v`1Q&nACT~k+6TUT3GUtizQ(Ae121aL@NT3Z1W$&Vn9&d$!RuCDIx?w;HH zzP`Tx{{Df1fx+JpB*0o1u-r9%OCk9`wFkeaTmp;pz}D$4a^$uKcDoM`*aP7F+=%~C z{rXGl$e$`=|I!{1LjPX+qEP_)vcK$s;ve>4G>KyJ8IupB^i`q}EFM4xu?KUB3Mpa` zd$16sQD_X5z8t123_5`=G7p-i8VE#s|A@t)$$7KNoq4+GP5a})wl9lQ4_CYWvp;*s=Uz8Jg1!B4aeVSJJXwTc|V>ms(L0j<@#Ydhw|YR{*>F!TnUQm)OPIKCg@U& zak6wCav{GK2fU?8;X{c^uw7Xz zU7%yz*CIccF+qAC_hqkbPp`e!V%MkNzHU1OAPd<(2qE&`v5R18+p&oe8?(tvRMoR7 zJTr>i^}Ywj{!p~8!#Go%W3Wtfw;(mrCar9B*uETG{v3I~0@xzkuWb2HwqNzz78#zy z$J!CP@{e^BeET2kXJr4_A}c>=dgHNw(7YZBY>~ZBb@EES0?S{QzHt7vJ>a-4eLeU*DX?Afc}nE`<7dbg8BqGdcRZbyr>{JHsmyZX)PBLRIIKBCbDOR?M+vH~ zxj;&atNDtM?^N>*u3oL?5~iQM<~!6JM$OgryTfYm)yZ`A^(Ayp7i>B^^t*BYT;gnK zrRJVFUJiE*LnGMx{Jo1h93J>tM(_^Jy({h1eg(~}q@M>Y3tHgb5e z8ycf#^7n5qaCq})8Kajs_wRoJ`Xl0Rj4|8!2M%#LpU9Dz+!=2k_{_`sRL#%?XN7<8 zT!+(_3FWtbkvEh*2phx-Du#u{0G^w-f`v2R|nanR6kF){J(+#$fm zCd9!Z#Ki^DZUJxuK!^p>6>eY+gd{{nq`+JC&6D$w$L3!?AOFcOZ{N6YpPn?gnOHY# z)j$dZuuTnwKLe;4;L-U%953@f;h~wG4dmbc4YuJIwV~)o>=nRn_y@69b#-<14fPF; z4UJ8Wjm=E}x~sXhxuq3??}9ut+dDcs{;xbVZ-Lae@7K4FP5{;b0A+wjClGjh`_TN4 z`$cDKq_>0R>t>f+JTd1WX|I2(iaxAQT%-w}F9^S~?0}6d86DYqLLwM))}m zlBShpGK&#eumacfi8vP4wswUiE8z^$dqr-9$yb~EeD^|R+7gwNdIZ&7GX>~J&#gM1wdHa=e|COzYRxGQ} z$=-53+PlyzC;kU(l>yUu4}F@YHXDfRRgIm$9`v-SL_PYX@$JzH5)AYo_Ee|-G`3Lj8f``hZ;9~Z*U zKmC(C;Lm^cPwX_nO#tll?S=3^lQi|e{wk=ggkN2jz&tnIgy8+R{PQeuUj73Z z{oj|@e)rG7Rj|DcNqPmqEdXf>;7kE7`W7q&Tm^uIzAdu-$t3@iAAkC19K@Wy9suHp z4vX27(-(#Sb>VP@F&P>;_Q{96WLwpr+ieL&g5>71xZR(t8s+hu}=BkX86EKlR z4J85+<7{_2-@i5^^*S_a zcLY@>>d0aHuQc0fL~0|f>rQ1O>Q$`o#XW?L-F!y|Oo%-&DS}G=+Rl%4DADHwRTK3s ztya9ji?Th%nZv&(0gB{0sDghZBx=_g2?%?2-iBNb8{b4T?O8IX{doTB|3Wg zf0zf&&B!9i$Rf(fa+i@shLJ^{kwuY-MTv<;gNa3piA9Zx1&F%`BBB3Y5Vrgux(UN% zV`T$|P`KIHMA$jyc?9Hm1!eh!r3FOq3Wu7CjXJZG*9+0g) zM0O4j92^}VIypPJxVk{ztAUqlPav3W>o>7U;bUeFR>*qB&Qo19mbnp>8ZQ!iQ_3hwI{o8xn?^l7^a7hFa2w zTGI#HG6veSfDHA%j-1|(+}_UouCC&a?y|O?s+Qi`=Dvo;zLxs_j@p5qn!zDJwS&WT zgCmW@qpc(39ix-IV^aeY)5DX~qf^u4)6-Kk5aRp7!ouR>($W$nIdd68_XJo@YwG~X zX%n~#c7QNUAfVy~Hupz{+|5-0_=3y-^fvf6E(#I`O!&V@Yx*M$nnEg)MBydHXcB|g z&lwXS4BBg!=675R(lRRWq76xFVlpytVfcw_*^?^Pt%syFl`qD7blu=u?v!25>F$l*2K~t#w-+q3i&z#mnKt6o6~t z`{s3<*7Rpwi`)L{-{&lmJUc-Q@P3XZ@3m9 zt?Bdr+H^Mr*8}fu<^5K!K5sBauEB3Yc&gbY8Z*#kGWy z;c&wTo4%)#iilk2Vhr&)`??(j6}=fJ9?}*+M2-vA7!G&O`X)zI^1N*asKXC2?T5sO zeKRdci`BQQx?{a(6AbkPnJG9wHavt5|?eB|k zbD7(~RM92|QMt$)H`jV}-;8nmdWfn=|$1)|76L|WpnrHB%VbQZlqjp&n3iSFd zrtIaI;Nzh&vT`v?Og*gZq_%#` zDmnP5WqW}VO$6m0=4TH?U74zgJAF9_%_D=-5e|k$mxeD4Y=!01_K{Il??g#<)It*6BQ~6t9b;z6EqcAtG2Jot*cZ?}4D23bDtQbM8E%Da zp05RwdDfxuE|WQe-MjBn2BxxVT1B9L<$(VV+2o1u7g+n!!WyeY7YbGqS_5Pfx zMf@@WRDRKC{UnGySY@m+#8n(8qpuWEdbN;%&gQz#X%F=AIc_qf!IMm(_s4<4m2zU zNV7(or;Rhl>P;@RZDF}-fTn+6-9c42t%MoExPBkrS#5mC0}J~0q!9z%y5z}^%IG~e zxE6$&3R@HC<(J+b4JA4ec6!9i^KH5`6}%D$4mOtwOR1?%EpNje-Nsj9KQ=Y@435}b zyR57ec~TYAvf0Ls8-_nhr5JRqdX(M%X4hbma-p-z13U4}0hs=`u?BG{0l-c%0pXWK z47h|0xCDS`@d#+}390Z2DG7beq@)x8*_@o50?nB|9Z0 z9~G4l6_qd*l^_)rFBKKbPe$E8|L5PgD1IR8ZX+)L?h|NW00$_<0OvLz3_|_|ni)Xq zrKq@w_+3#6DIg6@TuM${Mo~gm`L4X0q=LGPvX-2RwxXJjiUvT+)CG*xpUy2c6JVwr z85xEdJJ z;-~K%sOc1{>>RD&njr6%BJGwg>yah<_=T)@p6t^?dA|~+z;gAlYMtnYd+{ws$?fLp zoz|J%wprZ{+1(GHce%dka?k1Te$ndpqA~b+O~mtx*zA(H?81bs{KU+>q-QTuGBQ)s zpQWUwr=+F+(=WxNORIi zYwAc_#z_0Kk@n1yj;xW6?2*nFBb~V;UHLaE80jt?=`I@TDH-f79q20`?5iB?uNfR@ z7#M8n8*1+x?&=-s?H%p!9UJN%AMKqS@0*(HpPn9^o*tT+8JV3OfBABHVPPI{Rd3$h zPHB-^<;{B+WP0~k>*C+(SloK7pYL5j z)()fu1AsHr-y=K=`5AusCp!h9-=RPmmKMQ*#?m+dJ9U$_1B^99BlSEJe*o=q)3>;> zQ@BhyS>lgjQg6l@7RvSO4RF?hILs1*pY%ISgvVErKj?R~rLUNmS|3B~)FMTAH^ffe zgkOg4`^wzV?|_-}=MXzJp3eP?e#Z}{|5pDF3QnCL#F^XhJN?dWQ!INVI}aKbg!8z^ zp!xWho!TsJZzJ{}F)4z93&!^Q!%iJuoGwFs{O&@0G(uhs^Zu58cXb(Y{aW;}@s0l@ za5y)}_ts9mv@HsA+Mb>si+;-~gG@~yn4Kkuf+0HsNhyqFy zsyqO+X%J2)WNLBWLvSh0O!urX0~l*y46qH%p+lT1*_n9m0ZFL{8-6j4#TN@DnfgWNPB%&EXK^&kzadtxQkC>5TF= znCWEvkAmoid?P~ZMwn0}v0j?H<~O|ok5yD>8SZ^*KZ;DSv8=x?dUoVGpkLz&kerD~sh)FF(L*_F;X1OCW2yI2g`uSV-vOjtQPq6m_fZ zcg*9KXQsIdO~*sP$S!4UdQqe;^u%^2+aAh>IMYdHvBVi!51dFi(`H~YB6HdPI17F* z=LC)ubA^Uq(;AcqO3UT+)<&6U5b4nbe3~0K;NRe&8GX#hX+pJ zDF3hD(@IO;m2*caIVai*D(`Qnyh9StW?kAemvqcuIa^{FniguO#mQiC;2b2gNK|M_ z396yRH}vlCSOy@j3hnO0Y?p-vY+rXxybmYNO?-oLXv$aud&)jNkxoF&gZY}&apC|V z3O6;%K2e0b&tfFh6|Wa?9cQgKE=cS@HEkO+Xv4R~iIFv}Nl?>O4F zU|CGm<&$kFxRF2soW2O?BY=K~s;PU+Z%j-wlwg8 zr+IYp;Tdh_IITW$F^q)%pfK&dtOa$)N3&?32qSF0C^h-U7^ImqrwG*PmTA7XaJJ|@fp8F2zU+}0zgExgv4}2fJo?x zNf}7U7)Z$&Ny(YWD456r0oZK_e4BxSk{%Ex6&)oN?N8BBQPELR(@|5?133Y-bPPaL z05BuT%nU?lvjdLdwoLoKA{^kqSh5X^j0uU34~|I+ib)BIO$&-k501|WO~?S^{i2i7 zM)^0CuYqz%rn}0bb`O7*8%#5Sm0hrs`@>Ee=?5cQ*$|boO;;z_q_TP*B---jw zZB=Cuz}$|f!l(Pe+(xjMkKY&&$K|{Z2;63b2|?#|Y75@RFb>oP)7g#G%ooY0vaDT6 z6@!wxWr$4cEQ@pAcDplJB>FF}TOp)eQ_%Lc*1YP`hThen+PT}0dFL*69Zt*QnsESD z;8&k*1zFv6w2p69^z@rbXl6UdU(&{hl<<^bu}-&-X$u%~_?j*8H7i3+Ij31MN5)_x zoH>#>2}S~8Vjr<{lH%#FD2%3RNzhp4ZYYmCqv$hOCYWiAF_O?cAL+5mmX#q)X1Bci z2EH!j<0`GCsc=F_7`&D)@E!oeXSBBG(7V4(qB9xNi@)&QcKa3EI(B_1GrDnR%IK&6+OkdT^)n3|Y`nuL^! zl#GfD2mmDqGC(1spr9eAq$Q`MBd4S%r(__bWF)0zBBf*@p=2edWGABJAf)6XpyYvw z3L<^k)NE2pOS^2npJ?7O@M(zfQeI(ja!hDSBO_Y zSWxJHbgIbzyEy(AUK~oX1dxm4G0l&QgCP&NH~?7x_b|xCfxxFK^5f$83F}9w6Yz(o z>`TvC_i~+~2o6HI=4b&fj@1C*;t&OrHA-$Tjxfl@fdO0`VYe5@bN{h*D@4e}ai{I) z#lg_q8;_07#9+x7UoGARO$ht>d}=Pbf`jn!)wrrEOgcv2%>F(*ery^+Dk9a+^rn)$ zhJ?$*QMLjDgkJOKQWWti!Ppz7bXpvkFtDV%#^#bNGfhc}ti|f`;TydfsT+4{Xv2GZ z^OChF+|y9Jr>SJ1rE*_e?Y@qNp{|ypzOLateItYWMux^l zMrOt)mc}MlCZ^VaOwDWnnVH)HGPkg^0Ay)rX=QI^ZEtPkU}NiGXZOI~!STU^hYx{1 zkhAlD@!p7xjEsr`mV={XVq#)rW8>oDfXwoQgoMPK+;X5!@pp#fFC52h%E$kK;rRcj zM?CYV9x>1X`ZsfkfIZ{e(gjen_}Lh`4fX(P6%ea&((}PPKLYP)$S>7Wg?NI&F)Vgmg^GzR_?phGTt&*y zI2_Tl7~=!sU+}oT8F`&htf+n{5^#YD4I7Eeq>ED+aY7oR4W{6Q+t6l`$~S%e6{Z*} zNnDz;WA&o~H?0ub-uI0B99_z#rt6tX=h0lY-gaoImbWWfWys?B^F)nXclO1-lWeP; zVI)V8G3g74tQ4AMIs86~w92=)(iow;z~v=<&V4kCt3EK}_BAdIb-Ac85Hpy#K&9=voDmrps83l^Fc5X^Y-Pe*OyImaj zO(H2UYw25LV7&tvBp!3}cVnI;Qclz;yYF;BNounstoP!TOIWD#_MUPsKgCTs3P8Yd z23kUhcYcJ9-}IFwppZdw(8{1&g9Cqm)a~ha%9GJ2noVFdBu^yVW8V2;zY6Q@n)hM8Ot1*bI#}=%|A+nixWjFQ8 zVS3SVX31rK#dG0}@6uY>+jq(DwhOoS8+Q-d_doR>9FBZCn*MY&e|WTXc=YDzXzl2D zbsc>DNx_xO14_+;`S-^7U)$w{I1fm$~1+XMF#jbafSXbrpSe6?t_PesvXgtJ}-PZ@om~XCZW?CKpJN zq*lz5ugwG41>E*;Mt-piu)-wBt~Gz_EB`Enz8S6m5d(7DS9UugNCyVEf5d>4K?t8V-K6x=p%~fyPfkJ4bpl9{kO(FD2!);&L_`xCv&{qZuq0#f4 zH-*ry2VOTZAd3eqZIHfld7|n~42XbUKM(`rVgI@b=qs}l@*l4C1RZ{11!6!pts|&` zzVcV?ttlV|1dJ{8Wq+x@y`c)|EAPDN2Kvh6A|gOv*(OtMy6frgmrtAH+tDyv`eX(} z$@eUV(KER$9+<5?fyG;z*Mv^6oW-*xcn1t{3$?)GBmXVCfG~qb7sK+x48kth8734W z0N4cqE(u|gJY|TXm>eHUs12o}H8$fIpJ5HeO5+K>!n6aGzK?MDZVIpqj2q$TZu`o{ zyCK*b9=leWdX@mYK=d^F)S;2V1~}=`;e9<QPj=^&#JctuL-kDN88+AJbTd2P8n-Xe# zpC(JBxM_hQdP1_6cy@?lY98v3{v|;QSBfC;+7emg@X?5Ne=u~ zADkXbJPCgAD5ghE?;Y@TI9j(H_$w*+h#)VsKx6B|Y~62VUE(!{>v zJ-O&%1Zg@S{Ym&sW#EG42k4rt5cTyplxpJP=!A|V?Fjqu3q}&1o>V>6N8L;?yo=3Z zsUB^6I)(}Eg`?>kz%^0MC+VjOraYA(W+9P+?iCmov!)HuuNmYU>5Vb0$cvSfFCfQ% zogzecl;HCosMXy|kv4dlm>g~P`##mLR4yD`YKZWt0e225B0}l{qPtl$bR&OiG7mZmM|vtf23jFT26iSU7A7X)Ik)VL&+gzw7Tm6C=e zM@s{O9AMR3M&=JG$VzLJ&PMYM&jE^@wkrWQ8}Gc5tDNvyK@1rTY-Rk zp|E?th)_{8Yg#MtQA$k5n8?^u8HXn)OUchzt^z=bdB=*nyB zdEVTg+Bld{KNR0ElF&Yr(!ZQNwVgYEn74FVuyX#(>;LLY{{A?Y2_@qC?QvYX5t$|Y z0vY9q;f@(Uz0xX&{0kA{;e+=g-$AqzBNZm>+@vdCY6ge?|J9K`<<1RpJQH@2`|Z> z3pGLdlJ{w+o)nO<^!!Za@~TgNsA|}HGv-D7UUhYow03Fku#@`1s)+XhTR9|^%N@@% zwX1dbp;4P{S4%y*@B)s;s_Z*jAeAeQbSDS?$r3%KVIZtjG#=XsXEcYKG6W^$IuxcE zJ(CnGa#&d(EBvX|EhYe+3xX1o^dN%jl$Ii-^0UP?3zx8Fn4qx6qDJ+;3qc9l#mFZz z?UE#EP#+bzNz0a3Y$ zv}jx0X>nY>ry?H;S%FNVT>UKIb>@);*H9hG1HA|G9I!X(unuX)`p0 z7ONg#a4$}{8*e=;s!#4=gh{50S+YV28>?3*k$*hc4=Ep+=61M+neIDX6T&C8X}YbA zE>x@9Dt5Wg{`GrEVP%AHF9QKEAsY8tv1`nIBZZtQ{l3`T>JOS>d1j{f3iGp~UhVAGRf{dA)^ZKCqaTESr6ztTqrSh`PfEl54q@4GH&0~^eHhAN+sEEzQ$L3P zB#hP!r~SKjae6Y#3--P~IdS&WB-751TMf#5Sq)%&;ev=jb1=KiZ@aoCHUG$v2~Wie zLJHY}3cl8J%{{FL)?4kpJ5s+L5NsWe73~Zgq7>hV1rU`XZz*i6y6_VMhrr^`I?DUi zg08vm7j^G)w+@G24bz+wq3rG(6`>4$X&!SEH&HWj55>jKJv*BXd8APj0@?7&N6UR6 zS-Bgxe(*kw1nuDUh_IdLwX|J3iK9k$#Rrk4|UbuI-K)s(b z`3PutH2+9lUy0&OOZ6!p%u?Rr94>W+zxYiRYLF{g2r0{!Oj6v5~hP-#bu^)>`IO&eR zjWu*hihU>WGg%tNPLYWx1Vx(R&lshR^suONs0L(O8)@fD!M~@K`hE*d+tcEM+e&i@ z@Xo@3WhVKI;1DQ!DP5*>5qp~IFeZcO0cjj8`Dx)+^iN~oXyM~{42qAmR>&gx> z0jY9?l5!5?MUGCr`#7Em$0y$E7A;Z!=wp?wZ3c~8*B|f}p85E~+LA@QE8>k$aT>?a zJK?e8LGFDidGmEBPbW=l z(l*tLa1$_m#}V++7}do9twXzU(Ct+x@n7W?#qyEp5;!Mu_rK#cWgURHg_!{!H*kwj zmD9C^jm#Cll`Kli311we8d+Ux569$9V|p1N`g~mqNYYAjb`Y7_=RcH5Vb5P9iE9cP z9&MlF6(B!)?R>h?C~_K9sDhI(EN~QLh!_+5O%f%X&xLLD@TAz$1L->$Gd`?pO!Ymv zkfC>3R@T6|)K;4LOX3q;Lu8f&mV+!;U!g`d^{Igs=aA#k^u&!=*vH{E_K%}^X`L>= z$`iw5O@Dk$>HSmX8VI-Jw@ySPpT5nujWB)nr^;3PB1ax=YpJ3zL){xMXpq!FnRzh% zr^;m>+%B=s0BE0ec~+xTnjIlR8RcGu2@X+E?!>fSFDlU_zoOiM+SA=LHmMI#~yTB0@Vdjb})HCPZf`b(iu85Vt zs$8JT2nog2!dNK5H@V8M35eCFA{V`?5tXrdifin;7kyfTe^t3y-ureKfgC+T71s-B zlW;ARtI)}lh;{zPivhccs?-g|4dI!KLC9cL`q}RKi_nW9AM~drz$5V^Ro@|)a&;!< zz^07I<*@asV+M=TRy*nC$O9psY=MC-Wsl3zjCiLUS*7hIqsuXpVcz^dDxt>9@yzFU zDxm>#wHa#0pf5G0t^+#;8$uJ+pxW{@hn)|hUqzs&HI)eiyZTrjC}afxhcKl*-~5It z)L?Bb<&BM{hsVS?=&YtrY2P8`YG4js+wknszE$Ma>_J3b?P&A9`|Xdpu`hK^X9J(j zXRa1@yIm_z#LNw%uxRmyaPMCZ90ZLf&0|DDpg3Qw{racq`z5Ow5x&?^kL#7_`1&4n zo8n=}hR$G@Jj zmgR~^huYMOuJEED1CzUvc3S!yR{Vkdknj+DtvQR;~Rva63dJaUh0>%ZPeEWX`u|7A-vZC!mx^oZ^Amsvxs3!_O-YfAI9 zGdBlH_pAgTYz_Cs_4}Wrh$mDvh^c(3!M-O_q`kQ21yHjh0rQ#-*N_dDT`0k7lzn&} z@oKqq-HS;?;B6LfF}#qte9x@}Gj(%kU2_68IY*ZI5Zwfb zFkbL;JeOjWy#N$DSk~o3qJPa9q)srXApvF#Ft@A^vY!b0TpzYc4t0PyQ0F@-)&UhX ziO$Od1kVGlH3GLOL+j0*uk(VRQ$_?q{NGLnSGh)nCOBJBf~rt~Ye@T)Gf2B!Xm>)y zF4Sq6)yv{(@brOyKc#;XAnGLF^HV~^OO$_spwAmrWO<_505tfshEE362LXxxy%y&0 z;!d;aXJbx)%8%UH3|yoPJj^#cM+N7@zQiVcsRD$&>_M9y=bItUA`-M*{PO%?1Uqu| z`kME^?g<558->JbdT?2~NKQd&03kmhAshMrET{l;lvx_o4A&x>Dk*L|C)%_-+UG3# zaj&mdg8vV}h>iMynuG|&o-aIkf${ZjJLbV(DZl0(00rS+F7SeF*@EmIy3q@I$L5Cz z=XtaLaQndO|FQ@68{+b5GX9b(k&`W2tk=xW)kh;Z%r-Yn=SNa}SDeXuTp=JnY%*fp zC^$qL*0AB+OBpKy!^VU;qDed#Tx0t4fFD@DR=Nhn)w!^_d9E8dO9jWM<+-$J#$({e zKBx4|qw;=eo*Dv(-2w#n0K7#Df(PLK3#`#L=x#@GXk6+=8hkBD+QmH#NsI>ot=Oe6 z9soy-%yGaNII5q#@g0tGlNQ~+4LnYlx_gZVhQALeKoVmnH~#p?=hNVCc)~Q77sl5= zEbiHXmW)96qHKd%ym9(I1CleS`wR(njDdv~7*Sr!7#Nf~na%OvX_7N_hQHGhgnz@u zSTu5GvdZM$wqh;J6f7j;cwe5mmIZK9sRHV>IEW|>BJ?r&lcA7@E ztZ)wA*KBl6w&z6l5=pk|bWYgQ9JMz&8tysIw=H!DFtB}c1tqb>7IQuonj2B)$_nS+ z1m<|S_@vwQzns zwL?&H0i$pJK~BD#ORnU$GbuGuGYUh=6MOAwiBnVS=3<-EZT!f7kn{Zr*CoPVRc*k>jP)_Z)AXOWw;m+yjmSc<+Z z!_dtG;CEG)YYA-Q)|PC`?$!C#)MUT)<=0wBCk+E_t5Q_&z(kz`t7 zDTAT1RPofKlC|H0AyoT`2)dFo`mZh)jrlVVEzVFgG094@wj7?jDwjtkpS6}isM$$F zmBd|@tFhu`sK#rBYBDYid77GcSEULb8cLyNIN)=&NUXfRU~f<3_NNr z2+NE@Rqi5PBwXJu@2XroIoAEPrhS$s{UnD%f2v%Vx^)*$btyquZYd`WxJO z-%y(pje6Xd7^{W#cU7*{?)vZmM034Ff?xGRA6cW$FPm7zaW>GG`h} zXRNZX32S`_J3|R;@A5Pxgyo9_%^rAmB)D%G zD7Z*4%XFI$(G-m`yp0$%m}(h~P$RqwRl+;D{%Q*0x^+vJZc|-(OPvv6tt#PxE@2f0 zVKX7%gCx$Fb@OG4Eh?osLZnU&1F-mvu;H!>CfS1L*|M3^Qs3ILx6^W{KuF5b_S*vw z#(>LL{*$`c=Eg(qHl_BR9bSbIA+Aj;UTP~rDk0Hq>&{NgFPgRoqJ-R{KM^#zG@c#w zGi{3x9_Cg2&?f{`sJ1eDwz3oxvK6-zAzGf({;UDF^@w!vG&R{p{S?&eO3Uq_L(qzI z)I7Gsdo9{2?b-RPxRZpagN&$)n}g7bh!D1jsgY{lX-6b!SNWI$N9Ot1|6fav4qrgv};pB-9jCuAIC`#$<))?QtSBReK>z?PH{Xax|{}jD; z3EnGy>Q5CYcQuzJCzj1H>n*m~3F9W*u&7%Ey=^c0MLPuJ?;EE@Vur&fQ@g6#`XqF* z>=`#Me?|7On*B6?5etoxN!TA@}Cr`r!@U&^y{J+`L67 zwVIuBGNA7RUrR0^_GXW~hWN4s;McgVMk836Qua@$%#^0$m5_ZA1}P5R9k~Iyr++tXT9c!m9UC4o{ZV8G!D$9>=KHk6IreE zi|o@&rkjnvC#oMn@C};Xb-)a2W~P;}>IP;kT~HhP*vpT&WcKOh=I36utZb>SYV@wj zM+gjvu5U3Af#y|%RoCaz%qqdF6Xn>t=^*{m)n?$j7@PoYJ+FE{9UekL{PH~za?L9i zi)|4u(6V=_}jjf0q52+@7h(W*-LWf&)^X`#*vP4y9bW^jC+e)M%Wg$c(}2kCy$6) zy>@u*xVKwDed0vvO`s3+W=i`!H^x93zqyzQvvi_9%UsoE@pH1jX7Q1MFNmR* zXCu!?#-Fbv>3;3`@@~BXj+H)H3O5t}wBaL(cV8O#61+YvzV}-htC5a(6uq+$zS4~Z zR2UHtA8bI1@eWj{s3M6BRYhSD#3Lk|u;)i!#b~^fj6+sa!T>Z5`!_h*a}xHlEpizg zA}T;;DPau*E`j|v2kl^fNxxU~G#h%`=MnA_mptZMym1f^^YNDA3zGMAzL>tpSZ{eo zz$6-U%$VO*i@8a3=D;r*NCZ2$upV!XXONr}GruRE9b>@8tiZdULxgF}H4etcJUr03 zC0-FD5p?8I0+Z;eU>p4Eon$M9q#2luZZz`qWqluR^IywN$oN5 z1;g1-_uoHSNyL73nh_oIAo{(Pj(yS?TG3*wV?HOWJR}sqkDGqc<5Y0r`0}(GUL>iI zfFo{_e-dGHan+TP4E>yGy(NY!lYFHEVht;AMPXwaubKZmxnFg@p-(bzNV4>83*+z? zeT(x>JU&@{VFq6S_TQ59Nx9bgV9Z|p*Q|Dx2v7D$JZP8HVUv;GqxCfLN5X4wed#9IC^m~0d-RiZXTI1( zt*j@e(Lj&&+#Z`b3*2uA;+)=)?i?`0x>a%zd=p1&N~u_PXgQElGAljtuwuNSl*eD@ zIPN*O@#)^&Pbj@1+Vk>cZvphf} zI>E1j0;}b(i6yYPr0&ZyRY*Nhk>Zjj*EFe+rZf!Tl6h#JT_HpBxsyxwk?U%OEWI~2 zx7=eWQ>7eZq!hP2bAm~wJj=HL?l)|C*_Cgem349}aMrC>D!llK&7;T#XR1=<8Is~r z;+r(7QW97Q;87OZ$VOKwi~Q>3Q4u>^tx}P={r_E+>nQ@5aaZNqvOuv=u9WdQIgjg?G>082Ci$ol1;N-}C%?ecnWibR>sN>2d{R zT#JmnwA#{qcu8*rFNTE%w3*&%1V`zQRK_RnGJ-#%M-&Vjf)jZx*PcCN?Ef&bmB=%N z!z1+JjT--Z<)K)4=B)3&FcKfi)av!ra<&*LjTI_MDxb%+_`P-p?-P~pzkV_An`VKi zO#9!da%oz>{$EwO#&TW^EGqoH%4Ic@xc|>8*Vy;d*nC;(zp7jr)XsSc2eN|M)DfTX z{0jb5x!&sFJ5u@QE01rn)*6Qt1g%i(NL%ZSPve%lt7pftLe+j6kMl=mK5`Oc({dC> z6WqbY6AP#|b>+Q7jthjGZbVhj&GU7>G!Cl zRL{87?W8)&X&wa%91x7W9_yf^t$|y|Q4_i!XXe5lZ80N!BOK~$faXZ3)$fqDuTPeN zkHk72zeiDp_hAF%3Z12GiLGXcZuGW4&FW2wL}vf{ z<%nw1ZLw0Bq4LPWFUQRToX_|(+4UkWKQ_R^tpqU$HC^rE%d;4ux@TN-Vb7^*R;fyS zW)>I1YUA3k4!S>t-_tB0tp#2!%BU&yPdG?HsI#KBd3mW9?f4l|>7J3k-6tvE^k^zBRRR4ipKY zdJtbU>QiL3L}2EapIDSTp6|~WvWOMKNIhYTmB2!T@(N2V8f`uZli*l)prz`zALNEj z>8yhZKOpQWN;4{SiH*iy|EMrJw)T$JhM+XyClF}X3`Q7Y@MB{|>#pd&?}|a|%A@po zCo|JV%c;{$y3&Ziq8(#u^#roM^E9h?Ap(=|BkF897dNi zT_a&TpiK|N`+};}q6KWUl)7F}NYQ3+!+qC!GbjE$(-49_t&z8xwni6Sbxhd_1THn% z()^sJ`)Sef!sjqledDU8HQ&klFzusJH3d8aH>fDC|Fhg@*DT-yFPPfE%JT}+H2mdR zx5)NRB&G-og_N!MW&@(?r~3J1C|^Puu~C_xFb$ljwNf8^%V&N(!P1TJ!8!7%d7e+hWudKBhaAH|HO%%!lR*xc_>M zVx)L5S>2`HcNpH{+C#^AylNdG{*|~#Id7oQ~J_pU!@Au041PNF}v$q$k-y~4Ay5d`ka8X$=grz4>Q*BCa!+6pB++MfFqSiOr_KnB$ zP;1RBQ*XYh(3)z(R;OnT-2L_DSZvG+EeizCf21^?9Sq^|l#@3L+me2mIQMW@pmhJNQ>(urRNv6(L z(stMU>Q~hTFV#9_oH}K%`S1fe<+D5AjIqj8cPfr`)->e*H>zA+I@Mi97Xf->UHYqC zD(6rG?C$@kDp$98K({%9!LXRps)@lmmC~k|!8VNYQ!2w}PfEKm274Py2Tuk^JxV7V z24_V|7d-}7QA&s+gBu5>yC{PPEu|+1gBKCy7g`4IH`f$CL=3*W6n@wA{<9PTyYztw zilA9~XcGktK_6U95z<5-no1E?OdlRb5s^wC=}8e4_RZwF%YwHzMyfYftvAl3H(sxo z=-*0Qq!_mt9Dnc`XRP6Sd8B_^4<0-qCnu+%p!h4s^>4==LUWfTxLbdP3I523|I_-r zi})W#;{WyePx^(Pm4Shqf#KDYCyI=W>Woa9j7&O=Oj?Xg>WqvkjEpi*o(MetuZDm- zbJO4V-^2loj87PunV4CaSy-R4vazzUv#~#Wb_d3A{NZB$g~t5D9PqF6@9uzq-2{WV z{=Q#;xu1i%Il(*}U|voxo)=s^cW!|@fd5YLC@%hI*ynCy@J{dcpO&DY@W1j3cdr%V z7Ztuc1w{G(Y_Yq|!7uf1JdU9L-35SOA6MYd#b4V1ThIU?WQH%~fG_BYD;R+znuYnM z74u!^y^sAEj>CT#nL9M*ZhMX0gN#!83`m4^Dn_=ehSX_63k`$5>-wg?^GcU-&ys*- zi#TQo*`)~C#PM5vonOO2Qq4^Hz0P}eEe%a= zJ$-!x1H%s=KA7FL87wTVEv>B0Ek7HWc)T<4lhX)&sT%qE{a1OVcnzskW6|%Qh4MTF zivmSULZ!+g-&KA!D2cK77V$aA*VW6@?aLPrUte#3fB!o()SYqQ4*b8P{_l|gJJ|nj zs4yidIVmMAF)cGDqaY-s-0yp>cV?4!POE=mH>?C6RoWR>)}CC^o>AMG+XOFd?=SB{ zl=h9J53S~nt`&`~)r`(}4-NMXArXjyyNSTNh3M^qch&T^756n~_cz84HNa-Ne0Rn? zk7gjh=YmdGza1PRb}u(}ua7sb{$KGKd~Ry6YQ{%dOorD4RPuku`u~F^>A%pdH4nM7 z;Sn@EPwRXBNwX5DGs;F{t8z^F<@}3g{h#AAl)vJcS@CF<8e$9ovLqQG)V5?IZjJsR??<`4rnd-#~NR+{Uv?NswbKDOblk8sp z%aY`M4v{4@XaD#&OA`HYDi5o>$E{M!A4?L&DoP!jNps=fOI$Y7_8YoBcO@=ky9ndB zd4F0L!D$J)Al79VlRH10VwSv|-kb7IiHkf*6XTv%ti?*W;ClW_#H4Zb6Jzk75*L0F z;9a=rKT2FbvLi|NWmjX>+AWyEzm1cEIF!o*vK6 zosRgKb&0!p;hiOkI(yr!0_H!E+h=yCBM#;!G^t+n6XC2m)a&27(-F_))OiH$d@5b} zYF*m!M@O6)K7G00lHaZHNf0&v>`q7g6JA<%{S=Y+bIjm@Lfc)5i^~bHP8ATrE6DccIO==#HSDM#+)>Qk&s(?YfDqgeJw))G(Jl@M12~WDwigr6$Zjj(#q~ia<>w|; z%2}yrSko7>%|oQ@i<{#y&0E)_eskjCUlXpsZq62=-lC_|2|r2Bmj6*J@b+pM(6K>Z z6MQd|V~SlZyG380{kr=E5@lcj*&z z^4(a!Vixt(vUG_rS6Dv{qtF9S%@R(e__ph=3PC~}A^&VO7=U?@cvWbJG<=&Yc#r_%VzsQ&Ja^r?(bo#OO zW`^meMrn;&;IiFO9lC;8Dh@vaxyuhi%=3-odK7cHe^>T4%$4hxWgBwLd?&I}{YYI# zrNBA*B-C(ZjiO<KL`1|tsHMdGI&U2brM69$J$WNhQ9fXs`97cYggM>n9<;*U zG;dz58*He<7+LC6SOu}F~;xS7@L)kr|R2sY_iL7{)(E22({A+@uH2#Z< z_NkPoZ?Zf-RF0^@yHB3#PSS)MV@~ur*Q{|K6l&hpo@;8aE73XvAp>dcsAu7iHWKg8 z8Zq5c4R$lJ3imb`b#UL|Gjy3T`uL`6N>xn;ZLD%_*K_IAl=%w-dvYo4@6wh1A1VUN zOr7y3(+nPrMh>#tm=AnOO62>_3NzJedN zKP;Ul16aN~tz_1+#IGp5!)Hv6sG%)EOyyauyFf~jF58#||XI(>?$>)@QeYw(&KFtNUc;)_LJi1!IQ#pTx zC2luJJ_`eA)_1Zf%iMuU_D`4|Q!pwYMtID^cx_C}&@Uncu9jZ-lhJmARR@pa8?V>E zkv|aT%D zSEq!;wv zoK!xjRT&^o@V;I+xqmjEhdwEfY~D3jxtg9qpVkj~t@4!#4SLWWXG+}LDlynMQUUHa zsI(j<3|+5_++H9fTaNKnU=0`O-{0wP4rdvP`SOFxkaD5dR}^e^IEF&Hl59K4PPX_QT4%*Bfd!RA*lBuLivF5y_@sC zwB~u;QgYu*bd6{wZf0;zl=Q*X@}Y*fZM3>?loLm4;y?7Y zO7+3hg1Ama0b^tXH7p=$V308@Bux@z(gQJKb^WLnmJuJac~ zdAXkj!0x=W=e|l*uCG}k(vSeOb3%Z^CWN)euVw=pqY1033vy?HI%&D;)(5%(pkHN! z6Y_$sv;qUogJG?~^>F+}BqUo4TJH+I$%9gj`nzu6`D*#VC0(QBU~lsSuIxZKtbr{k z;!BdS8&%>rT0S!Q0ZbNt4w?b>l>U8?u%G8)dyB+Ztw3r)9~mut1{5JHRT!ct9LFLI z2KK?}ajzB(ccKhCAo1Hm5x+PO?_qUaJP$jN^kM6XXk-oF+$7!sN7}PQP}jpwV0f5Y zFo%s`NL`3iLa=syumLJKGtoVx9zyUCl5G)E2Ms9{gchSh?)P}_0zwHGLtPR=>jhzJ z^`R{mVO;gFdr9c9h`V}{ykEbds{{lzMHLus5%oAfh6V*wkPCfh5p`qahb8BCSRb>= zN{nR@CMF+=z>8JcikXMR@>xdp=EDwpLUq{uTh9Fy&SR@B0;=)iB&G-zAh15USO_4< zArZJH2}<+9OH~D}F@RDfL6Ba2SD^&wttdwUf)!QJ$^p;-5)@<^xR?P9WCJUQ~&_V|hR01zYzm|dS#ESZ>okpxK!@s>}}Igd)(Ok6Wca?l1PX$Qrl zl8PU?hG>IQk%7xm3DLa?mV&Ms+Mub{XqTjrsRQ5&2B?23Rfj4W=97|Ep6o1?Mz@s; zLxTwxTL~JI0v)J8D;YpXNYIo~veQ&jlVt)VDWxkZv3)Cu-p#dC@GDdAi>KPItidtt zLII&Dn9ai&*m)TLR-A)u{8a|%WD!qhlXx{h;CZjRcmb$aEAC#B-@OpLXNli!*n&S5 ze5Xcz7Y+Und=oL47+|=S(O^MDFYL$p#*er!ltSk&9_wl+4>Cvu&OHQ82B#%Zxze&F z+QSK!7Xt&>lIb31#{_3P1BOdpK-MjGZVs%xi|K6fQ{MHRtV-Zj_o$+qd z?-wlW1$!{JdvSwN5x-7gwngwFI5k@?8-kzosv&Lep{xFR!dxFgGAnf2Ct>YPZu3Qy zkzh)JTS<6dmW?3vfI7wXBC0bf5YFbR)l*t>k+etcnhr^!>y3K&FnXo1v{fkk*gcP= zKiICPWLr27V4d$go!pEM%CbvsW^>hWFJC#xmuyHEXD=sv21-9D-z`9wMg+;7?$yJaF_OVCj3Gr=i}5tcVO&C? zS9lq(tmC-wOBAe&SLI@(&WqXE4o#N7|NXF5>ths4%=A^4IwMZ6&uu`Y00|M z;E;WtKx($KG;p+dVf4486inTa%gZu1n(~r@U>x0a%Bw8=XQl9@3T(pqo}@g2oxm^C zSuEDUJ@N(NQ}|PMby)`$Up-0~i^_Bo)9DHVr!x{z7j>rRKfo!j+zM4!%LUiLRgFbe zSyr_#AuyYy0C~0|ZG}*gi#X`Cps+TYeH| zT1|yN(+>N!N&GSe_FlfGEisa`ujz&aMAzfanh)AI4`bMjpu>y9m8)sc^4X(`{a8$> zJKJR-8lm49XVw(DejfT_y1Pd>4!1r-Td%~Du;Zs?DjL>W(j1(yD z4L8tA#n%gAyzYa@2U#g31{4J*6E=n-@*gTD4r-Tr>n0Wpr34}f5}JAv5giU29TLS( zFZK8^wL)90e54e;-wJum>>`3Rqvv-AL}&*?00YBBoDDkzbF>~iii5s@!F{5t722U7 z^TCbcXIs07y=(U?#UU5K5E>Ekn-=M3K6DoLY}VfsyBSF|hXg(H8mIg!Bv=IqN6tar ziPMIun}=!j-I^vCHeM*0(&&dO zyp;n&%@x4n9pm?r;0TEti@`rJnks)Zlfa2e(MP2ZunZg!+^UZ2G7=oOj%#M&!+rR2 z892()_zMT7M^~mj{c(}1!0`+s3-l;aO%%Ts2GB~9Z!&Gp?Dd?`;#@1EX62q!V#!p% z+*Doo(;v+0?9Q(bsJ3T$gf z2_b>wMxZeLA`97 zd5~l}R%yvHs{!Af9g&p5S`rCIkr-b>>)MOf*)HI!?mS3;e&yL9@NMa`D&4BU7e0$c zqKa~UVgr6$aX!};K7zqTw8qNf_@ns|&Lt_?rJC@0Dsg7++?h%SATonU21DAEaXQt_1cc0uS9C`Wl)sC?_4!9wEmofXOT zYULft{q6FWHPPp*7jrXKL0kGCMl1P1J776?{=|zaV+33TVL-;I0 zBIXFve~p1Rwn4yZN#I%O{=M6|@tegX10W&sKIU`Hp%S8PgE>me^++A{y~J5&|C`Jl|}4y}9AF1XX52Ve7}fBdo^Q zGF{n;08V`k=VSjei<(FIlYk28R=?A&9Vzi$0e94RPF{i*j^-BhZm0FXos54uG4P(f zQsSE5Gr#Af0%Tht3RmItFyQknJIGMsyA|W(=I86f_{DyE zE<|!+5q0^a`tqycQ9v0k`>$DVn{T499 zPWJ&WqZyW!G6>cVK>G~DA}UNj#I(Zp-&RW~n*GM#BO&f7#}q;m%x6sMjRM1N);dOZ z+DT7T4f#xmPSszZoe-bpGAtX?pI!~ko=Wgx7+cMUDxNs3YBBxlYV)59GyHPyo+EU6ayfxex+@7Q}ZVYHHJQ8x3oU(Wf<96{+8Y3+^7% zbpXMiik++CsV%G=!0K7Wo1?iz-!HL4YNmMegv!??u?E%=S+c~h#9+DFn)!VJnf4U@ zJ1TWXD}y;ge1PGGmr&)dLbK$78g*j!82;b8MyVG51TFI66uezvPQ&h0?cZjDX=2`J z+($ac79(1Uk43&RsWm@UN*BF=?=9F&*Vry}r|F)3ns4^H#ii3bw_ENCr-#q&j+f}- z6H&3M`uJdQWGQuFty}7KLEt7f-FUlS+rn{_#GNd@UcY?*+);|-XZp(J;qUPUfzJzH z(80LBS+EPfe{FAE%|hcolzkFJupQKdNm&>v0mZ1^eTi5M$tmk_Xg_#X6_&i+p+m+< zz?qM52xI4KxqMTeR8CODS`u=3@T`17xTv53+-VJOEdLtvxFz67L9R8`SDN~Vm1TE# zVs3Od8(%EKSDt3>&0&UCes3`EKk=FOyc~i*aB1w9FM1;F=k4K-R@eU>p9xG^C)YM} zf8MZFNT?L&0K3>F#ZmGFB*v1FfdSaV&w68Bn7E}APbK{#A1iQ;AHS1-F!n;?w<7aU zlZtHIroQc6hSDEZI2WaoqtBHAht;Mv?4N!dK*@H^f#YTK4G= zlNc4W?V=|72QwE_PS*2kjc&Hwpdpgt{I{nXm#jH1i)ei4I~7M2uBR%pkH`^w;@M(Qr@zV+i zVj6`Kk`q50YK!W)%0e@n4^NkivQL89QszmED1M|}6mT?`2Z|Io-7H5NI2?`?P^X9N zx*D~IJ>g*KDYVzi&ral+duCOb6!h@BG8C7h`{_?X*E!b>FGUW~g7rWq!B3fOENWZ; z(|_PI-U_Wkn?_H^s-(KPy4UCH@&ubhMb^YU4_VOVh$FbHgx85PJQGiOEDWCbRMBnY z5v0^j-23Ki<92WpD`(#P8kzC1c*y75p+Oh=`P*VFex&aN`}=k}!IuOYc8q&G?cKub z)TrYje|l_VJnP>-x9Pd1~fS>SV;<$RLr~JdgDgl{9UWozBPP=?BIX+O-)ORh@z7>`a`#{wtD8n5; z9QL7;fi&Mjn!{l@{BytxUJm7>t&D>(*Upc0CwGt6=oKF=u;2ZtRxbYT;V9_rhvU@O zvY0l$k&yu=Ow2;^;0t@N+nz;+qMnyhE+a7vYD^gT<=Bj>Be8i>rtInkB8(hM_a2nD z;)oykK1f}Rsp~XFH)&yzu^Pwy#5My5qJd{jk9{W&w2)#JejB1OmPy%V@ppViq#=-*wko~i z_^J5Wk9YC=xv5T4nfOYq7|9cN2G*Ja5Ow+c^wWRhGisR>6Oe{zUx)LZADtf#+I)`mr4bDy_0Om;nY=`GjacbRNlxGAMqs6buivava$rfid0RIRF51jSb?geinMU6mgtVi8cMojRByQ(MaoG-YC-h<%Go%GzWue&#kLqw1J} zBWCf6avBMhamplb-h3I;MxKMw#lj@EMWrd+&EI_-?wq~Nu!YwZ3=dZU!e5sPN09i;od5c|;!0Zw+6w=8oZV&bTodWNM z2*wRmS~}@b4{Dh7NQ)nBK5koPk#*}+Z*hpPn_YVWbwhAQU~723dLRH78XWcdOPhu?p&xjx2*}k>@|&cE_I#TQ5%Aw?B&C! zSfQqM=YZbvmQ!q|rJc{vtMOiNNb2O=zDPp#&=l}EgU|~uMSRp8{RK0JXYSzUIWFyT z3#40M{xIxY*9xTy6^AM&Q&Ie?cJcy=m6-=s<*GjAVVJ7qV@L^QLj%eUlXc~{1miE?D~8_ zoO<2AaCsMHgnxY@ElBXqDMbXe6)pH-()1U%7|=%@k!JbvE8ZUs2vF7~u8pjru! zTZv8B?lHAudNyN8wK~6V#W}9PC94F4wRR8&2|on5*M}=w#Euj}zY5`8-3ywl54eZj z&Oi&2Z4LOUjjh;&ttyyp3wuC)9sY=^d1^E0X>s@?Cp46XBgqN_#EISZ{J8xEb_bZO zgNvzyo412Us)JXpgU_Uc->E|&phGaWLnymLxVl56vqN;OLu|D}{J28`yHk>^^CeT~ zE8fo6Qk_z2ozf=CO)Iv+4T>6#^AWi@PCfaSj2W) zW_MdvcUyOM+l+PFu6BPq?*5Dowha_4@t5ieQ0oaa=?QY`fd=%zVtazKdqS#vLOXlH z#(Kh6dm@f|BC&g;$acJL?Ffx1FML^W5f{l0FrFruHQ7mJ1{CWfF4sD z7&jT1a2l8l7(m4iOl1#DR}ai|4$O`X%&iX09}g^G4=$1oE-?)*^A4^^4X&yUu9*z3 zI}L6G3~t5_ZeNIo~ zFmxU}bdf!DSv_>sIdnZXbhA2yJ|4QoMq-d7?=d4W`H)!BNNjZ^jwuq?83_nP;>98H zbC3izNWv~8(Kr&gh6J4;iE)NW$cOJU50ml@Kad_KQy(Tb9j0&|rVJdWiW`2IGfZ7G zOw%y?@fqdjK^T-pv5k~0|CiM|!(~+mnBP@XpuPYeq%7Mn$FH zrjNWgUwyxLUNCh&DjwMN5@$?ekL?xbSQ;tlTV}YF`j`f<+JfDftm&AXX_x#OP>Fm@ zp=<1|RN>s>m^an93VGMNuJE_g>hEtl)oXz2Cu$m;(wbi5T6<%-QR-^hfbRZ-jhuj1IIq7Pneocm^n|F2ToYTO<3kkSk+8ecTL!gPuQ+ad^(xA*MXC_U+;Wbg!B8=$iB#pY%enO@29<^u|H?kfVH? zhkf}_{?e!bbyT1!D#%&OixUNnLj~ucLTXT<%_vwGDtrwUae|7>(F*rMY2ZQQ4)6>x zref8n;?^eBSOKvES~NLYiunK~u=YozsnqeQv^A`Rz$tgQU0`RSAd&^u7_8kB@7o59@KoIrIit+BZn$#o=o}?RN|$nlnDLSrCE`t$ycun z5z}$6(T;J}`D_8r%hCFToc$3v*$}Sh?uBESh>O;;o7Bk&GDl7glh1lH>v?d(CT%r8 zZ_akdO|?IQe#FxkN8!4o=3L1E{mrv3663K=rGMiteLk#&CP+<^|;m~dbepo)|>x>ySEOi z`t26JX*S(R$EH(2T0laiODXA)4k_u_ba&SV=`M*)NJ^)GlG5NNL=*%>+&o|8cmK|P z?)#kQywAMzzJEN|tYN;h1!NfZnrp3VU7rt$loW@FueVVm#Vg6rJy z{`rbQ5{3c0v1mp_gT=N#t?8z5G@hp(%JFul@dnigJsM|25XQ3GNtAvs22P!s+eQM& z#3b!U1e1yR)T<@3^R;ra@GYy&^aew?{1V|46T0)Y%2IRnwHK0R7Mk5VyXh+`&Q|-9 z5&COulu&aYt53EtbSW6RH7s0sZ}+Vg2KUs8@v*5@Y(9G{hBd^J9bvV?|H&)d`aW=N z`^mO3x!D5x3%?(h$DgcM$aZANBQ5!MeDf(kx0p)mZd9;DXir&wj^Eu^+f|BKAm2mP zL_m$7I)C2c+4cNk_HqxM^?XT}748O#@T!aS4qP@2G*l1N`}o@`YHg*fWlPE&15pZ0 zyKUQ*?QynR@CIh^2I?6HhTB5W9WpT3r>uj%?0E~Bp_$mYlxYR#Q~E+)__QqfD%x!F zMEI00?WY@uKQVWOM7-o(UmmoPD*Rk9wOMYpWvFfy9Jmw`XcdZYA1Zb54BwbF(AKU3 zolW;s6g0xvc`w#^Ar`}^@As~?l!Gb8o~OK}8DiHoVM|QiPD+12(8m_vK0UoMv$tTrNRjm~!?%uiNH%Jq${pW{aA z>CIp$eB7|iS`A1)4r6(q+G0n#@Gau)7h0P|s*7(7^#;g2TOY~X!qC4n>3#gpV&mqg z_MJ8IJGV z=RuzD5nAIx_SPe0;!HAqMD3B527#jHeJ!mUg{Smd&%P>X6KLtIE9l;6>P;)?f7N{6 zqhPSEX;`mdG_7e|pkUIYX_}~DRRX`jpAW17AOCj)t?12)|0~P!S z>Ua+{aRq_$<0+o-Gh7iJToGM7Q9V2{J$x}eLNQ$;ab03@UDAiT_at~cEypXfeN&=pbAeW;=-y#YwY2L$ij7+*dRKQZ;MVBt z>+kO$7#MgrFaU@(h6V?RhyJYL;h{ek}y|lFSKN^t%xyIh!9^gd=BQ zU1e%sjQ@sDL<>C-@7t^j2 zLEQHgmnWT|YF=TfnyI0!=v0E@*an=_&FLLahSaQ|4c#seQ#d?+Jum3;S^?KUs}pJ0 zKrr`hC{Ly_#L&aXk@>JwA+&v)3im?qx&X}@arQHn;kpRf3;B#H^Y~@%_gEYZdRt9c z@4_lNg^@EuC;q*VES$1hPD`t9F$?or&vt!jhnHf~)!f22GB z5uc2Lm6Vd5l!}vtnwyB`J|V3D0i7TLy)ZtbC>~fG5Bw09NdlKi5|>#DheaBPO%|J7 z9*a`}#I1~ZUjswn8O8%0bU{6IA$@e==V&5^Xd*^vqCotag%>kMy9HJPAOGt>7c<5X zGsYA%0*M)6iyPsJ8{$7SAd)a3mwZn7NS{txpGj7a}>kqjTrKOBVks z^P34l4*_I;%%GCZ{zx2Z@i0ZL!gtYR^d|4J_&1*<&|(InQ9fN&WMIU~k;s0!p`5{C zio(%4n=N*q5lhXSQAqZA zB0}1%)AA{qX}1ONzVxqV!$l7SBHPN>*>>)=bl#vbyw`NK9k202*OKOa(;hdC1c__C zZwfE24P;(;?6CoGO z@HPI&h9A*Y2s-;cDcdPbP`-j`XxU=}bF8<>d$%)||5<^ePFf|>6# zvG6gm2!L51fLVpWY{HD}B8==}j2z+&oD%e0Qgl4hw7haO_vNYi6e#$W$plnM9%v8= zYT*g#U<>PmL<|51FZ$n!?H}n4NMLt43ji>K395XprLD^1DM|b&-OfbTb`HB&MwX`U0=Gm zxd5(rH$e98?%@IW-d}lodU|}!lER$w*V)y@S+ymZ4W$`PWf{%o>8%xMZIx;5m1!MSshyQcoz-bwK-8qa z1)?_dZEe=uy6m_0xm^wUT@8g@jYVBerJc={ovn49u;$K=_O9Dq&#hRj`_Im&w->OA z_4oA+^!Ec+vA_2}!0u;wc=&e51KcA5;Jg#SrJ~8nsk^-nAa{TN9uSSq&E0KyK79Q6 zpY}YT0H@f-#+^G1Fq0k}+?q)Nv&Yx3UjY>+2IC8W+r|{|2`OP+%HLc(2r zv*4g?^s9%L^vI3-Apa}O(V=@7xJ9^evz)fObDt5xD#82oMHpz$vWJv^(Tkz)A>ylX zDdGFeJKCVLOlij5%Igd*WSZ1y*+&^Q5 z{CqfUhwk`&mkjzD+PmuG=0@6EFdZZnjA0IYP{7N7X2alh!^Z#$+M%)CaL4u7+6ddh zWkp6kP_x|-!N5fe#$L5uG<^Uf+(E+IiV~$~9mCs^Cf~1E%p)gapYNpvS_rRQy)+7vqJ5HfEMUBCI@*V}<))hx^Tc1Rgo+}MTj0z%^mPXcUW!IGc zv+=^at<@eO>j4&JFj6@Ow+_dBBj6(^j|L~tLr$Li9NfJB7Cao>|8=l(@G`UUFo3ye z=-7aure&j|VFhf6Kmc0Adz37H=@M@(iOiJL%+$2ZwDipM3@i+Q2a$=5m6d~wgNv7o zTY!gK=su4qAFmW2uN*(G0{?w^f%}gI`DBCy)eT24vkv9heZiX0G6R39s-$}6fWD5)tbt1GE! zD646zs%vRzX+PE0)7E>gt8buhUro+BrJfIyu?AbhdJP`Qnv}d4Rh?n5TA}uUblgQf81+ z21G42NH-?PG9u6s66h5a=o=W|?;8;48vyYSy3Js>`RjHA78wy46&V#B6&({D6B`p7 z2Ly0cF)lss`wumjzrJGsffE10vcQqbps}jpvFgyVny|5&@Uhyc(fat| zhLpjktbvw-p0>))_QtkOSW|ajW6wZC-@Cg0!J2o&RfD7DL*wPc6F^jsOjM3eRE71SInVsvOn;%(Nm|k7|xVgEuyL(ru0ZQe6 zuhRaHwqk$ftxER)C-RVXt#Ij-|9su@bgMUq=)OM;@*naLIG_j1`2DMVA|o#SUPBb> zz+A7n@P@a zMc*IFnnRDB1)n67mTnxc-E+N1NT-+NG&4ftWf1QoCOe-Z^0Q^}O2B%NgM{`TGa8d? zTu%Vv)Du3ar^87T12D4sZ$UI>Qc~3(jEr?S` zAwV60K10|9 zE2yU3yqc%2WcIwKt&vmAsA89Vqq+iJ^$^1^gr?K^Wo36rG-GRfHE*5P`7dJj0`dku zf6%wKoN_B+cNPxIKsb%ehsIfaE=tD+8H`ZSwzSM5*#?a#!%K2EYw&}MZ}wI-wuA|2 z$o5I@mE5?Sk@qtv8hMe;aeV2}<+pCX9ytL?uPfbEf zNpo*&jS2li?!~vX4~<$IR;?mG?{&6BJN&xC)lv~hFG>mt=d=+zE5PMxC9kl;`)Z{5 zDqSaI;!(CXQ8*?gY}7@@YC}jMN_bmcAWCq7&Tf2Jbyz@#-_J3-1e;oLyZrSHlfWb{ z+oEMG=Y8gp)#h)9hmBTm$~{vL`jnl#dz`o&7Y1_lq*EXy+ULzpPY%73WtmZoe*P4P zGW%J6{VL+TcDlBnlUCyUwm&e1VdDe?7RJ-#5HLrmz*$mSsoRqE*_-L=yas^HwK zWviakZyG^+K9)(>7jKcIIGlFdW#_{(qMC@9wN?FA=_2=rLCRAB4GdHm_eP0Ej%2|3 zNw^+++U$?^?V^RKv?#SN2?+IB(GD&##ia@{;WHeXtg0+{3f9V*=4>|o&nP(@+o)8M zWv!BCCoY*(+|hGpQe_*PQ9_=7LFz2!jEmRljB{a zDf~$Hy~K#N-u3K9UL^?*BB$zfnrZg1SFBh$zHf?UW`2suz@0=b5Dz|Yw6awB70t!P zJ)@CLcsCNFizeW28~nIcn?b3}S`L+XSU@>*^tyQ{Ri)2XoY#z!@P$1`%BcCV^TO+- zI*bf1)R{-xLo?|)4Uc*{r^CQIvsCAiRy-dx;F=zU-+plVIZH2dk;5m1uI%%6YVNTz zn@@fVVyrt!6fcFl)4aa}b3U zvDPm>t9m{7Dqx~xVT*=6noD%%B?g}3 zWY_}zJ@TQ+g21X;z3)OSajJJ48znoc#JkQkE5ePgjBl9ci{tBvD?Ko4U;Qnuyfmti z5K;K`5ek#pZ}MAOc|#bR>L#|~U$pXxO?H+^q6TmufqJBm!oShVYx(=! zwNy9UYbb`L@tcw&Rd>MDKSvZJT(EdG@#%2%X&$Nn2d$h{01FWBpcgFA*HXx246E)5 z9RK4pVDJVO;MWus6ciB=0jM0no)s|HC@Lzd zsHmu`t7~a#J$v>{TU-0@<{xlmaCd3|bOHZm-JK)c9VPs8Wqo&`0H85|4Jyzbw6?xI zN&wCg?hX-v;{(8y`OmVDtnZ5Jzw7J2OKhM`c((%nv4D#EUyAO# ziW?}mfleVH(FF9Fsi~>|7g#g@rKSc9nyag;KxMtQwzj^$4%F9xo_lL+3#hVpc6R#Yb`l z(TLh6Wdu9pW8>Z(wf%8FK0*cq<(mpp`M))a{^JE+FjxW%)&qkrz+fXV*Z>UH0fSYT zm>#jP2(qy~;N}(-5CEVt03`4i2LIw1~1q~wvO`?R&B1A00#a~29*+j|OMLlthR&tJ3bBR`WiP3V6(s2zpb%R*D z`#ZRKJGs4bb_LqyE)I@Pw>TMFJ1cAJ7gkold&u0v!qmjn$j}IQ&)vQs^?;*1z32LR zhR=134W3yUs=JxU2UEPOE~XRtF_l2gX$eL{$0)S9tiAIeV8``BGb1w}hG!Q?=2ylRK20reykFaz+t{Ap*<0E_SpNET@B7!2^OK8< zuRqT|Uw+@b{JQ+}=))y^^5^d8&#iYq*Lp8Lb$?&#JpR}YpKINI-~4In&GKZ^$H_Ny z6K`fFnx`k4r^Z_*M;j(aYQ_i4Mn|efMyp50YDULu{wm+pV7;#k`$B=fxzRt%rvBCa z*t8Xn1-Kuty@LD4GWjgW^8SsMLwo0bOyxA@OzRKNqRCRuS8n;^egw+5mTJ8`E%S)q z%74qIgug7Nzg)R3-~PBC&*O4a>ev3bA5~#4YCVB?ce1JBCq!~k)%K>{@o*N)wLj&X zwovFDEvHDM+GMgrXmh^KavZ9*!gaKKE1UX#D*VU&c>c%zSn|jH=wtcE{b+LUkNeTR z<<|Z9HTg9ngkGcDU-Nixu9__|@a?aQ`IUhJjdj@d)#d4ScYRM!(1*a5vvmmC(4Mv` zYI?~=2(B<3a6dj_-wXq2Ih%59WEGncG@iGzsXw%w4BIVjP)WsB4EHT9hi~XsHudoz zv>b_Z_;#Z7EiLCUx!q2(BKA*>6jkAU!2S4yV>j*2{b*gen_+ZE%K_YvFEZ@*vTe&M z_i`Lt_xEyLhW^lUmbOSIwTo?pE6&3P=e#ey>MT*45Ae3e} zNeOwBt`B?36De0*1_|9|>DMJ0_ElNALs^`$&=BQqPQ+E*K~YJX0XB14o^rc=d4alE zKMT_tyAllu_m>5g9qCVp2GO--tT%#djnS+#$FQ21DP3x&Cbu#zCY??1^AS6dCnw0B`moT%f zCAef=mEy~ex4O!>1$E9w@!;koB@hbTu=4kklPZuyOwrSrCMapSqAJ@Y+!CWmgOH?} zd{*0?x2zm)$2IMn5GOt5tIp{EpVlCS3-@kCL-?2uCl;*-Py?e>88v(bhDklfMkAUC+qd4wr8 z$1Ub4;?v0c=57bi#cc8c0@T{NCZRg!poEGkbFOFn(;0gb``m@TQ)0ExL{m;j3iaZD zw7+43a2=#+Q2Ffgr_zb>@DDtE2yNUFYdQo?6t$N2aDhDsd3X(;oA>CVDaXlwax7w{@sSV(6%?BdgxOWr`Wy1pd+3MD|X_mETATG&{ z5#L-zU8*=+ECvi$Qw}PcD{bvy6=sJ3oX1(5KfL5HgjI>>sbpCFD|!Sqxgth~iy3{NE%*mtz-G#G0tXgku7)vEGFQ_P&h@9icX@=pUsm1Y zHowYf>8n;Qs>q;_;b{C(Tc_OMx9`B%XjV~VF80Rxxs}7i*FR*!CcmU%saR{*=k$}l zo=f8=EjLLmov(JAt2=p7j=l}SP>Mr}VA0m%`;rswQzj7Y-C|}QEc9{Q_#tj2gk}-UF2_%6QMgny25&YFdR#+W9pu6fvl@bd6FPTjRPSv=dzY6BT!` zin0VS7TK+MDIL6V97^bOkvQ$1G#uA2c}5SCzC3S2#}fg#sm= z`4f?9dX`^5Re?*Y_#bxaJFfr2fXPXz%)HU_uf~5!B<)7^@qKvwZV}#!&dh9f|6271 zs?ay{>+{%9Uny`l;&)6xF_nH*aKdFj2j0dD@(hCnlLG%(`NaehiD>>d^T9;#XjPhq zYD67mOe=7~p!#5Gmvf=`NV}6==o4Ici+Uc@;H=W{lY&Oj(~tG|OqK4xwRLVf79E;@ zu%-tb-Ba*`_1B%ZcK-h2lK2-bM^a6tqjT+I%B!vX1(pIl_L_)#5bb$PmGR>jt;P7b*-F8QTPXK$T`en(4k;m`0p; z-u&*r7!=!+_NGR%L{vWNQQnxoLHq)kWfYKbOw^4AP{e1HjY81RHewWZ@7@M{Jc?jq z(O^=TFU$ph+Q$3s27Y8D&Q`BKp|{U{qF{mwU!xP;?}46pivWw87iRf z!?TDgvKTnn5JI*Xid=!iXzML)>rGbyk>tZYv+-eCgs^1!j`oHQ_M!t`s0@YB2Na=k zpRp$y!XvywwPAq|;h`4rpms=bWLxm#sGu+f$b?N;f3N=~8}2a@{^@YU_6hMeVOXe5 zBsM&F;sPJv8-Lsjzk)C7%qs{Hsvoso7!fFn4_QPdxQy5~3kzk792bekAMxKI1cj92 z7mLjx9!R5rX*m2qX*RAd3NcijaUyVi6=HrX)1U4OB@;yd)qk zVMv$+MWS|GTn=A0m0*dg%~X2lKLbsCnal)B#%mavt@;_ zVTBGRg>)~bEJF~u`rfhp72(5$cuNei;GeifNqD>*DPqx~yqDn|m3VT|$xrohhan+@ z3@N-7X{!5aec#9BRE>MP1WlH~L zM!jC*54Oz6iwH(g@|jmcC?@WQ%P0U-B+!Uf+J**ez~6vFWJJT%U|EDCSy4+#q2*bO z@ZdcC=){W5d{A&dBrfVQDvT}L?;88L4S_WYXcJfrN? z?#diWgjmMgXuKZEJQJ~8i{5-Tcx;GGu7GHM=)H)8rJUaA^oQOdT(D#KOWsH7Trw!rJ4n-g?*GhapNoKUY|_l>Ni z(bp^^nUvx|YKo9_pG0VTwq#PFPgFLXBAIhJ3p$$V2@2u3Dq!JEUdaw|#!3}i$}?xr z@4gHN+okC$hN>y04n9vcTtw}Nf`%;Q$t$JE*+E-J&_^{xpLArLSH_yd@{H`EJeS3f ze4*VHu{M=>dg7@@lz5ds1vJrRt*}s=nAD;ZT&J-DZ){)r3V-Ya|G0}JUr;thP7ERu zD@!OCiPP0rEvqP=G9+RDbv#vea#fOua>ZO0#Cx=Yn=0BXI;haDh}jpQ6nS@vl^OY@ zbS>qXW`$~BLS>(q@Mnd>E^}0t^Qg0vJM^Kd9pP_B@>H(U^C;GY zqni0_b~T-2=)%>p)LhUpW$y=m&_M>MXhj}>Csa)-S@z+Z4&{RHcHS^ho#sQItqzo= z@&p|51bSGMyIJI?hPtCM|A(7#dN`GrzV-SKTNx>;(nTYMeJdvx@Di{isj-966r(ah zZTX=HJ^>d6Ld z_KFZbhcvz=+%ECbFt4&=!cwKm(qV&|3coi_(Wy;~Z|3(iL@QG04^zy&ldF|FRS#0_ z#0p+s;ntm$?NPS8`{jMVH$nTM-^2HQ8JxcC23_wIVsqKv&KSN;avu&jbiu6qjH=|~ zACW^cahP3rFX4dMm{AM1b_8r z|1_R>kTH?mPz;dEX=rHvJE}79PXL1Xj?R3`X{NX(HQzk|9|4Lp0Cc`v0Nfc^q@<(( z=owgllb?ZS;6-5FeFE^wz*hlZ3w&ofIywdh2FCw!-BOuZ7{P1+v6&J4;ICE~lRFcW zH<-x}%;e8>8$L|8uh@XWW?-->n8}!l2>?FpvaqVKvP-jb3UY991IT7}PEK|X4t9Xx z{Ex+U_W-=e$q9T8CpXW31P?FgzXf1C2k_1Rynwba(0T*4S0*N3Aefl~IhexunPa7x)1QH}jlnsl;9N6s zo&`An1-QrwT<*nG8_ZrG#``AvF)UH1Gu5aq*}N{nsW>4hKP4_JGb=MQ3&0!$?b(Ec zgxJ_vV7e0+HURp!z}yrtLj`ntf$=J!6@1qg271Ln>lm0q2WGQ?mNL*-wz06VF*kn! z%tM%)19R-a0!G?_Ffg%DF?AKSh~TwKVYkU+ zoap})$lmj)KJ)0l^O*i0umV2d1%99le=is}{y1e=BdyOct=l-W%OtDAEW6Djx5K`m z$Gv#at7-yLGZtApl2AXG*)o{l(o@v-wgLvLY;CBht*R(5t|%*fQn|Q1tQZ`s>m6$D8hG3BuD4@oplA3UFl;_DI`U_(d~AGTY;1CT zdTw?b4nM!Vyar_H|9Sn@c*3IjFD>W)x$z{ph(*_>%Ji(tXtb$x{IAB7^|<g#oi=ow6ylp&5zJDs=`K^0&Q>_d3?UQTwtB0?;+D|{v{KIm- z_{L#<>bCLp2h*(4-SzVnK3DxunC71D-@h(T57(!AZZXYuIs*_ia$AOAIr#VSe`!30 zQ&|67<0+aQS}{(DNtMMQaMySmgKa7E>?s!VDx$%Q{T1Ow+mH@YCJX+K4bc~|J=bt% z{~qpW+~^VZ_L5*VsmfhnEqt-vD4i;g-QefWcC2PEVNGLyH=fG#>bm$fGsOcrEV4M_ zqf2GZ@;Kmz_EWc*=2@TeG;M=@8$2s~Qg~rnRXV&h3*1qW8DDi4!TLIkv#KJe>zj>C zs&19Nes=4DeJ&z*Z^=$Mr+0h07Pf_*$XZUEc2L!8@Z+E%dnl(E%J^OEDSNxHp96b& zQE-HG59_=V2Za)j7RM_e<}c0o=_y#$7<6hFP4^I;k5^>^TXc!?KEaQf*su zllSLW-%Q*;hyN;U0`ng_*3FP-mA2l@%tbS&XbUK`+Zr7ba&ObUbAf#lZ+4X<=kll< znu7u|9n4a{CSbgfl22*}=0hNLxtcnbdoF5W`#^Yl^mNjZY6aYcvlcrUvIt-KDxh@p z@I)Dd{@Ss5L!5hthU6Zz(+IA)D(~Qm=jzNbu50|vh*|CguPkT%q=2)Ny8ATe+(z+f z&hM%0Q^b_y_|FG5rve9sk{5!uiITr9wqJ&!MUuA6W0AmIJ~TMSVYH@rGzqodNN_80 ztY@IOvX)$<@^jxP9uBdTYlBB&hAK^D)N}pdP8R11BP=*{AW-aGv5NpEm9swax04 z`%?SO8mHrzC6C^G@|g42Sa%>^4vspH^`nWGiOF5>roa@c+~jmay^_mYgjGk+$J`bl4xDg>W=#zFpATuUOjrXh3@uu?OB>>A5g zjYOcn|JY)WDfwMT!`;0CjhKfY6Ib2A%8>%S{VBWDtM*#|I=eZ^**0vy291Dg!$IDEDp^8ioEJ@!I5r~;n@1~^Ph?iFk3Yj8-$^ebbtI&NNo4Um2|YE~Apx~=>bCEuhmi2n?CdgRW6l3&N>O`^bsCmAIcV?22~Twde@5A9@O_RZ7e2iJW^@eWtd1=4*8 zoX(D3%HYtHW7rT3FdoxgRAHd%d{?kRe;P6`hbqbU97|u2z@pd^l_?%mgUY%ej|Abd z)y%8Z<>#y6xhBT~3;f)<6M&zNBExdA5iPzFKAoPAnlJtAVgw7}=8*0V|FGJsX}V0D z)yF;g69!VtZrrBxawuRr(t0GEuARefmAdL2F^OdVOc!5(YBp`J-X3&hx8t!fPx?ef z7XNWFsFa22s}FDB$GXCsjn6cqeHi$@U(-ry*xNeNdB4ich6;B*CK0j`6NGC<5l>c0 zcgRZOAEcz-qgfd9s2Jh=E>Kcr_iXJT<0((kHXV=7{@bTi!#WN84H7D*=1$@YeY>Ql zh~D9zjB^~v9l1RGgKdSer5g8Hfmdgj2H5xYW^g?dYFG}@jvgz@>Jd*9=Qtps7>1yZ zr|(=MCJ$oh`!Lx=Xy;=ZrwVS0nY>zd$GfU|{m6lNCK=pZLOEc9 zO17`4L_C+xB)P9nQZ|e3s}=u5?SR_OU`*nBa}_2@iF5%aYp}XzjJ4XK!OGP~*wmfn z{Fk^qms?Akp4yQG^{>Sd_10UidE4rW$*r7_y?Um?`* zb|DdB<5qP^C_h(rxe7!_dQ#jMB_vq#Yp$jIO99cY}0u44n4X?5cI_|&5*VI9L95IC|c<{ z#iWYblk4#b3+g`2R`?AU`sx{{5^#jc@oUbifM{7{=cv;3O4TvQW9<#=7j#3v6?ys- zusmq&gDr=r6h z=L?GP`g6#!_R?_D}t5b5M;&RC-5*ecn~Jc z?R&Wk?r^X|R50>ou%UkVv#9W=ppg2upsI^txyvv(CaKIB$JJBdIp4e)Qjh_5D-lm`Vli=soYPxA{1#j^vOkN z0$Y?|R`_XoaD`1+9w>%dlvxu5QDu+8g?rj(`O#9uKw-Wlpja$mYE#yuV*#QC0(t;J zHS7_^ixKU%5jeIXS9@U{wn6n-fdwE6f7tWDtT3f=*DzQ}^h^lSMbx|=YNBYUa$A5H zEHrZ=G=d#}1r)9UhY$m%;Nh6mF~Kp|Ry5C|Zap&P&|1%mf_Uh;mq>3Md)NE=iFh5j8qU@_AU*V)PqW z1ffzg^3QP5?6kZrSGUWEM;wV*c8PB(lI}eZ!h{2$f@F|lxCobhT{&( zh)=>_c0G-=)XGTQ^NS76MYhO|b28FRUq1nB%1V^?&>uIRS{Uch}ocsB!`&Q9xBR5NSjl{dsW0oRV*N0ENEZAj$KU1 zN64aCEU{cHbyX})RkGWT*3^LaU7Fw<1iwtPK*Rv*;)1PDQu@>v+lBBoSej5ar_`XM z)M&XBH3scN1OBomzPk(F!3khm$2?ss+3~?%*^pjw!TwH(x7`bEF2oP&g)%@&O_s|8 zugW3IJ6&8E%7>2B(xPI zkSQTvyfpOS3jK{)RULNaZgkC40NE&pwq98FL9={ z0)+Cg7UYVGbV4BFf^OQ2PLlgZyz>o*eI2|CH$faa-vBzst{>#A-}%`%Mcnk6GRjq< z>8PWQ`>?*v0D9lB4%AqV5{xP${YH5FjTv>T#Y$l>XHCCy4Q*_5gLox4w!xIIY2ToU z!?5ny421p=s;7d3YmSWSifZ|*4MGk3#ZeX1TNNFH?+N@i84BpeTgUAyf92Gj@io9S zTTES=VqDrh49nTZ3H3M$!3?mXhaDxI&`<+>&l%hozQFGYExxMk8z=GS%I3-b=3SpA z*9E+5U;J#*25uFC!>aZrPAm;-B2mMRk=(8joU%hCtd$15eF)ZZQduHr=N@9e%!RWY z+qcD(kZA1J+YRd0$5nU=IVCE}1(?WqD2;fOu22om(i4?Z>@jrN20YY<&^7ArtInQZ zeuVeLiD=CTnL3J4%rP-@daiSOu_ZbXhJ-Ip2$A!u8LN=c-@gWR^-|>ZNdTtYUO?{K zi%-;t=32<$OGt`KM3vXiiQ9Pduzz*0@8+bJp@xu}p`VGS$k>mFt7|}_rkY2BP*@uM znF~4}_W-D`?FI=&2-jv~>0Nj*h72Gyrx{SVCIA<{qlIAj!rvLi-4lXf5cVQr7a~32 zB4l?VWH}-5_Zw8{8Z^Eha{e}GE-{28jbt4+WbZhrUo+^8I~-_~i*Vx}df_;H<1&Pi zJVb7W>H*23CGI($13v1 zs=CH%R>$hD#~NtHn}I2A!J|1{!z#qNn5i!tCqhvL#_-IMTe~JE zRwt&eCuV3SX93Ik^%zWIq;q0iJZCfpcS0^D!_h0X!f^t%ABo_->xaClgRZHg)v4p_ zsgsGZ1*74mxS>^U6m2tXr`}O9l&RpIu^l5+4znraH&NgGXF&Ng*ncq1fdbQLn$wZ~ z(?7eWRko&8z}|k50j_Oc>YZL0dLEk;vm^e5^}YDLh6vP%dztv3W_f?l@&R0CT3bS% z_czj5X`13jy;zwLtOh=8Cr{tYr1z{5R|~VA5b)d0eX$p zQi$(?8TQ<1=E3g|X0#tIBtO14n(H(owAjUl7LJlh&SO5E*8_)rND7TpWJqNX%gPFM z`vhV~LXI**ks!qPFaN;V9{&QMFy}AEyj|3@__(Z!UDCi?Ryg7m@V>u|S^Z&DL~ZKoZZ#fe!Whryv0}XAB$K+zor{%ie%eY?_(UF(39I>aT3m8#_vYjXtKbQ1__R9pdv%6qvI(IE{D|WX(%9{_OfH|m5}*{7-?-~< zqrt{rTVGPPYeUP`79-l0-+x*={=IghHs>BUX~RP(T5D5hhLzciWsii?z%ZXd>nhiu z;r!gA@U4GhDPwjwnmRJ#yF(51x>bv5i_T1(?7m!_8e`AAhxCHc4Vbk=K`>}*S6y% zc9gq!R86+$)UXuRCZ*PPv`uz(@juxjVMCFy9g&cJ8e^sLVG)t+=KAki2kzM>EZS~h zmG+{Ca%0w6Vi`0}Djt8d3;gU2{fz0Pi(pS0XYa+xLehMJzvXKJj|ha%=5G_lqX=(c zh42z~a|5n)c$&$6hVx_$bTZ#;Csb-T6R}@NcOWV?8Vd}HOJgO{?OX94)T|xUAqJmG zA9PMgO7QM`nlSLyS(bf2=vq5`q%P5vfKsf9MPmH9&;R9sL~c}kO845)6tCk1%i#-6 zYkdynZEYY{F)@K7U1>{Tg!bB%-Z0G;6sx_rp@Jzxd*NkA>r}Qs1Vfj?*=< zG8-^nL$GrBu!YUuckpaH3Gj!(_G2bfb&FLiFR}(Abvtx`ZmqWCsPjcXeYRLu9Pbq$C42Q>OP})`Z$)mN%<%-Fp zMD}meH$Q5mjx$`oIjDVgL)u_0_>#pFwPU-Q`+EtCE^vf4%KhSeC?IMgFiN=RBHDIF zZ~fGa{<5}v%i;%tz1rCxFJ>*|47KPCV|HbSVzuY(68h}-B(|TrrtuI{FH-eI!=9hU zJwHPpU1h3Y?rdRMy*zFoxD?vBe8;oNartR8ehR}aP?%s%eG(J)^3-Sjr-;U)I3VP^ ze^p|79qIfn9dbpEghTrh)fLfuRd;hn9Z-b}3E)^&14x6V#I10H_#vbfi%j zD5&VzNQBZv-_{?;+$g6tn8~0;;nB`809V|16jNB#ppUbk?kZ>S7IK;E z+P`;r-{AOVZ7^5wt4Vi&amOUKAbh6&$#1$RdHT2CQ4a;tp3Y_7p+Nf=rdgSB0Ff_o zuV#0uRIT7i{?&JzJ~EC(U0TC)0MlIDlp&$tY`*db(@ev746FAE^)Kd_ciWo~dP_uS zeC2Uq8y(4t{jh}98_^YXgRe0+Z}a&?g2bl5p!fi=oUi*Ed!28CHg2n_v;`-x04^mQcEjP-rc;D%7C%u6 z^dK5xPKj!%_eOD-uzS#Yx`Ow(XLEcKa`L`5Ir?_dP5d+cs+$T@Q{ z|3)cw8TL&Bd4UUsn#+(>lYwp@xhcad>&0|Gb01CAyC?MNq?xofHGA)Ip&a95!wjro`1O^@?5falvjn`Uc;F%Kp!KF0EOhD^d`1F~o#t4%q0z?#%4$R&CYn%&l+Tdf<7ws;TPRoO91TpYN13dE6AbYzQWASEPgj z^Si!?M~!9`8)8dm{m5haw)eoInsrV3;orBr9@E5~6LI4lS>{q~RGj8MCXqQTzQ^sP zCV1ETowPyJsO!aw<8Xo7S9Z@??~99d4w|Rzg28Pz$+|{ z%%TJVhvxazPHi5?3BB@ytFIe!%HF4GN!DLj&+J3f+x^t2q$`@fR~>KUjRU*hO}r8b zyXLm9&tXoT@OW#KQ|vWa+2>ZZH#?@t{dU3Iq&=vDt32ZP*lL0dO;|)Fl8~HwnX)-x zg37_T=o$u2NH4ghBBcI3T}N$VxU=DWs_!FXZt>1-KWk0ixcewYSfjvIQR~1(asgenDr_+7WnlA&j?2SxV`t_%q&pqqa_$_rVxYfN z^7HrGU<|2O5^!X)>@6^+->t$cR62UzpCT@yq+_&br2I^$L=Zo61g4owQ~bGvYB*G? z#6wOuhp1yQg7O2c&4I=U>FQ!+hhB-7QxfA=T0KVzeyt?DLm$$;T1Z zesbYvL?xwCgpJQ$I;J5o&ANn)f!}p>w-A`-dos>s)2GM|v`<*b2$*8&!Bg&;amqx! z8wI<#o)&s69qD}>xA+l{O~XV}E@8Z+^_B6SxfG8O%1jRjseXCk z-Xz7q4ky4+b}=I|tOkOmf$YTs&oT-0m&XaT73?VRo+WpMvC5ODtFymP!BL0E1$uEi zWTeTS)maHXMxl%Bxn;TRq}jj1k97_`igSK#ka%Pz7|8ln?F98m&~bY~LR*q@z(bmj zF(ig(c}eFEb@~WaRUKJSRkUwmCB}0iqH4#*xfvRPLe1F!o!?cMQksE4=;uQ8b}2rW zg{fRP|CnkqTLs_#4h+RT+yN80QgF;x)wX7-XmNy!I=)6V<3zSprkwneK1D9AN3+(c zxkhLxQYGl=Sgn^<1u;tS80#54r7I0Ws1@{`3|g%ND~$}O<+NDS zaD^VXo5mnC0L6^YM0c%gd9ZXni+R`TA$8{KnG##2xNO~-$cDI0hMKU#Xd+o9F1eGh z4wlk+*|VX9rJBtjY_t?Uj8~>KP?Ur+_+-ok#n83ajkB0&lWlH@UbbO|n8#|PmJvjh z*)$Sq+YNFvgzx~{A-kVbkg^O;VA7)L#i$H;(=iIKkV(oA?un^C48pb;R5EauYb)cn zuJ;;TiC_&Y+qWpC0bin>BMO z?XXr0+2S1}buzXOlX$8=w?j}F+~9y_xS7mOI4s3Q7P^6L`UN*uu4lGB z!MlSO#b)+YaSkxlwyzhnf!0=n^%nL?zd7R9?kgg_1|!1Ci&ZCK%bZhhT*(kLhQQO! zCofrw+_BR?%Y~Q0U&oH4G~=b|8J0a>D`l!zy5$?V8Ns@~yl8A1qjNz+){Q2eav=P8 z4*5_aPTXk&QNVzbFn8{(F6b`=uzNfbTHa1?yw`r`qW61dZ0^9il}+HHLb@RHJe4V!9)x`#N9A(TaUlux6I=42;Y4=Q&s>Y%@>6V`DWC}#_dneuQ1 zC^cUx1PMqA?CSpZ?Vwx`(l|HJ(LGN@tS9>Lmge!tiizciGPmDnZ{>gPybMx&k@sdl zQ{eZ_WA-hn%j08FE8Lz52|SdRJcukcM8Q9V3Lg3v#+-X8iXK03{FVFRzAbmEvr8c+ z0+I0$#*8vxriFx0=3wFCVBw{U-B0x~&BWl;6NPJJ;(>>QKtfsct>p1ogo@%idg6SH zUHBp5;Y;G7=R@hLIRFbR@YXQ?&ob zn?gvFc)3Q%-jwPk5v~{xb*fLV&ePPoFzQd6WH8&l&|u+F(NHAw|n1?p7buDa7D7G z-<{-?i^P3v%n+5vRPTjL2m$>Q*}yt!I}Z|jk6a@-5rOxXjA83b^4t!5?7m>~K46&8 zsHAY1M&BfpOpK;TSc-5n<>)KT7qR7RzJ{q5bA)nonb2-F*{{-?I27PIvUn=F&qp$^ zzX-E4jeUJ0@@}axh*3mZSR{#SK$d|9+qR$Mwa8>l|MJ%wv^C2kyzx>Prs@@OSW#ur4us@Smt2txzEOy zlX*A{#J?6z7K+}BlPw36A1z6hhQnN%@JTL6Nbxar>{5m63xf9w8{(fmmEz0An>vaX z_YUKldM*9LqdsI?6j+LNo|ibwjYYIP_i|4Wz8MyK>HhrvYfz-`+|ok=TKfEK+589Y z-pw(ktfl#nI9;Evm0VE}q~<}y^I!7Cc2O1f+U7~CLqbXs-}RwP#mY)$9ZvpYnkak+ zIK0!`44KjGe6dR3>ua+NW6r^ES2$HN#NJ+0HQb;!#*B`ZZt%es!0qI1`cD;CASaU^kBcp-DWb2PYY+{s8r`y@U8tGwfq##Q z;OR$v_8LW;XY|jcTO)*9Qpw5bZL^+w_G0tAvy)KM6{O-o$zMh$;`hL?c~^#NIYlm_ zw%@1R953C%oFZ;8S1L~9w9zG%m;EyyE&`ZW1@Zt+uDHKy@WIQ~)7^%qQke_R`&q|@ znMAOUT2wd-`a><4?=&=axDljg4PMWN4?@ZUMjbn28fr^RBJFLWH%t5|%VGsB;&hsn zzur&94oQx)oz;t;&rSZiW|pB=7i7VGqisRllX~<*4j# z68t*VRKEeK^02`O7LS38B=Y(4o?3RCTG;&)w#Zr9^I9C7E6$3|lD`%|W38$uEGa7W z_G_xi(~+hOuULEot7arqj>D+?wd|Cjx-1IzB^VP9>K6N}`fkh2EIKPNP0XzY4{2se z&$Y4pC{O)WpZz5Ssd+hD2NfQ=_Bud7pi(gj-rh7-f9zqurp@khC zkrQdj8zX`l$ATFzjg?^ZH1Qc$^o?#B(nb!ZUM~Fxcw`MOp!Y#nFVsdagnvCbKo3QK zBU>xMb7g@fccXfJqta%hka(jO=|dHnelq=sR(>7q<@agP?Is0MC4wLFqd&~#=r66W zM9)m}Unjxq^$U*lak}+|ra#Q(&HsaGH_Dd*j!o;!)#ihFx+QrQd%!~g(rNuuf|`Mh>Ns} z4mHF>X*1cdCHupoXBXUbe=&$TTkngZ-yF#b@ME*@$GiZ8Q1q!L`7=W1@Z+jYt45?Rq z{M0$J;f!sfld`^V^fWer^qS@K{nt;o`_&7oCind{KPpVv0zUt$VE(o88TM_4_hZ5{ zymdG+|31+xLQWDWykAxi>!V z602mH$YhwtQ7+-+?-<&CwY!bXxZPqU9b<&5O*}x$xQ+blR}5N*2A6P-$4s_>|QLj%-C|)}5gu8J7M#ywO(r3#MNv^~6&P5bZmpCsJm}<>`7_w zNn7p7cs9XSckCNX>>IA`8y)N$H|{GXqpAg?z_L*ViY?K$QRVp~1d_vHHYj>d zX!6P7^3|xYga~~>aCC{D~S{SA)iYAX_qh}oEJP;n0Xc^QI?huK@*@c>T zyPv;$TySt)czaxgeo{Lo#HvVifXXZd8G1?omFNyZ*YXOjeVUHnz9W_T_%eBd8As?iN-m4 zS0ozRt6-)nROjfgrG;O6SWkKv?CY!!oR7kp=pDUd?jsdd!%DTo6wV`+ zkR0IX+xBLxXp~2G2;+qzDHLGcIa^WUg{O$9Q;+F=|ue;UAfEdNE@x0`+ zcFB8oC3AMIeRiYmEb!e7x$EVN@7wW<(a*i?@P^JFR?mK~I#arwJ))l@k)A(+o+I;} zqsY3TbcQ=^qoQSp4J4x6eL_XoLDJ1W<)d{`K0;SWHrF_cbmB+53k-8ULf4o&f98yd z+!gMGC?~j_@g$=XIY%QNfE6R(Wrj^>hDDyAJCUKGtho?+pV2(J-gUS*XNN`lz)_s5 zFDSFjDLP%L)?6`)E+bXL$ez2R>AE=&xiDs-^7>qmIisO%Bg2qf1!zu*+1!wI&zYU0 z)s7;S<<14Ft^_-;geLzD(@eTwemhf9==`(M`4{iCq^yUex7$nWYnelL*f#oZWvKji zB)W67!2LNmDB^h(3NjSU={}OjCR*hVojuE(F&Wh<`Rd8zwd$H1BnS=Z5Y?$TJW}k5 z95mt)9;!)tsd5&H$>t)b6Y&V~)X3U3I*bHHg*k0U8fNVpIC~i#dZN*WX=0!W7)LnW zqidMlIvshSEr!csxG1RJL}K14*kJMo+iM-6!^EDTxu8HWZq?w2k%}(Y{*!mF*X{xi z?@(mz$|KM2jqNILpGxrEhspZ5D2Tt{~%qeCK#a7;#xdV8Pn=$&Ehn-%4o!}cRB z2qo&xk35WEo^$kUou3t-Bh|!Cav#w-i|;i}A|l!RQl0N%2*2Y*6sst-NLjy1YriTC zB$cKg3}SW)>yb+Lca5^XNK-z|I(`LwzQugLiZ&>a7e6(&(dCEy%6Wau2JeTV4+$FJQ`Ji$(0g%}`x)ppgU`d<+Qap_u6P)+vozAK55obTUEc;&LVk&&s1MUIWIoEe;IH;5%BR4{nOp= zjkADxjKCdeFwYUX*Lvh$XW-Wt5ucyK7uf=|rXCJIzgA!mxX%pR>--&@6?ifT|N1r% zIU6Or2nE?C%xOLH9vXBNb@u)Z{6+wY~G6qR1x^_Jv z&gKF*5l_MAc6xLHno0)BrZU@Jg5`-Ab>Q~LmvnR4EDDSDwpWmad=>4>)8i}XVzERN z0gD}Xb*FcxcBt8!(le;nr^agG@x%hE4EGMTaQL`%MV0r*_27WRdF%HT^c`NmV}Yl- zMB2Nzrxx0Dc}}Ow&z|{bR(JM`{Dv#W%2(vq>FFF0Gjm6jdq>GOr=^=&n$x8F zsi8a{ySl~SEvMReHK7mYd0g|HuD4h(H9G#{{k|n^dHMY}C-i)quKI-4Nw|~GCquhu z=T=#>)4NcPpvQ%EcFE;_rRD>W35}T_2$uS3ixt=8Tr$UF-a^H6A!{9KY9;>wB z%euO;T6#M^#lCAh;iuhuSi%<;U*1#c01TLg>I3VTTUphR?S(UkmRW?R8i(g=8oI90 zps7RYTUxGN*9W}k*~n=W3)B7#Ux(2sU$c*3G4-*JJ`;LiA4~L-eBQt+FY%U_qv8jF z(Dm5Wg3yX~=!L@d*wdvkV($mnsnhuUW`$2vk}A2QZecOg?ER8S!a}$TDs*&3^w%Ub!!_TmDK^ROwyjnAez;OyXnDdD^jZ-Gst3hhNvvyXn~b zn|I4~_M^cJM{`-@iuGW6{-o)nWQ&48nc~GK1<(e;Hml>v!Ws-9+NSXNRFR8MM)G?e z_|k#t`epiQpXI9GELcD!{fhTupT+i@x+Ir#clW~Ox>8ad3kvR(n(24NmW%9!E-{8+!4zLVfcXPkNF47WNC?@%lxls z^6>xT)spkyS}o*%R*T;MMw$H=6tllS{%@37(_gcLmX?;**4Ft=?Cf0Z z?7VDj!YnM3OiXeN3`$U_Dg>fQN2d)28_jkOVFY?H1AWL*6_?;W9(X7DMSiL-{v`ic5y7YliAOhUy>xh_U*Px$2s=>Vm!U8+ZAk zVA+mX$+~RuJH?_owZciAf)S&$J>mw#lt`$f|bAE_2N; z^vKHb&xj963ywGCt8_G8N zE90STfVqM@Nc=M@#z0%ep74+NbJTrW)T&H8)JQ)l76$j&&E0^cD0EVU4rVO|x+=v#Fi4*}by`{c|OQbG0LLtrK&-Q*$FTa}#s(GjsE^ z^Yedc{BIW)7ZDtO1cd(|SRlf22*C(M&;b!#z=MN>e>{c$F$?+c(Ei{^k5~`ZPX8s! zjK7)oUmc|vrQ?aTlCf0sm!Ro11c{p4=5jmf1ry;wJk|x>TmqM4Xq)YK$Vkp}PdC)u z)Fb6Gba&u5W?R)rg-VHfIz=j@Mhz^$ZZF*-rz?rq8TpwId;La>)p+XfERxEFR)@DE zMwD61hHah^9rLwqPO{3oV)#V&s|}`u5fKEeRHPgx6ERn!tFdd%tM#b?GT-ZbzBXr} z-B6Hx?7r453wXy`z;x&I{#^#Cf%aB6hgD*JV)HkIf6MV~m27WiueYmfPm3+eoxM=Y z-a$IY0m&5QvCH!MO6o%6s*g+kdJdd#f=U18V6?sBD+Du7cz-5}`=svWPhtJyeCi5XPx#X#xjnP-B4wrd2%=~* z`SGHuE3!)MA^$f}W{{e_{|seTqmGPKA6}8c;S__PsYinf$>R3&eV1*PD{mELg;$C} z8-jGM!gG*)g~h3YgL;r@{=K_OJn)vBJ~yaQUM(*ekH8w-^GYv)L&bvOs3;96Rb3u- zSyNL&*iLSZObd3G&ZOPevnhVm%&ig2tE8wbg4ah*Ge|j}gjm+3z{BiI8f$B<>fe}A zFg1lO!0PfkV{5fcONGPpEQXLt9nOa_q4nn@IDDt)qj<8+7i09@ z+Y*u_CW@{xB<5Qe6EuN+suQ$j;phPWA%Q4o}@U1z0=7ZcgJy*6bh{~PX>=1glt&`A2aWb}DU7VZx^_9*!|Gm5M1 zDaA_8tYbml3ap$}H*@@o=?WXTYwp_XcZ8028CLJ6skXVyNvfjc2xu;hJ^Nk&>mp`Y z-edZP+=sTvtyFu-zm4sNFYhwetT8H-)*2esfBJpz1LFU#Y`6$2hY;INx~8b-|7f!m zT8f_4)K-`Ij`HLIr+ZkC!K3)}6e@j}H7oh$GW2BGg5@*$l!eibFBVxb{=00kKrc=c zUakF?40iH)+AcER6;{5N+NfBIy65L zvo)@{&y&FIYY9$n(?oymWzX|;=nuH7YCU1mnem;FBErOQ%a3)S+gmQ zbW+)G+?jfu;slPA!+Q!^8>O1+MEF)%V>$MV32HgU1(jB-?zb4AYcp&jv*nYZ4g=|>n#}m!3yL#e3ay2qJdFtxR9YgQ(l0!{RuTTvstGH8i zP#fXU!R$WziOxV|?UDR)Sy+%$?SvItHS4pL&uDQl+Q$U5s5t2c59PHSKUP4MD0!1p zjp||(3%ANr{pYmMY{hsum*phi;W4#V9OkuMsq>sQ{vg3Z87kYrY2U=dC!Ky4-kZ2# zhQpvO)^vWB-SW5jAGD<7XL&p>6C)h={=K8Lzlr6YIO$V--i(4R?N_qiy*VqP5aYi)?Nl8P`gVG%P14`_mdn?!WXf)pF8nkJaXhgmit=Y;<$2QZ6{A zS;4X+ifXU_eOoKG^_3-oLQ?1RBDHmd-3RCMO&!#4?Nz3~6+;FnM#!ysM&KOAOF`E; z3sOWDRT{+B?k3trvGGi$(z>gjep@9xohEWBKTShv@IF-*y4OZyN*;^&Z{pIOS7SIG z$07HX%k1B%DEVy*Y544jt8^1sE3{=khN;Q3b=8R{&KRC)lrxI<;xPnBOFn9Av%)#? z^t7HuUoEt7Jg*LaIbbarMRCY=*W2S+C?bOLaU?X}oN9cF-oV@abC0$w44`;^^l7V9 zjnsQjB>w<+mw$TfK=bIc5iB}Ebdv}ml9Ab`Z1ry_GZW6!+Cs-pKBMm(o$~_3<$7~w zr+uSs!#hic^J(s9d4za}n=7r9GAcX;9C4d_Ka%3pEQ-ZY;ad?gFFsybeKyn*;fHFl zH+c^q1s059!#|SN*A~qO(ie%yCud!|C*xROjRQmyF2B!1pNY4HrC zp{T<`&ZK_XWdTYE;$pSakY>nl8Gnkd5UTYMn){IPRiVozjZtvu#fU|}MW~X6q%p5F zDhDGDs&Q3>-wK9|`Pl2^5iu5T5ANuo)hwS1%fRFoCI-}yK2nc;??8q&CXpk7#x`3W zmq4dtY~l6rx{6oxmsW>R(YIov+Wf)MI?pcAU$?Zqmbn-BK!=CIt!OL9-d}FyVJ1h* zALXGN<>eFQlO4(#^_t&8%*i7%Z8s_iHTvTXM0GE;nnOw!Ye>xORxO-F5JyKE7ggh( zh9)iT(=4d|OM07L$(I|X%CDrO39iET?_yx85rMjbD!M^WxW!mVV@;~XbjcWIF~ogK z)qY3CXjjEP<&7k`7JudD%($oAXl}&dp}4prF>$THE+y}KAHPVJ@SZ$saZO<@IT>qFRc}76U=H0F z7QJLf{d9W0JcwQqSib~pQV2FLpmWTp^T?<3DxmW%qVp@EdtFKwSV0$DO&3-ViEM;K zH$mfCp$Q$(q;C4;Ui#Dl`qUx%)KU7Bar)#bXyO7iei;(?0TT0>F6s+il5z*h_yNiO3Ca5jE&K&7eSlW}rmunjyBKQV|51!JaOUb?oR!yt z49a8j5Whife9v&iK?FdZ!|1h8(j>PmpDc3~xFZ%R(kyto7B`kmHd}lbCh|8)?SG8<1h6=;% zL5{$5DhQ-di*RkEo2C)z$oQ&_SuvX@l8paTXG%XQlaGf$Vs+Q#xo$)-dWBqdzDAW& zRwkGTyL35g)61*xq*WH4qlVg-& zxCv>2tWdZ~7FVlR?lbSr>GWSCcS0|k{sROkNK19dMpM{APaqszHi|g(pO%k{MpT9s z_JNr|6MtxbXY6HgJ!i5v9*KDgQRAuD7u@#b79w}zS5wmAByf%3P-8CamZ>v%I7R=Bd4jb+5A zT02h^>5yF6!319WhD|!ZqlOIAFHD|;cBo%pw?CNIHFrb&K7sn&)*WODB(#wmmjbiv z+=9Dg?3~6OW?6hcug2DOWr*Y&I?M87CeWVraOc2+!9AJ*FNhBc2aq(lYcwjJ*8WY| zngV~lCoOtSc-3xWk+vfA#wyh3Hfd;*fmE}zT%6RTzo9Kz4k(Zgtq3Qh|&MaEA_L?G~r#e8MazY`Y%PNmy*~ zJ^Jy{p?mdW<;-mK!g6EZ1B311e2nys>W&lf>jy{f!-b4XEWLzI1wU&CHdApEY$I#T zr23x(5bONkY)Nu2JXD)T9# z|1dl=_8|nyoJNxiQQMu%ime1-$Ep5`K%2Ja_lj_htj&J@eUT2F-)-p~fM04Hh%qAg z;Udu|9~0}URkrV1O|2CFV+eaIMPtT^Sj_uuH@t4vZDw(UiyycG1Uv$$oX)gqC?pd$ z<}F**vK$d#b#O6`n19kma*jWtD=)mvDKu@NI?RhER`aEtk(=aq17lut3Zx)wLlRJa zEX;M4C97Sk09u921u(G+v2klcjdqhYq&kRLzgxz*TUgR`PR~2}ae;!`6!^b#E+lC> zqsF!kd*zRG>rW}DCrixR;%e490ODw);Mkur36fh(qRoWL7-hs1R>+IUC+xZ(WPe%^ zw^reon~XnQ>-F)i_d8&6zZu=Ou+U|Rp^44vHOSm2LS~AB+56ja&%ca8v=I0;Y97kl z)aOH3v{qo2_$(xSL|rdao&ZVUu&GlZe~kl?dBx-MvDA}0#SZdH);=i%=6wRK(0HQS zO^HOx!ReJozl@hIQgT|m1gl~3#H^M9N7_*J{t*777pK3n!wg-S_U7yhKi1(0nMg|7 zEi7w*FvFh@T5;AiD+`1+iHi$ZGzK=}Xkh9c)o-U|FP&nS>WuG^SVvB07`4Ss3YMr|N;)JU}Hd^eSN+nV6$Y32N$#PL2 z#FE54dlA30p3(Sd*l5q0lU+)a(Loea_+r+U_j}+?@Ak8^K%`7wvyq6tiSDWo6TH+n zZWRrWE~-zx!wP)^(rX%zp7^`nWJZ z^eLvRY}G*>4%Ke9_^6t_s-LI41?G&`uI)AZqFh`9Prp=}e92iz#|V9=u|V#B2KqcK z97(kgb~LVcOtjx;E)bk;6SPb-dD5Atu9_2HHK;ko5_Q{5znf7rr5^ zM3+w28cSNC8vh2*sJ;>IH&PT9HNNPi30IDdjx3q;V$ii`+aU%UX(B0P8h z-EH@8iQ%6@!=Eq|;jv2(gfN2`SU}7yKz3#zFB4Fh5hx1;^EiLoUEyR5ZNojD0m?uOc9J(R8+nAj@>1 zSr*VV=a0;Cffo5dn?j&nG0?dT=v@u;uLb(n0lgc59!)@(R*+*C$Zim1ISDp@2ew`V z+kFB%?Sb8o!M@+Y!B^nWYjDI3IOdKn;RjvnPe{fuNbUo)7!ECmLo4C*RdD+1zxo^1 z{(CTsh-4XS9$2bxxGTPjm24^H&uQn3>t&A`WRDnR4;vzsHDs7IXq4G+oYD0vwaGG} z#6Bw7`?X7`yLPODREiZ>rWr%FDP8U>Q0}Wg?8`qg1?HQB3a!DVj-W~}V6`8xHUL-` z^jE>ax?oU!2)H2>@+O?QHHN=CNvQX2)EP!{%|;7sCd%BVt9@r` z17_+1XX^rIYJ;X~gC?p%M$01xN@Cgz)9MNeDsw9fv+GmR+Tv0=BGP(7v-?8|hJ!06 zf@-FNYG;D#X8)!7+2Hy=g@uTw*_hVZq|TYl-sznF>D+(fZkuhS}kU*`dbS!RFb%&e@K>ndX7%hT-Yjk;$sDiHeD_ zvWd}>sgdI8ks^dvlJn={~=eBfOOtiF8v`_ep|#yy}S@2#Ua!0^tn3uIJ*Xn_fLh7w{QM+y!?oaErUn4 zGnNceD9m4W-JMM5vi~%fvu76SdFJ)UGQ~DD^&E|c`DfeLwI=MB(PPd|M}NqbP6o@a zUq23oVXJ(gygJ{VO1ol)8~nc@SEAEzBgmEOB*>T$o9$3EMxPX}CU$yLe_Vakop7?u zC@Jb-%n@{24chHFhDX|SX;#dKGC9X?9FGXmhvlVVp7s@#kvNXflNUPkf* zL!t01G-2Wg6ac{&8@I&>MZxLa^tGJkC|aC{-Lm8=yc}%2wPc&UEK^Z(K(?8BO{Ir6 zN$QssnBdbn=pf>8yXG)ASkStHmcfakG~3-6L?@xfNDdHBKxeFRp+qJJ zBgeKyLt|rUbMSH#X;4qf%fDOE(MAl#1Q*@lg_WklJqy1;UnULcJ}2~juYb}wJUspN z&GwI{r%jt!3a8Cekh;^Bx$kQut&1|7r)}NR_Kw)gR=+54wnkhUI<_-cSvprE?OCmN z{g}RWpDJfMb$^@4TkrikWAAKoEz!F~=nMa%#P}#CIopq#lz!F<#=^k|ve1;f4CDEG zuy=q&PVs;!Liw&^RMy-a5-KkAa+I{_`7o4c`O%y}X2|jr-u8{9VG{P4csy>7mw-g* z6YDw7m(RSJuO(l+*ek2h;6{2j#Bi9(DGZ|TzYu3{yG&XTW(&Vq5xR2#FB?B+xs{N9 zZXpx(%m%CUy<$-p3NMtee-R6180o1v_f^<)_*(<>k5`*WNdmXqm>Iv{ZbaZnxxH5? zJLR489BIWvsz$3+{cME&;8pMtti-<)S;R6WX3!$CxLa7|QO%2>6bTHuAnA9`L)aX~k<@l<~076~N!tZ;}2?7flSzCLdXveb?tsKcku+vgsF^ zFH}lSGz#CNG6>buOC+RQfL}1k!?Zaiv%u*eDi>v6gvt|Q!PH_X#;Zc|+0|pkDynGZ z=d^P#Gwj_=E0QaLO2^-6pGx3W`~65#%TR|6OYJar9?R(fH6#RtwQ6A#j5>fR^5$Hv zhHKY4Ly@O3m2;4S!s;0_<;(2P@O*XL=VtY!C!9qRn^5te$H`Bhq?;pCV~P`|Dv;3- zmEgRtMj>QW`=!=adf7`avsv{nA@@xg&2Jhx$=v>wR8234$nl}NAdy_HrWkVpCXf7= z_gTpFl>|A*a&~qak9$q(G|2Bt)ICaxc$!W5Q}Gkr(w9M*>al)5LkY1$7pQ)4>Rh8f z$rfJGu$E4z#oYc<5s4~8=xZl`A5I{ea<5p^afHpQo>FBM4J9xtAxiX+S?sAT(*3Sh zZJ|U|IwduOt;dy;Ym;u4M^s}#5<{y>gs$`B!`hqNXK9#UOtau!nnGGbD*k>%HiRwf zOq?B5%G7GSfV$^Q>X|Q_rQpdW$O@Ix!%OnZ4;9o3o4V4LC$y?y8AFr27nW|Aw%HQz zD%pATLKUwHR+yI@f3+D137R*``K1_LFv?5gWOd!T0+7dQYTX8EYyH%#;?`s8K8USl zt?)FY*Uo5-NxUa-L~{ zRqGm=>tT<~sMvW1svD(&kVH$5Ea641wU~I&%Xm$EppG7_Aq zte7@yExHDLW)3gD!kIIcD>xEhO;)k2K+|$L4NmpByL2|s{`iASL(a5;QkDYX-G&-& zxJsF&rf@_~Ippg`Ucjxg!y2=VG(&jS;tC5ddH>A&?*i|SI2tqZx@)byVj~w=2zeT? zJ}cQTy(@}D9IYo@5GkI~IS}y>{Mh};t0${1F0rxj)wg54U*zMM9GS5RED{!1trm3p zysc2_ZJS5;54{u|9W2MEj@Dh9pAOi&Mt|?PrWuSKi1IbHHGD^F?)`}7$Jd83rcNBv#bidH)d0S8#_~PehO02G-nyV#hWUp4~@nx}OyFCEc%9J%pM`JGk zmfpKGG8V#pA~-27^+oK>jxnb_+63kZD;ugJzQhPqFj74DSSx)qKrOEEm9#2D{@#$< zl>BedM3T_ZkUz-RM~u=_+*(#q8Gg@K z;&m{d4Ta++gigcOD9h#*)Kbq%i|Sr^1MIC04F$=&whu+_I$nM?_+0f_`{mQ9 zTkn!7lA}pF1`H{&Fj{#_*YhaX*h~wb4lQDK8#f|1IjGnCO04~p;3zji-%d9JZ3$Ly z+fOdqLQr`G6)@oPDdv&$Wt7VpKM4W9M+Xsvq?$G|Bg7+9w~{DSjayL(L+^J~f}VEZ zrY;Fxwfym{UXf>-31nL6Wm?G_#&~5;al``1(>$s(n};)Ly6`G6v-B=vC3zs2 zZki10ac4RfsPbAoBdE`&tn4wc6|=zFhdA(5qpl-plueez6YsfjOKBcS<~8sGI-ssJ zXEswwPBpthN9Ai*w(AN#mqlu-FVV;BFexn$C-lT3jVOTWg*2n(R!k^k-pt zZr!;;YN2W|Zp}HNriVBtdr<5rxurFENt(I+Kj`HIq&-R#My3h*;F#V|?sJ8*&3Y|h z_+OG=9_4pWE4_~~SpMOxm0ckEE~PDmR7RSKRd{X?$QFXQzq?sqjO@H4}%I)edBACNC6E-YR?srip z6I&pcOX4GMKv#-sbRo%h`5b16*O?8%9e3qxNetEni)G?z5d&oPC@Jg`Y# z3>dR=+^dob$g5&>+*7PQlU$y6p;?Z~;Zc(@I-?d#Vp+lMXYl>T3b3)Po4fT2qeAjl z0^N1Nc*u|uBO#Yhpo(gee>O(PO4&vaEAL-OzfsYhwhG z&$}$FEo(AKj1G?MN^LjkE>WlYRm}ehEQvJ z^(7~zeJ-&g%=T#SYG}1EeV2Tm`PG7VPg1ctBuNPZLIoREX6mr?jeXxUvLMh_C(3vq zjP1I7+Ee@h0y-o)>6pV6C7N2+GmYPR@L6Ywx_p~}DNPE1avW>|Tp=R4jVgTqX0p6y zir!|b&1RZk&9sy);^O9FCq(*KE$@iR)?^zfOW*+nPvoJ$ni-fhnDg*`IO{xWU>tGH zDliX!aw$yJ3LQV!kmD*Tk~$MRuc0HHhbqv?O^CT$wtSmZ@p`l4No#hDHr-6l^BO#E zYxnk>=e|8vYwNYO*JxhE#bNDA_L?^3*UeFa9y?Qdfy>oyl?u@rmT&FqGW=?IA`;m; zvhA^3y|h~~glb)7AyYNbgxuPPu3F1X?53Z!#= z?181TCb%S~zGk-m{2VjCj4w?U6587xURMXeE{dpXV8SSTd!zFC1N)9(>LUE1L&UJ0&3@=1$hXUJ`W!g(F4TjO;FZ|o_^V@fO>G5Ku zm&q9Any}wVSBBNKzCG#yG5gZ{K8vhtZXkzxd^KN1O^MP<^dYSagpIcK4#{OTzVnfq z*B`i&tBrBPE83G~y6*_xRd^Pi4#NpmJPlFqQ*vobJkLuWVD!#{)Qj5m+^l#cXDR*E z0k>18S}@A0^mSjv^}evR3-BxIiM#7y-WVf`o`iPydF79mk-9r_51P`$v?&HGF#Tw2 zB0EBvj4qs2uyb~Yrg*XX+D019sq{qj2EX|a!CYsm5j(AY{~5WmcD8l8AO^48EoXwH^Y{p|(if9TS(M{M6g|7_m@ zfSCYb3XmZKz>@=z$OEY71N8F%#(6-Kzj~DiGR*^-<%28=z}AHz+hUMoDaf@Pj;+Dr~m&jq{!>?{Bq-5|CrYRw(EF}YzmX?*3l!l2*sEEGQ5)wA% z=eOqOc4FsnV`cMZX7OiW2!KNWmbpPeKp;YYHr@X2z9IJg{#3ewKnEbu@~`XiUsoBR zG4NkP)Tj|M1OhdHKv6^;8vum-`}t*B5P+5*K+6UI2m$~Se`XK|kckn*4Frn=!T$$) zZyi)+->;7i*XIgF5L68W)dE9xLG-#120c0^9eP%6Mm{ZO zDQ#9wEe;E9ZdY9%KLhSiBkp)pjubPt40HBubA~)~I+z9I7c*uHsdR_d_|ew|Gc|^> zHAnKa$BA|)%ME7fjO3a8g@5p1<3%Z36AF@J!r zkD0EI8Lx}&sYz_CN-rw#E+lonS$E0?lv-{Bb z1L%SwfOA6vC>)+H9G)s1o-7)fEFPIG9h<70oQ6+N*P^ED(9;d*iAKy=GiIm-)8C5e zZNqf6VOrbJP3@?LE@W-b6uf`3s(-v{YVu3-tWd^vEPly|J(E(ZXwp%fcb~WOIid?6j3J52z{aS z!5m|$`hnUtB!%{rn2fX~(PJ`i89Cy13Te4$7FT|Y7;@X533jLRRr8x~cE!`9Xb+!# zN?RGUr;XMAfLJ9N&Hnfy74NWt00%C7v7Nqd=Pm2ECc9?n3ST3~Tg zly1#BRq4*6RlYk{+(&xv+yvzmT(Xbmg*2j+8>M5!;x#v=SK>8Op@F!cSPtfCEpzW; zF>O_4>pE^#=iAn8!Hayiw`$5_nYIx?|cP(&mbVK zir;pWnB6oW1PSM|BgJlLMq>Fiw9I2anQueMzRtK->K-YRtalC;k2@eWBBDu{vWmOc zMPZF2d50Rp1`a>>+U>d(z`QqbPs53|>j8mQWfMNDhdh2qSAY7o*;~6`nohs;GY=9- zS%2-MFpU7?U#;~M;Ygm3O8~71QcV(jBm^A&I5iv|ljF$O`)E9oWS0sP)@W>r2LwFQ zn44JyEHk%0q7LV<@rcm$dbldyH?iCxZKF@<3BNzTIcs3|%+HX=OG0U9V5dt|iqPk} zw=Pj@f1GW$PyaOh2~m@2_ugMSXYW@o$8Y^N8jmmE1t0GnzYoV@JNXbz?kXVTW|)2Q zk(pg|KG}qQOYY=mEG^Tm>=;kPCh^_cc1sBnIK>=QNl@=NOAO7uyN{`d?pQ(` z977p5xEAcKBFP|FeUc{fk5F5*pZx_B4L$SEiwj<}F@BK=O{mJmBgw|TCq?ZsnwONC z-xD=G*9J;lO?p4@ElhHb`vB_L+aGD-siywvy7)KAll6@-(KC0LLd=!DCKBd5QiFOn z7kXlpeQ7@}rlgRfdR1>&a-=Q7e~MBecteEcBPV*3$vun^JF84o0zp9O=<)>jRh;@F zLasN>o3i2k?UrotK|p#i4Z$y&@c5&%{kThUf(oKI`3Vr!LA<l z^y375ro2a@dEF=Zrg)hPaW|~Vbg?`3-NiXUEiiM$z5&s=g+2 zYp7N(!HeWEoL}svLVD(rMrlsVnkZX>d?>~DXY>x_ARZ?12V5-GyXpatudcWFR&i@y zzoNh_qcU?TNo}rWbE0I3$I=G|=5Fkf3KD5>Xx@na$l2|HkY2!*5p-Mw3r0`bqwS)h zi$v5Kh%uQ?cN%tOF#m83o3O{B&%?`TFvl!vF7)hM=`})xIF90cBo&YluY!;yN6*I! zeJ^kN1d_h0oQ#LKS6r`SkY-EN_!0cfE4t`yJlcQGlj^y*jl2n=T9qvSmyzm+H`5;Z zOv^naoJjkr3_bu^2;YIRr$@0=DOgcK@Cmn+^Qug%cu<2uhaZFR#@@5^DlC3MXfo+J zzR#^A7b`@2(Qswg(NDvk*O^Y|Su<%G;0VlwJlYQxwb>F*aCiw=(<5IjYDMDvOIStv zMDdQ%8eAB@+AC{U-_bUCVz9~JFI$&SRb-K%E2J}a|EMj0w!xMkv-~vhsJ)D^(Oynz zWdU~7ftYQO*6M$l;%MF3FngKm#EtcO>C5Lz3sOc(6>UvksAB-r7!AJNfwGK`LtdB9 ztg@4~7Ts)m)3^HY+{6#@X%%0*7&f!LduR3hsH7C=5_C5 zfwwAd1+&?p$m=s7UcDj9aO|`7wxF!o5{kSz)1l#ON31HhGB3NbbX{$5#o`(D%V^;I z8~%2A>EiR2hR{<@E?xV+njwnOqFsZO-#h11lzM7gc8#*lYWN4V{!`DK*{pT8D09sE zL0j&q@FPyEf*BjWZje)G2dN$iQHtsWS$4LRvk;eyJC9LyXCV@ z#+m$ac<9>b^YL#g0C;NP~dW(@= z?lc@ZQ16JeU3+Oz|5GsalHbpk)FDEN9);xX86$tXAN%C|BT-t<1ik7(VmUiz3xl51@do+&C0qMV)_Btwi#t8$&mbhxMKB=J^-#Wna_5 zxAY`93tQZzj|G*4$G4|m<-W*z@+oZW%RQ$1?~=DYggJX;S69?ay=F89BYLYAQ|!OF zqG)&Jz(1Gc;746^gJ1mS{?&N=wY!O=l>I?k7fdzuyczO%3B&IHEr7&}Gu3;3lvN)2 z@Y3f4MLV(P?p{_JPzmsfIPmjxa@2glE4fOmCvBYr4#`jAD@JY+rLJ1htewFw)3Swj zHYTJr=*`65Vr5Mwb7;}nPOMzHx{a9Q7 zSbLCEnMLEW#pE7=SY81M{&zjW!B)4K)Xs7ZA(OfPCR#{nM=QX+}hJ<;_$e`-Ypzh`G;m`1}C-%Kh{N2x+k}@-%TX=yyB-bX^TfhqIpQ; zm?E(zH=))xF*+`hry{Wdk=X1XVB8U|T>ya=&@m_k_u)o1P52H8n2!o1k8gsf^s^4h z*t85xmGZ(Iu%aw*Q=szV^zte9;kmE!Q(nva4-?_Me?Npc7fQ}E zg&ooEAPDy2RVwK8+jycMv^k`0L`7^RTiB=VVh1V<1cr>INgt&>33nS=lsLIhIBiW7 zea+l`&7n~+^Z->*Ybdqd^Jep7U{SyykrBU%4Hv%@-ao<8snr#c9 z0Xea!SjTwDKnabm97LZ!5i#Wh&UE;(5qC_ zRS6qes(9j9`cTNE^dz?BG(d?Vutz}di_nc(BB9H(?&6a5`<{ehD7m_#zO~pVn zU(n^fr!U%MDA{MMK4z>rXGC25Q@rz^-u%|`TmZs!j+!Ih>V1)l4f&E4jlwy-0;EB~ zlu`cpujxN;|}XbH|} zh)%CbO0CFDDb7kM&Q2-LNiE4qEzM0U%S|uOO|Qt!sLIW(&dsXH$*#@Lt;@=5%z(9~ z7Ih?-^dy!K#8nN)RF6g1OhzK6BkGXh^=Lqn^GB8QhbI7pImw-v^d3xhA11dSlRt=o z4gDJoV+#Lcb}Bz7rMh6J<`5WlqzT?tttFQx^hgjxY^jn8t8SQzW`I z4%Lx}?8!h5%&P(v`}aN+bw@zhww)Hr-<0x>mJH;JsD{6#Y~PGXvon07R#2aOrP zV1_Z6F$`uLgPFk0Ok!rHF~0@z=o!o({Lum328aar|6T{Qto~ngK+h}xqYmi8|6e*F zhlPq8UP8rxh=fAP3wqxAKMl6GJ)HE~?0@NibnUJapB^oPM>`we_5(VgVtLDw_^`C1 zVuAkOI-q95NWS!FZj$JGN+rs@ZOTeNxxQlPL2c`E0FeNI zt_4Jy8>C$7A{6mkp9|fm7&nT%Upj0Q`+u(8DEUjg&a_z;ecusiu%)ZptVsU6fi3n! zSySznAV-!&Wj+?K6bBI>&j`~Jwf0tZL2lo3crn*^hq_AGHj~1oXnwqmq@eT3T_L>S zle+@AEDTd!nVtJ~KHt{py8kRFeQ+_e?&}DlOJRfbJ_$C* z5H^2u`sjVz4)@MGdd>%v6m|^tEwTJ8bhiY+}-3;I7J@1E9NP)F$ z(@D;w5!i)dcfD~6@hWDO5PDXG8(G{h{Z}QhM#R}ko@8QZFR?hp^pC{+Xdd<~TW;*} z74I1eSZ5G{YON(X-tUgSkGjF;|Ir*s{eGk28(^J;BU6H26S(Kvw|>>p7?5wBi?XSc zOi~Sen)534bla=Tl}^&W?(}Y9`UY#j_PKCK?^fMv)A`{H|JU!B9z8^NcC2ttc#EMklsU5aY?*tt!HMC!|jqKd4zO3?uNZ|IJwJ0;SCo7 z$x2q~5VnrTX^|8%6rd5WTqT){eE-sytrmXR8fLrU@>96>3{lnnH*iGq%UC^IMfO?1Z9-koNpnyt!RuIb&io$;Z)e*WH^UTGO^_+NL&inSme*TWzM>pV<@{`!X|Ls8B$K>2c)=HzO4HhStMJ zIrD|@Y8#HbaC(_;=ym8csS;lQAyXmDNh8QCnKyjlf)0DVGtmLZA9PmXhz@7ccJuyG zj}u@V9nxX=3@Jg8FXZ@andrf{oM{G1zPP z(#m%)xu#YvSK)h`Oq8t3sR<6HMY#;!(t0>>u56_Sn|1wO%=jr+eiZmK=P`W7_8s9R z?746uZ~N)2d+N8XHRFO;qHCF?2k))6c1fQ+!JfN!Dpe?sw5!6+qoHH{!jKcIxk$#5 zW^BQD^WkB)B#sT7V2yoAa_#vDF>GG&CQlx=(^g53Ucq59d;SRnH`6l?JLO`M6c_lU z=53jgeG$!wgFXmzC_=^^iqxx7vNyuH+2|+Zxj-pQ&2>x6w+@;L7fMjTX_VZVCw;>S!3>v$%=$$)5DVBv0vIbq}CHjM;dVt{IQ(~j|| z>fI+;@k8GTP!xL)dwpNFzdgF?p&vQI{Pku4t#3P7`?h}?ZePvBYMkA9ajP||- z_zNkL76P`L5<2oCcN0QJu8okNloX%7lUyJ5R=#ySHDYy4c(fI#a_53qPV+ z^Yb$UJ!z=%tF@IgCT9v;C!&bu4m)u5e$&=0z0X_TkKAmgVg z6-*o+-nl^v?T*wt2xnU&m9#bH)Q{rxj}pj_66%Q(UWyX+hhD1*?C>L&r6Xn|jjrX7 zzTaxJIz=RxuUG3AlmHJho(@u35Biczv!DZI_wk*F3ih>WCd)>_^MY^p1PkAc!aWE! zjva$L6e`#60c8&TQg;L2QHj>$2{!%8X;FUjirBt*dM>K ze#%S#l%@QXm7bJ0ODXJa-1jIz74WEd`{=rOdp~}=XZoqcyY1AlBNskY6kb4FLB?Pj90pB8oj?J3ghCAt1Rq@^9XerHYGZDgE=52QvW9zP%+ ze<8hC+o7Q*9%ni93WtZ4LJV&!HFG@U)4lM=1{NsY^mLpeaq@u7y8O(`d|7#J;kH+a zme?`o?KHG8NioP6aztjttN6NCN!zg@Ch-y2M`E+c+jIJAOq9GMn<@GQIfnmH2V^EF zu*#sb&yYgFA8pI%@-;qAv?sUshux>m+)doPPX4rST4^*j-XG~LO&AmnNYi2b4(oPN zH)@pzszDRlP;E(jCSdcUz!xPI?tlvX`;;08OsUGhQ?VF-`B5N@U?>}yffdZm4&h)2 zi!g(gpdejfpG-?@PD^Y3+grYD?NJ|?+OB?!M@wa{TpRM(OeFa=3z92ex z5R)T_%^JjM3Kq}@^Q(b{<-rmX5NTnEB0ofx6QaceF<=0j(1XqB!4`~QYi5uw8_1CZ ze_~y%7(h)+J+2xOGHJNcWIwv@sN4p zs3B}Z2ZmCHJ(DU}7Rvp=o4wAFxy_RKg)!}rKI;cG`vjVM3N1LJEBQ$WY`@EY(pR1{ zz|Vnw`0wfa9B|Aq*ZyRyJ>jYSE>X8@SpVLoe$l6XKB#^+r2g0T`=0>T;D2qxn=rtH z3s_I$T7S7uQaUjizlYqs0d&y_vUCjjXJ~~_Pu8NQ>d^oue~qi?p(gZDGkUP?mkqnS z57Rz`X&J>djbR#oVWwgH7aAviyRxTenvpZD$e9k*Og9?She8ja&_gKH2pTnB+ zrx#cDclnB^r38!`PUXZ1jp$phcP0bA+ew!w7k*A=;HlHj=YL!N+VTezCePF-lJJ2S z%X0hgDfNGCu@0w9bbPU$LlUjNbnz1|!Ok!igF_7j5G%i*hG9XfJQ`HqgBoy$7leBY zp3DU&Wjn^m(Ar=E9!up8^tM|e8}DA)>&~lw0M^~NAFB@Z{F+jk?UE)sif!F+&(Zfz zGRvYCYHtixg_s|8H|Ji`WLM;K9+}-3zVP?`-2XlDEsBj+ga|Jv_RZC@n^q%6xk zmVnsOKa3CV6nGduP0;bdQ{XdVHC6a%b2Ux;7UK&i5b<=m_*22_=l zx}r~cK$ZwN!BWYzLgRtDJvbrK%0D30MyCQBpNxy8(qQB^6B*jErUZ8&(`S}ChkQl(<7t}sl@ zbZqGT%qSsiip7+5nK`9cTMI(TQn=uH#8TCl^ikO$+ENX->R6Xy4sZuv+Us1ht>5e7R1hla9*e*%n8!TyRj<%L6#DF-O&U#AxmC?j)1U5npGl!> zC~`+E7kw(1eRZyM(<&&I$)?!9?fMqm6`aT3rJpX4E`wCh7Gh_m{*0r-@?DUleT;+S zO4C3E<))K#nE+9x%ZZ}8rQKBYcB{ddp!y_Tn#TdBjjJ#tbnDY?1LmJ3Rm_qC-;5|L zZ?PBT+o>}sZ$TwqB|eZu9rZRW2wvUzDt4?We5)#XYG!ZQzNYbL#kqTrPvO($4~E*| z*bi0e^qtNu55=hn>GXO{f(;k}<opitD8% z7quhLYK_)TB%0(@=|~?vuHwYtSUjrw65Xm4;mlLGN-D|IB_4TR9?s&ZkLC#3D(d+1i@*AUtUZEkrwp0RW`r=f(by_J!I zNbw4b%NIME1V3=P7|Fi=W8M88m1d~D^V)4qn>SOy&F$rbXX2NW1JQ5r!jmJVzdBM- z9t1qIGMRWdtPO8H^H~d(jVf9i$(f3}mL8Gr36|rE8(CmziP)1Wxe^wL#oBHKQ|!K> zBvYS8iAROu|H>Dz?_5q!i)Al_(cqCxQQK-Je&~m}I&YvLDkRZ_z?&@o2gmW+L%s_kHs*D&KYrn zz{Eq+k2I$WyrC>wcoS6_bel43oy;a3ee$5e0%cdWmarQIwnB_;Lia9j#GGF`P7Moa zDeCe{#k^gEjY}u6X!<%TU$;UIEcqx7YjClAd!r=%gX@{$?mdNxfbd2}TwKQY^$ZWWh>|>QsqWbz1s% zJsz6Ki?9oV-Y&=D>#whrJjK=#E|1C#siv2}i5xGS@=9{*tjv3p5m%%6qs55jvmCGD zpD8s5%ENs-D+7d|e?6I;ALk{-EnT(r{cSCC6?$cfmy6{S%9roY@cr?;f^}-1OCwA8 zx>gqE9b$1Aw?)zv;S#!cLNWzPAw1&K5iAa{K~@vDQ~wvKy6Wa(;gY`XPAx3kFO}wk zoj2YErnj%~lsq&BLs!zd6tlUy6A6p_2Nm9h&HR8}Ki9i0Xk{e3d}M63R)+PNdFX7x zH5(mRbT`7D2JPRmAM3#ZsQ^S)nil;5H+|)8j)Lg9E&g+ujHw`XyS_6|Q8>4#T zm7Dh@lR1B=8(ilT>1F%oJ|JA~Oey>N@>5rs3xtfU?C2FSPCm`pZ0S<+YlbzZyxww* z)mNH)B7RN&BK%(0?5_H^&kX0%tC&738*CAM8+#eH<-&d$RQ}PFM^CN6vV|~**lR7~ z4S5r;1?_n3&g#`I9>d%S$qcejQ#Z(YMo;Q9o`mA|-^%MMx1M?g_T06!ay?ndf7$`( zpS@2n@gu=6BfEy)nOx%@a~~Nar?St|rvL+?YO4COhYaAEeNDGE{D4OB>5T`7JIl@8 zGK7y5pf&HiK0fbJmCsBFf;;qi^^B%&3@f`7plOYYbtez8`1vF_<$^GIPB|rr75Vm5 zwy3W~Bv;Yf1ts`FD-)t`JNNV?`*Pv0Qb3ty!*#-8F-Grz!asMMpJ`)lD+@d&JTU)n zgo>MfLG8Cr8U$w*f6_1PB}fVveHWjiHf@r%_3!)yV`I6@W~O zL1x7u^K!5y9AZ@iwS_~SYv?@SbiP$|fpBPOEnRdYePTO9T0cY1BxB(MW7%8A%Fm27 zUloFnqn4mgz z00Qj`M|xCFJC{$|mrPg}ja$IR%nL@%@<&bo!Y^6qFZ{I$8aB%tHqRTh&g*l|ZS~5j z4bCZz%gM^li7n3wXv}r($+sQMHwRqW{}q3kwhOJsi)|-L945=1rz+g0tGrNfUtp7h zLIj}@A?UilmMLgpnbI7EZizv)C!o61P<`2`fjsnJ0eTRI9)JO_zjiA_h10`@fR=M& zv~+Z$Vq~g%7>O7_)%K(7deHS+3)!(dOpn*47q~Oax@e?(Xga`9xp7eEItI>;E97=pJx{R(tS& z_6SWE-k~gm%;u13az5pPt0ZM~Y(;w?!qsBAO^(hLzMId(WU}rE3u$ku!Bvav%o%y= z7On)4o36n-5DI1AsW zQ}Ps%7oKl1$C60Z`EWk>%^XYVGC|cDM&mdeP59&yZXmDCbnTVGZHd0_uYWs2CxQ0A zsp)0d(IwJ6zeYa#F-{0pAiz+3X7upY!^>@o&mrc=-O?;(rl#{`W1uDc$n8+mY2LT5 zpJ8ntSSyju^oh63`%}?~zxQU%*NBXGUi(7o?$xz@si>=#8kKNtE`)@i684E&JjyZL0XLU8Po|HQ(Z6>l0stw_Nj`f3dKX+8N zOmbhlI#OXAiC!WLSeh}4wR>G}e0TP`Kg2S#$t+i3=bLNfC@nN7)-r3_q?$O|b##st zVDOJt6kQ}t3}J=#Hj%a}!M*&% z1NjtfauKy{(1{L0P4>|dQ@uKuZbK%|ktibSi9y@_+%`Vk?qs$`5i>@fS)E*#gGR6X z?Jb$agTb5lv2 zI+~l7;OyGuxbcg8*Oq{^)^VP?>M(gnQ^|pPNglb-h>)&OOLLDvqi0C6UN70* z5fJ!J+z{sh5pN3Rk4q5rNTc&!zIpGE&P9MA_HnlLj;#8`d#I*vn^d_Z8Eddzo&An{j>x6X2hjdR* zWfC0@EBJn;6!E2nJC2&ljVz~2@n$*e?II~rHgcXCP9*iq3myB%O~)qikeExSdtJFi z3<~dRN}UfOY~(#-frhuZp$%`~`+5kVAxvF@A_8u_%Ci!z4!PAqh{a1*C&-F6v(<#k z=;+NZmG9W}LJC+m#08Ko1nQxm9@=j@EDR)g`&g1_pHa~b*psE`FHpmUI$Qb^(FEb7 z&vT&r*vz#Nw`}Upi*9LUO25U{vi;G<)P=BV3)!=Er&`xO<;m>dRaxYp8CNnKM7`|l z`_VYryU6n#^fY!N!*fp=BSh@^Olsv%rytu5YCGlLDwLa1+ zWCgWO2~Db4^5m2^HsVKYF24{p@AlW$vS;0Z z5Rx6GWp-1rwCBtZ#R#-|bT6ag%fw!t;EkV$oCPzg@@Mr}%u#Jvqbf zwfR&1g4?{wA8w@vmswwKTAYo-tukRbpJ;B*3{KYee*g8_agox@;od%_^mG(eT?jT*(Ybu(r+pC?i-QX>Aq|( zVcn7V{#wLwHb+my1UKyG3_JezT=h-eW?oqMIaekJMVj3rL+2<{>Nip)0 zl%OyL-dz`w*K-mRZXFv@)He)vEh&DcnKKAiGceQaE`HKgd%f<#s&ldmyLtLr+LpRO zSpjkAAjR{7&QVF{lOb%xynW zXG<(vC#_Ud@2R;n9z4x8j5llG`fXU$dQnLmREEiQrMp$9-0s?oW6=Zsq4S2eQ}>Ib zzz?UzvIm_bkK9{%pDWUUd|u;Abj@%;M~nJo-|N2*$azDc2!EY1Whq+grqjTkch*j$ z*X`nn!_e6DdKPup!w>(;zb&}g@qO^u?)UFi$471immy$6eHIA}a3%hopF2UXBlJ0~ z%mP0><+5!h;`en4F4CdhP@#v`oy@u=sBRo}qwUmwuDrfH3e_rt-)(!FsBTC**j)JK zF_#c{TEvY2?^057(({Af%!XH2%?Ioq_7s8LQZbnp@d6OLQ^+HO`tsgu4K~f`2ynDM zlrU!s0q+UD+_%qW8j`}o`aLah{)&f+0;Yw#zhq&**mhPh5H(6i2WEnTIly2+Fjxi* zQUlTIgJ_L^!vsWY4x+UN(K>=?-2kB&nAQhO>kp<41k?VS86cogI#2`)C|(GhsRD+X zL8?3o3%*=*> zl8k}DoSxnWO6LrLdV=YK!Hgjgws0^{6j&q)_efXwnh=J{aDT(E66#32*v zoDTI!hx%kf{c|Bf1(4t(NN_1QqyijP4UVjX#5O|{+v!re>C$@XvqtE1F!WhVbQvG$ zQrGE{w&~Ko(q(_Ahn+H%{$#B9$yEK5rRtQc>f4jbZJDxnD#b6f3ugdjm~s9XpbYyn z5||YL6T%oUDgXn6bJ?VO<+OJ-G5~=JsznFap+oC`A*>b|UNaR@H6B$y6kFDtT+*5k zD=p8H08aQxv)_5!0Q4 z>CHm-<)8sI)o&>kaQ9W)-$`%KessY?B(S1CDenQc;qvDR=nWow%yeqeV`OD%hK27pcxPAisWlEs}L|?(vSwKA0`Kv1P znIfsAM;9+NIE;IYDWS7{olbRDW|$I{e!JZjARdY?Am~3#3t7x&PydIqFtJ(~|Fv85 z@57&6;Cy(1MS`I5y2`me5=q3CHxXegOz|;h3i@p7fxh{sh5M~rCm-YcW0q)vhaKWm zBFleML(xk^Hn4ao&j(_Wn8BBoWz@bFqaT@`rLI_Oqo$qczMf?ii_(n8Be9;~!On<; z=3c2gq~};pp#U)y-Qv2KlPIP5&8G|g9tn3Vp$cWp&}Ut~lLLXt;Z;zqW@JmOMc6Xj6Xp^MF&Z%3l7l-qf< zz0*8$i+Q(Y;=a>A;-UC(<~@LLFU%xu)D9=^S~0v0>BbA;#J@olv9p)<`96fL z_ilAiQ?iP)KE31;m*hO%wY7*W+yH;9S+Po@gRebTJwLxBsZa~JNoel3DU1&F?9cUG zt!X6P#xi5!fZntVYDp$E%qQx>3R3WRbXTv43;odV=RwjvEd7tjM>o{tQP}MbToNn~ z&OMW;JmuTF_*Rvhp2~~uew$-l*mA^Nk&1XcW!59)ea;F)5cO!@PQE>?`*nclrFEXm z(LV|I|L89(Uc6ii97p=SXS*ak3AA2lK#Gy?1aV3z*q^DPjqI2?Mx**Sz9R?JGuhc- z8=POJG|0z1*2qY)0@n9p28enZ?36r4v!B0C1hrN^HJx#rVd?K`)Z4$grr@7^`l)N2 z+#7-Y(1!l%5mY za>MhxC&dKBcO=%QDWb$G?`D0a(85Kfwbm2Zf-ro5SQp2y&q{yRHCM8=bw8HPi`FNV zUbNPSDDG14dATOW)12VYkEkvG*vSJH9ScC$FvZ5kYr9!Nii)y z#RWS^ZoW=KHC#Ex>syoJ`aK1USaYa(IhiK=CzeE8Oq(PHwmRX@xZ_VqDiBwy!p(aU zB#&!B}0zCV&ZFp5Jg3Gg4gU7DcG<`AZD;i3kmNj*5aG&aWGOs0-5`r!bNit zx5}}Jb2TJNs&})`nBvbg6{sHFhnS_`uw}NvBNSiG^avJy%zj%zWF|lXA4K#PuY9!i zi^J_q_)IP-s7v`(^j$9!7BkjF&OYN*=E9YQ)xkd0Q{TRC#rw%M!W#;6fh*riPA+F^ zM2`bx3Ij5K`O8E$P87uW)L~>`d5FCNXDuENXDq3$grIL*l7XgWO)!J>`wwL?1FAs` z!nCX*Cu%8YHaU16A9}JvZ7q(2nKlGDs_uwx|B_9~X=De;p= z3R&WWr2>YRjRdsz)4M-^oaGTuPWX@4l$s@~$V%{=ycpK~V3GhnU`k=GA1|xO(xg zNqb$W+F%+jdKmJI8y(3R>u0Hb2Z8@jgdj+`QQAGAPb;p3d{C9wm?dqwN6~THX~}v}mo~+sdSiCHW&0`K!|*E|qAOKRjL~P;OGSs1b;f%QXcCNzWPbAJ zv}*;i4CiAIM&D<_20U%DlP;<|)R}I+20h1P+&sGoc4L6 zL1)j)?sOvLE{K;h&lVBzR9mP>6X*$7@d?+a<|Lj&!dqhUG{AF(2U?U-)yid^9cMSb zwwh_%JIB&q(ByYv9TT2eop`P5D*?6T*-NSdk$1dmjM&Edp01XK>5@I;gPI{1*(22b z2;JHGJ;D0ZJd`g~&1e)?W+5nuL`NRA_;48~NvL80`z=cxVYn1Q5MuGZNoijFt~2+O zVeiF70gOV6-neHvYiM)MRm_e}cOkvZrN8>6IQ?OXd|(GutrxBL^f0&oe4Qh$cgEz? z*8;C-OWy8YS@$m<>dh-@7CxQRp?*7x%xf6V`x1km!rP|Z_m@cS@wK|W)Sp(Q+@N}6 z>kx8j6en!t-JX2JQp2hn-%+r!g7!r8o}(zVyx)8(X;s9y`hX(~oGKtbDn_Rq>QDRM zjcPFs+<3B4f6oA|;s*B=q}#V4dh?-LhEwWrU}OAs@nWnfCUlzg%z{a z#LoF2S=ij!%fD(UxcAuhd^)$=Yb@{754OMIu8M&_gnra&G4h|_x#?ts6Q?-_h>Q|Dv<&3}=Ay&+E5nk$ zIexaYU4NhgRl>r!X$DsJ)T6z4={wP}jNu^G)wZdOk9CE(&^{k};B}njZ2?`ePk# za`JxV_y442{5H8H0MpF%YsA-T{%v91|9ijS{J(N>{l2)lxp{baczJpG`1ttw`2__9 zpFDXYA|e7b7y|{aKocv_z^bUI_@{nVLqh}TF4of00(w|=baa3cW1x){=rIPGC;#+L z8XFq}&8+`_r}6(MdMEL&dHil^9SQ$E>)-k{>-%2Uy+(Bne60o-j~EaC-faSM!aG!V z?moOr^q7d4mWTvQd=El=5Bdirq;!ABJyN=RWPbo9z5fRgviktQ_sJpT6i{+XC z{OOtm?)iV-@B#t?z&$S{Bm~^{!otG9oez|L17+X9{VyT$SA92-Auao>iC9TNQAJTn zO-WfpSw&MtRa;d}M@?NoT(?d!=l-}5?Ni+ znQd|zjmqgY8foPQ>1F2WWp){*E}5lXS*8BjB_TN_kvS!Cxg|+?CFunvIk1w#qSB(` z(&Cb`lG5_BvWoJG%F4>>>S{OwfvBsitFNzbXlQ6`Y;0<3YHn`+f2NgnadGk0t5?9v z59o>f=gMz&bq#2X1U7!ay6CcX&y2aaxVZc`*B=Ym6&|$!M|3O^_B|%!_=?*+91QmrwR2qH%I~tr=h}Mn^SnG=y)!VsMe(rPy^${C(==-Q`upia=OYU)%GsO*8ann) zWlRy@Mc-cJA;yVFwa8vNGtRG#;BX3Ie>--~zD3>(68HxP zaYeXP%B}c3@0ITE*zT8ek?p2(t;4*%HcP3S~2*W7CH+%Rm_gAoQGI zC^PV60CWp~#nJ)*i!)ZB8gu}O2W$#S#H@p38)@u~>%DGLiIi3%x-3CoL%%1MaHN{Y)$O2|k8jHBdV zarOVEHT_pNx-8&ul>^f4W##4N0zg#- zfa))(s;a4~si^^N>c79vfiH6-eN8J<4M$6LcUv`od&N*k*(fKeco*>`7twS#p==L< zTu;7y51u?P!5lAZuyW|a5$tTXDbq?5P_WVuuye-y(FRZWwmcnl=uv(xoiA8<9?xlrBN(2I-RS7LabFn?-krbfHa!|? z&Khbh80aYN@2>9eZRqQ3?i*<98|>^E?s+^q@OW&bZ+x_GVsvnFYsC z7)ya0wNK~ffV~u896Y-?RSSp*7uRZEzC>KByZULwF=cU{FqLFySrQ3&}q7+z>6)FtI8cHV8 zxy{G36&g#Y9x|)F{N+GTrI=!(ntbc013gTgjk=qtx#C%+PNS`RX0KYMMu6s!*!H?Mju0QR0zIB!w zu>sFxkc=ZruMNy@KRbiml$GFd?p=S#iAIGvK+}ggOyI$7-MZ?G9b^HM;E+WP0#;AX#e8cq>iI1jar!%qlI--BuRQH5 zSePQ%niTH&h4*r^!;V%pi_mW=h+ZwCnG+kbL?2;VUotZEctzW^6iR zw9j@cT|Tg|s<_qkEFsIXl`sLvDV+YEWg&d!>U^1J)ZHbzh~}r6izS`IEb>{|aqIwM zB)XHqC4kw#z~)WxQ8!MM`h>kInta|mne1`I)zm!)`AS+k$7pEn8$$j|-s}N-Z#&*1 zM``o;Gae{%2SU&tnrg@`zb~fP@8Fd6up6aLyBxpc&w(y0Zb@m5S5b6g{CvKSr#fg8J zk2#o?8Au~mJmb&*@>E&q-IqCaxvO92po3fS;!x%4ug?uU-+f&$iMaZ0@oykTO&YpG zLWO~9L3H?OXfu5EPZm~Q%dQjtZ3|xeIbSyu7S>DKY& zMP{-iIeL|qVc%Ze2-o+wO$#+1Z&c1^N2t3FU;5IB6F8D{e5&gg9UaNG4DVM=oeO$hOnOl~=#I6xjg!Lax2-|6cu(%%`a+AD&e|`z zScoKtN_TljeneDuChFTn;atdkkn59=5B%P0LEU$A#4Yz}hUIZM2&CihymD{~mEXi6 z|0qfQW;@A+a*+7l=$NXHi0*ecHlwMgCaLnI>lpra;~cyip0ewQJRo@M_W`?>Jrbb%f
Fd*B-TsMv!0 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

ZxfzgVy@3;n~6m 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 literal 0 HcmV?d00001 From 730c89fdc9a81464ecd46393c57d6737073673f4 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 19 Dec 2024 02:55:29 +0530 Subject: [PATCH 043/328] Ensures development mode ids are calculated from development path (#97) Fixes https://github.com/microsoft/vscode-python-environments/issues/96 --- src/api.ts | 4 ++- src/common/extension.apis.ts | 4 +++ src/common/extensions.apis.ts | 24 --------------- src/common/utils/frameUtils.ts | 53 ++++++++++++++++++++++++++++++++++ src/features/envManagers.ts | 2 +- 5 files changed, 61 insertions(+), 26 deletions(-) delete mode 100644 src/common/extensions.apis.ts create mode 100644 src/common/utils/frameUtils.ts diff --git a/src/api.ts b/src/api.ts index 4f2d170..0e6af2c 100644 --- a/src/api.ts +++ b/src/api.ts @@ -316,7 +316,9 @@ export interface EnvironmentManager { readonly displayName?: string; /** - * The preferred package manager ID for the environment manager. + * The preferred package manager ID for the environment manager. This is a combination + * of publisher id, extension id, and {@link EnvironmentManager.name package manager name}. + * `.:` * * @example * 'ms-python.python:pip' diff --git a/src/common/extension.apis.ts b/src/common/extension.apis.ts index 5a2f9cc..c77594b 100644 --- a/src/common/extension.apis.ts +++ b/src/common/extension.apis.ts @@ -4,3 +4,7 @@ import { Extension, extensions } from 'vscode'; export function getExtension(extensionId: string): Extension | undefined { return extensions.getExtension(extensionId); } + +export function allExtensions(): readonly Extension[] { + return extensions.all; +} diff --git a/src/common/extensions.apis.ts b/src/common/extensions.apis.ts deleted file mode 100644 index 4340546..0000000 --- a/src/common/extensions.apis.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { extensions } from 'vscode'; -import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from './constants'; -import { parseStack } from './errors/utils'; - -export function getCallingExtension(): string { - const frames = parseStack(new Error()); - - const pythonExts = [ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID]; - const otherExts = extensions.all.map((ext) => ext.id).filter((id) => !pythonExts.includes(id)); - - for (const frame of frames) { - for (const ext of otherExts) { - const filename = frame.getFileName(); - if (filename) { - const parts = filename.split(/\\\//); - if (parts.includes(ext)) { - return ext; - } - } - } - } - - return PYTHON_EXTENSION_ID; -} diff --git a/src/common/utils/frameUtils.ts b/src/common/utils/frameUtils.ts new file mode 100644 index 0000000..f0b32d4 --- /dev/null +++ b/src/common/utils/frameUtils.ts @@ -0,0 +1,53 @@ +import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../constants'; +import { parseStack } from '../errors/utils'; +import { allExtensions, getExtension } from '../extension.apis'; + +interface FrameData { + filePath: string; + functionName: string; +} + +function getFrameData(): FrameData[] { + const frames = parseStack(new Error()); + return frames.map((frame) => ({ + filePath: frame.getFileName(), + functionName: frame.getFunctionName(), + })); +} + +export function getCallingExtension(): string { + const pythonExts = [ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID]; + + const extensions = allExtensions(); + const otherExts = extensions.filter((ext) => !pythonExts.includes(ext.id)); + const frames = getFrameData().filter((frame) => !!frame.filePath); + + for (const frame of frames) { + const filename = frame.filePath; + if (filename) { + const ext = otherExts.find((ext) => filename.includes(ext.id)); + if (ext) { + return ext.id; + } + } + } + + // `ms-python.vscode-python-envs` extension in Development mode + const candidates = frames.filter((frame) => otherExts.some((s) => frame.filePath.includes(s.extensionPath))); + const envsExtPath = getExtension(ENVS_EXTENSION_ID)?.extensionPath; + if (!envsExtPath) { + throw new Error('Something went wrong with feature registration'); + } + + if (candidates.length === 0 && frames.every((frame) => frame.filePath.startsWith(envsExtPath))) { + return PYTHON_EXTENSION_ID; + } + + // 3rd party extension in Development mode + const candidateExt = otherExts.find((ext) => candidates[0].filePath.includes(ext.extensionPath)); + if (candidateExt) { + return candidateExt.id; + } + + throw new Error('Unable to determine calling extension id, registration failed'); +} diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 8186f8f..2861d3a 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -30,7 +30,7 @@ import { PythonProjectManager, PythonProjectSettings, } from '../internal.api'; -import { getCallingExtension } from '../common/extensions.apis'; +import { getCallingExtension } from '../common/utils/frameUtils'; import { EnvironmentManagerAlreadyRegisteredError, PackageManagerAlreadyRegisteredError, From 82cdd42fc100e8f1efe129665a47249c04fd4b67 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 6 Jan 2025 09:24:45 -0800 Subject: [PATCH 044/328] Ensure env manager context is available to use by extensions (#100) Closes https://github.com/microsoft/vscode-python-environments/issues/94 --- .vscode/launch.json | 6 +- package.json | 6 +- src/features/views/treeViewItems.ts | 56 +--- .../features/views/treeViewItems.unit.test.ts | 241 ++++++++++++++++++ 4 files changed, 261 insertions(+), 48 deletions(-) create mode 100644 src/test/features/views/treeViewItems.unit.test.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index 152f2b5..0536c79 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,6 +14,9 @@ "preLaunchTask": "${defaultBuildTask}" }, { + "name": "Unit Tests", + "type": "node", + "request": "launch", "args": [ "-u=tdd", "--timeout=180000", @@ -24,12 +27,9 @@ "./out/test/**/*.unit.test.js" ], "internalConsoleOptions": "openOnSessionStart", - "name": "Unit Tests", "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", - "request": "launch", "skipFiles": ["/**"], "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"], - "type": "node", "preLaunchTask": "tasks: watch-tests" }, { diff --git a/package.json b/package.json index c815275..5c73335 100644 --- a/package.json +++ b/package.json @@ -278,11 +278,11 @@ { "command": "python-envs.create", "group": "inline", - "when": "view == env-managers && viewItem =~ /.*pythonEnvManager.*-create.*/" + "when": "view == env-managers && viewItem =~ /.*pythonEnvManager.*;create;.*/" }, { "command": "python-envs.remove", - "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*-remove.*/" + "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*;remove;.*/" }, { "command": "python-envs.setEnv", @@ -297,7 +297,7 @@ { "command": "python-envs.createTerminal", "group": "inline", - "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*activatable.*/" + "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*;activatable;.*/" }, { "command": "python-envs.refreshPackages", diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 6c3901b..b8b5d85 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -1,4 +1,4 @@ -import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon, Uri } from 'vscode'; +import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon } from 'vscode'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { PythonEnvironment, IconPath, Package, PythonProject } from '../../api'; import { removable } from './utils'; @@ -31,23 +31,14 @@ export class EnvManagerTreeItem implements EnvTreeItem { item.contextValue = this.getContextValue(); item.description = manager.description; item.tooltip = manager.tooltip; - this.setIcon(item); + item.iconPath = manager.iconPath; this.treeItem = item; } private getContextValue() { - const create = this.manager.supportsCreate ? '-create' : ''; - return `pythonEnvManager${create}`; - } - - private setIcon(item: TreeItem) { - const iconPath = this.manager.iconPath; - if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { - item.resourceUri = iconPath; - item.iconPath = ThemeIcon.File; - } else { - item.iconPath = iconPath; - } + const create = this.manager.supportsCreate ? 'create' : ''; + const parts = ['pythonEnvManager', create, this.manager.id].filter(Boolean); + return parts.join(';') + ';'; } } @@ -55,28 +46,19 @@ export class PythonEnvTreeItem implements EnvTreeItem { public readonly kind = EnvTreeItemKind.environment; public readonly treeItem: TreeItem; constructor(public readonly environment: PythonEnvironment, public readonly parent: EnvManagerTreeItem) { - const item = new TreeItem(environment.displayName ?? environment.name, TreeItemCollapsibleState.Collapsed); + const item = new TreeItem(environment.displayName, TreeItemCollapsibleState.Collapsed); item.contextValue = this.getContextValue(); item.description = environment.description; item.tooltip = environment.tooltip; - this.setIcon(item); + item.iconPath = environment.iconPath; this.treeItem = item; } private getContextValue() { - const activatable = isActivatableEnvironment(this.environment) ? '-activatable' : ''; - const remove = this.parent.manager.supportsRemove ? '-remove' : ''; - return `pythonEnvironment${remove}${activatable}`; - } - - private setIcon(item: TreeItem) { - const iconPath = this.environment.iconPath; - if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { - item.resourceUri = iconPath; - item.iconPath = ThemeIcon.File; - } else { - item.iconPath = iconPath; - } + const activatable = isActivatableEnvironment(this.environment) ? 'activatable' : ''; + const remove = this.parent.manager.supportsRemove ? 'remove' : ''; + const parts = ['pythonEnvironment', remove, activatable].filter(Boolean); + return parts.join(';') + ';'; } } @@ -244,7 +226,7 @@ export class ProjectEnvironment implements ProjectTreeItem { public readonly id: string; public readonly treeItem: TreeItem; constructor(public readonly parent: ProjectItem, public readonly environment: PythonEnvironment) { - this.id = ProjectEnvironment.getId(parent, environment); + this.id = this.getId(parent, environment); const item = new TreeItem( this.environment.displayName ?? this.environment.name, TreeItemCollapsibleState.Collapsed, @@ -252,23 +234,13 @@ export class ProjectEnvironment implements ProjectTreeItem { item.contextValue = 'python-env'; item.description = this.environment.description; item.tooltip = this.environment.tooltip; - this.setIcon(item); + item.iconPath = this.environment.iconPath; this.treeItem = item; } - static getId(workspace: ProjectItem, environment: PythonEnvironment): string { + getId(workspace: ProjectItem, environment: PythonEnvironment): string { return `${workspace.id}>>>${environment.envId}`; } - - private setIcon(item: TreeItem) { - const iconPath = this.environment.iconPath; - if (iconPath instanceof Uri && iconPath.fsPath.endsWith('__icon__.py')) { - item.resourceUri = iconPath; - item.iconPath = ThemeIcon.File; - } else { - item.iconPath = iconPath; - } - } } export class NoProjectEnvironment implements ProjectTreeItem { diff --git a/src/test/features/views/treeViewItems.unit.test.ts b/src/test/features/views/treeViewItems.unit.test.ts new file mode 100644 index 0000000..929f76f --- /dev/null +++ b/src/test/features/views/treeViewItems.unit.test.ts @@ -0,0 +1,241 @@ +import * as assert from 'assert'; +import { EnvManagerTreeItem, PythonEnvTreeItem } from '../../../features/views/treeViewItems'; +import { InternalEnvironmentManager, PythonEnvironmentImpl } from '../../../internal.api'; +import { Uri } from 'vscode'; + +suite('Test TreeView Items', () => { + suite('EnvManagerTreeItem', () => { + test('Context Value: no-create', () => { + const manager = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + }); + const item = new EnvManagerTreeItem(manager); + assert.equal(item.treeItem.contextValue, 'pythonEnvManager;ms-python.python:test-manager;'); + }); + + test('Context Value: with create', () => { + const manager = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + create: () => Promise.resolve(undefined), + }); + const item = new EnvManagerTreeItem(manager); + assert.equal(item.treeItem.contextValue, 'pythonEnvManager;create;ms-python.python:test-manager;'); + }); + + test('Name is used', () => { + const manager = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + }); + const item = new EnvManagerTreeItem(manager); + assert.equal(item.treeItem.label, manager.name); + }); + + test('DisplayName is used', () => { + const manager = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + displayName: 'Test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + }); + const item = new EnvManagerTreeItem(manager); + assert.equal(item.treeItem.label, manager.displayName); + }); + }); + + suite('PythonEnvTreeItem', () => { + const manager1 = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + displayName: 'Test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + }); + const managerItem1 = new EnvManagerTreeItem(manager1); + + const manager2 = new InternalEnvironmentManager('ms-python.python:test-manager', { + name: 'test', + displayName: 'Test', + description: 'test', + preferredPackageManagerId: 'pip', + refresh: () => Promise.resolve(), + getEnvironments: () => Promise.resolve([]), + resolve: () => Promise.resolve(undefined), + set: () => Promise.resolve(), + get: () => Promise.resolve(undefined), + create: () => Promise.resolve(undefined), + remove: () => Promise.resolve(), + }); + const managerItem2 = new EnvManagerTreeItem(manager2); + + test('Context Value: no-remove, no-activate', () => { + const env = new PythonEnvironmentImpl( + { + id: 'test-env', + managerId: manager1.id, + }, + { + name: 'test-env', + displayName: 'Test Env', + description: 'This is test environment', + displayPath: '/home/user/envs/.venv/bin/python', + version: '3.12.1', + environmentPath: Uri.file('/home/user/envs/.venv/bin/python'), + execInfo: { + run: { + executable: '/home/user/envs/.venv/bin/python', + }, + }, + sysPrefix: '/home/user/envs/.venv', + }, + ); + + const item = new PythonEnvTreeItem(env, managerItem1); + assert.equal(item.treeItem.contextValue, 'pythonEnvironment;'); + }); + + test('Context Value: no-remove, with activate', () => { + const env = new PythonEnvironmentImpl( + { + id: 'test-env', + managerId: manager1.id, + }, + { + name: 'test-env', + displayName: 'Test Env', + description: 'This is test environment', + displayPath: '/home/user/envs/.venv/bin/python', + version: '3.12.1', + environmentPath: Uri.file('/home/user/envs/.venv/bin/python'), + execInfo: { + run: { + executable: '/home/user/envs/.venv/bin/python', + }, + activation: [ + { + executable: '/home/user/envs/.venv/bin/activate', + }, + ], + }, + sysPrefix: '/home/user/envs/.venv', + }, + ); + + const item = new PythonEnvTreeItem(env, managerItem1); + assert.equal(item.treeItem.contextValue, 'pythonEnvironment;activatable;'); + }); + + test('Context Value: with remove, with activate', () => { + const env = new PythonEnvironmentImpl( + { + id: 'test-env', + managerId: manager2.id, + }, + { + name: 'test-env', + displayName: 'Test Env', + description: 'This is test environment', + displayPath: '/home/user/envs/.venv/bin/python', + version: '3.12.1', + environmentPath: Uri.file('/home/user/envs/.venv/bin/python'), + execInfo: { + run: { + executable: '/home/user/envs/.venv/bin/python', + }, + activation: [ + { + executable: '/home/user/envs/.venv/bin/activate', + }, + ], + }, + sysPrefix: '/home/user/envs/.venv', + }, + ); + + const item = new PythonEnvTreeItem(env, managerItem2); + assert.equal(item.treeItem.contextValue, 'pythonEnvironment;remove;activatable;'); + }); + + test('Context Value: with remove, no-activate', () => { + const env = new PythonEnvironmentImpl( + { + id: 'test-env', + managerId: manager2.id, + }, + { + name: 'test-env', + displayName: 'Test Env', + description: 'This is test environment', + displayPath: '/home/user/envs/.venv/bin/python', + version: '3.12.1', + environmentPath: Uri.file('/home/user/envs/.venv/bin/python'), + execInfo: { + run: { + executable: '/home/user/envs/.venv/bin/python', + }, + }, + sysPrefix: '/home/user/envs/.venv', + }, + ); + + const item = new PythonEnvTreeItem(env, managerItem2); + assert.equal(item.treeItem.contextValue, 'pythonEnvironment;remove;'); + }); + + test('Display Name is used', () => { + const env = new PythonEnvironmentImpl( + { + id: 'test-env', + managerId: manager1.id, + }, + { + name: 'test-env', + displayName: 'Test Env', + description: 'This is test environment', + displayPath: '/home/user/envs/.venv/bin/python', + version: '3.12.1', + environmentPath: Uri.file('/home/user/envs/.venv/bin/python'), + execInfo: { + run: { + executable: '/home/user/envs/.venv/bin/python', + }, + }, + sysPrefix: '/home/user/envs/.venv', + }, + ); + + const item = new PythonEnvTreeItem(env, managerItem1); + + assert.equal(item.treeItem.label, env.displayName); + }); + }); +}); From 7f37910423e06d5ab19a84e34d05e5d1148d4173 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 6 Jan 2025 15:42:58 -0800 Subject: [PATCH 045/328] Adds group feature environment manager UI (#101) Closes https://github.com/microsoft/vscode-python-environments/issues/95 --- src/api.ts | 32 ++++++++++++++++ src/features/envCommands.ts | 4 +- src/features/views/envManagersView.ts | 54 +++++++++++++++++++++++++-- src/features/views/treeViewItems.ts | 34 +++++++++++++++-- src/internal.api.ts | 3 ++ src/managers/conda/condaUtils.ts | 4 ++ 6 files changed, 122 insertions(+), 9 deletions(-) diff --git a/src/api.ts b/src/api.ts index 0e6af2c..cc3fbb2 100644 --- a/src/api.ts +++ b/src/api.ts @@ -143,6 +143,33 @@ export interface PythonEnvironmentId { managerId: string; } +/** + * Display information for an environment group. + */ +export interface EnvironmentGroupInfo { + /** + * The name of the environment group. This is used as an identifier for the group. + * + * Note: The first instance of the group with the given name will be used in the UI. + */ + readonly name: string; + + /** + * The description of the environment group. + */ + readonly description?: string; + + /** + * The tooltip for the environment group, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString; + + /** + * The icon path for the environment group, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; +} + /** * Interface representing information about a Python environment. */ @@ -202,6 +229,11 @@ export interface PythonEnvironmentInfo { * This is required by extension like Jupyter, Pylance, and other extensions to provide better experience with python. */ readonly sysPrefix: string; + + /** + * Optional `group` for this environment. This is used to group environments in the Environment Manager UI. + */ + readonly group?: string | EnvironmentGroupInfo; } /** diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 0ff8a66..6ddf324 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -29,6 +29,7 @@ import { ProjectEnvironment, ProjectPackageRootTreeItem, GlobalProjectItem, + EnvTreeItemKind, } from './views/treeViewItems'; import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; @@ -156,7 +157,8 @@ export async function createAnyEnvironmentCommand( export async function removeEnvironmentCommand(context: unknown, managers: EnvironmentManagers): Promise { if (context instanceof PythonEnvTreeItem) { const view = context as PythonEnvTreeItem; - const manager = view.parent.manager; + const manager = + view.parent.kind === EnvTreeItemKind.environmentGroup ? view.parent.parent.manager : view.parent.manager; await manager.remove(view.environment); } else if (context instanceof Uri) { const manager = managers.getEnvironmentManager(context as Uri); diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index 82edb20..2c04ade 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -1,5 +1,5 @@ import { Disposable, Event, EventEmitter, ProviderResult, TreeDataProvider, TreeItem, TreeView, window } from 'vscode'; -import { PythonEnvironment } from '../../api'; +import { EnvironmentGroupInfo, PythonEnvironment } from '../../api'; import { DidChangeEnvironmentManagerEventArgs, DidChangePackageManagerEventArgs, @@ -19,6 +19,7 @@ import { NoPythonEnvTreeItem, EnvInfoTreeItem, PackageRootInfoTreeItem, + PythonGroupEnvTreeItem, } from './treeViewItems'; import { createSimpleDebounce } from '../../common/utils/debounce'; import { ProjectViews } from '../../common/localize'; @@ -97,21 +98,66 @@ export class EnvManagerView implements TreeDataProvider, Disposable const manager = (element as EnvManagerTreeItem).manager; const views: EnvTreeItem[] = []; const envs = await manager.getEnvironments('all'); - envs.forEach((env) => { + envs.filter((e) => !e.group).forEach((env) => { const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem); views.push(view); this.revealMap.set(env.envId.id, view); }); + const groups: string[] = []; + const groupObjects: (string | EnvironmentGroupInfo)[] = []; + envs.filter((e) => e.group).forEach((env) => { + const name = + env.group && typeof env.group === 'string' ? env.group : (env.group as EnvironmentGroupInfo).name; + if (name && !groups.includes(name)) { + groups.push(name); + groupObjects.push(env.group as EnvironmentGroupInfo); + } + }); + + groupObjects.forEach((group) => { + views.push(new PythonGroupEnvTreeItem(element as EnvManagerTreeItem, group)); + }); + if (views.length === 0) { views.push(new NoPythonEnvTreeItem(element as EnvManagerTreeItem)); } return views; } + if (element.kind === EnvTreeItemKind.environmentGroup) { + const groupItem = element as PythonGroupEnvTreeItem; + const manager = groupItem.parent.manager; + const views: EnvTreeItem[] = []; + const envs = await manager.getEnvironments('all'); + const groupName = + typeof groupItem.group === 'string' ? groupItem.group : (groupItem.group as EnvironmentGroupInfo).name; + const grouped = envs.filter((e) => { + if (e.group) { + const name = + e.group && typeof e.group === 'string' ? e.group : (e.group as EnvironmentGroupInfo).name; + return name === groupName; + } + return false; + }); + + grouped.forEach((env) => { + const view = new PythonEnvTreeItem(env, groupItem); + views.push(view); + this.revealMap.set(env.envId.id, view); + }); + + return views; + } + if (element.kind === EnvTreeItemKind.environment) { - const environment = (element as PythonEnvTreeItem).environment; - const envManager = (element as PythonEnvTreeItem).parent.manager; + const pythonEnvItem = element as PythonEnvTreeItem; + const environment = pythonEnvItem.environment; + const envManager = + pythonEnvItem.parent.kind === EnvTreeItemKind.environmentGroup + ? pythonEnvItem.parent.parent.manager + : pythonEnvItem.parent.manager; + const pkgManager = this.getSupportedPackageManager(envManager); const parent = element as PythonEnvTreeItem; const views: EnvTreeItem[] = []; diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index b8b5d85..7197c87 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -1,12 +1,13 @@ import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon } from 'vscode'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; -import { PythonEnvironment, IconPath, Package, PythonProject } from '../../api'; +import { PythonEnvironment, IconPath, Package, PythonProject, EnvironmentGroupInfo } from '../../api'; import { removable } from './utils'; import { isActivatableEnvironment } from '../common/activation'; export enum EnvTreeItemKind { manager = 'python-env-manager', environment = 'python-env', + environmentGroup = 'python-env-group', noEnvironment = 'python-no-env', package = 'python-package', packageRoot = 'python-package-root', @@ -42,11 +43,31 @@ export class EnvManagerTreeItem implements EnvTreeItem { } } +export class PythonGroupEnvTreeItem implements EnvTreeItem { + public readonly kind = EnvTreeItemKind.environmentGroup; + public readonly treeItem: TreeItem; + constructor(public readonly parent: EnvManagerTreeItem, public readonly group: string | EnvironmentGroupInfo) { + const label = typeof group === 'string' ? group : group.name; + const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed); + item.contextValue = `pythonEnvGroup;${this.parent.manager.id}:${label};`; + this.treeItem = item; + + if (typeof group !== 'string') { + item.description = group.description; + item.tooltip = group.tooltip; + item.iconPath = group.iconPath; + } + } +} + export class PythonEnvTreeItem implements EnvTreeItem { public readonly kind = EnvTreeItemKind.environment; public readonly treeItem: TreeItem; - constructor(public readonly environment: PythonEnvironment, public readonly parent: EnvManagerTreeItem) { - const item = new TreeItem(environment.displayName, TreeItemCollapsibleState.Collapsed); + constructor( + public readonly environment: PythonEnvironment, + public readonly parent: EnvManagerTreeItem | PythonGroupEnvTreeItem, + ) { + const item = new TreeItem(environment.displayName ?? environment.name, TreeItemCollapsibleState.Collapsed); item.contextValue = this.getContextValue(); item.description = environment.description; item.tooltip = environment.tooltip; @@ -56,7 +77,12 @@ export class PythonEnvTreeItem implements EnvTreeItem { private getContextValue() { const activatable = isActivatableEnvironment(this.environment) ? 'activatable' : ''; - const remove = this.parent.manager.supportsRemove ? 'remove' : ''; + let remove = ''; + if (this.parent.kind === EnvTreeItemKind.environmentGroup) { + remove = this.parent.parent.manager.supportsRemove ? 'remove' : ''; + } else if (this.parent.kind === EnvTreeItemKind.manager) { + remove = this.parent.manager.supportsRemove ? 'remove' : ''; + } const parts = ['pythonEnvironment', remove, activatable].filter(Boolean); return parts.join(';') + ';'; } diff --git a/src/internal.api.ts b/src/internal.api.ts index 1d10048..839773b 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -24,6 +24,7 @@ import { ResolveEnvironmentContext, PackageInstallOptions, Installable, + EnvironmentGroupInfo, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; @@ -268,6 +269,7 @@ export class PythonEnvironmentImpl implements PythonEnvironment { public readonly iconPath?: IconPath; public readonly execInfo: PythonEnvironmentExecutionInfo; public readonly sysPrefix: string; + public readonly group?: string | EnvironmentGroupInfo; constructor(public readonly envId: PythonEnvironmentId, info: PythonEnvironmentInfo) { this.name = info.name; @@ -281,6 +283,7 @@ export class PythonEnvironmentImpl implements PythonEnvironment { this.iconPath = info.iconPath; this.execInfo = info.execInfo; this.sysPrefix = info.sysPrefix; + this.group = info.group; } } diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 5bcf691..bc2bc23 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -270,6 +270,7 @@ function nativeToPythonEnv( activation: [{ executable: conda, args: ['activate', e.prefix] }], deactivation: [{ executable: conda, args: ['deactivate'] }], }, + group: 'Prefix', }, manager, ); @@ -297,6 +298,7 @@ function nativeToPythonEnv( activation: [{ executable: conda, args: ['activate', name] }], deactivation: [{ executable: conda, args: ['deactivate'] }], }, + group: 'Named', }, manager, ); @@ -490,6 +492,7 @@ async function createNamedCondaEnvironment( run: { executable: path.join(envPath, bin) }, }, sysPrefix: envPath, + group: 'Named', }, manager, ); @@ -565,6 +568,7 @@ async function createPrefixCondaEnvironment( deactivation: [{ executable: 'conda', args: ['deactivate'] }], }, sysPrefix: prefix, + group: 'Prefix', }, manager, ); From 90e196fd9bf80c0aa8177bb416dbde2c17b00847 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 9 Jan 2025 09:52:57 -0800 Subject: [PATCH 046/328] Allow package manager to fully control install/uninstall steps (#105) Closes https://github.com/microsoft/vscode-python-environments/issues/99 --- .vscode/settings.json | 4 +- examples/sample1/src/api.ts | 92 +- files/common_packages.txt | 3013 ----- files/common_pip_packages.json | 12054 ++++++++++++++++++++ files/conda_packages.json | 3584 ++++++ src/api.ts | 54 +- src/common/localize.ts | 4 +- src/common/pickers/packages.ts | 374 +- src/features/envCommands.ts | 41 +- src/internal.api.ts | 13 +- src/managers/builtin/pipManager.ts | 42 +- src/managers/builtin/pipUtils.ts | 182 + src/managers/builtin/venvUtils.ts | 111 +- src/managers/common/pickers.ts | 265 + src/managers/common/utils.ts | 18 +- src/managers/conda/condaPackageManager.ts | 35 +- src/managers/conda/condaUtils.ts | 41 +- 17 files changed, 16264 insertions(+), 3663 deletions(-) delete mode 100644 files/common_packages.txt create mode 100644 files/common_pip_packages.json create mode 100644 files/conda_packages.json create mode 100644 src/managers/builtin/pipUtils.ts create mode 100644 src/managers/common/pickers.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index bf5eb7c..20a4c9f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,5 +18,7 @@ "editor.defaultFormatter": "charliermarsh.ruff", "diffEditor.ignoreTrimWhitespace": false }, - "prettier.tabWidth": 4 + "prettier.tabWidth": 4, + "python-envs.defaultEnvManager": "ms-python.python:venv", + "python-envs.pythonProjects": [] } diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index 71524da..be7821c 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -143,6 +143,33 @@ export interface PythonEnvironmentId { managerId: string; } +/** + * Display information for an environment group. + */ +export interface EnvironmentGroupInfo { + /** + * The name of the environment group. This is used as an identifier for the group. + * + * Note: The first instance of the group with the given name will be used in the UI. + */ + readonly name: string; + + /** + * The description of the environment group. + */ + readonly description?: string; + + /** + * The tooltip for the environment group, which can be a string or a Markdown string. + */ + readonly tooltip?: string | MarkdownString; + + /** + * The icon path for the environment group, which can be a string, Uri, or an object with light and dark theme paths. + */ + readonly iconPath?: IconPath; +} + /** * Interface representing information about a Python environment. */ @@ -202,6 +229,11 @@ export interface PythonEnvironmentInfo { * This is required by extension like Jupyter, Pylance, and other extensions to provide better experience with python. */ readonly sysPrefix: string; + + /** + * Optional `group` for this environment. This is used to group environments in the Environment Manager UI. + */ + readonly group?: string | EnvironmentGroupInfo; } /** @@ -218,7 +250,7 @@ export interface PythonEnvironment extends PythonEnvironmentInfo { * Type representing the scope for setting a Python environment. * Can be undefined or a URI. */ -export type SetEnvironmentScope = undefined | Uri; +export type SetEnvironmentScope = undefined | Uri | Uri[]; /** * Type representing the scope for getting a Python environment. @@ -316,7 +348,9 @@ export interface EnvironmentManager { readonly displayName?: string; /** - * The preferred package manager ID for the environment manager. + * The preferred package manager ID for the environment manager. This is a combination + * of publisher id, extension id, and {@link EnvironmentManager.name package manager name}. + * `.:` * * @example * 'ms-python.python:pip' @@ -563,7 +597,7 @@ export interface PackageManager { * @param packages - The packages to install. * @returns A promise that resolves when the installation is complete. */ - install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; + install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise; /** * Uninstalls packages from the specified Python environment. @@ -571,7 +605,7 @@ export interface PackageManager { * @param packages - The packages to uninstall, which can be an array of packages or strings. * @returns A promise that resolves when the uninstall is complete. */ - uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise; + uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise; /** * Refreshes the package list for the specified Python environment. @@ -587,17 +621,6 @@ export interface PackageManager { */ getPackages(environment: PythonEnvironment): Promise; - /** - * Get a list of installable items for a Python project. - * - * @param environment The Python environment for which to get installable items. - * - * Note: An environment can be used by multiple projects, so the installable items returned. - * should be for the environment. If you want to do it for a particular project, then you should - * ask user to select a project, and filter the installable items based on the project. - */ - getInstallable?(environment: PythonEnvironment): Promise; - /** * Event that is fired when packages change. */ @@ -717,45 +740,6 @@ export interface PackageInstallOptions { upgrade?: boolean; } -export interface Installable { - /** - * The display name of the package, requirements, pyproject.toml or any other project file. - */ - readonly displayName: string; - - /** - * Arguments passed to the package manager to install the package. - * - * @example - * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. - * ['--pre', 'debugpy'] for `pip install --pre debugpy`. - * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. - */ - readonly args: string[]; - - /** - * Installable group name, this will be used to group installable items in the UI. - * - * @example - * `Requirements` for any requirements file. - * `Packages` for any package. - */ - readonly group?: string; - - /** - * Description about the installable item. This can also be path to the requirements, - * version of the package, or any other project file path. - */ - readonly description?: string; - - /** - * External Uri to the package on pypi or docs. - * @example - * https://pypi.org/project/debugpy/ for `debugpy`. - */ - readonly uri?: Uri; -} - export interface PythonProcess { /** * The process ID of the Python process. diff --git a/files/common_packages.txt b/files/common_packages.txt deleted file mode 100644 index 82d30a9..0000000 --- a/files/common_packages.txt +++ /dev/null @@ -1,3013 +0,0 @@ -about-time -absl-py -accelerate -accesscontrol -accessible-pygments -acme -acquisition -acryl-datahub -acryl-datahub-airflow-plugin -adagio -adal -addict -adlfs -aenum -affine -agate -aio-pika -aioboto3 -aiobotocore -aiodns -aiofiles -aiogram -aiohappyeyeballs -aiohttp -aiohttp-cors -aiohttp-retry -aioitertools -aiokafka -aiomqtt -aiomultiprocess -aioredis -aioresponses -aiormq -aiosignal -aiosqlite -ajsonrpc -alabaster -albucore -albumentations -alembic -algoliasearch -alive-progress -aliyun-python-sdk-core -aliyun-python-sdk-kms -allure-pytest -allure-python-commons -altair -altgraph -amazon-ion -amqp -amqpstorm -analytics-python -aniso8601 -annotated-types -annoy -ansi2html -ansible -ansible-compat -ansible-core -ansible-lint -ansicolors -ansiwrap -anthropic -antlr4-python3-runtime -antlr4-tools -anyascii -anybadge -anyio -anytree -apache-airflow -apache-airflow-providers-amazon -apache-airflow-providers-apache-spark -apache-airflow-providers-atlassian-jira -apache-airflow-providers-celery -apache-airflow-providers-cncf-kubernetes -apache-airflow-providers-common-compat -apache-airflow-providers-common-io -apache-airflow-providers-common-sql -apache-airflow-providers-databricks -apache-airflow-providers-datadog -apache-airflow-providers-dbt-cloud -apache-airflow-providers-docker -apache-airflow-providers-fab -apache-airflow-providers-ftp -apache-airflow-providers-google -apache-airflow-providers-http -apache-airflow-providers-imap -apache-airflow-providers-jdbc -apache-airflow-providers-microsoft-azure -apache-airflow-providers-microsoft-mssql -apache-airflow-providers-mongo -apache-airflow-providers-mysql -apache-airflow-providers-odbc -apache-airflow-providers-oracle -apache-airflow-providers-pagerduty -apache-airflow-providers-postgres -apache-airflow-providers-salesforce -apache-airflow-providers-sftp -apache-airflow-providers-slack -apache-airflow-providers-smtp -apache-airflow-providers-snowflake -apache-airflow-providers-sqlite -apache-airflow-providers-ssh -apache-airflow-providers-tableau -apache-beam -apache-sedona -apispec -appdirs -appium-python-client -applicationinsights -appnope -apprise -apscheduler -apsw -arabic-reshaper -aresponses -argcomplete -argh -argon2-cffi -argon2-cffi-bindings -argparse -argparse-addons -arnparse -arpeggio -array-record -arrow -artifacts-keyring -arviz -asana -asciitree -asgi-correlation-id -asgi-lifespan -asgiref -asn1crypto -asteroid-filterbanks -asteval -astor -astral -astroid -astronomer-cosmos -astropy -astropy-iers-data -asttokens -astunparse -async-generator -async-lru -async-property -async-timeout -asyncio -asyncpg -asyncssh -asynctest -atlassian-python-api -atomicwrites -atomlite -atpublic -attrdict -attrs -audioread -auth0-python -authencoding -authlib -autobahn -autocommand -autofaker -autoflake -autograd -autograd-gamma -automat -autopage -autopep8 -av -avro -avro-gen -avro-gen3 -avro-python3 -awacs -awesomeversion -awkward -awkward-cpp -aws-cdk-asset-awscli-v1 -aws-cdk-asset-kubectl-v20 -aws-cdk-asset-node-proxy-agent-v6 -aws-cdk-aws-lambda-python-alpha -aws-cdk-cloud-assembly-schema -aws-cdk-integ-tests-alpha -aws-cdk-lib -aws-encryption-sdk -aws-lambda-builders -aws-lambda-powertools -aws-psycopg2 -aws-requests-auth -aws-sam-cli -aws-sam-translator -aws-secretsmanager-caching -aws-xray-sdk -awscli -awscliv2 -awscrt -awswrangler -azure -azure-ai-formrecognizer -azure-ai-ml -azure-appconfiguration -azure-applicationinsights -azure-batch -azure-cli -azure-cli-core -azure-cli-telemetry -azure-common -azure-core -azure-core-tracing-opentelemetry -azure-cosmos -azure-cosmosdb-nspkg -azure-cosmosdb-table -azure-data-tables -azure-datalake-store -azure-devops -azure-eventgrid -azure-eventhub -azure-functions -azure-graphrbac -azure-identity -azure-keyvault -azure-keyvault-administration -azure-keyvault-certificates -azure-keyvault-keys -azure-keyvault-secrets -azure-kusto-data -azure-kusto-ingest -azure-loganalytics -azure-mgmt -azure-mgmt-advisor -azure-mgmt-apimanagement -azure-mgmt-appconfiguration -azure-mgmt-appcontainers -azure-mgmt-applicationinsights -azure-mgmt-authorization -azure-mgmt-batch -azure-mgmt-batchai -azure-mgmt-billing -azure-mgmt-botservice -azure-mgmt-cdn -azure-mgmt-cognitiveservices -azure-mgmt-commerce -azure-mgmt-compute -azure-mgmt-consumption -azure-mgmt-containerinstance -azure-mgmt-containerregistry -azure-mgmt-containerservice -azure-mgmt-core -azure-mgmt-cosmosdb -azure-mgmt-databoxedge -azure-mgmt-datafactory -azure-mgmt-datalake-analytics -azure-mgmt-datalake-nspkg -azure-mgmt-datalake-store -azure-mgmt-datamigration -azure-mgmt-deploymentmanager -azure-mgmt-devspaces -azure-mgmt-devtestlabs -azure-mgmt-dns -azure-mgmt-eventgrid -azure-mgmt-eventhub -azure-mgmt-extendedlocation -azure-mgmt-hanaonazure -azure-mgmt-hdinsight -azure-mgmt-imagebuilder -azure-mgmt-iotcentral -azure-mgmt-iothub -azure-mgmt-iothubprovisioningservices -azure-mgmt-keyvault -azure-mgmt-kusto -azure-mgmt-loganalytics -azure-mgmt-logic -azure-mgmt-machinelearningcompute -azure-mgmt-managedservices -azure-mgmt-managementgroups -azure-mgmt-managementpartner -azure-mgmt-maps -azure-mgmt-marketplaceordering -azure-mgmt-media -azure-mgmt-monitor -azure-mgmt-msi -azure-mgmt-netapp -azure-mgmt-network -azure-mgmt-notificationhubs -azure-mgmt-nspkg -azure-mgmt-policyinsights -azure-mgmt-powerbiembedded -azure-mgmt-privatedns -azure-mgmt-rdbms -azure-mgmt-recoveryservices -azure-mgmt-recoveryservicesbackup -azure-mgmt-redhatopenshift -azure-mgmt-redis -azure-mgmt-relay -azure-mgmt-reservations -azure-mgmt-resource -azure-mgmt-resourcegraph -azure-mgmt-scheduler -azure-mgmt-search -azure-mgmt-security -azure-mgmt-servicebus -azure-mgmt-servicefabric -azure-mgmt-servicefabricmanagedclusters -azure-mgmt-servicelinker -azure-mgmt-signalr -azure-mgmt-sql -azure-mgmt-sqlvirtualmachine -azure-mgmt-storage -azure-mgmt-subscription -azure-mgmt-synapse -azure-mgmt-trafficmanager -azure-mgmt-web -azure-monitor-opentelemetry -azure-monitor-opentelemetry-exporter -azure-monitor-query -azure-multiapi-storage -azure-nspkg -azure-search-documents -azure-servicebus -azure-servicefabric -azure-servicemanagement-legacy -azure-storage -azure-storage-blob -azure-storage-common -azure-storage-file -azure-storage-file-datalake -azure-storage-file-share -azure-storage-nspkg -azure-storage-queue -azure-synapse-accesscontrol -azure-synapse-artifacts -azure-synapse-managedprivateendpoints -azure-synapse-spark -azureml-core -azureml-dataprep -azureml-dataprep-native -azureml-dataprep-rslex -azureml-dataset-runtime -azureml-mlflow -azureml-telemetry -babel -backcall -backoff -backports-abc -backports-cached-property -backports-csv -backports-datetime-fromisoformat -backports-entry-points-selectable -backports-functools-lru-cache -backports-shutil-get-terminal-size -backports-tarfile -backports-tempfile -backports-weakref -backports-zoneinfo -bandit -base58 -bashlex -bazel-runfiles -bc-detect-secrets -bc-jsonpath-ng -bc-python-hcl2 -bcrypt -beartype -beautifulsoup -beautifulsoup4 -behave -bellows -betterproto -bidict -billiard -binaryornot -bio -biopython -biothings-client -bitarray -bitsandbytes -bitstring -bitstruct -black -blackduck -bleach -bleak -blendmodes -blessed -blessings -blinker -blis -blobfile -blosc2 -boa-str -bokeh -boltons -boolean-py -boto -boto3 -boto3-stubs -boto3-stubs-lite -boto3-type-annotations -botocore -botocore-stubs -bottle -bottleneck -boxsdk -braceexpand -bracex -branca -breathe -brotli -bs4 -bson -btrees -build -bump2version -bumpversion -bytecode -bz2file -c7n -c7n-org -cachecontrol -cached-property -cachelib -cachetools -cachy -cairocffi -cairosvg -casadi -case-conversion -cassandra-driver -catalogue -catboost -category-encoders -cattrs -cbor -cbor2 -cchardet -ccxt -cdk-nag -celery -cerberus -cerberus-python-client -certbot -certbot-dns-cloudflare -certifi -cffi -cfgv -cfile -cfn-flip -cfn-lint -cftime -chameleon -channels -channels-redis -chardet -charset-normalizer -checkdigit -checkov -checksumdir -cheroot -cherrypy -chevron -chex -chispa -chroma-hnswlib -chromadb -cibuildwheel -cinemagoer -circuitbreaker -ciso8601 -ckzg -clang -clang-format -clarabel -clean-fid -cleanco -cleo -click -click-default-group -click-didyoumean -click-help-colors -click-log -click-man -click-option-group -click-plugins -click-repl -click-spinner -clickclick -clickhouse-connect -clickhouse-driver -cliff -cligj -clikit -clipboard -cloud-sql-python-connector -cloudevents -cloudflare -cloudpathlib -cloudpickle -cloudscraper -cloudsplaining -cmaes -cmake -cmd2 -cmdstanpy -cmudict -cobble -codecov -codeowners -codespell -cog -cohere -collections-extended -colorama -colorcet -colorclass -colored -coloredlogs -colorful -colorlog -colorzero -colour -comm -commentjson -commonmark -comtypes -conan -concurrent-log-handler -confection -config -configargparse -configobj -configparser -configupdater -confluent-kafka -connexion -constantly -construct -constructs -contextlib2 -contextvars -contourpy -convertdate -cookiecutter -coolname -core-universal -coreapi -coreschema -corner -country-converter -courlan -coverage -coveralls -cramjam -crashtest -crayons -crc32c -crccheck -crcmod -credstash -crispy-bootstrap5 -cron-descriptor -croniter -crypto -cryptography -cssselect -cssselect2 -cssutils -ctranslate2 -cuda-python -curl-cffi -curlify -cursor -custom-inherit -customtkinter -cvdupdate -cvxopt -cvxpy -cx-oracle -cycler -cyclonedx-python-lib -cymem -cython -cytoolz -dacite -daff -dagster -dagster-aws -dagster-graphql -dagster-pipes -dagster-postgres -dagster-webserver -daphne -darkdetect -dash -dash-bootstrap-components -dash-core-components -dash-html-components -dash-table -dask -dask-expr -databases -databend-driver -databend-py -databricks -databricks-api -databricks-cli -databricks-connect -databricks-feature-store -databricks-pypi1 -databricks-pypi2 -databricks-sdk -databricks-sql-connector -dataclasses -dataclasses-json -datacompy -datadog -datadog-api-client -datadog-logger -datamodel-code-generator -dataproperty -datasets -datasketch -datefinder -dateformat -dateparser -datetime -dateutils -db-contrib-tool -db-dtypes -dbfread -dbl-tempo -dbt-adapters -dbt-bigquery -dbt-common -dbt-core -dbt-databricks -dbt-extractor -dbt-postgres -dbt-redshift -dbt-semantic-interfaces -dbt-snowflake -dbt-spark -dbus-fast -dbutils -ddsketch -ddt -ddtrace -debtcollector -debugpy -decopatch -decorator -deepdiff -deepmerge -defusedxml -delta -delta-spark -deltalake -dep-logic -dependency-injector -deprecated -deprecation -descartes -detect-secrets -dict2xml -dictdiffer -dicttoxml -diff-cover -diff-match-patch -diffusers -dill -dirtyjson -discord -discord-py -diskcache -distlib -distribute -distributed -distro -dj-database-url -django -django-allauth -django-anymail -django-appconf -django-celery-beat -django-celery-results -django-compressor -django-cors-headers -django-countries -django-crispy-forms -django-csp -django-debug-toolbar -django-environ -django-extensions -django-filter -django-health-check -django-import-export -django-ipware -django-js-asset -django-model-utils -django-mptt -django-oauth-toolkit -django-otp -django-phonenumber-field -django-picklefield -django-redis -django-reversion -django-ses -django-silk -django-simple-history -django-storages -django-stubs -django-stubs-ext -django-taggit -django-timezone-field -django-waffle -djangorestframework -djangorestframework-simplejwt -djangorestframework-stubs -dm-tree -dnslib -dnspython -docker -docker-compose -docker-pycreds -dockerfile-parse -dockerpty -docopt -docstring-parser -documenttemplate -docutils -docx2txt -dogpile-cache -dohq-artifactory -doit -domdf-python-tools -dominate -dotenv -dotmap -dparse -dpath -dpkt -drf-nested-routers -drf-spectacular -drf-yasg -dropbox -duckdb -dulwich -dunamai -durationpy -dvclive -dynaconf -dynamodb-json -easydict -easyprocess -ebcdic -ec2-metadata -ecdsa -ecos -ecs-logging -edgegrid-python -editables -editdistance -editor -editorconfig -einops -elastic-apm -elastic-transport -elasticsearch -elasticsearch-dbapi -elasticsearch-dsl -elasticsearch7 -elementary-data -elementpath -elyra -email-validator -emcee -emoji -enchant -enrich -entrypoints -enum-compat -enum34 -envier -environs -envyaml -ephem -eradicate -et-xmlfile -eth-abi -eth-account -eth-hash -eth-keyfile -eth-keys -eth-rlp -eth-typing -eth-utils -etils -eval-type-backport -evaluate -eventlet -events -evergreen-py -evidently -exceptiongroup -exchange-calendars -exchangelib -execnet -executing -executor -expandvars -expiringdict -extensionclass -extract-msg -extras -eyes-common -eyes-selenium -f90nml -fabric -face -facebook-business -facexlib -factory-boy -fairscale -faiss-cpu -fake-useragent -faker -fakeredis -falcon -farama-notifications -fastapi -fastapi-cli -fastapi-utils -fastavro -fastcluster -fastcore -fasteners -faster-whisper -fastjsonschema -fastparquet -fastprogress -fastrlock -fasttext -fasttext-langdetect -fasttext-wheel -fcm-django -feedparser -ffmpeg-python -ffmpy -fido2 -filelock -filetype -filterpy -find-libpython -findpython -findspark -fiona -fire -firebase-admin -fixedint -fixit -fixtures -flake8 -flake8-black -flake8-bugbear -flake8-builtins -flake8-comprehensions -flake8-docstrings -flake8-eradicate -flake8-import-order -flake8-isort -flake8-polyfill -flake8-print -flake8-pyproject -flake8-quotes -flaky -flaml -flasgger -flashtext -flask -flask-admin -flask-appbuilder -flask-babel -flask-bcrypt -flask-caching -flask-compress -flask-cors -flask-httpauth -flask-jwt-extended -flask-limiter -flask-login -flask-mail -flask-marshmallow -flask-migrate -flask-oidc -flask-openid -flask-restful -flask-restx -flask-session -flask-socketio -flask-sqlalchemy -flask-swagger-ui -flask-talisman -flask-testing -flask-wtf -flatbuffers -flatdict -flatten-dict -flatten-json -flax -flexcache -flexparser -flit-core -flower -fluent-logger -folium -fonttools -formencode -formic2 -formulaic -fpdf -fpdf2 -fqdn -freetype-py -freezegun -frictionless -frozendict -frozenlist -fs -fsspec -ftfy -fugue -func-timeout -funcsigs -functions-framework -functools32 -funcy -furl -furo -fusepy -future -future-fstrings -futures -fuzzywuzzy -fvcore -galvani -gast -gcloud-aio-auth -gcloud-aio-bigquery -gcloud-aio-storage -gcovr -gcs-oauth2-boto-plugin -gcsfs -gdown -gender-guesser -gensim -genson -geoalchemy2 -geocoder -geographiclib -geoip2 -geojson -geomet -geopandas -geopy -gevent -gevent-websocket -geventhttpclient -ghapi -ghp-import -git-remote-codecommit -gitdb -gitdb2 -github-heatmap -github3-py -gitpython -giturlparse -glob2 -glom -gluonts -gmpy2 -gnureadline -google -google-ads -google-ai-generativelanguage -google-analytics-admin -google-analytics-data -google-api-core -google-api-python-client -google-apitools -google-auth -google-auth-httplib2 -google-auth-oauthlib -google-cloud -google-cloud-access-context-manager -google-cloud-aiplatform -google-cloud-appengine-logging -google-cloud-audit-log -google-cloud-automl -google-cloud-batch -google-cloud-bigquery -google-cloud-bigquery-biglake -google-cloud-bigquery-datatransfer -google-cloud-bigquery-storage -google-cloud-bigtable -google-cloud-build -google-cloud-compute -google-cloud-container -google-cloud-core -google-cloud-datacatalog -google-cloud-dataflow-client -google-cloud-dataform -google-cloud-dataplex -google-cloud-dataproc -google-cloud-dataproc-metastore -google-cloud-datastore -google-cloud-discoveryengine -google-cloud-dlp -google-cloud-dns -google-cloud-error-reporting -google-cloud-firestore -google-cloud-kms -google-cloud-language -google-cloud-logging -google-cloud-memcache -google-cloud-monitoring -google-cloud-orchestration-airflow -google-cloud-org-policy -google-cloud-os-config -google-cloud-os-login -google-cloud-pipeline-components -google-cloud-pubsub -google-cloud-pubsublite -google-cloud-recommendations-ai -google-cloud-redis -google-cloud-resource-manager -google-cloud-run -google-cloud-secret-manager -google-cloud-spanner -google-cloud-speech -google-cloud-storage -google-cloud-storage-transfer -google-cloud-tasks -google-cloud-texttospeech -google-cloud-trace -google-cloud-translate -google-cloud-videointelligence -google-cloud-vision -google-cloud-workflows -google-crc32c -google-generativeai -google-pasta -google-re2 -google-reauth -google-resumable-media -googleapis-common-protos -googlemaps -gotrue -gpiozero -gprof2dot -gprofiler-official -gpustat -gpxpy -gql -gradio -gradio-client -grapheme -graphene -graphframes -graphlib-backport -graphql-core -graphql-relay -graphviz -graypy -great-expectations -greenlet -gremlinpython -griffe -grimp -grpc-google-iam-v1 -grpc-interceptor -grpc-stubs -grpcio -grpcio-gcp -grpcio-health-checking -grpcio-reflection -grpcio-status -grpcio-tools -grpclib -gs-quant -gspread -gspread-dataframe -gsutil -gtts -gunicorn -gym -gym-notices -gymnasium -h11 -h2 -h3 -h5netcdf -h5py -halo -hashids -hatch -hatch-fancy-pypi-readme -hatch-requirements-txt -hatch-vcs -hatchling -haversine -hdbcli -hdfs -healpy -hexbytes -hijri-converter -hiredis -hishel -hjson -hmmlearn -hnswlib -holidays -hologram -honeybee-core -honeybee-schema -honeybee-standards -hpack -hstspreload -html-testrunner -html-text -html2text -html5lib -htmldate -htmldocx -htmlmin -httmock -httpcore -httplib2 -httpretty -httptools -httpx -httpx-sse -hubspot-api-client -huggingface-hub -humanfriendly -humanize -hupper -hvac -hydra-core -hypercorn -hyperframe -hyperlink -hyperopt -hyperpyyaml -hypothesis -ibm-cloud-sdk-core -ibm-db -ibm-platform-services -icalendar -icdiff -icecream -identify -idna -idna-ssl -ifaddr -igraph -ijson -imagecodecs -imagehash -imageio -imageio-ffmpeg -imagesize -imapclient -imath -imbalanced-learn -imblearn -imdbpy -immutabledict -immutables -import-linter -importlib -importlib-metadata -importlib-resources -impyla -imutils -incremental -inexactsearch -inflate64 -inflect -inflection -influxdb -influxdb-client -iniconfig -inject -injector -inquirer -inquirerpy -insight-cli -install-jdk -installer -intelhex -interegular -interface-meta -intervaltree -invoke -iopath -ipaddress -ipdb -ipykernel -ipython -ipython-genutils -ipywidgets -isbnlib -iso3166 -iso8601 -isodate -isoduration -isort -isoweek -itemadapter -itemloaders -iterative-telemetry -itsdangerous -itypes -j2cli -jaconv -janus -jaraco-classes -jaraco-collections -jaraco-context -jaraco-functools -jaraco-text -java-access-bridge-wrapper -java-manifest -javaproperties -jax -jaxlib -jaxtyping -jaydebeapi -jdcal -jedi -jeepney -jellyfish -jenkinsapi -jetblack-iso8601 -jieba -jinja2 -jinja2-humanize-extension -jinja2-pluralize -jinja2-simple-tags -jinja2-time -jinjasql -jira -jiter -jiwer -jmespath -joblib -josepy -joserfc -jplephem -jproperties -jpype1 -jq -js2py -jsbeautifier -jschema-to-python -jsii -jsmin -json-delta -json-log-formatter -json-logging -json-merge-patch -json2html -json5 -jsonargparse -jsonconversion -jsondiff -jsonlines -jsonmerge -jsonpatch -jsonpath-ng -jsonpath-python -jsonpath-rw -jsonpickle -jsonpointer -jsonref -jsons -jsonschema -jsonschema-path -jsonschema-spec -jsonschema-specifications -jstyleson -junit-xml -junitparser -jupyter -jupyter-client -jupyter-console -jupyter-core -jupyter-events -jupyter-lsp -jupyter-packaging -jupyter-server -jupyter-server-fileid -jupyter-server-terminals -jupyter-server-ydoc -jupyter-ydoc -jupyterlab -jupyterlab-pygments -jupyterlab-server -jupyterlab-widgets -jupytext -justext -jwcrypto -jwt -kafka-python -kaitaistruct -kaleido -kazoo -kconfiglib -keras -keras-applications -keras-preprocessing -keyring -keyrings-alt -keyrings-google-artifactregistry-auth -keystoneauth1 -kfp -kfp-pipeline-spec -kfp-server-api -kivy -kiwisolver -knack -koalas -kombu -korean-lunar-calendar -kornia -kornia-rs -kubernetes -kubernetes-asyncio -ladybug-core -ladybug-display -ladybug-geometry -ladybug-geometry-polyskel -lagom -langchain -langchain-anthropic -langchain-aws -langchain-community -langchain-core -langchain-experimental -langchain-google-vertexai -langchain-openai -langchain-text-splitters -langcodes -langdetect -langgraph -langsmith -language-data -language-tags -language-tool-python -lark -lark-parser -lasio -latexcodec -launchdarkly-server-sdk -lazy-loader -lazy-object-proxy -ldap3 -leather -levenshtein -libclang -libcst -libretranslatepy -librosa -libsass -license-expression -lifelines -lightgbm -lightning -lightning-utilities -limits -line-profiler -linecache2 -linkify-it-py -lit -litellm -livereload -livy -lizard -llama-cloud -llama-index -llama-index-agent-openai -llama-index-cli -llama-index-core -llama-index-embeddings-openai -llama-index-indices-managed-llama-cloud -llama-index-legacy -llama-index-llms-openai -llama-index-multi-modal-llms-openai -llama-index-program-openai -llama-index-question-gen-openai -llama-index-readers-file -llama-index-readers-llama-parse -llama-parse -llvmlite -lm-format-enforcer -lmdb -lmfit -locket -lockfile -locust -log-symbols -logbook -logging-azure-rest -loguru -logz -logzero -looker-sdk -looseversion -lpips -lru-dict -lunarcalendar -lunardate -lxml -lxml-html-clean -lz4 -macholib -magicattr -makefun -mako -mammoth -mando -mangum -mapbox-earcut -marisa-trie -markdown -markdown-it-py -markdown2 -markdownify -markupsafe -marshmallow -marshmallow-dataclass -marshmallow-enum -marshmallow-oneofschema -marshmallow-sqlalchemy -mashumaro -matplotlib -matplotlib-inline -maturin -maxminddb -mbstrdecoder -mccabe -mchammer -mdit-py-plugins -mdurl -mdx-truly-sane-lists -mecab-python3 -mediapipe -megatron-core -memoization -memory-profiler -memray -mercantile -mergedeep -meson -meson-python -methodtools -mf2py -microsoft-kiota-abstractions -microsoft-kiota-authentication-azure -microsoft-kiota-http -microsoft-kiota-serialization-json -microsoft-kiota-serialization-text -mimesis -minidump -minimal-snowplow-tracker -minio -mistune -mixpanel -mizani -mkdocs -mkdocs-autorefs -mkdocs-get-deps -mkdocs-material -mkdocs-material-extensions -mkdocstrings -mkdocstrings-python -ml-dtypes -mleap -mlflow -mlflow-skinny -mlserver -mltable -mlxtend -mmcif -mmcif-pdbx -mmh3 -mock -mockito -model-bakery -modin -molecule -mongoengine -mongomock -monotonic -more-itertools -moreorless -morse3 -moto -motor -mouseinfo -moviepy -mpmath -msal -msal-extensions -msgpack -msgpack-numpy -msgpack-python -msgraph-core -msgraph-sdk -msgspec -msoffcrypto-tool -msrest -msrestazure -mss -multi-key-dict -multidict -multimapping -multimethod -multipart -multipledispatch -multiprocess -multitasking -multivolumefile -munch -munkres -murmurhash -mutagen -mxnet -mygene -mypy -mypy-boto3-apigateway -mypy-boto3-appconfig -mypy-boto3-appflow -mypy-boto3-athena -mypy-boto3-cloudformation -mypy-boto3-dataexchange -mypy-boto3-dynamodb -mypy-boto3-ec2 -mypy-boto3-ecr -mypy-boto3-events -mypy-boto3-glue -mypy-boto3-iam -mypy-boto3-kinesis -mypy-boto3-lambda -mypy-boto3-rds -mypy-boto3-redshift-data -mypy-boto3-s3 -mypy-boto3-schemas -mypy-boto3-secretsmanager -mypy-boto3-signer -mypy-boto3-sqs -mypy-boto3-ssm -mypy-boto3-stepfunctions -mypy-boto3-sts -mypy-boto3-xray -mypy-extensions -mypy-protobuf -mysql -mysql-connector -mysql-connector-python -mysqlclient -myst-parser -naked -nameparser -namex -nanoid -narwhals -natsort -natto-py -nbclassic -nbclient -nbconvert -nbformat -nbsphinx -ndg-httpsclient -ndindex -ndjson -neo4j -nest-asyncio -netaddr -netcdf4 -netifaces -netsuitesdk -networkx -newrelic -newrelic-telemetry-sdk -nh3 -nibabel -ninja -nltk -node-semver -nodeenv -nose -nose2 -notebook -notebook-shim -notifiers -notion-client -nox -nptyping -ntlm-auth -ntplib -nulltype -num2words -numba -numcodecs -numdifftools -numexpr -numpy -numpy-financial -numpy-quaternion -numpydoc -nvidia-cublas-cu11 -nvidia-cublas-cu12 -nvidia-cuda-cupti-cu11 -nvidia-cuda-cupti-cu12 -nvidia-cuda-nvrtc-cu11 -nvidia-cuda-nvrtc-cu12 -nvidia-cuda-runtime-cu11 -nvidia-cuda-runtime-cu12 -nvidia-cudnn-cu11 -nvidia-cudnn-cu12 -nvidia-cufft-cu11 -nvidia-cufft-cu12 -nvidia-curand-cu11 -nvidia-curand-cu12 -nvidia-cusolver-cu11 -nvidia-cusolver-cu12 -nvidia-cusparse-cu11 -nvidia-cusparse-cu12 -nvidia-ml-py -nvidia-nccl-cu11 -nvidia-nccl-cu12 -nvidia-nvjitlink-cu12 -nvidia-nvtx-cu11 -nvidia-nvtx-cu12 -o365 -oauth2client -oauthlib -objsize -oci -odfpy -office365-rest-python-client -okta -oldest-supported-numpy -olefile -omegaconf -onnx -onnxconverter-common -onnxruntime -onnxruntime-gpu -open-clip-torch -open3d -openai -openapi-schema-pydantic -openapi-schema-validator -openapi-spec-validator -opencensus -opencensus-context -opencensus-ext-azure -opencensus-ext-logging -opencv-contrib-python -opencv-contrib-python-headless -opencv-python -opencv-python-headless -openinference-instrumentation -openinference-semantic-conventions -openlineage-airflow -openlineage-integration-common -openlineage-python -openlineage-sql -openpyxl -opensearch-py -openstacksdk -opentelemetry-api -opentelemetry-distro -opentelemetry-exporter-gcp-trace -opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-common -opentelemetry-exporter-otlp-proto-grpc -opentelemetry-exporter-otlp-proto-http -opentelemetry-instrumentation -opentelemetry-instrumentation-aiohttp-client -opentelemetry-instrumentation-asgi -opentelemetry-instrumentation-aws-lambda -opentelemetry-instrumentation-botocore -opentelemetry-instrumentation-dbapi -opentelemetry-instrumentation-django -opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-grpc -opentelemetry-instrumentation-httpx -opentelemetry-instrumentation-jinja2 -opentelemetry-instrumentation-logging -opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-redis -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-sqlalchemy -opentelemetry-instrumentation-sqlite3 -opentelemetry-instrumentation-urllib -opentelemetry-instrumentation-urllib3 -opentelemetry-instrumentation-wsgi -opentelemetry-propagator-aws-xray -opentelemetry-propagator-b3 -opentelemetry-proto -opentelemetry-resource-detector-azure -opentelemetry-resourcedetector-gcp -opentelemetry-sdk -opentelemetry-sdk-extension-aws -opentelemetry-semantic-conventions -opentelemetry-util-http -opentracing -openturns -openvino -openvino-telemetry -openxlab -opsgenie-sdk -opt-einsum -optax -optimum -optree -optuna -oracledb -orbax-checkpoint -ordered-set -orderedmultidict -orderly-set -orjson -ortools -os-service-types -oscrypto -oslo-config -oslo-i18n -oslo-serialization -oslo-utils -osmium -osqp -oss2 -outcome -outlines -overrides -oyaml -p4python -packageurl-python -packaging -paddleocr -paginate -paho-mqtt -palettable -pamqp -pandas -pandas-gbq -pandas-stubs -pandasql -pandera -pandocfilters -panel -pantab -papermill -param -parameterized -paramiko -parse -parse-type -parsedatetime -parsel -parsimonious -parsley -parso -partd -parver -passlib -paste -pastedeploy -pastel -patch-ng -patchelf -path -path-dict -pathable -pathlib -pathlib-abc -pathlib-mate -pathlib2 -pathos -pathspec -pathtools -pathvalidate -pathy -patool -patsy -pbr -pbs-installer -pdb2pqr -pdf2image -pdfkit -pdfminer-six -pdfplumber -pdm -pdpyras -peewee -pefile -peft -pendulum -pentapy -pep517 -pep8 -pep8-naming -peppercorn -persistence -persistent -pex -pexpect -pfzy -pg8000 -pgpy -pgvector -phik -phonenumbers -phonenumberslite -pickleshare -piexif -pika -pikepdf -pillow -pillow-avif-plugin -pillow-heif -pinecone-client -pint -pip -pip-api -pip-requirements-parser -pip-tools -pipdeptree -pipelinewise-singer-python -pipenv -pipreqs -pipx -pkce -pkgconfig -pkginfo -pkgutil-resolve-name -plac -plaster -plaster-pastedeploy -platformdirs -playwright -plotly -plotnine -pluggy -pluginbase -plumbum -ply -pmdarima -poetry -poetry-core -poetry-dynamic-versioning -poetry-plugin-export -poetry-plugin-pypi-mirror -polars -polib -policy-sentry -polling -polling2 -polyline -pony -pooch -port-for -portalocker -portend -portpicker -posthog -pox -ppft -pprintpp -prance -pre-commit -pre-commit-hooks -prefect -prefect-aws -prefect-gcp -premailer -preshed -presto-python-client -pretend -pretty-html-table -prettytable -primepy -priority -prisma -prison -probableparsing -proglog -progress -progressbar2 -prometheus-client -prometheus-fastapi-instrumentator -prometheus-flask-exporter -promise -prompt-toolkit -pronouncing -property-manager -prophet -propka -prospector -protego -proto-plus -protobuf -protobuf3-to-dict -psutil -psycopg -psycopg-binary -psycopg-pool -psycopg2 -psycopg2-binary -ptpython -ptyprocess -publication -publicsuffix2 -publish-event-sns -pulp -pulsar-client -pulumi -pure-eval -pure-sasl -pusher -pvlib -py -py-cpuinfo -py-models-parser -py-partiql-parser -py-serializable -py-spy -py4j -py7zr -pyaes -pyahocorasick -pyairports -pyairtable -pyaml -pyannote-audio -pyannote-core -pyannote-database -pyannote-metrics -pyannote-pipeline -pyapacheatlas -pyarrow -pyarrow-hotfix -pyasn1 -pyasn1-modules -pyathena -pyautogui -pyawscron -pybase64 -pybcj -pybind11 -pybloom-live -pybtex -pybytebuffer -pycairo -pycares -pycep-parser -pyclipper -pyclothoids -pycocotools -pycodestyle -pycomposefile -pycountry -pycparser -pycrypto -pycryptodome -pycryptodomex -pycurl -pydantic -pydantic-core -pydantic-extra-types -pydantic-openapi-helper -pydantic-settings -pydash -pydata-google-auth -pydata-sphinx-theme -pydeck -pydeequ -pydevd -pydicom -pydispatcher -pydocstyle -pydot -pydriller -pydruid -pydub -pydyf -pyee -pyelftools -pyerfa -pyfakefs -pyfiglet -pyflakes -pyformance -pygame -pygeohash -pygetwindow -pygit2 -pygithub -pyglet -pygments -pygobject -pygsheets -pygtrie -pyhamcrest -pyhanko -pyhanko-certvalidator -pyhcl -pyhive -pyhocon -pyhumps -pyiceberg -pyinstaller -pyinstaller-hooks-contrib -pyinstrument -pyjarowinkler -pyjsparser -pyjwt -pykakasi -pykwalify -pylev -pylint -pylint-django -pylint-plugin-utils -pylru -pyluach -pymatting -pymdown-extensions -pymeeus -pymemcache -pymilvus -pyminizip -pymisp -pymongo -pymongo-auth-aws -pympler -pymsgbox -pymssql -pymsteams -pymupdf -pymupdfb -pymysql -pynacl -pynamodb -pynetbox -pynndescent -pynput-robocorp-fork -pynvim -pynvml -pyod -pyodbc -pyogrio -pyopengl -pyopenssl -pyorc -pyotp -pypandoc -pyparsing -pypdf -pypdf2 -pypdfium2 -pyperclip -pyphen -pypika -pypinyin -pypiwin32 -pypng -pyppeteer -pyppmd -pyproj -pyproject-api -pyproject-hooks -pyproject-metadata -pypyp -pyqt5 -pyqt5-qt5 -pyqt5-sip -pyqt6 -pyqt6-qt6 -pyqt6-sip -pyquaternion -pyquery -pyramid -pyrate-limiter -pyreadline3 -pyrect -pyrfc3339 -pyright -pyroaring -pyrsistent -pyrtf3 -pysaml2 -pysbd -pyscaffold -pyscreeze -pyserial -pyserial-asyncio -pysftp -pyshp -pyside6 -pyside6-addons -pyside6-essentials -pysmb -pysmi -pysnmp -pysocks -pyspark -pyspark-dist-explore -pyspellchecker -pyspnego -pystache -pystan -pyston -pyston-autoload -pytablewriter -pytd -pytelegrambotapi -pytesseract -pytest -pytest-aiohttp -pytest-alembic -pytest-ansible -pytest-assume -pytest-asyncio -pytest-azurepipelines -pytest-base-url -pytest-bdd -pytest-benchmark -pytest-check -pytest-cov -pytest-custom-exit-code -pytest-dependency -pytest-django -pytest-dotenv -pytest-env -pytest-flask -pytest-forked -pytest-freezegun -pytest-html -pytest-httpserver -pytest-httpx -pytest-icdiff -pytest-instafail -pytest-json-report -pytest-localserver -pytest-messenger -pytest-metadata -pytest-mock -pytest-mypy -pytest-order -pytest-ordering -pytest-parallel -pytest-playwright -pytest-random-order -pytest-randomly -pytest-repeat -pytest-rerunfailures -pytest-runner -pytest-socket -pytest-split -pytest-subtests -pytest-sugar -pytest-timeout -pytest-xdist -python-arango -python-bidi -python-box -python-can -python-certifi-win32 -python-consul -python-crfsuite -python-crontab -python-daemon -python-dateutil -python-decouple -python-docx -python-dotenv -python-editor -python-engineio -python-gettext -python-gitlab -python-gnupg -python-hcl2 -python-http-client -python-igraph -python-ipware -python-iso639 -python-jenkins -python-jose -python-json-logger -python-keycloak -python-keystoneclient -python-ldap -python-levenshtein -python-logging-loki -python-lsp-jsonrpc -python-magic -python-memcached -python-miio -python-multipart -python-nvd3 -python-on-whales -python-pam -python-pptx -python-rapidjson -python-slugify -python-snappy -python-socketio -python-stdnum -python-string-utils -python-telegram-bot -python-ulid -python-utils -python-xlib -python3-logstash -python3-openid -python3-saml -pythonnet -pythran-openblas -pytimeparse -pytimeparse2 -pytoolconfig -pytorch-lightning -pytorch-metric-learning -pytube -pytweening -pytz -pytz-deprecation-shim -pytzdata -pyu2f -pyudev -pyunormalize -pyusb -pyvinecopulib -pyvirtualdisplay -pyvis -pyvisa -pyviz-comms -pyvmomi -pywavelets -pywin32 -pywin32-ctypes -pywinauto -pywinpty -pywinrm -pyxdg -pyxlsb -pyyaml -pyyaml-env-tag -pyzipper -pyzmq -pyzstd -qdldl -qdrant-client -qiskit -qrcode -qtconsole -qtpy -quantlib -quart -qudida -querystring-parser -questionary -queuelib -quinn -radon -random-password-generator -rangehttpserver -rapidfuzz -rasterio -ratelim -ratelimit -ratelimiter -raven -ray -rcssmin -rdflib -rdkit -reactivex -readchar -readme-renderer -readthedocs-sphinx-ext -realtime -recommonmark -recordlinkage -red-discordbot -redis -redis-py-cluster -redshift-connector -referencing -regex -regress -rembg -reportlab -repoze-lru -requests -requests-auth-aws-sigv4 -requests-aws-sign -requests-aws4auth -requests-cache -requests-file -requests-futures -requests-html -requests-mock -requests-ntlm -requests-oauthlib -requests-pkcs12 -requests-sigv4 -requests-toolbelt -requests-unixsocket -requestsexceptions -requirements-parser -resampy -resize-right -resolvelib -responses -respx -restrictedpython -result -retry -retry-decorator -retry2 -retrying -rfc3339 -rfc3339-validator -rfc3986 -rfc3986-validator -rfc3987 -rich -rich-argparse -rich-click -riot -rjsmin -rlp -rmsd -robocorp-storage -robotframework -robotframework-pythonlibcore -robotframework-requests -robotframework-seleniumlibrary -robotframework-seleniumtestability -rollbar -roman -rope -rouge-score -routes -rpaframework -rpaframework-core -rpaframework-pdf -rpds-py -rply -rpyc -rq -rsa -rstr -rtree -ruamel-yaml -ruamel-yaml-clib -ruff -runs -ruptures -rustworkx -ruyaml -rx -s3cmd -s3fs -s3path -s3transfer -sacrebleu -sacremoses -safetensors -safety -safety-schemas -sagemaker -sagemaker-core -sagemaker-mlflow -salesforce-bulk -sampleproject -sanic -sanic-routing -sarif-om -sasl -scandir -scapy -schedule -schema -schematics -schemdraw -scikit-build -scikit-build-core -scikit-image -scikit-learn -scikit-optimize -scipy -scons -scp -scramp -scrapy -scrypt -scs -seaborn -secretstorage -segment-analytics-python -segment-anything -selenium -selenium-wire -seleniumbase -semantic-version -semgrep -semver -send2trash -sendgrid -sentence-transformers -sentencepiece -sentinels -sentry-sdk -seqio-nightly -serial -service-identity -setproctitle -setuptools -setuptools-git -setuptools-git-versioning -setuptools-rust -setuptools-scm -setuptools-scm-git-archive -sgmllib3k -sgp4 -sgqlc -sh -shap -shapely -shareplum -sharepy -shellescape -shellingham -shiboken6 -shortuuid -shtab -shyaml -signalfx -signxml -silpa-common -simple-ddl-parser -simple-parsing -simple-salesforce -simple-term-menu -simple-websocket -simpleeval -simplegeneric -simplejson -simpy -singer-python -singer-sdk -singledispatch -singleton-decorator -six -skl2onnx -sklearn -sktime -skyfield -slack-bolt -slack-sdk -slackclient -slacker -slicer -slotted -smart-open -smartsheet-python-sdk -smbprotocol -smdebug-rulesconfig -smmap -smmap2 -sniffio -snowballstemmer -snowflake -snowflake-connector-python -snowflake-core -snowflake-legacy -snowflake-snowpark-python -snowflake-sqlalchemy -snuggs -social-auth-app-django -social-auth-core -socksio -soda-core -soda-core-spark -soda-core-spark-df -sodapy -sortedcontainers -sounddevice -soundex -soundfile -soupsieve -soxr -spacy -spacy-legacy -spacy-loggers -spacy-transformers -spacy-wordnet -spandrel -spark-nlp -spark-sklearn -sparkorm -sparqlwrapper -spdx-tools -speechbrain -speechrecognition -spellchecker -sphinx -sphinx-argparse -sphinx-autobuild -sphinx-autodoc-typehints -sphinx-basic-ng -sphinx-book-theme -sphinx-copybutton -sphinx-design -sphinx-rtd-theme -sphinx-tabs -sphinxcontrib-applehelp -sphinxcontrib-bibtex -sphinxcontrib-devhelp -sphinxcontrib-htmlhelp -sphinxcontrib-jquery -sphinxcontrib-jsmath -sphinxcontrib-mermaid -sphinxcontrib-qthelp -sphinxcontrib-serializinghtml -sphinxcontrib-websupport -spindry -spinners -splunk-handler -splunk-sdk -spotinst-agent -sql-metadata -sqlalchemy -sqlalchemy-bigquery -sqlalchemy-jsonfield -sqlalchemy-migrate -sqlalchemy-redshift -sqlalchemy-spanner -sqlalchemy-utils -sqlalchemy2-stubs -sqlfluff -sqlfluff-templater-dbt -sqlglot -sqlglotrs -sqlite-utils -sqlitedict -sqllineage -sqlmodel -sqlparams -sqlparse -srsly -sse-starlette -sseclient-py -sshpubkeys -sshtunnel -stack-data -stanio -starkbank-ecdsa -starlette -starlette-exporter -statsd -statsforecast -statsmodels -std-uritemplate -stdlib-list -stdlibs -stepfunctions -stevedore -stk -stko -stomp-py -stone -strawberry-graphql -streamerate -streamlit -strenum -strict-rfc3339 -strictyaml -stringcase -strip-hints -stripe -striprtf -structlog -subprocess-tee -subprocess32 -sudachidict-core -sudachipy -suds-community -suds-jurko -suds-py3 -supabase -supafunc -supervision -supervisor -svglib -svgwrite -swagger-spec-validator -swagger-ui-bundle -swebench -swifter -symengine -sympy -table-meta -tableau-api-lib -tableauhyperapi -tableauserverclient -tabledata -tables -tablib -tabulate -tangled-up-in-unicode -tb-nightly -tbats -tblib -tcolorpy -tdqm -tecton -tempita -tempora -temporalio -tenacity -tensorboard -tensorboard-data-server -tensorboard-plugin-wit -tensorboardx -tensorflow -tensorflow-addons -tensorflow-cpu -tensorflow-datasets -tensorflow-estimator -tensorflow-hub -tensorflow-intel -tensorflow-io -tensorflow-io-gcs-filesystem -tensorflow-metadata -tensorflow-model-optimization -tensorflow-probability -tensorflow-serving-api -tensorflow-text -tensorflowonspark -tensorstore -teradatasql -teradatasqlalchemy -termcolor -terminado -terminaltables -testcontainers -testfixtures -testpath -testtools -text-unidecode -textblob -textdistance -textparser -texttable -textual -textwrap3 -tf-keras -tfx-bsl -thefuzz -thinc -thop -threadpoolctl -thrift -thrift-sasl -throttlex -tifffile -tiktoken -time-machine -timeout-decorator -timezonefinder -timm -tink -tinycss2 -tinydb -tippo -tk -tld -tldextract -tlparse -tokenize-rt -tokenizers -tomesd -toml -tomli -tomli-w -tomlkit -toolz -toposort -torch -torch-audiomentations -torch-model-archiver -torch-pitch-shift -torchaudio -torchdiffeq -torchmetrics -torchsde -torchtext -torchvision -tornado -tox -tqdm -traceback2 -trafilatura -trailrunner -traitlets -traittypes -trampoline -transaction -transformers -transitions -translate -translationstring -tree-sitter -tree-sitter-python -treelib -triad -trimesh -trino -trio -trio-websocket -triton -tritonclient -trl -troposphere -trove-classifiers -truststore -tsx -tweepy -twilio -twine -twisted -txaio -typed-ast -typedload -typeguard -typeid-python -typepy -typer -types-aiobotocore -types-aiobotocore-s3 -types-awscrt -types-beautifulsoup4 -types-cachetools -types-cffi -types-colorama -types-cryptography -types-dataclasses -types-decorator -types-deprecated -types-docutils -types-html5lib -types-jinja2 -types-jsonschema -types-markdown -types-markupsafe -types-mock -types-paramiko -types-pillow -types-protobuf -types-psutil -types-psycopg2 -types-pygments -types-pyopenssl -types-pyserial -types-python-dateutil -types-pytz -types-pyyaml -types-redis -types-requests -types-retry -types-s3transfer -types-setuptools -types-simplejson -types-six -types-tabulate -types-toml -types-ujson -types-urllib3 -typing -typing-extensions -typing-inspect -typing-utils -typish -tyro -tzdata -tzfpy -tzlocal -ua-parser -uamqp -uc-micro-py -ufmt -uhashring -ujson -ultralytics -ultralytics-thop -umap-learn -uncertainties -undetected-chromedriver -unearth -unicodecsv -unidecode -unidiff -unittest-xml-reporting -unittest2 -universal-pathlib -unstructured -unstructured-client -update-checker -uplink -uproot -uptime-kuma-api -uri-template -uritemplate -uritools -url-normalize -urllib3 -urllib3-secure-extra -urwid -usaddress -user-agents -userpath -usort -utilsforecast -uuid -uuid6 -uv -uvicorn -uvloop -uwsgi -validate-email -validators -vcrpy -venusian -verboselogs -versioneer -versioneer-518 -vertexai -vine -virtualenv -virtualenv-clone -visions -vllm -voluptuous -vtk -vulture -w3lib -waitress -wand -wandb -wasabi -wasmtime -watchdog -watchfiles -watchgod -watchtower -wcmatch -wcwidth -weasel -weasyprint -weaviate-client -web3 -webargs -webcolors -webdataset -webdriver-manager -webencodings -webhelpers2 -webob -webrtcvad-wheels -websocket-client -websockets -webtest -werkzeug -west -wget -wheel -whitenoise -widgetsnbextension -wikitextparser -wirerope -wmi -wmill -wordcloud -workalendar -wrapt -ws4py -wsgiproxy2 -wsproto -wtforms -wurlitzer -xarray -xarray-einstats -xatlas -xattr -xformers -xgboost -xhtml2pdf -xlrd -xlsxwriter -xlutils -xlwt -xmlschema -xmlsec -xmltodict -xmod -xmodem -xxhash -xyzservices -y-py -yacs -yamale -yamllint -yapf -yappi -yarg -yarl -yarn-api-client -yaspin -ydata-profiling -yfinance -youtube-dl -youtube-transcript-api -ypy-websocket -yq -yt-dlp -z3-solver -z3c-pt -zarr -zc-lockfile -zconfig -zeep -zenpy -zeroconf -zexceptions -zha-quirks -zict -zigpy -zigpy-deconz -zigpy-xbee -zigpy-znp -zipfile-deflate64 -zipfile36 -zipp -zodb -zodbpickle -zope -zope-annotation -zope-browser -zope-browsermenu -zope-browserpage -zope-browserresource -zope-cachedescriptors -zope-component -zope-configuration -zope-container -zope-contentprovider -zope-contenttype -zope-datetime -zope-deferredimport -zope-deprecation -zope-dottedname -zope-event -zope-exceptions -zope-filerepresentation -zope-globalrequest -zope-hookable -zope-i18n -zope-i18nmessageid -zope-interface -zope-lifecycleevent -zope-location -zope-pagetemplate -zope-processlifetime -zope-proxy -zope-ptresource -zope-publisher -zope-schema -zope-security -zope-sequencesort -zope-site -zope-size -zope-structuredtext -zope-tal -zope-tales -zope-testbrowser -zope-testing -zope-traversing -zope-viewlet -zopfli -zstandard -zstd -zthreading \ No newline at end of file diff --git a/files/common_pip_packages.json b/files/common_pip_packages.json new file mode 100644 index 0000000..7561c63 --- /dev/null +++ b/files/common_pip_packages.json @@ -0,0 +1,12054 @@ +[ + { + "name": "about-time", + "uri": "https://pypi.org/project/about-time" + }, + { + "name": "absl-py", + "uri": "https://pypi.org/project/absl-py" + }, + { + "name": "accelerate", + "uri": "https://pypi.org/project/accelerate" + }, + { + "name": "accesscontrol", + "uri": "https://pypi.org/project/accesscontrol" + }, + { + "name": "accessible-pygments", + "uri": "https://pypi.org/project/accessible-pygments" + }, + { + "name": "acme", + "uri": "https://pypi.org/project/acme" + }, + { + "name": "acquisition", + "uri": "https://pypi.org/project/acquisition" + }, + { + "name": "acryl-datahub", + "uri": "https://pypi.org/project/acryl-datahub" + }, + { + "name": "acryl-datahub-airflow-plugin", + "uri": "https://pypi.org/project/acryl-datahub-airflow-plugin" + }, + { + "name": "adagio", + "uri": "https://pypi.org/project/adagio" + }, + { + "name": "adal", + "uri": "https://pypi.org/project/adal" + }, + { + "name": "addict", + "uri": "https://pypi.org/project/addict" + }, + { + "name": "adlfs", + "uri": "https://pypi.org/project/adlfs" + }, + { + "name": "aenum", + "uri": "https://pypi.org/project/aenum" + }, + { + "name": "affine", + "uri": "https://pypi.org/project/affine" + }, + { + "name": "agate", + "uri": "https://pypi.org/project/agate" + }, + { + "name": "aio-pika", + "uri": "https://pypi.org/project/aio-pika" + }, + { + "name": "aioboto3", + "uri": "https://pypi.org/project/aioboto3" + }, + { + "name": "aiobotocore", + "uri": "https://pypi.org/project/aiobotocore" + }, + { + "name": "aiodns", + "uri": "https://pypi.org/project/aiodns" + }, + { + "name": "aiofiles", + "uri": "https://pypi.org/project/aiofiles" + }, + { + "name": "aiogram", + "uri": "https://pypi.org/project/aiogram" + }, + { + "name": "aiohappyeyeballs", + "uri": "https://pypi.org/project/aiohappyeyeballs" + }, + { + "name": "aiohttp", + "uri": "https://pypi.org/project/aiohttp" + }, + { + "name": "aiohttp-cors", + "uri": "https://pypi.org/project/aiohttp-cors" + }, + { + "name": "aiohttp-retry", + "uri": "https://pypi.org/project/aiohttp-retry" + }, + { + "name": "aioitertools", + "uri": "https://pypi.org/project/aioitertools" + }, + { + "name": "aiokafka", + "uri": "https://pypi.org/project/aiokafka" + }, + { + "name": "aiomqtt", + "uri": "https://pypi.org/project/aiomqtt" + }, + { + "name": "aiomultiprocess", + "uri": "https://pypi.org/project/aiomultiprocess" + }, + { + "name": "aioredis", + "uri": "https://pypi.org/project/aioredis" + }, + { + "name": "aioresponses", + "uri": "https://pypi.org/project/aioresponses" + }, + { + "name": "aiormq", + "uri": "https://pypi.org/project/aiormq" + }, + { + "name": "aiosignal", + "uri": "https://pypi.org/project/aiosignal" + }, + { + "name": "aiosqlite", + "uri": "https://pypi.org/project/aiosqlite" + }, + { + "name": "ajsonrpc", + "uri": "https://pypi.org/project/ajsonrpc" + }, + { + "name": "alabaster", + "uri": "https://pypi.org/project/alabaster" + }, + { + "name": "albucore", + "uri": "https://pypi.org/project/albucore" + }, + { + "name": "albumentations", + "uri": "https://pypi.org/project/albumentations" + }, + { + "name": "alembic", + "uri": "https://pypi.org/project/alembic" + }, + { + "name": "algoliasearch", + "uri": "https://pypi.org/project/algoliasearch" + }, + { + "name": "alive-progress", + "uri": "https://pypi.org/project/alive-progress" + }, + { + "name": "aliyun-python-sdk-core", + "uri": "https://pypi.org/project/aliyun-python-sdk-core" + }, + { + "name": "aliyun-python-sdk-kms", + "uri": "https://pypi.org/project/aliyun-python-sdk-kms" + }, + { + "name": "allure-pytest", + "uri": "https://pypi.org/project/allure-pytest" + }, + { + "name": "allure-python-commons", + "uri": "https://pypi.org/project/allure-python-commons" + }, + { + "name": "altair", + "uri": "https://pypi.org/project/altair" + }, + { + "name": "altgraph", + "uri": "https://pypi.org/project/altgraph" + }, + { + "name": "amazon-ion", + "uri": "https://pypi.org/project/amazon-ion" + }, + { + "name": "amqp", + "uri": "https://pypi.org/project/amqp" + }, + { + "name": "amqpstorm", + "uri": "https://pypi.org/project/amqpstorm" + }, + { + "name": "analytics-python", + "uri": "https://pypi.org/project/analytics-python" + }, + { + "name": "aniso8601", + "uri": "https://pypi.org/project/aniso8601" + }, + { + "name": "annotated-types", + "uri": "https://pypi.org/project/annotated-types" + }, + { + "name": "annoy", + "uri": "https://pypi.org/project/annoy" + }, + { + "name": "ansi2html", + "uri": "https://pypi.org/project/ansi2html" + }, + { + "name": "ansible", + "uri": "https://pypi.org/project/ansible" + }, + { + "name": "ansible-compat", + "uri": "https://pypi.org/project/ansible-compat" + }, + { + "name": "ansible-core", + "uri": "https://pypi.org/project/ansible-core" + }, + { + "name": "ansible-lint", + "uri": "https://pypi.org/project/ansible-lint" + }, + { + "name": "ansicolors", + "uri": "https://pypi.org/project/ansicolors" + }, + { + "name": "ansiwrap", + "uri": "https://pypi.org/project/ansiwrap" + }, + { + "name": "anthropic", + "uri": "https://pypi.org/project/anthropic" + }, + { + "name": "antlr4-python3-runtime", + "uri": "https://pypi.org/project/antlr4-python3-runtime" + }, + { + "name": "antlr4-tools", + "uri": "https://pypi.org/project/antlr4-tools" + }, + { + "name": "anyascii", + "uri": "https://pypi.org/project/anyascii" + }, + { + "name": "anybadge", + "uri": "https://pypi.org/project/anybadge" + }, + { + "name": "anyio", + "uri": "https://pypi.org/project/anyio" + }, + { + "name": "anytree", + "uri": "https://pypi.org/project/anytree" + }, + { + "name": "apache-airflow", + "uri": "https://pypi.org/project/apache-airflow" + }, + { + "name": "apache-airflow-providers-amazon", + "uri": "https://pypi.org/project/apache-airflow-providers-amazon" + }, + { + "name": "apache-airflow-providers-apache-spark", + "uri": "https://pypi.org/project/apache-airflow-providers-apache-spark" + }, + { + "name": "apache-airflow-providers-atlassian-jira", + "uri": "https://pypi.org/project/apache-airflow-providers-atlassian-jira" + }, + { + "name": "apache-airflow-providers-celery", + "uri": "https://pypi.org/project/apache-airflow-providers-celery" + }, + { + "name": "apache-airflow-providers-cncf-kubernetes", + "uri": "https://pypi.org/project/apache-airflow-providers-cncf-kubernetes" + }, + { + "name": "apache-airflow-providers-common-compat", + "uri": "https://pypi.org/project/apache-airflow-providers-common-compat" + }, + { + "name": "apache-airflow-providers-common-io", + "uri": "https://pypi.org/project/apache-airflow-providers-common-io" + }, + { + "name": "apache-airflow-providers-common-sql", + "uri": "https://pypi.org/project/apache-airflow-providers-common-sql" + }, + { + "name": "apache-airflow-providers-databricks", + "uri": "https://pypi.org/project/apache-airflow-providers-databricks" + }, + { + "name": "apache-airflow-providers-datadog", + "uri": "https://pypi.org/project/apache-airflow-providers-datadog" + }, + { + "name": "apache-airflow-providers-dbt-cloud", + "uri": "https://pypi.org/project/apache-airflow-providers-dbt-cloud" + }, + { + "name": "apache-airflow-providers-docker", + "uri": "https://pypi.org/project/apache-airflow-providers-docker" + }, + { + "name": "apache-airflow-providers-fab", + "uri": "https://pypi.org/project/apache-airflow-providers-fab" + }, + { + "name": "apache-airflow-providers-ftp", + "uri": "https://pypi.org/project/apache-airflow-providers-ftp" + }, + { + "name": "apache-airflow-providers-google", + "uri": "https://pypi.org/project/apache-airflow-providers-google" + }, + { + "name": "apache-airflow-providers-http", + "uri": "https://pypi.org/project/apache-airflow-providers-http" + }, + { + "name": "apache-airflow-providers-imap", + "uri": "https://pypi.org/project/apache-airflow-providers-imap" + }, + { + "name": "apache-airflow-providers-jdbc", + "uri": "https://pypi.org/project/apache-airflow-providers-jdbc" + }, + { + "name": "apache-airflow-providers-microsoft-azure", + "uri": "https://pypi.org/project/apache-airflow-providers-microsoft-azure" + }, + { + "name": "apache-airflow-providers-microsoft-mssql", + "uri": "https://pypi.org/project/apache-airflow-providers-microsoft-mssql" + }, + { + "name": "apache-airflow-providers-mongo", + "uri": "https://pypi.org/project/apache-airflow-providers-mongo" + }, + { + "name": "apache-airflow-providers-mysql", + "uri": "https://pypi.org/project/apache-airflow-providers-mysql" + }, + { + "name": "apache-airflow-providers-odbc", + "uri": "https://pypi.org/project/apache-airflow-providers-odbc" + }, + { + "name": "apache-airflow-providers-oracle", + "uri": "https://pypi.org/project/apache-airflow-providers-oracle" + }, + { + "name": "apache-airflow-providers-pagerduty", + "uri": "https://pypi.org/project/apache-airflow-providers-pagerduty" + }, + { + "name": "apache-airflow-providers-postgres", + "uri": "https://pypi.org/project/apache-airflow-providers-postgres" + }, + { + "name": "apache-airflow-providers-salesforce", + "uri": "https://pypi.org/project/apache-airflow-providers-salesforce" + }, + { + "name": "apache-airflow-providers-sftp", + "uri": "https://pypi.org/project/apache-airflow-providers-sftp" + }, + { + "name": "apache-airflow-providers-slack", + "uri": "https://pypi.org/project/apache-airflow-providers-slack" + }, + { + "name": "apache-airflow-providers-smtp", + "uri": "https://pypi.org/project/apache-airflow-providers-smtp" + }, + { + "name": "apache-airflow-providers-snowflake", + "uri": "https://pypi.org/project/apache-airflow-providers-snowflake" + }, + { + "name": "apache-airflow-providers-sqlite", + "uri": "https://pypi.org/project/apache-airflow-providers-sqlite" + }, + { + "name": "apache-airflow-providers-ssh", + "uri": "https://pypi.org/project/apache-airflow-providers-ssh" + }, + { + "name": "apache-airflow-providers-tableau", + "uri": "https://pypi.org/project/apache-airflow-providers-tableau" + }, + { + "name": "apache-beam", + "uri": "https://pypi.org/project/apache-beam" + }, + { + "name": "apache-sedona", + "uri": "https://pypi.org/project/apache-sedona" + }, + { + "name": "apispec", + "uri": "https://pypi.org/project/apispec" + }, + { + "name": "appdirs", + "uri": "https://pypi.org/project/appdirs" + }, + { + "name": "appium-python-client", + "uri": "https://pypi.org/project/appium-python-client" + }, + { + "name": "applicationinsights", + "uri": "https://pypi.org/project/applicationinsights" + }, + { + "name": "appnope", + "uri": "https://pypi.org/project/appnope" + }, + { + "name": "apprise", + "uri": "https://pypi.org/project/apprise" + }, + { + "name": "apscheduler", + "uri": "https://pypi.org/project/apscheduler" + }, + { + "name": "apsw", + "uri": "https://pypi.org/project/apsw" + }, + { + "name": "arabic-reshaper", + "uri": "https://pypi.org/project/arabic-reshaper" + }, + { + "name": "aresponses", + "uri": "https://pypi.org/project/aresponses" + }, + { + "name": "argcomplete", + "uri": "https://pypi.org/project/argcomplete" + }, + { + "name": "argh", + "uri": "https://pypi.org/project/argh" + }, + { + "name": "argon2-cffi", + "uri": "https://pypi.org/project/argon2-cffi" + }, + { + "name": "argon2-cffi-bindings", + "uri": "https://pypi.org/project/argon2-cffi-bindings" + }, + { + "name": "argparse", + "uri": "https://pypi.org/project/argparse" + }, + { + "name": "argparse-addons", + "uri": "https://pypi.org/project/argparse-addons" + }, + { + "name": "arnparse", + "uri": "https://pypi.org/project/arnparse" + }, + { + "name": "arpeggio", + "uri": "https://pypi.org/project/arpeggio" + }, + { + "name": "array-record", + "uri": "https://pypi.org/project/array-record" + }, + { + "name": "arrow", + "uri": "https://pypi.org/project/arrow" + }, + { + "name": "artifacts-keyring", + "uri": "https://pypi.org/project/artifacts-keyring" + }, + { + "name": "arviz", + "uri": "https://pypi.org/project/arviz" + }, + { + "name": "asana", + "uri": "https://pypi.org/project/asana" + }, + { + "name": "asciitree", + "uri": "https://pypi.org/project/asciitree" + }, + { + "name": "asgi-correlation-id", + "uri": "https://pypi.org/project/asgi-correlation-id" + }, + { + "name": "asgi-lifespan", + "uri": "https://pypi.org/project/asgi-lifespan" + }, + { + "name": "asgiref", + "uri": "https://pypi.org/project/asgiref" + }, + { + "name": "asn1crypto", + "uri": "https://pypi.org/project/asn1crypto" + }, + { + "name": "asteroid-filterbanks", + "uri": "https://pypi.org/project/asteroid-filterbanks" + }, + { + "name": "asteval", + "uri": "https://pypi.org/project/asteval" + }, + { + "name": "astor", + "uri": "https://pypi.org/project/astor" + }, + { + "name": "astral", + "uri": "https://pypi.org/project/astral" + }, + { + "name": "astroid", + "uri": "https://pypi.org/project/astroid" + }, + { + "name": "astronomer-cosmos", + "uri": "https://pypi.org/project/astronomer-cosmos" + }, + { + "name": "astropy", + "uri": "https://pypi.org/project/astropy" + }, + { + "name": "astropy-iers-data", + "uri": "https://pypi.org/project/astropy-iers-data" + }, + { + "name": "asttokens", + "uri": "https://pypi.org/project/asttokens" + }, + { + "name": "astunparse", + "uri": "https://pypi.org/project/astunparse" + }, + { + "name": "async-generator", + "uri": "https://pypi.org/project/async-generator" + }, + { + "name": "async-lru", + "uri": "https://pypi.org/project/async-lru" + }, + { + "name": "async-property", + "uri": "https://pypi.org/project/async-property" + }, + { + "name": "async-timeout", + "uri": "https://pypi.org/project/async-timeout" + }, + { + "name": "asyncio", + "uri": "https://pypi.org/project/asyncio" + }, + { + "name": "asyncpg", + "uri": "https://pypi.org/project/asyncpg" + }, + { + "name": "asyncssh", + "uri": "https://pypi.org/project/asyncssh" + }, + { + "name": "asynctest", + "uri": "https://pypi.org/project/asynctest" + }, + { + "name": "atlassian-python-api", + "uri": "https://pypi.org/project/atlassian-python-api" + }, + { + "name": "atomicwrites", + "uri": "https://pypi.org/project/atomicwrites" + }, + { + "name": "atomlite", + "uri": "https://pypi.org/project/atomlite" + }, + { + "name": "atpublic", + "uri": "https://pypi.org/project/atpublic" + }, + { + "name": "attrdict", + "uri": "https://pypi.org/project/attrdict" + }, + { + "name": "attrs", + "uri": "https://pypi.org/project/attrs" + }, + { + "name": "audioread", + "uri": "https://pypi.org/project/audioread" + }, + { + "name": "auth0-python", + "uri": "https://pypi.org/project/auth0-python" + }, + { + "name": "authencoding", + "uri": "https://pypi.org/project/authencoding" + }, + { + "name": "authlib", + "uri": "https://pypi.org/project/authlib" + }, + { + "name": "autobahn", + "uri": "https://pypi.org/project/autobahn" + }, + { + "name": "autocommand", + "uri": "https://pypi.org/project/autocommand" + }, + { + "name": "autofaker", + "uri": "https://pypi.org/project/autofaker" + }, + { + "name": "autoflake", + "uri": "https://pypi.org/project/autoflake" + }, + { + "name": "autograd", + "uri": "https://pypi.org/project/autograd" + }, + { + "name": "autograd-gamma", + "uri": "https://pypi.org/project/autograd-gamma" + }, + { + "name": "automat", + "uri": "https://pypi.org/project/automat" + }, + { + "name": "autopage", + "uri": "https://pypi.org/project/autopage" + }, + { + "name": "autopep8", + "uri": "https://pypi.org/project/autopep8" + }, + { + "name": "av", + "uri": "https://pypi.org/project/av" + }, + { + "name": "avro", + "uri": "https://pypi.org/project/avro" + }, + { + "name": "avro-gen", + "uri": "https://pypi.org/project/avro-gen" + }, + { + "name": "avro-gen3", + "uri": "https://pypi.org/project/avro-gen3" + }, + { + "name": "avro-python3", + "uri": "https://pypi.org/project/avro-python3" + }, + { + "name": "awacs", + "uri": "https://pypi.org/project/awacs" + }, + { + "name": "awesomeversion", + "uri": "https://pypi.org/project/awesomeversion" + }, + { + "name": "awkward", + "uri": "https://pypi.org/project/awkward" + }, + { + "name": "awkward-cpp", + "uri": "https://pypi.org/project/awkward-cpp" + }, + { + "name": "aws-cdk-asset-awscli-v1", + "uri": "https://pypi.org/project/aws-cdk-asset-awscli-v1" + }, + { + "name": "aws-cdk-asset-kubectl-v20", + "uri": "https://pypi.org/project/aws-cdk-asset-kubectl-v20" + }, + { + "name": "aws-cdk-asset-node-proxy-agent-v6", + "uri": "https://pypi.org/project/aws-cdk-asset-node-proxy-agent-v6" + }, + { + "name": "aws-cdk-aws-lambda-python-alpha", + "uri": "https://pypi.org/project/aws-cdk-aws-lambda-python-alpha" + }, + { + "name": "aws-cdk-cloud-assembly-schema", + "uri": "https://pypi.org/project/aws-cdk-cloud-assembly-schema" + }, + { + "name": "aws-cdk-integ-tests-alpha", + "uri": "https://pypi.org/project/aws-cdk-integ-tests-alpha" + }, + { + "name": "aws-cdk-lib", + "uri": "https://pypi.org/project/aws-cdk-lib" + }, + { + "name": "aws-encryption-sdk", + "uri": "https://pypi.org/project/aws-encryption-sdk" + }, + { + "name": "aws-lambda-builders", + "uri": "https://pypi.org/project/aws-lambda-builders" + }, + { + "name": "aws-lambda-powertools", + "uri": "https://pypi.org/project/aws-lambda-powertools" + }, + { + "name": "aws-psycopg2", + "uri": "https://pypi.org/project/aws-psycopg2" + }, + { + "name": "aws-requests-auth", + "uri": "https://pypi.org/project/aws-requests-auth" + }, + { + "name": "aws-sam-cli", + "uri": "https://pypi.org/project/aws-sam-cli" + }, + { + "name": "aws-sam-translator", + "uri": "https://pypi.org/project/aws-sam-translator" + }, + { + "name": "aws-secretsmanager-caching", + "uri": "https://pypi.org/project/aws-secretsmanager-caching" + }, + { + "name": "aws-xray-sdk", + "uri": "https://pypi.org/project/aws-xray-sdk" + }, + { + "name": "awscli", + "uri": "https://pypi.org/project/awscli" + }, + { + "name": "awscliv2", + "uri": "https://pypi.org/project/awscliv2" + }, + { + "name": "awscrt", + "uri": "https://pypi.org/project/awscrt" + }, + { + "name": "awswrangler", + "uri": "https://pypi.org/project/awswrangler" + }, + { + "name": "azure", + "uri": "https://pypi.org/project/azure" + }, + { + "name": "azure-ai-formrecognizer", + "uri": "https://pypi.org/project/azure-ai-formrecognizer" + }, + { + "name": "azure-ai-ml", + "uri": "https://pypi.org/project/azure-ai-ml" + }, + { + "name": "azure-appconfiguration", + "uri": "https://pypi.org/project/azure-appconfiguration" + }, + { + "name": "azure-applicationinsights", + "uri": "https://pypi.org/project/azure-applicationinsights" + }, + { + "name": "azure-batch", + "uri": "https://pypi.org/project/azure-batch" + }, + { + "name": "azure-cli", + "uri": "https://pypi.org/project/azure-cli" + }, + { + "name": "azure-cli-core", + "uri": "https://pypi.org/project/azure-cli-core" + }, + { + "name": "azure-cli-telemetry", + "uri": "https://pypi.org/project/azure-cli-telemetry" + }, + { + "name": "azure-common", + "uri": "https://pypi.org/project/azure-common" + }, + { + "name": "azure-core", + "uri": "https://pypi.org/project/azure-core" + }, + { + "name": "azure-core-tracing-opentelemetry", + "uri": "https://pypi.org/project/azure-core-tracing-opentelemetry" + }, + { + "name": "azure-cosmos", + "uri": "https://pypi.org/project/azure-cosmos" + }, + { + "name": "azure-cosmosdb-nspkg", + "uri": "https://pypi.org/project/azure-cosmosdb-nspkg" + }, + { + "name": "azure-cosmosdb-table", + "uri": "https://pypi.org/project/azure-cosmosdb-table" + }, + { + "name": "azure-data-tables", + "uri": "https://pypi.org/project/azure-data-tables" + }, + { + "name": "azure-datalake-store", + "uri": "https://pypi.org/project/azure-datalake-store" + }, + { + "name": "azure-devops", + "uri": "https://pypi.org/project/azure-devops" + }, + { + "name": "azure-eventgrid", + "uri": "https://pypi.org/project/azure-eventgrid" + }, + { + "name": "azure-eventhub", + "uri": "https://pypi.org/project/azure-eventhub" + }, + { + "name": "azure-functions", + "uri": "https://pypi.org/project/azure-functions" + }, + { + "name": "azure-graphrbac", + "uri": "https://pypi.org/project/azure-graphrbac" + }, + { + "name": "azure-identity", + "uri": "https://pypi.org/project/azure-identity" + }, + { + "name": "azure-keyvault", + "uri": "https://pypi.org/project/azure-keyvault" + }, + { + "name": "azure-keyvault-administration", + "uri": "https://pypi.org/project/azure-keyvault-administration" + }, + { + "name": "azure-keyvault-certificates", + "uri": "https://pypi.org/project/azure-keyvault-certificates" + }, + { + "name": "azure-keyvault-keys", + "uri": "https://pypi.org/project/azure-keyvault-keys" + }, + { + "name": "azure-keyvault-secrets", + "uri": "https://pypi.org/project/azure-keyvault-secrets" + }, + { + "name": "azure-kusto-data", + "uri": "https://pypi.org/project/azure-kusto-data" + }, + { + "name": "azure-kusto-ingest", + "uri": "https://pypi.org/project/azure-kusto-ingest" + }, + { + "name": "azure-loganalytics", + "uri": "https://pypi.org/project/azure-loganalytics" + }, + { + "name": "azure-mgmt", + "uri": "https://pypi.org/project/azure-mgmt" + }, + { + "name": "azure-mgmt-advisor", + "uri": "https://pypi.org/project/azure-mgmt-advisor" + }, + { + "name": "azure-mgmt-apimanagement", + "uri": "https://pypi.org/project/azure-mgmt-apimanagement" + }, + { + "name": "azure-mgmt-appconfiguration", + "uri": "https://pypi.org/project/azure-mgmt-appconfiguration" + }, + { + "name": "azure-mgmt-appcontainers", + "uri": "https://pypi.org/project/azure-mgmt-appcontainers" + }, + { + "name": "azure-mgmt-applicationinsights", + "uri": "https://pypi.org/project/azure-mgmt-applicationinsights" + }, + { + "name": "azure-mgmt-authorization", + "uri": "https://pypi.org/project/azure-mgmt-authorization" + }, + { + "name": "azure-mgmt-batch", + "uri": "https://pypi.org/project/azure-mgmt-batch" + }, + { + "name": "azure-mgmt-batchai", + "uri": "https://pypi.org/project/azure-mgmt-batchai" + }, + { + "name": "azure-mgmt-billing", + "uri": "https://pypi.org/project/azure-mgmt-billing" + }, + { + "name": "azure-mgmt-botservice", + "uri": "https://pypi.org/project/azure-mgmt-botservice" + }, + { + "name": "azure-mgmt-cdn", + "uri": "https://pypi.org/project/azure-mgmt-cdn" + }, + { + "name": "azure-mgmt-cognitiveservices", + "uri": "https://pypi.org/project/azure-mgmt-cognitiveservices" + }, + { + "name": "azure-mgmt-commerce", + "uri": "https://pypi.org/project/azure-mgmt-commerce" + }, + { + "name": "azure-mgmt-compute", + "uri": "https://pypi.org/project/azure-mgmt-compute" + }, + { + "name": "azure-mgmt-consumption", + "uri": "https://pypi.org/project/azure-mgmt-consumption" + }, + { + "name": "azure-mgmt-containerinstance", + "uri": "https://pypi.org/project/azure-mgmt-containerinstance" + }, + { + "name": "azure-mgmt-containerregistry", + "uri": "https://pypi.org/project/azure-mgmt-containerregistry" + }, + { + "name": "azure-mgmt-containerservice", + "uri": "https://pypi.org/project/azure-mgmt-containerservice" + }, + { + "name": "azure-mgmt-core", + "uri": "https://pypi.org/project/azure-mgmt-core" + }, + { + "name": "azure-mgmt-cosmosdb", + "uri": "https://pypi.org/project/azure-mgmt-cosmosdb" + }, + { + "name": "azure-mgmt-databoxedge", + "uri": "https://pypi.org/project/azure-mgmt-databoxedge" + }, + { + "name": "azure-mgmt-datafactory", + "uri": "https://pypi.org/project/azure-mgmt-datafactory" + }, + { + "name": "azure-mgmt-datalake-analytics", + "uri": "https://pypi.org/project/azure-mgmt-datalake-analytics" + }, + { + "name": "azure-mgmt-datalake-nspkg", + "uri": "https://pypi.org/project/azure-mgmt-datalake-nspkg" + }, + { + "name": "azure-mgmt-datalake-store", + "uri": "https://pypi.org/project/azure-mgmt-datalake-store" + }, + { + "name": "azure-mgmt-datamigration", + "uri": "https://pypi.org/project/azure-mgmt-datamigration" + }, + { + "name": "azure-mgmt-deploymentmanager", + "uri": "https://pypi.org/project/azure-mgmt-deploymentmanager" + }, + { + "name": "azure-mgmt-devspaces", + "uri": "https://pypi.org/project/azure-mgmt-devspaces" + }, + { + "name": "azure-mgmt-devtestlabs", + "uri": "https://pypi.org/project/azure-mgmt-devtestlabs" + }, + { + "name": "azure-mgmt-dns", + "uri": "https://pypi.org/project/azure-mgmt-dns" + }, + { + "name": "azure-mgmt-eventgrid", + "uri": "https://pypi.org/project/azure-mgmt-eventgrid" + }, + { + "name": "azure-mgmt-eventhub", + "uri": "https://pypi.org/project/azure-mgmt-eventhub" + }, + { + "name": "azure-mgmt-extendedlocation", + "uri": "https://pypi.org/project/azure-mgmt-extendedlocation" + }, + { + "name": "azure-mgmt-hanaonazure", + "uri": "https://pypi.org/project/azure-mgmt-hanaonazure" + }, + { + "name": "azure-mgmt-hdinsight", + "uri": "https://pypi.org/project/azure-mgmt-hdinsight" + }, + { + "name": "azure-mgmt-imagebuilder", + "uri": "https://pypi.org/project/azure-mgmt-imagebuilder" + }, + { + "name": "azure-mgmt-iotcentral", + "uri": "https://pypi.org/project/azure-mgmt-iotcentral" + }, + { + "name": "azure-mgmt-iothub", + "uri": "https://pypi.org/project/azure-mgmt-iothub" + }, + { + "name": "azure-mgmt-iothubprovisioningservices", + "uri": "https://pypi.org/project/azure-mgmt-iothubprovisioningservices" + }, + { + "name": "azure-mgmt-keyvault", + "uri": "https://pypi.org/project/azure-mgmt-keyvault" + }, + { + "name": "azure-mgmt-kusto", + "uri": "https://pypi.org/project/azure-mgmt-kusto" + }, + { + "name": "azure-mgmt-loganalytics", + "uri": "https://pypi.org/project/azure-mgmt-loganalytics" + }, + { + "name": "azure-mgmt-logic", + "uri": "https://pypi.org/project/azure-mgmt-logic" + }, + { + "name": "azure-mgmt-machinelearningcompute", + "uri": "https://pypi.org/project/azure-mgmt-machinelearningcompute" + }, + { + "name": "azure-mgmt-managedservices", + "uri": "https://pypi.org/project/azure-mgmt-managedservices" + }, + { + "name": "azure-mgmt-managementgroups", + "uri": "https://pypi.org/project/azure-mgmt-managementgroups" + }, + { + "name": "azure-mgmt-managementpartner", + "uri": "https://pypi.org/project/azure-mgmt-managementpartner" + }, + { + "name": "azure-mgmt-maps", + "uri": "https://pypi.org/project/azure-mgmt-maps" + }, + { + "name": "azure-mgmt-marketplaceordering", + "uri": "https://pypi.org/project/azure-mgmt-marketplaceordering" + }, + { + "name": "azure-mgmt-media", + "uri": "https://pypi.org/project/azure-mgmt-media" + }, + { + "name": "azure-mgmt-monitor", + "uri": "https://pypi.org/project/azure-mgmt-monitor" + }, + { + "name": "azure-mgmt-msi", + "uri": "https://pypi.org/project/azure-mgmt-msi" + }, + { + "name": "azure-mgmt-netapp", + "uri": "https://pypi.org/project/azure-mgmt-netapp" + }, + { + "name": "azure-mgmt-network", + "uri": "https://pypi.org/project/azure-mgmt-network" + }, + { + "name": "azure-mgmt-notificationhubs", + "uri": "https://pypi.org/project/azure-mgmt-notificationhubs" + }, + { + "name": "azure-mgmt-nspkg", + "uri": "https://pypi.org/project/azure-mgmt-nspkg" + }, + { + "name": "azure-mgmt-policyinsights", + "uri": "https://pypi.org/project/azure-mgmt-policyinsights" + }, + { + "name": "azure-mgmt-powerbiembedded", + "uri": "https://pypi.org/project/azure-mgmt-powerbiembedded" + }, + { + "name": "azure-mgmt-privatedns", + "uri": "https://pypi.org/project/azure-mgmt-privatedns" + }, + { + "name": "azure-mgmt-rdbms", + "uri": "https://pypi.org/project/azure-mgmt-rdbms" + }, + { + "name": "azure-mgmt-recoveryservices", + "uri": "https://pypi.org/project/azure-mgmt-recoveryservices" + }, + { + "name": "azure-mgmt-recoveryservicesbackup", + "uri": "https://pypi.org/project/azure-mgmt-recoveryservicesbackup" + }, + { + "name": "azure-mgmt-redhatopenshift", + "uri": "https://pypi.org/project/azure-mgmt-redhatopenshift" + }, + { + "name": "azure-mgmt-redis", + "uri": "https://pypi.org/project/azure-mgmt-redis" + }, + { + "name": "azure-mgmt-relay", + "uri": "https://pypi.org/project/azure-mgmt-relay" + }, + { + "name": "azure-mgmt-reservations", + "uri": "https://pypi.org/project/azure-mgmt-reservations" + }, + { + "name": "azure-mgmt-resource", + "uri": "https://pypi.org/project/azure-mgmt-resource" + }, + { + "name": "azure-mgmt-resourcegraph", + "uri": "https://pypi.org/project/azure-mgmt-resourcegraph" + }, + { + "name": "azure-mgmt-scheduler", + "uri": "https://pypi.org/project/azure-mgmt-scheduler" + }, + { + "name": "azure-mgmt-search", + "uri": "https://pypi.org/project/azure-mgmt-search" + }, + { + "name": "azure-mgmt-security", + "uri": "https://pypi.org/project/azure-mgmt-security" + }, + { + "name": "azure-mgmt-servicebus", + "uri": "https://pypi.org/project/azure-mgmt-servicebus" + }, + { + "name": "azure-mgmt-servicefabric", + "uri": "https://pypi.org/project/azure-mgmt-servicefabric" + }, + { + "name": "azure-mgmt-servicefabricmanagedclusters", + "uri": "https://pypi.org/project/azure-mgmt-servicefabricmanagedclusters" + }, + { + "name": "azure-mgmt-servicelinker", + "uri": "https://pypi.org/project/azure-mgmt-servicelinker" + }, + { + "name": "azure-mgmt-signalr", + "uri": "https://pypi.org/project/azure-mgmt-signalr" + }, + { + "name": "azure-mgmt-sql", + "uri": "https://pypi.org/project/azure-mgmt-sql" + }, + { + "name": "azure-mgmt-sqlvirtualmachine", + "uri": "https://pypi.org/project/azure-mgmt-sqlvirtualmachine" + }, + { + "name": "azure-mgmt-storage", + "uri": "https://pypi.org/project/azure-mgmt-storage" + }, + { + "name": "azure-mgmt-subscription", + "uri": "https://pypi.org/project/azure-mgmt-subscription" + }, + { + "name": "azure-mgmt-synapse", + "uri": "https://pypi.org/project/azure-mgmt-synapse" + }, + { + "name": "azure-mgmt-trafficmanager", + "uri": "https://pypi.org/project/azure-mgmt-trafficmanager" + }, + { + "name": "azure-mgmt-web", + "uri": "https://pypi.org/project/azure-mgmt-web" + }, + { + "name": "azure-monitor-opentelemetry", + "uri": "https://pypi.org/project/azure-monitor-opentelemetry" + }, + { + "name": "azure-monitor-opentelemetry-exporter", + "uri": "https://pypi.org/project/azure-monitor-opentelemetry-exporter" + }, + { + "name": "azure-monitor-query", + "uri": "https://pypi.org/project/azure-monitor-query" + }, + { + "name": "azure-multiapi-storage", + "uri": "https://pypi.org/project/azure-multiapi-storage" + }, + { + "name": "azure-nspkg", + "uri": "https://pypi.org/project/azure-nspkg" + }, + { + "name": "azure-search-documents", + "uri": "https://pypi.org/project/azure-search-documents" + }, + { + "name": "azure-servicebus", + "uri": "https://pypi.org/project/azure-servicebus" + }, + { + "name": "azure-servicefabric", + "uri": "https://pypi.org/project/azure-servicefabric" + }, + { + "name": "azure-servicemanagement-legacy", + "uri": "https://pypi.org/project/azure-servicemanagement-legacy" + }, + { + "name": "azure-storage", + "uri": "https://pypi.org/project/azure-storage" + }, + { + "name": "azure-storage-blob", + "uri": "https://pypi.org/project/azure-storage-blob" + }, + { + "name": "azure-storage-common", + "uri": "https://pypi.org/project/azure-storage-common" + }, + { + "name": "azure-storage-file", + "uri": "https://pypi.org/project/azure-storage-file" + }, + { + "name": "azure-storage-file-datalake", + "uri": "https://pypi.org/project/azure-storage-file-datalake" + }, + { + "name": "azure-storage-file-share", + "uri": "https://pypi.org/project/azure-storage-file-share" + }, + { + "name": "azure-storage-nspkg", + "uri": "https://pypi.org/project/azure-storage-nspkg" + }, + { + "name": "azure-storage-queue", + "uri": "https://pypi.org/project/azure-storage-queue" + }, + { + "name": "azure-synapse-accesscontrol", + "uri": "https://pypi.org/project/azure-synapse-accesscontrol" + }, + { + "name": "azure-synapse-artifacts", + "uri": "https://pypi.org/project/azure-synapse-artifacts" + }, + { + "name": "azure-synapse-managedprivateendpoints", + "uri": "https://pypi.org/project/azure-synapse-managedprivateendpoints" + }, + { + "name": "azure-synapse-spark", + "uri": "https://pypi.org/project/azure-synapse-spark" + }, + { + "name": "azureml-core", + "uri": "https://pypi.org/project/azureml-core" + }, + { + "name": "azureml-dataprep", + "uri": "https://pypi.org/project/azureml-dataprep" + }, + { + "name": "azureml-dataprep-native", + "uri": "https://pypi.org/project/azureml-dataprep-native" + }, + { + "name": "azureml-dataprep-rslex", + "uri": "https://pypi.org/project/azureml-dataprep-rslex" + }, + { + "name": "azureml-dataset-runtime", + "uri": "https://pypi.org/project/azureml-dataset-runtime" + }, + { + "name": "azureml-mlflow", + "uri": "https://pypi.org/project/azureml-mlflow" + }, + { + "name": "azureml-telemetry", + "uri": "https://pypi.org/project/azureml-telemetry" + }, + { + "name": "babel", + "uri": "https://pypi.org/project/babel" + }, + { + "name": "backcall", + "uri": "https://pypi.org/project/backcall" + }, + { + "name": "backoff", + "uri": "https://pypi.org/project/backoff" + }, + { + "name": "backports-abc", + "uri": "https://pypi.org/project/backports-abc" + }, + { + "name": "backports-cached-property", + "uri": "https://pypi.org/project/backports-cached-property" + }, + { + "name": "backports-csv", + "uri": "https://pypi.org/project/backports-csv" + }, + { + "name": "backports-datetime-fromisoformat", + "uri": "https://pypi.org/project/backports-datetime-fromisoformat" + }, + { + "name": "backports-entry-points-selectable", + "uri": "https://pypi.org/project/backports-entry-points-selectable" + }, + { + "name": "backports-functools-lru-cache", + "uri": "https://pypi.org/project/backports-functools-lru-cache" + }, + { + "name": "backports-shutil-get-terminal-size", + "uri": "https://pypi.org/project/backports-shutil-get-terminal-size" + }, + { + "name": "backports-tarfile", + "uri": "https://pypi.org/project/backports-tarfile" + }, + { + "name": "backports-tempfile", + "uri": "https://pypi.org/project/backports-tempfile" + }, + { + "name": "backports-weakref", + "uri": "https://pypi.org/project/backports-weakref" + }, + { + "name": "backports-zoneinfo", + "uri": "https://pypi.org/project/backports-zoneinfo" + }, + { + "name": "bandit", + "uri": "https://pypi.org/project/bandit" + }, + { + "name": "base58", + "uri": "https://pypi.org/project/base58" + }, + { + "name": "bashlex", + "uri": "https://pypi.org/project/bashlex" + }, + { + "name": "bazel-runfiles", + "uri": "https://pypi.org/project/bazel-runfiles" + }, + { + "name": "bc-detect-secrets", + "uri": "https://pypi.org/project/bc-detect-secrets" + }, + { + "name": "bc-jsonpath-ng", + "uri": "https://pypi.org/project/bc-jsonpath-ng" + }, + { + "name": "bc-python-hcl2", + "uri": "https://pypi.org/project/bc-python-hcl2" + }, + { + "name": "bcrypt", + "uri": "https://pypi.org/project/bcrypt" + }, + { + "name": "beartype", + "uri": "https://pypi.org/project/beartype" + }, + { + "name": "beautifulsoup", + "uri": "https://pypi.org/project/beautifulsoup" + }, + { + "name": "beautifulsoup4", + "uri": "https://pypi.org/project/beautifulsoup4" + }, + { + "name": "behave", + "uri": "https://pypi.org/project/behave" + }, + { + "name": "bellows", + "uri": "https://pypi.org/project/bellows" + }, + { + "name": "betterproto", + "uri": "https://pypi.org/project/betterproto" + }, + { + "name": "bidict", + "uri": "https://pypi.org/project/bidict" + }, + { + "name": "billiard", + "uri": "https://pypi.org/project/billiard" + }, + { + "name": "binaryornot", + "uri": "https://pypi.org/project/binaryornot" + }, + { + "name": "bio", + "uri": "https://pypi.org/project/bio" + }, + { + "name": "biopython", + "uri": "https://pypi.org/project/biopython" + }, + { + "name": "biothings-client", + "uri": "https://pypi.org/project/biothings-client" + }, + { + "name": "bitarray", + "uri": "https://pypi.org/project/bitarray" + }, + { + "name": "bitsandbytes", + "uri": "https://pypi.org/project/bitsandbytes" + }, + { + "name": "bitstring", + "uri": "https://pypi.org/project/bitstring" + }, + { + "name": "bitstruct", + "uri": "https://pypi.org/project/bitstruct" + }, + { + "name": "black", + "uri": "https://pypi.org/project/black" + }, + { + "name": "blackduck", + "uri": "https://pypi.org/project/blackduck" + }, + { + "name": "bleach", + "uri": "https://pypi.org/project/bleach" + }, + { + "name": "bleak", + "uri": "https://pypi.org/project/bleak" + }, + { + "name": "blendmodes", + "uri": "https://pypi.org/project/blendmodes" + }, + { + "name": "blessed", + "uri": "https://pypi.org/project/blessed" + }, + { + "name": "blessings", + "uri": "https://pypi.org/project/blessings" + }, + { + "name": "blinker", + "uri": "https://pypi.org/project/blinker" + }, + { + "name": "blis", + "uri": "https://pypi.org/project/blis" + }, + { + "name": "blobfile", + "uri": "https://pypi.org/project/blobfile" + }, + { + "name": "blosc2", + "uri": "https://pypi.org/project/blosc2" + }, + { + "name": "boa-str", + "uri": "https://pypi.org/project/boa-str" + }, + { + "name": "bokeh", + "uri": "https://pypi.org/project/bokeh" + }, + { + "name": "boltons", + "uri": "https://pypi.org/project/boltons" + }, + { + "name": "boolean-py", + "uri": "https://pypi.org/project/boolean-py" + }, + { + "name": "boto", + "uri": "https://pypi.org/project/boto" + }, + { + "name": "boto3", + "uri": "https://pypi.org/project/boto3" + }, + { + "name": "boto3-stubs", + "uri": "https://pypi.org/project/boto3-stubs" + }, + { + "name": "boto3-stubs-lite", + "uri": "https://pypi.org/project/boto3-stubs-lite" + }, + { + "name": "boto3-type-annotations", + "uri": "https://pypi.org/project/boto3-type-annotations" + }, + { + "name": "botocore", + "uri": "https://pypi.org/project/botocore" + }, + { + "name": "botocore-stubs", + "uri": "https://pypi.org/project/botocore-stubs" + }, + { + "name": "bottle", + "uri": "https://pypi.org/project/bottle" + }, + { + "name": "bottleneck", + "uri": "https://pypi.org/project/bottleneck" + }, + { + "name": "boxsdk", + "uri": "https://pypi.org/project/boxsdk" + }, + { + "name": "braceexpand", + "uri": "https://pypi.org/project/braceexpand" + }, + { + "name": "bracex", + "uri": "https://pypi.org/project/bracex" + }, + { + "name": "branca", + "uri": "https://pypi.org/project/branca" + }, + { + "name": "breathe", + "uri": "https://pypi.org/project/breathe" + }, + { + "name": "brotli", + "uri": "https://pypi.org/project/brotli" + }, + { + "name": "bs4", + "uri": "https://pypi.org/project/bs4" + }, + { + "name": "bson", + "uri": "https://pypi.org/project/bson" + }, + { + "name": "btrees", + "uri": "https://pypi.org/project/btrees" + }, + { + "name": "build", + "uri": "https://pypi.org/project/build" + }, + { + "name": "bump2version", + "uri": "https://pypi.org/project/bump2version" + }, + { + "name": "bumpversion", + "uri": "https://pypi.org/project/bumpversion" + }, + { + "name": "bytecode", + "uri": "https://pypi.org/project/bytecode" + }, + { + "name": "bz2file", + "uri": "https://pypi.org/project/bz2file" + }, + { + "name": "c7n", + "uri": "https://pypi.org/project/c7n" + }, + { + "name": "c7n-org", + "uri": "https://pypi.org/project/c7n-org" + }, + { + "name": "cachecontrol", + "uri": "https://pypi.org/project/cachecontrol" + }, + { + "name": "cached-property", + "uri": "https://pypi.org/project/cached-property" + }, + { + "name": "cachelib", + "uri": "https://pypi.org/project/cachelib" + }, + { + "name": "cachetools", + "uri": "https://pypi.org/project/cachetools" + }, + { + "name": "cachy", + "uri": "https://pypi.org/project/cachy" + }, + { + "name": "cairocffi", + "uri": "https://pypi.org/project/cairocffi" + }, + { + "name": "cairosvg", + "uri": "https://pypi.org/project/cairosvg" + }, + { + "name": "casadi", + "uri": "https://pypi.org/project/casadi" + }, + { + "name": "case-conversion", + "uri": "https://pypi.org/project/case-conversion" + }, + { + "name": "cassandra-driver", + "uri": "https://pypi.org/project/cassandra-driver" + }, + { + "name": "catalogue", + "uri": "https://pypi.org/project/catalogue" + }, + { + "name": "catboost", + "uri": "https://pypi.org/project/catboost" + }, + { + "name": "category-encoders", + "uri": "https://pypi.org/project/category-encoders" + }, + { + "name": "cattrs", + "uri": "https://pypi.org/project/cattrs" + }, + { + "name": "cbor", + "uri": "https://pypi.org/project/cbor" + }, + { + "name": "cbor2", + "uri": "https://pypi.org/project/cbor2" + }, + { + "name": "cchardet", + "uri": "https://pypi.org/project/cchardet" + }, + { + "name": "ccxt", + "uri": "https://pypi.org/project/ccxt" + }, + { + "name": "cdk-nag", + "uri": "https://pypi.org/project/cdk-nag" + }, + { + "name": "celery", + "uri": "https://pypi.org/project/celery" + }, + { + "name": "cerberus", + "uri": "https://pypi.org/project/cerberus" + }, + { + "name": "cerberus-python-client", + "uri": "https://pypi.org/project/cerberus-python-client" + }, + { + "name": "certbot", + "uri": "https://pypi.org/project/certbot" + }, + { + "name": "certbot-dns-cloudflare", + "uri": "https://pypi.org/project/certbot-dns-cloudflare" + }, + { + "name": "certifi", + "uri": "https://pypi.org/project/certifi" + }, + { + "name": "cffi", + "uri": "https://pypi.org/project/cffi" + }, + { + "name": "cfgv", + "uri": "https://pypi.org/project/cfgv" + }, + { + "name": "cfile", + "uri": "https://pypi.org/project/cfile" + }, + { + "name": "cfn-flip", + "uri": "https://pypi.org/project/cfn-flip" + }, + { + "name": "cfn-lint", + "uri": "https://pypi.org/project/cfn-lint" + }, + { + "name": "cftime", + "uri": "https://pypi.org/project/cftime" + }, + { + "name": "chameleon", + "uri": "https://pypi.org/project/chameleon" + }, + { + "name": "channels", + "uri": "https://pypi.org/project/channels" + }, + { + "name": "channels-redis", + "uri": "https://pypi.org/project/channels-redis" + }, + { + "name": "chardet", + "uri": "https://pypi.org/project/chardet" + }, + { + "name": "charset-normalizer", + "uri": "https://pypi.org/project/charset-normalizer" + }, + { + "name": "checkdigit", + "uri": "https://pypi.org/project/checkdigit" + }, + { + "name": "checkov", + "uri": "https://pypi.org/project/checkov" + }, + { + "name": "checksumdir", + "uri": "https://pypi.org/project/checksumdir" + }, + { + "name": "cheroot", + "uri": "https://pypi.org/project/cheroot" + }, + { + "name": "cherrypy", + "uri": "https://pypi.org/project/cherrypy" + }, + { + "name": "chevron", + "uri": "https://pypi.org/project/chevron" + }, + { + "name": "chex", + "uri": "https://pypi.org/project/chex" + }, + { + "name": "chispa", + "uri": "https://pypi.org/project/chispa" + }, + { + "name": "chroma-hnswlib", + "uri": "https://pypi.org/project/chroma-hnswlib" + }, + { + "name": "chromadb", + "uri": "https://pypi.org/project/chromadb" + }, + { + "name": "cibuildwheel", + "uri": "https://pypi.org/project/cibuildwheel" + }, + { + "name": "cinemagoer", + "uri": "https://pypi.org/project/cinemagoer" + }, + { + "name": "circuitbreaker", + "uri": "https://pypi.org/project/circuitbreaker" + }, + { + "name": "ciso8601", + "uri": "https://pypi.org/project/ciso8601" + }, + { + "name": "ckzg", + "uri": "https://pypi.org/project/ckzg" + }, + { + "name": "clang", + "uri": "https://pypi.org/project/clang" + }, + { + "name": "clang-format", + "uri": "https://pypi.org/project/clang-format" + }, + { + "name": "clarabel", + "uri": "https://pypi.org/project/clarabel" + }, + { + "name": "clean-fid", + "uri": "https://pypi.org/project/clean-fid" + }, + { + "name": "cleanco", + "uri": "https://pypi.org/project/cleanco" + }, + { + "name": "cleo", + "uri": "https://pypi.org/project/cleo" + }, + { + "name": "click", + "uri": "https://pypi.org/project/click" + }, + { + "name": "click-default-group", + "uri": "https://pypi.org/project/click-default-group" + }, + { + "name": "click-didyoumean", + "uri": "https://pypi.org/project/click-didyoumean" + }, + { + "name": "click-help-colors", + "uri": "https://pypi.org/project/click-help-colors" + }, + { + "name": "click-log", + "uri": "https://pypi.org/project/click-log" + }, + { + "name": "click-man", + "uri": "https://pypi.org/project/click-man" + }, + { + "name": "click-option-group", + "uri": "https://pypi.org/project/click-option-group" + }, + { + "name": "click-plugins", + "uri": "https://pypi.org/project/click-plugins" + }, + { + "name": "click-repl", + "uri": "https://pypi.org/project/click-repl" + }, + { + "name": "click-spinner", + "uri": "https://pypi.org/project/click-spinner" + }, + { + "name": "clickclick", + "uri": "https://pypi.org/project/clickclick" + }, + { + "name": "clickhouse-connect", + "uri": "https://pypi.org/project/clickhouse-connect" + }, + { + "name": "clickhouse-driver", + "uri": "https://pypi.org/project/clickhouse-driver" + }, + { + "name": "cliff", + "uri": "https://pypi.org/project/cliff" + }, + { + "name": "cligj", + "uri": "https://pypi.org/project/cligj" + }, + { + "name": "clikit", + "uri": "https://pypi.org/project/clikit" + }, + { + "name": "clipboard", + "uri": "https://pypi.org/project/clipboard" + }, + { + "name": "cloud-sql-python-connector", + "uri": "https://pypi.org/project/cloud-sql-python-connector" + }, + { + "name": "cloudevents", + "uri": "https://pypi.org/project/cloudevents" + }, + { + "name": "cloudflare", + "uri": "https://pypi.org/project/cloudflare" + }, + { + "name": "cloudpathlib", + "uri": "https://pypi.org/project/cloudpathlib" + }, + { + "name": "cloudpickle", + "uri": "https://pypi.org/project/cloudpickle" + }, + { + "name": "cloudscraper", + "uri": "https://pypi.org/project/cloudscraper" + }, + { + "name": "cloudsplaining", + "uri": "https://pypi.org/project/cloudsplaining" + }, + { + "name": "cmaes", + "uri": "https://pypi.org/project/cmaes" + }, + { + "name": "cmake", + "uri": "https://pypi.org/project/cmake" + }, + { + "name": "cmd2", + "uri": "https://pypi.org/project/cmd2" + }, + { + "name": "cmdstanpy", + "uri": "https://pypi.org/project/cmdstanpy" + }, + { + "name": "cmudict", + "uri": "https://pypi.org/project/cmudict" + }, + { + "name": "cobble", + "uri": "https://pypi.org/project/cobble" + }, + { + "name": "codecov", + "uri": "https://pypi.org/project/codecov" + }, + { + "name": "codeowners", + "uri": "https://pypi.org/project/codeowners" + }, + { + "name": "codespell", + "uri": "https://pypi.org/project/codespell" + }, + { + "name": "cog", + "uri": "https://pypi.org/project/cog" + }, + { + "name": "cohere", + "uri": "https://pypi.org/project/cohere" + }, + { + "name": "collections-extended", + "uri": "https://pypi.org/project/collections-extended" + }, + { + "name": "colorama", + "uri": "https://pypi.org/project/colorama" + }, + { + "name": "colorcet", + "uri": "https://pypi.org/project/colorcet" + }, + { + "name": "colorclass", + "uri": "https://pypi.org/project/colorclass" + }, + { + "name": "colored", + "uri": "https://pypi.org/project/colored" + }, + { + "name": "coloredlogs", + "uri": "https://pypi.org/project/coloredlogs" + }, + { + "name": "colorful", + "uri": "https://pypi.org/project/colorful" + }, + { + "name": "colorlog", + "uri": "https://pypi.org/project/colorlog" + }, + { + "name": "colorzero", + "uri": "https://pypi.org/project/colorzero" + }, + { + "name": "colour", + "uri": "https://pypi.org/project/colour" + }, + { + "name": "comm", + "uri": "https://pypi.org/project/comm" + }, + { + "name": "commentjson", + "uri": "https://pypi.org/project/commentjson" + }, + { + "name": "commonmark", + "uri": "https://pypi.org/project/commonmark" + }, + { + "name": "comtypes", + "uri": "https://pypi.org/project/comtypes" + }, + { + "name": "conan", + "uri": "https://pypi.org/project/conan" + }, + { + "name": "concurrent-log-handler", + "uri": "https://pypi.org/project/concurrent-log-handler" + }, + { + "name": "confection", + "uri": "https://pypi.org/project/confection" + }, + { + "name": "config", + "uri": "https://pypi.org/project/config" + }, + { + "name": "configargparse", + "uri": "https://pypi.org/project/configargparse" + }, + { + "name": "configobj", + "uri": "https://pypi.org/project/configobj" + }, + { + "name": "configparser", + "uri": "https://pypi.org/project/configparser" + }, + { + "name": "configupdater", + "uri": "https://pypi.org/project/configupdater" + }, + { + "name": "confluent-kafka", + "uri": "https://pypi.org/project/confluent-kafka" + }, + { + "name": "connexion", + "uri": "https://pypi.org/project/connexion" + }, + { + "name": "constantly", + "uri": "https://pypi.org/project/constantly" + }, + { + "name": "construct", + "uri": "https://pypi.org/project/construct" + }, + { + "name": "constructs", + "uri": "https://pypi.org/project/constructs" + }, + { + "name": "contextlib2", + "uri": "https://pypi.org/project/contextlib2" + }, + { + "name": "contextvars", + "uri": "https://pypi.org/project/contextvars" + }, + { + "name": "contourpy", + "uri": "https://pypi.org/project/contourpy" + }, + { + "name": "convertdate", + "uri": "https://pypi.org/project/convertdate" + }, + { + "name": "cookiecutter", + "uri": "https://pypi.org/project/cookiecutter" + }, + { + "name": "coolname", + "uri": "https://pypi.org/project/coolname" + }, + { + "name": "core-universal", + "uri": "https://pypi.org/project/core-universal" + }, + { + "name": "coreapi", + "uri": "https://pypi.org/project/coreapi" + }, + { + "name": "coreschema", + "uri": "https://pypi.org/project/coreschema" + }, + { + "name": "corner", + "uri": "https://pypi.org/project/corner" + }, + { + "name": "country-converter", + "uri": "https://pypi.org/project/country-converter" + }, + { + "name": "courlan", + "uri": "https://pypi.org/project/courlan" + }, + { + "name": "coverage", + "uri": "https://pypi.org/project/coverage" + }, + { + "name": "coveralls", + "uri": "https://pypi.org/project/coveralls" + }, + { + "name": "cramjam", + "uri": "https://pypi.org/project/cramjam" + }, + { + "name": "crashtest", + "uri": "https://pypi.org/project/crashtest" + }, + { + "name": "crayons", + "uri": "https://pypi.org/project/crayons" + }, + { + "name": "crc32c", + "uri": "https://pypi.org/project/crc32c" + }, + { + "name": "crccheck", + "uri": "https://pypi.org/project/crccheck" + }, + { + "name": "crcmod", + "uri": "https://pypi.org/project/crcmod" + }, + { + "name": "credstash", + "uri": "https://pypi.org/project/credstash" + }, + { + "name": "crispy-bootstrap5", + "uri": "https://pypi.org/project/crispy-bootstrap5" + }, + { + "name": "cron-descriptor", + "uri": "https://pypi.org/project/cron-descriptor" + }, + { + "name": "croniter", + "uri": "https://pypi.org/project/croniter" + }, + { + "name": "crypto", + "uri": "https://pypi.org/project/crypto" + }, + { + "name": "cryptography", + "uri": "https://pypi.org/project/cryptography" + }, + { + "name": "cssselect", + "uri": "https://pypi.org/project/cssselect" + }, + { + "name": "cssselect2", + "uri": "https://pypi.org/project/cssselect2" + }, + { + "name": "cssutils", + "uri": "https://pypi.org/project/cssutils" + }, + { + "name": "ctranslate2", + "uri": "https://pypi.org/project/ctranslate2" + }, + { + "name": "cuda-python", + "uri": "https://pypi.org/project/cuda-python" + }, + { + "name": "curl-cffi", + "uri": "https://pypi.org/project/curl-cffi" + }, + { + "name": "curlify", + "uri": "https://pypi.org/project/curlify" + }, + { + "name": "cursor", + "uri": "https://pypi.org/project/cursor" + }, + { + "name": "custom-inherit", + "uri": "https://pypi.org/project/custom-inherit" + }, + { + "name": "customtkinter", + "uri": "https://pypi.org/project/customtkinter" + }, + { + "name": "cvdupdate", + "uri": "https://pypi.org/project/cvdupdate" + }, + { + "name": "cvxopt", + "uri": "https://pypi.org/project/cvxopt" + }, + { + "name": "cvxpy", + "uri": "https://pypi.org/project/cvxpy" + }, + { + "name": "cx-oracle", + "uri": "https://pypi.org/project/cx-oracle" + }, + { + "name": "cycler", + "uri": "https://pypi.org/project/cycler" + }, + { + "name": "cyclonedx-python-lib", + "uri": "https://pypi.org/project/cyclonedx-python-lib" + }, + { + "name": "cymem", + "uri": "https://pypi.org/project/cymem" + }, + { + "name": "cython", + "uri": "https://pypi.org/project/cython" + }, + { + "name": "cytoolz", + "uri": "https://pypi.org/project/cytoolz" + }, + { + "name": "dacite", + "uri": "https://pypi.org/project/dacite" + }, + { + "name": "daff", + "uri": "https://pypi.org/project/daff" + }, + { + "name": "dagster", + "uri": "https://pypi.org/project/dagster" + }, + { + "name": "dagster-aws", + "uri": "https://pypi.org/project/dagster-aws" + }, + { + "name": "dagster-graphql", + "uri": "https://pypi.org/project/dagster-graphql" + }, + { + "name": "dagster-pipes", + "uri": "https://pypi.org/project/dagster-pipes" + }, + { + "name": "dagster-postgres", + "uri": "https://pypi.org/project/dagster-postgres" + }, + { + "name": "dagster-webserver", + "uri": "https://pypi.org/project/dagster-webserver" + }, + { + "name": "daphne", + "uri": "https://pypi.org/project/daphne" + }, + { + "name": "darkdetect", + "uri": "https://pypi.org/project/darkdetect" + }, + { + "name": "dash", + "uri": "https://pypi.org/project/dash" + }, + { + "name": "dash-bootstrap-components", + "uri": "https://pypi.org/project/dash-bootstrap-components" + }, + { + "name": "dash-core-components", + "uri": "https://pypi.org/project/dash-core-components" + }, + { + "name": "dash-html-components", + "uri": "https://pypi.org/project/dash-html-components" + }, + { + "name": "dash-table", + "uri": "https://pypi.org/project/dash-table" + }, + { + "name": "dask", + "uri": "https://pypi.org/project/dask" + }, + { + "name": "dask-expr", + "uri": "https://pypi.org/project/dask-expr" + }, + { + "name": "databases", + "uri": "https://pypi.org/project/databases" + }, + { + "name": "databend-driver", + "uri": "https://pypi.org/project/databend-driver" + }, + { + "name": "databend-py", + "uri": "https://pypi.org/project/databend-py" + }, + { + "name": "databricks", + "uri": "https://pypi.org/project/databricks" + }, + { + "name": "databricks-api", + "uri": "https://pypi.org/project/databricks-api" + }, + { + "name": "databricks-cli", + "uri": "https://pypi.org/project/databricks-cli" + }, + { + "name": "databricks-connect", + "uri": "https://pypi.org/project/databricks-connect" + }, + { + "name": "databricks-feature-store", + "uri": "https://pypi.org/project/databricks-feature-store" + }, + { + "name": "databricks-pypi1", + "uri": "https://pypi.org/project/databricks-pypi1" + }, + { + "name": "databricks-pypi2", + "uri": "https://pypi.org/project/databricks-pypi2" + }, + { + "name": "databricks-sdk", + "uri": "https://pypi.org/project/databricks-sdk" + }, + { + "name": "databricks-sql-connector", + "uri": "https://pypi.org/project/databricks-sql-connector" + }, + { + "name": "dataclasses", + "uri": "https://pypi.org/project/dataclasses" + }, + { + "name": "dataclasses-json", + "uri": "https://pypi.org/project/dataclasses-json" + }, + { + "name": "datacompy", + "uri": "https://pypi.org/project/datacompy" + }, + { + "name": "datadog", + "uri": "https://pypi.org/project/datadog" + }, + { + "name": "datadog-api-client", + "uri": "https://pypi.org/project/datadog-api-client" + }, + { + "name": "datadog-logger", + "uri": "https://pypi.org/project/datadog-logger" + }, + { + "name": "datamodel-code-generator", + "uri": "https://pypi.org/project/datamodel-code-generator" + }, + { + "name": "dataproperty", + "uri": "https://pypi.org/project/dataproperty" + }, + { + "name": "datasets", + "uri": "https://pypi.org/project/datasets" + }, + { + "name": "datasketch", + "uri": "https://pypi.org/project/datasketch" + }, + { + "name": "datefinder", + "uri": "https://pypi.org/project/datefinder" + }, + { + "name": "dateformat", + "uri": "https://pypi.org/project/dateformat" + }, + { + "name": "dateparser", + "uri": "https://pypi.org/project/dateparser" + }, + { + "name": "datetime", + "uri": "https://pypi.org/project/datetime" + }, + { + "name": "dateutils", + "uri": "https://pypi.org/project/dateutils" + }, + { + "name": "db-contrib-tool", + "uri": "https://pypi.org/project/db-contrib-tool" + }, + { + "name": "db-dtypes", + "uri": "https://pypi.org/project/db-dtypes" + }, + { + "name": "dbfread", + "uri": "https://pypi.org/project/dbfread" + }, + { + "name": "dbl-tempo", + "uri": "https://pypi.org/project/dbl-tempo" + }, + { + "name": "dbt-adapters", + "uri": "https://pypi.org/project/dbt-adapters" + }, + { + "name": "dbt-bigquery", + "uri": "https://pypi.org/project/dbt-bigquery" + }, + { + "name": "dbt-common", + "uri": "https://pypi.org/project/dbt-common" + }, + { + "name": "dbt-core", + "uri": "https://pypi.org/project/dbt-core" + }, + { + "name": "dbt-databricks", + "uri": "https://pypi.org/project/dbt-databricks" + }, + { + "name": "dbt-extractor", + "uri": "https://pypi.org/project/dbt-extractor" + }, + { + "name": "dbt-postgres", + "uri": "https://pypi.org/project/dbt-postgres" + }, + { + "name": "dbt-redshift", + "uri": "https://pypi.org/project/dbt-redshift" + }, + { + "name": "dbt-semantic-interfaces", + "uri": "https://pypi.org/project/dbt-semantic-interfaces" + }, + { + "name": "dbt-snowflake", + "uri": "https://pypi.org/project/dbt-snowflake" + }, + { + "name": "dbt-spark", + "uri": "https://pypi.org/project/dbt-spark" + }, + { + "name": "dbus-fast", + "uri": "https://pypi.org/project/dbus-fast" + }, + { + "name": "dbutils", + "uri": "https://pypi.org/project/dbutils" + }, + { + "name": "ddsketch", + "uri": "https://pypi.org/project/ddsketch" + }, + { + "name": "ddt", + "uri": "https://pypi.org/project/ddt" + }, + { + "name": "ddtrace", + "uri": "https://pypi.org/project/ddtrace" + }, + { + "name": "debtcollector", + "uri": "https://pypi.org/project/debtcollector" + }, + { + "name": "debugpy", + "uri": "https://pypi.org/project/debugpy" + }, + { + "name": "decopatch", + "uri": "https://pypi.org/project/decopatch" + }, + { + "name": "decorator", + "uri": "https://pypi.org/project/decorator" + }, + { + "name": "deepdiff", + "uri": "https://pypi.org/project/deepdiff" + }, + { + "name": "deepmerge", + "uri": "https://pypi.org/project/deepmerge" + }, + { + "name": "defusedxml", + "uri": "https://pypi.org/project/defusedxml" + }, + { + "name": "delta", + "uri": "https://pypi.org/project/delta" + }, + { + "name": "delta-spark", + "uri": "https://pypi.org/project/delta-spark" + }, + { + "name": "deltalake", + "uri": "https://pypi.org/project/deltalake" + }, + { + "name": "dep-logic", + "uri": "https://pypi.org/project/dep-logic" + }, + { + "name": "dependency-injector", + "uri": "https://pypi.org/project/dependency-injector" + }, + { + "name": "deprecated", + "uri": "https://pypi.org/project/deprecated" + }, + { + "name": "deprecation", + "uri": "https://pypi.org/project/deprecation" + }, + { + "name": "descartes", + "uri": "https://pypi.org/project/descartes" + }, + { + "name": "detect-secrets", + "uri": "https://pypi.org/project/detect-secrets" + }, + { + "name": "dict2xml", + "uri": "https://pypi.org/project/dict2xml" + }, + { + "name": "dictdiffer", + "uri": "https://pypi.org/project/dictdiffer" + }, + { + "name": "dicttoxml", + "uri": "https://pypi.org/project/dicttoxml" + }, + { + "name": "diff-cover", + "uri": "https://pypi.org/project/diff-cover" + }, + { + "name": "diff-match-patch", + "uri": "https://pypi.org/project/diff-match-patch" + }, + { + "name": "diffusers", + "uri": "https://pypi.org/project/diffusers" + }, + { + "name": "dill", + "uri": "https://pypi.org/project/dill" + }, + { + "name": "dirtyjson", + "uri": "https://pypi.org/project/dirtyjson" + }, + { + "name": "discord", + "uri": "https://pypi.org/project/discord" + }, + { + "name": "discord-py", + "uri": "https://pypi.org/project/discord-py" + }, + { + "name": "diskcache", + "uri": "https://pypi.org/project/diskcache" + }, + { + "name": "distlib", + "uri": "https://pypi.org/project/distlib" + }, + { + "name": "distribute", + "uri": "https://pypi.org/project/distribute" + }, + { + "name": "distributed", + "uri": "https://pypi.org/project/distributed" + }, + { + "name": "distro", + "uri": "https://pypi.org/project/distro" + }, + { + "name": "dj-database-url", + "uri": "https://pypi.org/project/dj-database-url" + }, + { + "name": "django", + "uri": "https://pypi.org/project/django" + }, + { + "name": "django-allauth", + "uri": "https://pypi.org/project/django-allauth" + }, + { + "name": "django-anymail", + "uri": "https://pypi.org/project/django-anymail" + }, + { + "name": "django-appconf", + "uri": "https://pypi.org/project/django-appconf" + }, + { + "name": "django-celery-beat", + "uri": "https://pypi.org/project/django-celery-beat" + }, + { + "name": "django-celery-results", + "uri": "https://pypi.org/project/django-celery-results" + }, + { + "name": "django-compressor", + "uri": "https://pypi.org/project/django-compressor" + }, + { + "name": "django-cors-headers", + "uri": "https://pypi.org/project/django-cors-headers" + }, + { + "name": "django-countries", + "uri": "https://pypi.org/project/django-countries" + }, + { + "name": "django-crispy-forms", + "uri": "https://pypi.org/project/django-crispy-forms" + }, + { + "name": "django-csp", + "uri": "https://pypi.org/project/django-csp" + }, + { + "name": "django-debug-toolbar", + "uri": "https://pypi.org/project/django-debug-toolbar" + }, + { + "name": "django-environ", + "uri": "https://pypi.org/project/django-environ" + }, + { + "name": "django-extensions", + "uri": "https://pypi.org/project/django-extensions" + }, + { + "name": "django-filter", + "uri": "https://pypi.org/project/django-filter" + }, + { + "name": "django-health-check", + "uri": "https://pypi.org/project/django-health-check" + }, + { + "name": "django-import-export", + "uri": "https://pypi.org/project/django-import-export" + }, + { + "name": "django-ipware", + "uri": "https://pypi.org/project/django-ipware" + }, + { + "name": "django-js-asset", + "uri": "https://pypi.org/project/django-js-asset" + }, + { + "name": "django-model-utils", + "uri": "https://pypi.org/project/django-model-utils" + }, + { + "name": "django-mptt", + "uri": "https://pypi.org/project/django-mptt" + }, + { + "name": "django-oauth-toolkit", + "uri": "https://pypi.org/project/django-oauth-toolkit" + }, + { + "name": "django-otp", + "uri": "https://pypi.org/project/django-otp" + }, + { + "name": "django-phonenumber-field", + "uri": "https://pypi.org/project/django-phonenumber-field" + }, + { + "name": "django-picklefield", + "uri": "https://pypi.org/project/django-picklefield" + }, + { + "name": "django-redis", + "uri": "https://pypi.org/project/django-redis" + }, + { + "name": "django-reversion", + "uri": "https://pypi.org/project/django-reversion" + }, + { + "name": "django-ses", + "uri": "https://pypi.org/project/django-ses" + }, + { + "name": "django-silk", + "uri": "https://pypi.org/project/django-silk" + }, + { + "name": "django-simple-history", + "uri": "https://pypi.org/project/django-simple-history" + }, + { + "name": "django-storages", + "uri": "https://pypi.org/project/django-storages" + }, + { + "name": "django-stubs", + "uri": "https://pypi.org/project/django-stubs" + }, + { + "name": "django-stubs-ext", + "uri": "https://pypi.org/project/django-stubs-ext" + }, + { + "name": "django-taggit", + "uri": "https://pypi.org/project/django-taggit" + }, + { + "name": "django-timezone-field", + "uri": "https://pypi.org/project/django-timezone-field" + }, + { + "name": "django-waffle", + "uri": "https://pypi.org/project/django-waffle" + }, + { + "name": "djangorestframework", + "uri": "https://pypi.org/project/djangorestframework" + }, + { + "name": "djangorestframework-simplejwt", + "uri": "https://pypi.org/project/djangorestframework-simplejwt" + }, + { + "name": "djangorestframework-stubs", + "uri": "https://pypi.org/project/djangorestframework-stubs" + }, + { + "name": "dm-tree", + "uri": "https://pypi.org/project/dm-tree" + }, + { + "name": "dnslib", + "uri": "https://pypi.org/project/dnslib" + }, + { + "name": "dnspython", + "uri": "https://pypi.org/project/dnspython" + }, + { + "name": "docker", + "uri": "https://pypi.org/project/docker" + }, + { + "name": "docker-compose", + "uri": "https://pypi.org/project/docker-compose" + }, + { + "name": "docker-pycreds", + "uri": "https://pypi.org/project/docker-pycreds" + }, + { + "name": "dockerfile-parse", + "uri": "https://pypi.org/project/dockerfile-parse" + }, + { + "name": "dockerpty", + "uri": "https://pypi.org/project/dockerpty" + }, + { + "name": "docopt", + "uri": "https://pypi.org/project/docopt" + }, + { + "name": "docstring-parser", + "uri": "https://pypi.org/project/docstring-parser" + }, + { + "name": "documenttemplate", + "uri": "https://pypi.org/project/documenttemplate" + }, + { + "name": "docutils", + "uri": "https://pypi.org/project/docutils" + }, + { + "name": "docx2txt", + "uri": "https://pypi.org/project/docx2txt" + }, + { + "name": "dogpile-cache", + "uri": "https://pypi.org/project/dogpile-cache" + }, + { + "name": "dohq-artifactory", + "uri": "https://pypi.org/project/dohq-artifactory" + }, + { + "name": "doit", + "uri": "https://pypi.org/project/doit" + }, + { + "name": "domdf-python-tools", + "uri": "https://pypi.org/project/domdf-python-tools" + }, + { + "name": "dominate", + "uri": "https://pypi.org/project/dominate" + }, + { + "name": "dotenv", + "uri": "https://pypi.org/project/dotenv" + }, + { + "name": "dotmap", + "uri": "https://pypi.org/project/dotmap" + }, + { + "name": "dparse", + "uri": "https://pypi.org/project/dparse" + }, + { + "name": "dpath", + "uri": "https://pypi.org/project/dpath" + }, + { + "name": "dpkt", + "uri": "https://pypi.org/project/dpkt" + }, + { + "name": "drf-nested-routers", + "uri": "https://pypi.org/project/drf-nested-routers" + }, + { + "name": "drf-spectacular", + "uri": "https://pypi.org/project/drf-spectacular" + }, + { + "name": "drf-yasg", + "uri": "https://pypi.org/project/drf-yasg" + }, + { + "name": "dropbox", + "uri": "https://pypi.org/project/dropbox" + }, + { + "name": "duckdb", + "uri": "https://pypi.org/project/duckdb" + }, + { + "name": "dulwich", + "uri": "https://pypi.org/project/dulwich" + }, + { + "name": "dunamai", + "uri": "https://pypi.org/project/dunamai" + }, + { + "name": "durationpy", + "uri": "https://pypi.org/project/durationpy" + }, + { + "name": "dvclive", + "uri": "https://pypi.org/project/dvclive" + }, + { + "name": "dynaconf", + "uri": "https://pypi.org/project/dynaconf" + }, + { + "name": "dynamodb-json", + "uri": "https://pypi.org/project/dynamodb-json" + }, + { + "name": "easydict", + "uri": "https://pypi.org/project/easydict" + }, + { + "name": "easyprocess", + "uri": "https://pypi.org/project/easyprocess" + }, + { + "name": "ebcdic", + "uri": "https://pypi.org/project/ebcdic" + }, + { + "name": "ec2-metadata", + "uri": "https://pypi.org/project/ec2-metadata" + }, + { + "name": "ecdsa", + "uri": "https://pypi.org/project/ecdsa" + }, + { + "name": "ecos", + "uri": "https://pypi.org/project/ecos" + }, + { + "name": "ecs-logging", + "uri": "https://pypi.org/project/ecs-logging" + }, + { + "name": "edgegrid-python", + "uri": "https://pypi.org/project/edgegrid-python" + }, + { + "name": "editables", + "uri": "https://pypi.org/project/editables" + }, + { + "name": "editdistance", + "uri": "https://pypi.org/project/editdistance" + }, + { + "name": "editor", + "uri": "https://pypi.org/project/editor" + }, + { + "name": "editorconfig", + "uri": "https://pypi.org/project/editorconfig" + }, + { + "name": "einops", + "uri": "https://pypi.org/project/einops" + }, + { + "name": "elastic-apm", + "uri": "https://pypi.org/project/elastic-apm" + }, + { + "name": "elastic-transport", + "uri": "https://pypi.org/project/elastic-transport" + }, + { + "name": "elasticsearch", + "uri": "https://pypi.org/project/elasticsearch" + }, + { + "name": "elasticsearch-dbapi", + "uri": "https://pypi.org/project/elasticsearch-dbapi" + }, + { + "name": "elasticsearch-dsl", + "uri": "https://pypi.org/project/elasticsearch-dsl" + }, + { + "name": "elasticsearch7", + "uri": "https://pypi.org/project/elasticsearch7" + }, + { + "name": "elementary-data", + "uri": "https://pypi.org/project/elementary-data" + }, + { + "name": "elementpath", + "uri": "https://pypi.org/project/elementpath" + }, + { + "name": "elyra", + "uri": "https://pypi.org/project/elyra" + }, + { + "name": "email-validator", + "uri": "https://pypi.org/project/email-validator" + }, + { + "name": "emcee", + "uri": "https://pypi.org/project/emcee" + }, + { + "name": "emoji", + "uri": "https://pypi.org/project/emoji" + }, + { + "name": "enchant", + "uri": "https://pypi.org/project/enchant" + }, + { + "name": "enrich", + "uri": "https://pypi.org/project/enrich" + }, + { + "name": "entrypoints", + "uri": "https://pypi.org/project/entrypoints" + }, + { + "name": "enum-compat", + "uri": "https://pypi.org/project/enum-compat" + }, + { + "name": "enum34", + "uri": "https://pypi.org/project/enum34" + }, + { + "name": "envier", + "uri": "https://pypi.org/project/envier" + }, + { + "name": "environs", + "uri": "https://pypi.org/project/environs" + }, + { + "name": "envyaml", + "uri": "https://pypi.org/project/envyaml" + }, + { + "name": "ephem", + "uri": "https://pypi.org/project/ephem" + }, + { + "name": "eradicate", + "uri": "https://pypi.org/project/eradicate" + }, + { + "name": "et-xmlfile", + "uri": "https://pypi.org/project/et-xmlfile" + }, + { + "name": "eth-abi", + "uri": "https://pypi.org/project/eth-abi" + }, + { + "name": "eth-account", + "uri": "https://pypi.org/project/eth-account" + }, + { + "name": "eth-hash", + "uri": "https://pypi.org/project/eth-hash" + }, + { + "name": "eth-keyfile", + "uri": "https://pypi.org/project/eth-keyfile" + }, + { + "name": "eth-keys", + "uri": "https://pypi.org/project/eth-keys" + }, + { + "name": "eth-rlp", + "uri": "https://pypi.org/project/eth-rlp" + }, + { + "name": "eth-typing", + "uri": "https://pypi.org/project/eth-typing" + }, + { + "name": "eth-utils", + "uri": "https://pypi.org/project/eth-utils" + }, + { + "name": "etils", + "uri": "https://pypi.org/project/etils" + }, + { + "name": "eval-type-backport", + "uri": "https://pypi.org/project/eval-type-backport" + }, + { + "name": "evaluate", + "uri": "https://pypi.org/project/evaluate" + }, + { + "name": "eventlet", + "uri": "https://pypi.org/project/eventlet" + }, + { + "name": "events", + "uri": "https://pypi.org/project/events" + }, + { + "name": "evergreen-py", + "uri": "https://pypi.org/project/evergreen-py" + }, + { + "name": "evidently", + "uri": "https://pypi.org/project/evidently" + }, + { + "name": "exceptiongroup", + "uri": "https://pypi.org/project/exceptiongroup" + }, + { + "name": "exchange-calendars", + "uri": "https://pypi.org/project/exchange-calendars" + }, + { + "name": "exchangelib", + "uri": "https://pypi.org/project/exchangelib" + }, + { + "name": "execnet", + "uri": "https://pypi.org/project/execnet" + }, + { + "name": "executing", + "uri": "https://pypi.org/project/executing" + }, + { + "name": "executor", + "uri": "https://pypi.org/project/executor" + }, + { + "name": "expandvars", + "uri": "https://pypi.org/project/expandvars" + }, + { + "name": "expiringdict", + "uri": "https://pypi.org/project/expiringdict" + }, + { + "name": "extensionclass", + "uri": "https://pypi.org/project/extensionclass" + }, + { + "name": "extract-msg", + "uri": "https://pypi.org/project/extract-msg" + }, + { + "name": "extras", + "uri": "https://pypi.org/project/extras" + }, + { + "name": "eyes-common", + "uri": "https://pypi.org/project/eyes-common" + }, + { + "name": "eyes-selenium", + "uri": "https://pypi.org/project/eyes-selenium" + }, + { + "name": "f90nml", + "uri": "https://pypi.org/project/f90nml" + }, + { + "name": "fabric", + "uri": "https://pypi.org/project/fabric" + }, + { + "name": "face", + "uri": "https://pypi.org/project/face" + }, + { + "name": "facebook-business", + "uri": "https://pypi.org/project/facebook-business" + }, + { + "name": "facexlib", + "uri": "https://pypi.org/project/facexlib" + }, + { + "name": "factory-boy", + "uri": "https://pypi.org/project/factory-boy" + }, + { + "name": "fairscale", + "uri": "https://pypi.org/project/fairscale" + }, + { + "name": "faiss-cpu", + "uri": "https://pypi.org/project/faiss-cpu" + }, + { + "name": "fake-useragent", + "uri": "https://pypi.org/project/fake-useragent" + }, + { + "name": "faker", + "uri": "https://pypi.org/project/faker" + }, + { + "name": "fakeredis", + "uri": "https://pypi.org/project/fakeredis" + }, + { + "name": "falcon", + "uri": "https://pypi.org/project/falcon" + }, + { + "name": "farama-notifications", + "uri": "https://pypi.org/project/farama-notifications" + }, + { + "name": "fastapi", + "uri": "https://pypi.org/project/fastapi" + }, + { + "name": "fastapi-cli", + "uri": "https://pypi.org/project/fastapi-cli" + }, + { + "name": "fastapi-utils", + "uri": "https://pypi.org/project/fastapi-utils" + }, + { + "name": "fastavro", + "uri": "https://pypi.org/project/fastavro" + }, + { + "name": "fastcluster", + "uri": "https://pypi.org/project/fastcluster" + }, + { + "name": "fastcore", + "uri": "https://pypi.org/project/fastcore" + }, + { + "name": "fasteners", + "uri": "https://pypi.org/project/fasteners" + }, + { + "name": "faster-whisper", + "uri": "https://pypi.org/project/faster-whisper" + }, + { + "name": "fastjsonschema", + "uri": "https://pypi.org/project/fastjsonschema" + }, + { + "name": "fastparquet", + "uri": "https://pypi.org/project/fastparquet" + }, + { + "name": "fastprogress", + "uri": "https://pypi.org/project/fastprogress" + }, + { + "name": "fastrlock", + "uri": "https://pypi.org/project/fastrlock" + }, + { + "name": "fasttext", + "uri": "https://pypi.org/project/fasttext" + }, + { + "name": "fasttext-langdetect", + "uri": "https://pypi.org/project/fasttext-langdetect" + }, + { + "name": "fasttext-wheel", + "uri": "https://pypi.org/project/fasttext-wheel" + }, + { + "name": "fcm-django", + "uri": "https://pypi.org/project/fcm-django" + }, + { + "name": "feedparser", + "uri": "https://pypi.org/project/feedparser" + }, + { + "name": "ffmpeg-python", + "uri": "https://pypi.org/project/ffmpeg-python" + }, + { + "name": "ffmpy", + "uri": "https://pypi.org/project/ffmpy" + }, + { + "name": "fido2", + "uri": "https://pypi.org/project/fido2" + }, + { + "name": "filelock", + "uri": "https://pypi.org/project/filelock" + }, + { + "name": "filetype", + "uri": "https://pypi.org/project/filetype" + }, + { + "name": "filterpy", + "uri": "https://pypi.org/project/filterpy" + }, + { + "name": "find-libpython", + "uri": "https://pypi.org/project/find-libpython" + }, + { + "name": "findpython", + "uri": "https://pypi.org/project/findpython" + }, + { + "name": "findspark", + "uri": "https://pypi.org/project/findspark" + }, + { + "name": "fiona", + "uri": "https://pypi.org/project/fiona" + }, + { + "name": "fire", + "uri": "https://pypi.org/project/fire" + }, + { + "name": "firebase-admin", + "uri": "https://pypi.org/project/firebase-admin" + }, + { + "name": "fixedint", + "uri": "https://pypi.org/project/fixedint" + }, + { + "name": "fixit", + "uri": "https://pypi.org/project/fixit" + }, + { + "name": "fixtures", + "uri": "https://pypi.org/project/fixtures" + }, + { + "name": "flake8", + "uri": "https://pypi.org/project/flake8" + }, + { + "name": "flake8-black", + "uri": "https://pypi.org/project/flake8-black" + }, + { + "name": "flake8-bugbear", + "uri": "https://pypi.org/project/flake8-bugbear" + }, + { + "name": "flake8-builtins", + "uri": "https://pypi.org/project/flake8-builtins" + }, + { + "name": "flake8-comprehensions", + "uri": "https://pypi.org/project/flake8-comprehensions" + }, + { + "name": "flake8-docstrings", + "uri": "https://pypi.org/project/flake8-docstrings" + }, + { + "name": "flake8-eradicate", + "uri": "https://pypi.org/project/flake8-eradicate" + }, + { + "name": "flake8-import-order", + "uri": "https://pypi.org/project/flake8-import-order" + }, + { + "name": "flake8-isort", + "uri": "https://pypi.org/project/flake8-isort" + }, + { + "name": "flake8-polyfill", + "uri": "https://pypi.org/project/flake8-polyfill" + }, + { + "name": "flake8-print", + "uri": "https://pypi.org/project/flake8-print" + }, + { + "name": "flake8-pyproject", + "uri": "https://pypi.org/project/flake8-pyproject" + }, + { + "name": "flake8-quotes", + "uri": "https://pypi.org/project/flake8-quotes" + }, + { + "name": "flaky", + "uri": "https://pypi.org/project/flaky" + }, + { + "name": "flaml", + "uri": "https://pypi.org/project/flaml" + }, + { + "name": "flasgger", + "uri": "https://pypi.org/project/flasgger" + }, + { + "name": "flashtext", + "uri": "https://pypi.org/project/flashtext" + }, + { + "name": "flask", + "uri": "https://pypi.org/project/flask" + }, + { + "name": "flask-admin", + "uri": "https://pypi.org/project/flask-admin" + }, + { + "name": "flask-appbuilder", + "uri": "https://pypi.org/project/flask-appbuilder" + }, + { + "name": "flask-babel", + "uri": "https://pypi.org/project/flask-babel" + }, + { + "name": "flask-bcrypt", + "uri": "https://pypi.org/project/flask-bcrypt" + }, + { + "name": "flask-caching", + "uri": "https://pypi.org/project/flask-caching" + }, + { + "name": "flask-compress", + "uri": "https://pypi.org/project/flask-compress" + }, + { + "name": "flask-cors", + "uri": "https://pypi.org/project/flask-cors" + }, + { + "name": "flask-httpauth", + "uri": "https://pypi.org/project/flask-httpauth" + }, + { + "name": "flask-jwt-extended", + "uri": "https://pypi.org/project/flask-jwt-extended" + }, + { + "name": "flask-limiter", + "uri": "https://pypi.org/project/flask-limiter" + }, + { + "name": "flask-login", + "uri": "https://pypi.org/project/flask-login" + }, + { + "name": "flask-mail", + "uri": "https://pypi.org/project/flask-mail" + }, + { + "name": "flask-marshmallow", + "uri": "https://pypi.org/project/flask-marshmallow" + }, + { + "name": "flask-migrate", + "uri": "https://pypi.org/project/flask-migrate" + }, + { + "name": "flask-oidc", + "uri": "https://pypi.org/project/flask-oidc" + }, + { + "name": "flask-openid", + "uri": "https://pypi.org/project/flask-openid" + }, + { + "name": "flask-restful", + "uri": "https://pypi.org/project/flask-restful" + }, + { + "name": "flask-restx", + "uri": "https://pypi.org/project/flask-restx" + }, + { + "name": "flask-session", + "uri": "https://pypi.org/project/flask-session" + }, + { + "name": "flask-socketio", + "uri": "https://pypi.org/project/flask-socketio" + }, + { + "name": "flask-sqlalchemy", + "uri": "https://pypi.org/project/flask-sqlalchemy" + }, + { + "name": "flask-swagger-ui", + "uri": "https://pypi.org/project/flask-swagger-ui" + }, + { + "name": "flask-talisman", + "uri": "https://pypi.org/project/flask-talisman" + }, + { + "name": "flask-testing", + "uri": "https://pypi.org/project/flask-testing" + }, + { + "name": "flask-wtf", + "uri": "https://pypi.org/project/flask-wtf" + }, + { + "name": "flatbuffers", + "uri": "https://pypi.org/project/flatbuffers" + }, + { + "name": "flatdict", + "uri": "https://pypi.org/project/flatdict" + }, + { + "name": "flatten-dict", + "uri": "https://pypi.org/project/flatten-dict" + }, + { + "name": "flatten-json", + "uri": "https://pypi.org/project/flatten-json" + }, + { + "name": "flax", + "uri": "https://pypi.org/project/flax" + }, + { + "name": "flexcache", + "uri": "https://pypi.org/project/flexcache" + }, + { + "name": "flexparser", + "uri": "https://pypi.org/project/flexparser" + }, + { + "name": "flit-core", + "uri": "https://pypi.org/project/flit-core" + }, + { + "name": "flower", + "uri": "https://pypi.org/project/flower" + }, + { + "name": "fluent-logger", + "uri": "https://pypi.org/project/fluent-logger" + }, + { + "name": "folium", + "uri": "https://pypi.org/project/folium" + }, + { + "name": "fonttools", + "uri": "https://pypi.org/project/fonttools" + }, + { + "name": "formencode", + "uri": "https://pypi.org/project/formencode" + }, + { + "name": "formic2", + "uri": "https://pypi.org/project/formic2" + }, + { + "name": "formulaic", + "uri": "https://pypi.org/project/formulaic" + }, + { + "name": "fpdf", + "uri": "https://pypi.org/project/fpdf" + }, + { + "name": "fpdf2", + "uri": "https://pypi.org/project/fpdf2" + }, + { + "name": "fqdn", + "uri": "https://pypi.org/project/fqdn" + }, + { + "name": "freetype-py", + "uri": "https://pypi.org/project/freetype-py" + }, + { + "name": "freezegun", + "uri": "https://pypi.org/project/freezegun" + }, + { + "name": "frictionless", + "uri": "https://pypi.org/project/frictionless" + }, + { + "name": "frozendict", + "uri": "https://pypi.org/project/frozendict" + }, + { + "name": "frozenlist", + "uri": "https://pypi.org/project/frozenlist" + }, + { + "name": "fs", + "uri": "https://pypi.org/project/fs" + }, + { + "name": "fsspec", + "uri": "https://pypi.org/project/fsspec" + }, + { + "name": "ftfy", + "uri": "https://pypi.org/project/ftfy" + }, + { + "name": "fugue", + "uri": "https://pypi.org/project/fugue" + }, + { + "name": "func-timeout", + "uri": "https://pypi.org/project/func-timeout" + }, + { + "name": "funcsigs", + "uri": "https://pypi.org/project/funcsigs" + }, + { + "name": "functions-framework", + "uri": "https://pypi.org/project/functions-framework" + }, + { + "name": "functools32", + "uri": "https://pypi.org/project/functools32" + }, + { + "name": "funcy", + "uri": "https://pypi.org/project/funcy" + }, + { + "name": "furl", + "uri": "https://pypi.org/project/furl" + }, + { + "name": "furo", + "uri": "https://pypi.org/project/furo" + }, + { + "name": "fusepy", + "uri": "https://pypi.org/project/fusepy" + }, + { + "name": "future", + "uri": "https://pypi.org/project/future" + }, + { + "name": "future-fstrings", + "uri": "https://pypi.org/project/future-fstrings" + }, + { + "name": "futures", + "uri": "https://pypi.org/project/futures" + }, + { + "name": "fuzzywuzzy", + "uri": "https://pypi.org/project/fuzzywuzzy" + }, + { + "name": "fvcore", + "uri": "https://pypi.org/project/fvcore" + }, + { + "name": "galvani", + "uri": "https://pypi.org/project/galvani" + }, + { + "name": "gast", + "uri": "https://pypi.org/project/gast" + }, + { + "name": "gcloud-aio-auth", + "uri": "https://pypi.org/project/gcloud-aio-auth" + }, + { + "name": "gcloud-aio-bigquery", + "uri": "https://pypi.org/project/gcloud-aio-bigquery" + }, + { + "name": "gcloud-aio-storage", + "uri": "https://pypi.org/project/gcloud-aio-storage" + }, + { + "name": "gcovr", + "uri": "https://pypi.org/project/gcovr" + }, + { + "name": "gcs-oauth2-boto-plugin", + "uri": "https://pypi.org/project/gcs-oauth2-boto-plugin" + }, + { + "name": "gcsfs", + "uri": "https://pypi.org/project/gcsfs" + }, + { + "name": "gdown", + "uri": "https://pypi.org/project/gdown" + }, + { + "name": "gender-guesser", + "uri": "https://pypi.org/project/gender-guesser" + }, + { + "name": "gensim", + "uri": "https://pypi.org/project/gensim" + }, + { + "name": "genson", + "uri": "https://pypi.org/project/genson" + }, + { + "name": "geoalchemy2", + "uri": "https://pypi.org/project/geoalchemy2" + }, + { + "name": "geocoder", + "uri": "https://pypi.org/project/geocoder" + }, + { + "name": "geographiclib", + "uri": "https://pypi.org/project/geographiclib" + }, + { + "name": "geoip2", + "uri": "https://pypi.org/project/geoip2" + }, + { + "name": "geojson", + "uri": "https://pypi.org/project/geojson" + }, + { + "name": "geomet", + "uri": "https://pypi.org/project/geomet" + }, + { + "name": "geopandas", + "uri": "https://pypi.org/project/geopandas" + }, + { + "name": "geopy", + "uri": "https://pypi.org/project/geopy" + }, + { + "name": "gevent", + "uri": "https://pypi.org/project/gevent" + }, + { + "name": "gevent-websocket", + "uri": "https://pypi.org/project/gevent-websocket" + }, + { + "name": "geventhttpclient", + "uri": "https://pypi.org/project/geventhttpclient" + }, + { + "name": "ghapi", + "uri": "https://pypi.org/project/ghapi" + }, + { + "name": "ghp-import", + "uri": "https://pypi.org/project/ghp-import" + }, + { + "name": "git-remote-codecommit", + "uri": "https://pypi.org/project/git-remote-codecommit" + }, + { + "name": "gitdb", + "uri": "https://pypi.org/project/gitdb" + }, + { + "name": "gitdb2", + "uri": "https://pypi.org/project/gitdb2" + }, + { + "name": "github-heatmap", + "uri": "https://pypi.org/project/github-heatmap" + }, + { + "name": "github3-py", + "uri": "https://pypi.org/project/github3-py" + }, + { + "name": "gitpython", + "uri": "https://pypi.org/project/gitpython" + }, + { + "name": "giturlparse", + "uri": "https://pypi.org/project/giturlparse" + }, + { + "name": "glob2", + "uri": "https://pypi.org/project/glob2" + }, + { + "name": "glom", + "uri": "https://pypi.org/project/glom" + }, + { + "name": "gluonts", + "uri": "https://pypi.org/project/gluonts" + }, + { + "name": "gmpy2", + "uri": "https://pypi.org/project/gmpy2" + }, + { + "name": "gnureadline", + "uri": "https://pypi.org/project/gnureadline" + }, + { + "name": "google", + "uri": "https://pypi.org/project/google" + }, + { + "name": "google-ads", + "uri": "https://pypi.org/project/google-ads" + }, + { + "name": "google-ai-generativelanguage", + "uri": "https://pypi.org/project/google-ai-generativelanguage" + }, + { + "name": "google-analytics-admin", + "uri": "https://pypi.org/project/google-analytics-admin" + }, + { + "name": "google-analytics-data", + "uri": "https://pypi.org/project/google-analytics-data" + }, + { + "name": "google-api-core", + "uri": "https://pypi.org/project/google-api-core" + }, + { + "name": "google-api-python-client", + "uri": "https://pypi.org/project/google-api-python-client" + }, + { + "name": "google-apitools", + "uri": "https://pypi.org/project/google-apitools" + }, + { + "name": "google-auth", + "uri": "https://pypi.org/project/google-auth" + }, + { + "name": "google-auth-httplib2", + "uri": "https://pypi.org/project/google-auth-httplib2" + }, + { + "name": "google-auth-oauthlib", + "uri": "https://pypi.org/project/google-auth-oauthlib" + }, + { + "name": "google-cloud", + "uri": "https://pypi.org/project/google-cloud" + }, + { + "name": "google-cloud-access-context-manager", + "uri": "https://pypi.org/project/google-cloud-access-context-manager" + }, + { + "name": "google-cloud-aiplatform", + "uri": "https://pypi.org/project/google-cloud-aiplatform" + }, + { + "name": "google-cloud-appengine-logging", + "uri": "https://pypi.org/project/google-cloud-appengine-logging" + }, + { + "name": "google-cloud-audit-log", + "uri": "https://pypi.org/project/google-cloud-audit-log" + }, + { + "name": "google-cloud-automl", + "uri": "https://pypi.org/project/google-cloud-automl" + }, + { + "name": "google-cloud-batch", + "uri": "https://pypi.org/project/google-cloud-batch" + }, + { + "name": "google-cloud-bigquery", + "uri": "https://pypi.org/project/google-cloud-bigquery" + }, + { + "name": "google-cloud-bigquery-biglake", + "uri": "https://pypi.org/project/google-cloud-bigquery-biglake" + }, + { + "name": "google-cloud-bigquery-datatransfer", + "uri": "https://pypi.org/project/google-cloud-bigquery-datatransfer" + }, + { + "name": "google-cloud-bigquery-storage", + "uri": "https://pypi.org/project/google-cloud-bigquery-storage" + }, + { + "name": "google-cloud-bigtable", + "uri": "https://pypi.org/project/google-cloud-bigtable" + }, + { + "name": "google-cloud-build", + "uri": "https://pypi.org/project/google-cloud-build" + }, + { + "name": "google-cloud-compute", + "uri": "https://pypi.org/project/google-cloud-compute" + }, + { + "name": "google-cloud-container", + "uri": "https://pypi.org/project/google-cloud-container" + }, + { + "name": "google-cloud-core", + "uri": "https://pypi.org/project/google-cloud-core" + }, + { + "name": "google-cloud-datacatalog", + "uri": "https://pypi.org/project/google-cloud-datacatalog" + }, + { + "name": "google-cloud-dataflow-client", + "uri": "https://pypi.org/project/google-cloud-dataflow-client" + }, + { + "name": "google-cloud-dataform", + "uri": "https://pypi.org/project/google-cloud-dataform" + }, + { + "name": "google-cloud-dataplex", + "uri": "https://pypi.org/project/google-cloud-dataplex" + }, + { + "name": "google-cloud-dataproc", + "uri": "https://pypi.org/project/google-cloud-dataproc" + }, + { + "name": "google-cloud-dataproc-metastore", + "uri": "https://pypi.org/project/google-cloud-dataproc-metastore" + }, + { + "name": "google-cloud-datastore", + "uri": "https://pypi.org/project/google-cloud-datastore" + }, + { + "name": "google-cloud-discoveryengine", + "uri": "https://pypi.org/project/google-cloud-discoveryengine" + }, + { + "name": "google-cloud-dlp", + "uri": "https://pypi.org/project/google-cloud-dlp" + }, + { + "name": "google-cloud-dns", + "uri": "https://pypi.org/project/google-cloud-dns" + }, + { + "name": "google-cloud-error-reporting", + "uri": "https://pypi.org/project/google-cloud-error-reporting" + }, + { + "name": "google-cloud-firestore", + "uri": "https://pypi.org/project/google-cloud-firestore" + }, + { + "name": "google-cloud-kms", + "uri": "https://pypi.org/project/google-cloud-kms" + }, + { + "name": "google-cloud-language", + "uri": "https://pypi.org/project/google-cloud-language" + }, + { + "name": "google-cloud-logging", + "uri": "https://pypi.org/project/google-cloud-logging" + }, + { + "name": "google-cloud-memcache", + "uri": "https://pypi.org/project/google-cloud-memcache" + }, + { + "name": "google-cloud-monitoring", + "uri": "https://pypi.org/project/google-cloud-monitoring" + }, + { + "name": "google-cloud-orchestration-airflow", + "uri": "https://pypi.org/project/google-cloud-orchestration-airflow" + }, + { + "name": "google-cloud-org-policy", + "uri": "https://pypi.org/project/google-cloud-org-policy" + }, + { + "name": "google-cloud-os-config", + "uri": "https://pypi.org/project/google-cloud-os-config" + }, + { + "name": "google-cloud-os-login", + "uri": "https://pypi.org/project/google-cloud-os-login" + }, + { + "name": "google-cloud-pipeline-components", + "uri": "https://pypi.org/project/google-cloud-pipeline-components" + }, + { + "name": "google-cloud-pubsub", + "uri": "https://pypi.org/project/google-cloud-pubsub" + }, + { + "name": "google-cloud-pubsublite", + "uri": "https://pypi.org/project/google-cloud-pubsublite" + }, + { + "name": "google-cloud-recommendations-ai", + "uri": "https://pypi.org/project/google-cloud-recommendations-ai" + }, + { + "name": "google-cloud-redis", + "uri": "https://pypi.org/project/google-cloud-redis" + }, + { + "name": "google-cloud-resource-manager", + "uri": "https://pypi.org/project/google-cloud-resource-manager" + }, + { + "name": "google-cloud-run", + "uri": "https://pypi.org/project/google-cloud-run" + }, + { + "name": "google-cloud-secret-manager", + "uri": "https://pypi.org/project/google-cloud-secret-manager" + }, + { + "name": "google-cloud-spanner", + "uri": "https://pypi.org/project/google-cloud-spanner" + }, + { + "name": "google-cloud-speech", + "uri": "https://pypi.org/project/google-cloud-speech" + }, + { + "name": "google-cloud-storage", + "uri": "https://pypi.org/project/google-cloud-storage" + }, + { + "name": "google-cloud-storage-transfer", + "uri": "https://pypi.org/project/google-cloud-storage-transfer" + }, + { + "name": "google-cloud-tasks", + "uri": "https://pypi.org/project/google-cloud-tasks" + }, + { + "name": "google-cloud-texttospeech", + "uri": "https://pypi.org/project/google-cloud-texttospeech" + }, + { + "name": "google-cloud-trace", + "uri": "https://pypi.org/project/google-cloud-trace" + }, + { + "name": "google-cloud-translate", + "uri": "https://pypi.org/project/google-cloud-translate" + }, + { + "name": "google-cloud-videointelligence", + "uri": "https://pypi.org/project/google-cloud-videointelligence" + }, + { + "name": "google-cloud-vision", + "uri": "https://pypi.org/project/google-cloud-vision" + }, + { + "name": "google-cloud-workflows", + "uri": "https://pypi.org/project/google-cloud-workflows" + }, + { + "name": "google-crc32c", + "uri": "https://pypi.org/project/google-crc32c" + }, + { + "name": "google-generativeai", + "uri": "https://pypi.org/project/google-generativeai" + }, + { + "name": "google-pasta", + "uri": "https://pypi.org/project/google-pasta" + }, + { + "name": "google-re2", + "uri": "https://pypi.org/project/google-re2" + }, + { + "name": "google-reauth", + "uri": "https://pypi.org/project/google-reauth" + }, + { + "name": "google-resumable-media", + "uri": "https://pypi.org/project/google-resumable-media" + }, + { + "name": "googleapis-common-protos", + "uri": "https://pypi.org/project/googleapis-common-protos" + }, + { + "name": "googlemaps", + "uri": "https://pypi.org/project/googlemaps" + }, + { + "name": "gotrue", + "uri": "https://pypi.org/project/gotrue" + }, + { + "name": "gpiozero", + "uri": "https://pypi.org/project/gpiozero" + }, + { + "name": "gprof2dot", + "uri": "https://pypi.org/project/gprof2dot" + }, + { + "name": "gprofiler-official", + "uri": "https://pypi.org/project/gprofiler-official" + }, + { + "name": "gpustat", + "uri": "https://pypi.org/project/gpustat" + }, + { + "name": "gpxpy", + "uri": "https://pypi.org/project/gpxpy" + }, + { + "name": "gql", + "uri": "https://pypi.org/project/gql" + }, + { + "name": "gradio", + "uri": "https://pypi.org/project/gradio" + }, + { + "name": "gradio-client", + "uri": "https://pypi.org/project/gradio-client" + }, + { + "name": "grapheme", + "uri": "https://pypi.org/project/grapheme" + }, + { + "name": "graphene", + "uri": "https://pypi.org/project/graphene" + }, + { + "name": "graphframes", + "uri": "https://pypi.org/project/graphframes" + }, + { + "name": "graphlib-backport", + "uri": "https://pypi.org/project/graphlib-backport" + }, + { + "name": "graphql-core", + "uri": "https://pypi.org/project/graphql-core" + }, + { + "name": "graphql-relay", + "uri": "https://pypi.org/project/graphql-relay" + }, + { + "name": "graphviz", + "uri": "https://pypi.org/project/graphviz" + }, + { + "name": "graypy", + "uri": "https://pypi.org/project/graypy" + }, + { + "name": "great-expectations", + "uri": "https://pypi.org/project/great-expectations" + }, + { + "name": "greenlet", + "uri": "https://pypi.org/project/greenlet" + }, + { + "name": "gremlinpython", + "uri": "https://pypi.org/project/gremlinpython" + }, + { + "name": "griffe", + "uri": "https://pypi.org/project/griffe" + }, + { + "name": "grimp", + "uri": "https://pypi.org/project/grimp" + }, + { + "name": "grpc-google-iam-v1", + "uri": "https://pypi.org/project/grpc-google-iam-v1" + }, + { + "name": "grpc-interceptor", + "uri": "https://pypi.org/project/grpc-interceptor" + }, + { + "name": "grpc-stubs", + "uri": "https://pypi.org/project/grpc-stubs" + }, + { + "name": "grpcio", + "uri": "https://pypi.org/project/grpcio" + }, + { + "name": "grpcio-gcp", + "uri": "https://pypi.org/project/grpcio-gcp" + }, + { + "name": "grpcio-health-checking", + "uri": "https://pypi.org/project/grpcio-health-checking" + }, + { + "name": "grpcio-reflection", + "uri": "https://pypi.org/project/grpcio-reflection" + }, + { + "name": "grpcio-status", + "uri": "https://pypi.org/project/grpcio-status" + }, + { + "name": "grpcio-tools", + "uri": "https://pypi.org/project/grpcio-tools" + }, + { + "name": "grpclib", + "uri": "https://pypi.org/project/grpclib" + }, + { + "name": "gs-quant", + "uri": "https://pypi.org/project/gs-quant" + }, + { + "name": "gspread", + "uri": "https://pypi.org/project/gspread" + }, + { + "name": "gspread-dataframe", + "uri": "https://pypi.org/project/gspread-dataframe" + }, + { + "name": "gsutil", + "uri": "https://pypi.org/project/gsutil" + }, + { + "name": "gtts", + "uri": "https://pypi.org/project/gtts" + }, + { + "name": "gunicorn", + "uri": "https://pypi.org/project/gunicorn" + }, + { + "name": "gym", + "uri": "https://pypi.org/project/gym" + }, + { + "name": "gym-notices", + "uri": "https://pypi.org/project/gym-notices" + }, + { + "name": "gymnasium", + "uri": "https://pypi.org/project/gymnasium" + }, + { + "name": "h11", + "uri": "https://pypi.org/project/h11" + }, + { + "name": "h2", + "uri": "https://pypi.org/project/h2" + }, + { + "name": "h3", + "uri": "https://pypi.org/project/h3" + }, + { + "name": "h5netcdf", + "uri": "https://pypi.org/project/h5netcdf" + }, + { + "name": "h5py", + "uri": "https://pypi.org/project/h5py" + }, + { + "name": "halo", + "uri": "https://pypi.org/project/halo" + }, + { + "name": "hashids", + "uri": "https://pypi.org/project/hashids" + }, + { + "name": "hatch", + "uri": "https://pypi.org/project/hatch" + }, + { + "name": "hatch-fancy-pypi-readme", + "uri": "https://pypi.org/project/hatch-fancy-pypi-readme" + }, + { + "name": "hatch-requirements-txt", + "uri": "https://pypi.org/project/hatch-requirements-txt" + }, + { + "name": "hatch-vcs", + "uri": "https://pypi.org/project/hatch-vcs" + }, + { + "name": "hatchling", + "uri": "https://pypi.org/project/hatchling" + }, + { + "name": "haversine", + "uri": "https://pypi.org/project/haversine" + }, + { + "name": "hdbcli", + "uri": "https://pypi.org/project/hdbcli" + }, + { + "name": "hdfs", + "uri": "https://pypi.org/project/hdfs" + }, + { + "name": "healpy", + "uri": "https://pypi.org/project/healpy" + }, + { + "name": "hexbytes", + "uri": "https://pypi.org/project/hexbytes" + }, + { + "name": "hijri-converter", + "uri": "https://pypi.org/project/hijri-converter" + }, + { + "name": "hiredis", + "uri": "https://pypi.org/project/hiredis" + }, + { + "name": "hishel", + "uri": "https://pypi.org/project/hishel" + }, + { + "name": "hjson", + "uri": "https://pypi.org/project/hjson" + }, + { + "name": "hmmlearn", + "uri": "https://pypi.org/project/hmmlearn" + }, + { + "name": "hnswlib", + "uri": "https://pypi.org/project/hnswlib" + }, + { + "name": "holidays", + "uri": "https://pypi.org/project/holidays" + }, + { + "name": "hologram", + "uri": "https://pypi.org/project/hologram" + }, + { + "name": "honeybee-core", + "uri": "https://pypi.org/project/honeybee-core" + }, + { + "name": "honeybee-schema", + "uri": "https://pypi.org/project/honeybee-schema" + }, + { + "name": "honeybee-standards", + "uri": "https://pypi.org/project/honeybee-standards" + }, + { + "name": "hpack", + "uri": "https://pypi.org/project/hpack" + }, + { + "name": "hstspreload", + "uri": "https://pypi.org/project/hstspreload" + }, + { + "name": "html-testrunner", + "uri": "https://pypi.org/project/html-testrunner" + }, + { + "name": "html-text", + "uri": "https://pypi.org/project/html-text" + }, + { + "name": "html2text", + "uri": "https://pypi.org/project/html2text" + }, + { + "name": "html5lib", + "uri": "https://pypi.org/project/html5lib" + }, + { + "name": "htmldate", + "uri": "https://pypi.org/project/htmldate" + }, + { + "name": "htmldocx", + "uri": "https://pypi.org/project/htmldocx" + }, + { + "name": "htmlmin", + "uri": "https://pypi.org/project/htmlmin" + }, + { + "name": "httmock", + "uri": "https://pypi.org/project/httmock" + }, + { + "name": "httpcore", + "uri": "https://pypi.org/project/httpcore" + }, + { + "name": "httplib2", + "uri": "https://pypi.org/project/httplib2" + }, + { + "name": "httpretty", + "uri": "https://pypi.org/project/httpretty" + }, + { + "name": "httptools", + "uri": "https://pypi.org/project/httptools" + }, + { + "name": "httpx", + "uri": "https://pypi.org/project/httpx" + }, + { + "name": "httpx-sse", + "uri": "https://pypi.org/project/httpx-sse" + }, + { + "name": "hubspot-api-client", + "uri": "https://pypi.org/project/hubspot-api-client" + }, + { + "name": "huggingface-hub", + "uri": "https://pypi.org/project/huggingface-hub" + }, + { + "name": "humanfriendly", + "uri": "https://pypi.org/project/humanfriendly" + }, + { + "name": "humanize", + "uri": "https://pypi.org/project/humanize" + }, + { + "name": "hupper", + "uri": "https://pypi.org/project/hupper" + }, + { + "name": "hvac", + "uri": "https://pypi.org/project/hvac" + }, + { + "name": "hydra-core", + "uri": "https://pypi.org/project/hydra-core" + }, + { + "name": "hypercorn", + "uri": "https://pypi.org/project/hypercorn" + }, + { + "name": "hyperframe", + "uri": "https://pypi.org/project/hyperframe" + }, + { + "name": "hyperlink", + "uri": "https://pypi.org/project/hyperlink" + }, + { + "name": "hyperopt", + "uri": "https://pypi.org/project/hyperopt" + }, + { + "name": "hyperpyyaml", + "uri": "https://pypi.org/project/hyperpyyaml" + }, + { + "name": "hypothesis", + "uri": "https://pypi.org/project/hypothesis" + }, + { + "name": "ibm-cloud-sdk-core", + "uri": "https://pypi.org/project/ibm-cloud-sdk-core" + }, + { + "name": "ibm-db", + "uri": "https://pypi.org/project/ibm-db" + }, + { + "name": "ibm-platform-services", + "uri": "https://pypi.org/project/ibm-platform-services" + }, + { + "name": "icalendar", + "uri": "https://pypi.org/project/icalendar" + }, + { + "name": "icdiff", + "uri": "https://pypi.org/project/icdiff" + }, + { + "name": "icecream", + "uri": "https://pypi.org/project/icecream" + }, + { + "name": "identify", + "uri": "https://pypi.org/project/identify" + }, + { + "name": "idna", + "uri": "https://pypi.org/project/idna" + }, + { + "name": "idna-ssl", + "uri": "https://pypi.org/project/idna-ssl" + }, + { + "name": "ifaddr", + "uri": "https://pypi.org/project/ifaddr" + }, + { + "name": "igraph", + "uri": "https://pypi.org/project/igraph" + }, + { + "name": "ijson", + "uri": "https://pypi.org/project/ijson" + }, + { + "name": "imagecodecs", + "uri": "https://pypi.org/project/imagecodecs" + }, + { + "name": "imagehash", + "uri": "https://pypi.org/project/imagehash" + }, + { + "name": "imageio", + "uri": "https://pypi.org/project/imageio" + }, + { + "name": "imageio-ffmpeg", + "uri": "https://pypi.org/project/imageio-ffmpeg" + }, + { + "name": "imagesize", + "uri": "https://pypi.org/project/imagesize" + }, + { + "name": "imapclient", + "uri": "https://pypi.org/project/imapclient" + }, + { + "name": "imath", + "uri": "https://pypi.org/project/imath" + }, + { + "name": "imbalanced-learn", + "uri": "https://pypi.org/project/imbalanced-learn" + }, + { + "name": "imblearn", + "uri": "https://pypi.org/project/imblearn" + }, + { + "name": "imdbpy", + "uri": "https://pypi.org/project/imdbpy" + }, + { + "name": "immutabledict", + "uri": "https://pypi.org/project/immutabledict" + }, + { + "name": "immutables", + "uri": "https://pypi.org/project/immutables" + }, + { + "name": "import-linter", + "uri": "https://pypi.org/project/import-linter" + }, + { + "name": "importlib", + "uri": "https://pypi.org/project/importlib" + }, + { + "name": "importlib-metadata", + "uri": "https://pypi.org/project/importlib-metadata" + }, + { + "name": "importlib-resources", + "uri": "https://pypi.org/project/importlib-resources" + }, + { + "name": "impyla", + "uri": "https://pypi.org/project/impyla" + }, + { + "name": "imutils", + "uri": "https://pypi.org/project/imutils" + }, + { + "name": "incremental", + "uri": "https://pypi.org/project/incremental" + }, + { + "name": "inexactsearch", + "uri": "https://pypi.org/project/inexactsearch" + }, + { + "name": "inflate64", + "uri": "https://pypi.org/project/inflate64" + }, + { + "name": "inflect", + "uri": "https://pypi.org/project/inflect" + }, + { + "name": "inflection", + "uri": "https://pypi.org/project/inflection" + }, + { + "name": "influxdb", + "uri": "https://pypi.org/project/influxdb" + }, + { + "name": "influxdb-client", + "uri": "https://pypi.org/project/influxdb-client" + }, + { + "name": "iniconfig", + "uri": "https://pypi.org/project/iniconfig" + }, + { + "name": "inject", + "uri": "https://pypi.org/project/inject" + }, + { + "name": "injector", + "uri": "https://pypi.org/project/injector" + }, + { + "name": "inquirer", + "uri": "https://pypi.org/project/inquirer" + }, + { + "name": "inquirerpy", + "uri": "https://pypi.org/project/inquirerpy" + }, + { + "name": "insight-cli", + "uri": "https://pypi.org/project/insight-cli" + }, + { + "name": "install-jdk", + "uri": "https://pypi.org/project/install-jdk" + }, + { + "name": "installer", + "uri": "https://pypi.org/project/installer" + }, + { + "name": "intelhex", + "uri": "https://pypi.org/project/intelhex" + }, + { + "name": "interegular", + "uri": "https://pypi.org/project/interegular" + }, + { + "name": "interface-meta", + "uri": "https://pypi.org/project/interface-meta" + }, + { + "name": "intervaltree", + "uri": "https://pypi.org/project/intervaltree" + }, + { + "name": "invoke", + "uri": "https://pypi.org/project/invoke" + }, + { + "name": "iopath", + "uri": "https://pypi.org/project/iopath" + }, + { + "name": "ipaddress", + "uri": "https://pypi.org/project/ipaddress" + }, + { + "name": "ipdb", + "uri": "https://pypi.org/project/ipdb" + }, + { + "name": "ipykernel", + "uri": "https://pypi.org/project/ipykernel" + }, + { + "name": "ipython", + "uri": "https://pypi.org/project/ipython" + }, + { + "name": "ipython-genutils", + "uri": "https://pypi.org/project/ipython-genutils" + }, + { + "name": "ipywidgets", + "uri": "https://pypi.org/project/ipywidgets" + }, + { + "name": "isbnlib", + "uri": "https://pypi.org/project/isbnlib" + }, + { + "name": "iso3166", + "uri": "https://pypi.org/project/iso3166" + }, + { + "name": "iso8601", + "uri": "https://pypi.org/project/iso8601" + }, + { + "name": "isodate", + "uri": "https://pypi.org/project/isodate" + }, + { + "name": "isoduration", + "uri": "https://pypi.org/project/isoduration" + }, + { + "name": "isort", + "uri": "https://pypi.org/project/isort" + }, + { + "name": "isoweek", + "uri": "https://pypi.org/project/isoweek" + }, + { + "name": "itemadapter", + "uri": "https://pypi.org/project/itemadapter" + }, + { + "name": "itemloaders", + "uri": "https://pypi.org/project/itemloaders" + }, + { + "name": "iterative-telemetry", + "uri": "https://pypi.org/project/iterative-telemetry" + }, + { + "name": "itsdangerous", + "uri": "https://pypi.org/project/itsdangerous" + }, + { + "name": "itypes", + "uri": "https://pypi.org/project/itypes" + }, + { + "name": "j2cli", + "uri": "https://pypi.org/project/j2cli" + }, + { + "name": "jaconv", + "uri": "https://pypi.org/project/jaconv" + }, + { + "name": "janus", + "uri": "https://pypi.org/project/janus" + }, + { + "name": "jaraco-classes", + "uri": "https://pypi.org/project/jaraco-classes" + }, + { + "name": "jaraco-collections", + "uri": "https://pypi.org/project/jaraco-collections" + }, + { + "name": "jaraco-context", + "uri": "https://pypi.org/project/jaraco-context" + }, + { + "name": "jaraco-functools", + "uri": "https://pypi.org/project/jaraco-functools" + }, + { + "name": "jaraco-text", + "uri": "https://pypi.org/project/jaraco-text" + }, + { + "name": "java-access-bridge-wrapper", + "uri": "https://pypi.org/project/java-access-bridge-wrapper" + }, + { + "name": "java-manifest", + "uri": "https://pypi.org/project/java-manifest" + }, + { + "name": "javaproperties", + "uri": "https://pypi.org/project/javaproperties" + }, + { + "name": "jax", + "uri": "https://pypi.org/project/jax" + }, + { + "name": "jaxlib", + "uri": "https://pypi.org/project/jaxlib" + }, + { + "name": "jaxtyping", + "uri": "https://pypi.org/project/jaxtyping" + }, + { + "name": "jaydebeapi", + "uri": "https://pypi.org/project/jaydebeapi" + }, + { + "name": "jdcal", + "uri": "https://pypi.org/project/jdcal" + }, + { + "name": "jedi", + "uri": "https://pypi.org/project/jedi" + }, + { + "name": "jeepney", + "uri": "https://pypi.org/project/jeepney" + }, + { + "name": "jellyfish", + "uri": "https://pypi.org/project/jellyfish" + }, + { + "name": "jenkinsapi", + "uri": "https://pypi.org/project/jenkinsapi" + }, + { + "name": "jetblack-iso8601", + "uri": "https://pypi.org/project/jetblack-iso8601" + }, + { + "name": "jieba", + "uri": "https://pypi.org/project/jieba" + }, + { + "name": "jinja2", + "uri": "https://pypi.org/project/jinja2" + }, + { + "name": "jinja2-humanize-extension", + "uri": "https://pypi.org/project/jinja2-humanize-extension" + }, + { + "name": "jinja2-pluralize", + "uri": "https://pypi.org/project/jinja2-pluralize" + }, + { + "name": "jinja2-simple-tags", + "uri": "https://pypi.org/project/jinja2-simple-tags" + }, + { + "name": "jinja2-time", + "uri": "https://pypi.org/project/jinja2-time" + }, + { + "name": "jinjasql", + "uri": "https://pypi.org/project/jinjasql" + }, + { + "name": "jira", + "uri": "https://pypi.org/project/jira" + }, + { + "name": "jiter", + "uri": "https://pypi.org/project/jiter" + }, + { + "name": "jiwer", + "uri": "https://pypi.org/project/jiwer" + }, + { + "name": "jmespath", + "uri": "https://pypi.org/project/jmespath" + }, + { + "name": "joblib", + "uri": "https://pypi.org/project/joblib" + }, + { + "name": "josepy", + "uri": "https://pypi.org/project/josepy" + }, + { + "name": "joserfc", + "uri": "https://pypi.org/project/joserfc" + }, + { + "name": "jplephem", + "uri": "https://pypi.org/project/jplephem" + }, + { + "name": "jproperties", + "uri": "https://pypi.org/project/jproperties" + }, + { + "name": "jpype1", + "uri": "https://pypi.org/project/jpype1" + }, + { + "name": "jq", + "uri": "https://pypi.org/project/jq" + }, + { + "name": "js2py", + "uri": "https://pypi.org/project/js2py" + }, + { + "name": "jsbeautifier", + "uri": "https://pypi.org/project/jsbeautifier" + }, + { + "name": "jschema-to-python", + "uri": "https://pypi.org/project/jschema-to-python" + }, + { + "name": "jsii", + "uri": "https://pypi.org/project/jsii" + }, + { + "name": "jsmin", + "uri": "https://pypi.org/project/jsmin" + }, + { + "name": "json-delta", + "uri": "https://pypi.org/project/json-delta" + }, + { + "name": "json-log-formatter", + "uri": "https://pypi.org/project/json-log-formatter" + }, + { + "name": "json-logging", + "uri": "https://pypi.org/project/json-logging" + }, + { + "name": "json-merge-patch", + "uri": "https://pypi.org/project/json-merge-patch" + }, + { + "name": "json2html", + "uri": "https://pypi.org/project/json2html" + }, + { + "name": "json5", + "uri": "https://pypi.org/project/json5" + }, + { + "name": "jsonargparse", + "uri": "https://pypi.org/project/jsonargparse" + }, + { + "name": "jsonconversion", + "uri": "https://pypi.org/project/jsonconversion" + }, + { + "name": "jsondiff", + "uri": "https://pypi.org/project/jsondiff" + }, + { + "name": "jsonlines", + "uri": "https://pypi.org/project/jsonlines" + }, + { + "name": "jsonmerge", + "uri": "https://pypi.org/project/jsonmerge" + }, + { + "name": "jsonpatch", + "uri": "https://pypi.org/project/jsonpatch" + }, + { + "name": "jsonpath-ng", + "uri": "https://pypi.org/project/jsonpath-ng" + }, + { + "name": "jsonpath-python", + "uri": "https://pypi.org/project/jsonpath-python" + }, + { + "name": "jsonpath-rw", + "uri": "https://pypi.org/project/jsonpath-rw" + }, + { + "name": "jsonpickle", + "uri": "https://pypi.org/project/jsonpickle" + }, + { + "name": "jsonpointer", + "uri": "https://pypi.org/project/jsonpointer" + }, + { + "name": "jsonref", + "uri": "https://pypi.org/project/jsonref" + }, + { + "name": "jsons", + "uri": "https://pypi.org/project/jsons" + }, + { + "name": "jsonschema", + "uri": "https://pypi.org/project/jsonschema" + }, + { + "name": "jsonschema-path", + "uri": "https://pypi.org/project/jsonschema-path" + }, + { + "name": "jsonschema-spec", + "uri": "https://pypi.org/project/jsonschema-spec" + }, + { + "name": "jsonschema-specifications", + "uri": "https://pypi.org/project/jsonschema-specifications" + }, + { + "name": "jstyleson", + "uri": "https://pypi.org/project/jstyleson" + }, + { + "name": "junit-xml", + "uri": "https://pypi.org/project/junit-xml" + }, + { + "name": "junitparser", + "uri": "https://pypi.org/project/junitparser" + }, + { + "name": "jupyter", + "uri": "https://pypi.org/project/jupyter" + }, + { + "name": "jupyter-client", + "uri": "https://pypi.org/project/jupyter-client" + }, + { + "name": "jupyter-console", + "uri": "https://pypi.org/project/jupyter-console" + }, + { + "name": "jupyter-core", + "uri": "https://pypi.org/project/jupyter-core" + }, + { + "name": "jupyter-events", + "uri": "https://pypi.org/project/jupyter-events" + }, + { + "name": "jupyter-lsp", + "uri": "https://pypi.org/project/jupyter-lsp" + }, + { + "name": "jupyter-packaging", + "uri": "https://pypi.org/project/jupyter-packaging" + }, + { + "name": "jupyter-server", + "uri": "https://pypi.org/project/jupyter-server" + }, + { + "name": "jupyter-server-fileid", + "uri": "https://pypi.org/project/jupyter-server-fileid" + }, + { + "name": "jupyter-server-terminals", + "uri": "https://pypi.org/project/jupyter-server-terminals" + }, + { + "name": "jupyter-server-ydoc", + "uri": "https://pypi.org/project/jupyter-server-ydoc" + }, + { + "name": "jupyter-ydoc", + "uri": "https://pypi.org/project/jupyter-ydoc" + }, + { + "name": "jupyterlab", + "uri": "https://pypi.org/project/jupyterlab" + }, + { + "name": "jupyterlab-pygments", + "uri": "https://pypi.org/project/jupyterlab-pygments" + }, + { + "name": "jupyterlab-server", + "uri": "https://pypi.org/project/jupyterlab-server" + }, + { + "name": "jupyterlab-widgets", + "uri": "https://pypi.org/project/jupyterlab-widgets" + }, + { + "name": "jupytext", + "uri": "https://pypi.org/project/jupytext" + }, + { + "name": "justext", + "uri": "https://pypi.org/project/justext" + }, + { + "name": "jwcrypto", + "uri": "https://pypi.org/project/jwcrypto" + }, + { + "name": "jwt", + "uri": "https://pypi.org/project/jwt" + }, + { + "name": "kafka-python", + "uri": "https://pypi.org/project/kafka-python" + }, + { + "name": "kaitaistruct", + "uri": "https://pypi.org/project/kaitaistruct" + }, + { + "name": "kaleido", + "uri": "https://pypi.org/project/kaleido" + }, + { + "name": "kazoo", + "uri": "https://pypi.org/project/kazoo" + }, + { + "name": "kconfiglib", + "uri": "https://pypi.org/project/kconfiglib" + }, + { + "name": "keras", + "uri": "https://pypi.org/project/keras" + }, + { + "name": "keras-applications", + "uri": "https://pypi.org/project/keras-applications" + }, + { + "name": "keras-preprocessing", + "uri": "https://pypi.org/project/keras-preprocessing" + }, + { + "name": "keyring", + "uri": "https://pypi.org/project/keyring" + }, + { + "name": "keyrings-alt", + "uri": "https://pypi.org/project/keyrings-alt" + }, + { + "name": "keyrings-google-artifactregistry-auth", + "uri": "https://pypi.org/project/keyrings-google-artifactregistry-auth" + }, + { + "name": "keystoneauth1", + "uri": "https://pypi.org/project/keystoneauth1" + }, + { + "name": "kfp", + "uri": "https://pypi.org/project/kfp" + }, + { + "name": "kfp-pipeline-spec", + "uri": "https://pypi.org/project/kfp-pipeline-spec" + }, + { + "name": "kfp-server-api", + "uri": "https://pypi.org/project/kfp-server-api" + }, + { + "name": "kivy", + "uri": "https://pypi.org/project/kivy" + }, + { + "name": "kiwisolver", + "uri": "https://pypi.org/project/kiwisolver" + }, + { + "name": "knack", + "uri": "https://pypi.org/project/knack" + }, + { + "name": "koalas", + "uri": "https://pypi.org/project/koalas" + }, + { + "name": "kombu", + "uri": "https://pypi.org/project/kombu" + }, + { + "name": "korean-lunar-calendar", + "uri": "https://pypi.org/project/korean-lunar-calendar" + }, + { + "name": "kornia", + "uri": "https://pypi.org/project/kornia" + }, + { + "name": "kornia-rs", + "uri": "https://pypi.org/project/kornia-rs" + }, + { + "name": "kubernetes", + "uri": "https://pypi.org/project/kubernetes" + }, + { + "name": "kubernetes-asyncio", + "uri": "https://pypi.org/project/kubernetes-asyncio" + }, + { + "name": "ladybug-core", + "uri": "https://pypi.org/project/ladybug-core" + }, + { + "name": "ladybug-display", + "uri": "https://pypi.org/project/ladybug-display" + }, + { + "name": "ladybug-geometry", + "uri": "https://pypi.org/project/ladybug-geometry" + }, + { + "name": "ladybug-geometry-polyskel", + "uri": "https://pypi.org/project/ladybug-geometry-polyskel" + }, + { + "name": "lagom", + "uri": "https://pypi.org/project/lagom" + }, + { + "name": "langchain", + "uri": "https://pypi.org/project/langchain" + }, + { + "name": "langchain-anthropic", + "uri": "https://pypi.org/project/langchain-anthropic" + }, + { + "name": "langchain-aws", + "uri": "https://pypi.org/project/langchain-aws" + }, + { + "name": "langchain-community", + "uri": "https://pypi.org/project/langchain-community" + }, + { + "name": "langchain-core", + "uri": "https://pypi.org/project/langchain-core" + }, + { + "name": "langchain-experimental", + "uri": "https://pypi.org/project/langchain-experimental" + }, + { + "name": "langchain-google-vertexai", + "uri": "https://pypi.org/project/langchain-google-vertexai" + }, + { + "name": "langchain-openai", + "uri": "https://pypi.org/project/langchain-openai" + }, + { + "name": "langchain-text-splitters", + "uri": "https://pypi.org/project/langchain-text-splitters" + }, + { + "name": "langcodes", + "uri": "https://pypi.org/project/langcodes" + }, + { + "name": "langdetect", + "uri": "https://pypi.org/project/langdetect" + }, + { + "name": "langgraph", + "uri": "https://pypi.org/project/langgraph" + }, + { + "name": "langsmith", + "uri": "https://pypi.org/project/langsmith" + }, + { + "name": "language-data", + "uri": "https://pypi.org/project/language-data" + }, + { + "name": "language-tags", + "uri": "https://pypi.org/project/language-tags" + }, + { + "name": "language-tool-python", + "uri": "https://pypi.org/project/language-tool-python" + }, + { + "name": "lark", + "uri": "https://pypi.org/project/lark" + }, + { + "name": "lark-parser", + "uri": "https://pypi.org/project/lark-parser" + }, + { + "name": "lasio", + "uri": "https://pypi.org/project/lasio" + }, + { + "name": "latexcodec", + "uri": "https://pypi.org/project/latexcodec" + }, + { + "name": "launchdarkly-server-sdk", + "uri": "https://pypi.org/project/launchdarkly-server-sdk" + }, + { + "name": "lazy-loader", + "uri": "https://pypi.org/project/lazy-loader" + }, + { + "name": "lazy-object-proxy", + "uri": "https://pypi.org/project/lazy-object-proxy" + }, + { + "name": "ldap3", + "uri": "https://pypi.org/project/ldap3" + }, + { + "name": "leather", + "uri": "https://pypi.org/project/leather" + }, + { + "name": "levenshtein", + "uri": "https://pypi.org/project/levenshtein" + }, + { + "name": "libclang", + "uri": "https://pypi.org/project/libclang" + }, + { + "name": "libcst", + "uri": "https://pypi.org/project/libcst" + }, + { + "name": "libretranslatepy", + "uri": "https://pypi.org/project/libretranslatepy" + }, + { + "name": "librosa", + "uri": "https://pypi.org/project/librosa" + }, + { + "name": "libsass", + "uri": "https://pypi.org/project/libsass" + }, + { + "name": "license-expression", + "uri": "https://pypi.org/project/license-expression" + }, + { + "name": "lifelines", + "uri": "https://pypi.org/project/lifelines" + }, + { + "name": "lightgbm", + "uri": "https://pypi.org/project/lightgbm" + }, + { + "name": "lightning", + "uri": "https://pypi.org/project/lightning" + }, + { + "name": "lightning-utilities", + "uri": "https://pypi.org/project/lightning-utilities" + }, + { + "name": "limits", + "uri": "https://pypi.org/project/limits" + }, + { + "name": "line-profiler", + "uri": "https://pypi.org/project/line-profiler" + }, + { + "name": "linecache2", + "uri": "https://pypi.org/project/linecache2" + }, + { + "name": "linkify-it-py", + "uri": "https://pypi.org/project/linkify-it-py" + }, + { + "name": "lit", + "uri": "https://pypi.org/project/lit" + }, + { + "name": "litellm", + "uri": "https://pypi.org/project/litellm" + }, + { + "name": "livereload", + "uri": "https://pypi.org/project/livereload" + }, + { + "name": "livy", + "uri": "https://pypi.org/project/livy" + }, + { + "name": "lizard", + "uri": "https://pypi.org/project/lizard" + }, + { + "name": "llama-cloud", + "uri": "https://pypi.org/project/llama-cloud" + }, + { + "name": "llama-index", + "uri": "https://pypi.org/project/llama-index" + }, + { + "name": "llama-index-agent-openai", + "uri": "https://pypi.org/project/llama-index-agent-openai" + }, + { + "name": "llama-index-cli", + "uri": "https://pypi.org/project/llama-index-cli" + }, + { + "name": "llama-index-core", + "uri": "https://pypi.org/project/llama-index-core" + }, + { + "name": "llama-index-embeddings-openai", + "uri": "https://pypi.org/project/llama-index-embeddings-openai" + }, + { + "name": "llama-index-indices-managed-llama-cloud", + "uri": "https://pypi.org/project/llama-index-indices-managed-llama-cloud" + }, + { + "name": "llama-index-legacy", + "uri": "https://pypi.org/project/llama-index-legacy" + }, + { + "name": "llama-index-llms-openai", + "uri": "https://pypi.org/project/llama-index-llms-openai" + }, + { + "name": "llama-index-multi-modal-llms-openai", + "uri": "https://pypi.org/project/llama-index-multi-modal-llms-openai" + }, + { + "name": "llama-index-program-openai", + "uri": "https://pypi.org/project/llama-index-program-openai" + }, + { + "name": "llama-index-question-gen-openai", + "uri": "https://pypi.org/project/llama-index-question-gen-openai" + }, + { + "name": "llama-index-readers-file", + "uri": "https://pypi.org/project/llama-index-readers-file" + }, + { + "name": "llama-index-readers-llama-parse", + "uri": "https://pypi.org/project/llama-index-readers-llama-parse" + }, + { + "name": "llama-parse", + "uri": "https://pypi.org/project/llama-parse" + }, + { + "name": "llvmlite", + "uri": "https://pypi.org/project/llvmlite" + }, + { + "name": "lm-format-enforcer", + "uri": "https://pypi.org/project/lm-format-enforcer" + }, + { + "name": "lmdb", + "uri": "https://pypi.org/project/lmdb" + }, + { + "name": "lmfit", + "uri": "https://pypi.org/project/lmfit" + }, + { + "name": "locket", + "uri": "https://pypi.org/project/locket" + }, + { + "name": "lockfile", + "uri": "https://pypi.org/project/lockfile" + }, + { + "name": "locust", + "uri": "https://pypi.org/project/locust" + }, + { + "name": "log-symbols", + "uri": "https://pypi.org/project/log-symbols" + }, + { + "name": "logbook", + "uri": "https://pypi.org/project/logbook" + }, + { + "name": "logging-azure-rest", + "uri": "https://pypi.org/project/logging-azure-rest" + }, + { + "name": "loguru", + "uri": "https://pypi.org/project/loguru" + }, + { + "name": "logz", + "uri": "https://pypi.org/project/logz" + }, + { + "name": "logzero", + "uri": "https://pypi.org/project/logzero" + }, + { + "name": "looker-sdk", + "uri": "https://pypi.org/project/looker-sdk" + }, + { + "name": "looseversion", + "uri": "https://pypi.org/project/looseversion" + }, + { + "name": "lpips", + "uri": "https://pypi.org/project/lpips" + }, + { + "name": "lru-dict", + "uri": "https://pypi.org/project/lru-dict" + }, + { + "name": "lunarcalendar", + "uri": "https://pypi.org/project/lunarcalendar" + }, + { + "name": "lunardate", + "uri": "https://pypi.org/project/lunardate" + }, + { + "name": "lxml", + "uri": "https://pypi.org/project/lxml" + }, + { + "name": "lxml-html-clean", + "uri": "https://pypi.org/project/lxml-html-clean" + }, + { + "name": "lz4", + "uri": "https://pypi.org/project/lz4" + }, + { + "name": "macholib", + "uri": "https://pypi.org/project/macholib" + }, + { + "name": "magicattr", + "uri": "https://pypi.org/project/magicattr" + }, + { + "name": "makefun", + "uri": "https://pypi.org/project/makefun" + }, + { + "name": "mako", + "uri": "https://pypi.org/project/mako" + }, + { + "name": "mammoth", + "uri": "https://pypi.org/project/mammoth" + }, + { + "name": "mando", + "uri": "https://pypi.org/project/mando" + }, + { + "name": "mangum", + "uri": "https://pypi.org/project/mangum" + }, + { + "name": "mapbox-earcut", + "uri": "https://pypi.org/project/mapbox-earcut" + }, + { + "name": "marisa-trie", + "uri": "https://pypi.org/project/marisa-trie" + }, + { + "name": "markdown", + "uri": "https://pypi.org/project/markdown" + }, + { + "name": "markdown-it-py", + "uri": "https://pypi.org/project/markdown-it-py" + }, + { + "name": "markdown2", + "uri": "https://pypi.org/project/markdown2" + }, + { + "name": "markdownify", + "uri": "https://pypi.org/project/markdownify" + }, + { + "name": "markupsafe", + "uri": "https://pypi.org/project/markupsafe" + }, + { + "name": "marshmallow", + "uri": "https://pypi.org/project/marshmallow" + }, + { + "name": "marshmallow-dataclass", + "uri": "https://pypi.org/project/marshmallow-dataclass" + }, + { + "name": "marshmallow-enum", + "uri": "https://pypi.org/project/marshmallow-enum" + }, + { + "name": "marshmallow-oneofschema", + "uri": "https://pypi.org/project/marshmallow-oneofschema" + }, + { + "name": "marshmallow-sqlalchemy", + "uri": "https://pypi.org/project/marshmallow-sqlalchemy" + }, + { + "name": "mashumaro", + "uri": "https://pypi.org/project/mashumaro" + }, + { + "name": "matplotlib", + "uri": "https://pypi.org/project/matplotlib" + }, + { + "name": "matplotlib-inline", + "uri": "https://pypi.org/project/matplotlib-inline" + }, + { + "name": "maturin", + "uri": "https://pypi.org/project/maturin" + }, + { + "name": "maxminddb", + "uri": "https://pypi.org/project/maxminddb" + }, + { + "name": "mbstrdecoder", + "uri": "https://pypi.org/project/mbstrdecoder" + }, + { + "name": "mccabe", + "uri": "https://pypi.org/project/mccabe" + }, + { + "name": "mchammer", + "uri": "https://pypi.org/project/mchammer" + }, + { + "name": "mdit-py-plugins", + "uri": "https://pypi.org/project/mdit-py-plugins" + }, + { + "name": "mdurl", + "uri": "https://pypi.org/project/mdurl" + }, + { + "name": "mdx-truly-sane-lists", + "uri": "https://pypi.org/project/mdx-truly-sane-lists" + }, + { + "name": "mecab-python3", + "uri": "https://pypi.org/project/mecab-python3" + }, + { + "name": "mediapipe", + "uri": "https://pypi.org/project/mediapipe" + }, + { + "name": "megatron-core", + "uri": "https://pypi.org/project/megatron-core" + }, + { + "name": "memoization", + "uri": "https://pypi.org/project/memoization" + }, + { + "name": "memory-profiler", + "uri": "https://pypi.org/project/memory-profiler" + }, + { + "name": "memray", + "uri": "https://pypi.org/project/memray" + }, + { + "name": "mercantile", + "uri": "https://pypi.org/project/mercantile" + }, + { + "name": "mergedeep", + "uri": "https://pypi.org/project/mergedeep" + }, + { + "name": "meson", + "uri": "https://pypi.org/project/meson" + }, + { + "name": "meson-python", + "uri": "https://pypi.org/project/meson-python" + }, + { + "name": "methodtools", + "uri": "https://pypi.org/project/methodtools" + }, + { + "name": "mf2py", + "uri": "https://pypi.org/project/mf2py" + }, + { + "name": "microsoft-kiota-abstractions", + "uri": "https://pypi.org/project/microsoft-kiota-abstractions" + }, + { + "name": "microsoft-kiota-authentication-azure", + "uri": "https://pypi.org/project/microsoft-kiota-authentication-azure" + }, + { + "name": "microsoft-kiota-http", + "uri": "https://pypi.org/project/microsoft-kiota-http" + }, + { + "name": "microsoft-kiota-serialization-json", + "uri": "https://pypi.org/project/microsoft-kiota-serialization-json" + }, + { + "name": "microsoft-kiota-serialization-text", + "uri": "https://pypi.org/project/microsoft-kiota-serialization-text" + }, + { + "name": "mimesis", + "uri": "https://pypi.org/project/mimesis" + }, + { + "name": "minidump", + "uri": "https://pypi.org/project/minidump" + }, + { + "name": "minimal-snowplow-tracker", + "uri": "https://pypi.org/project/minimal-snowplow-tracker" + }, + { + "name": "minio", + "uri": "https://pypi.org/project/minio" + }, + { + "name": "mistune", + "uri": "https://pypi.org/project/mistune" + }, + { + "name": "mixpanel", + "uri": "https://pypi.org/project/mixpanel" + }, + { + "name": "mizani", + "uri": "https://pypi.org/project/mizani" + }, + { + "name": "mkdocs", + "uri": "https://pypi.org/project/mkdocs" + }, + { + "name": "mkdocs-autorefs", + "uri": "https://pypi.org/project/mkdocs-autorefs" + }, + { + "name": "mkdocs-get-deps", + "uri": "https://pypi.org/project/mkdocs-get-deps" + }, + { + "name": "mkdocs-material", + "uri": "https://pypi.org/project/mkdocs-material" + }, + { + "name": "mkdocs-material-extensions", + "uri": "https://pypi.org/project/mkdocs-material-extensions" + }, + { + "name": "mkdocstrings", + "uri": "https://pypi.org/project/mkdocstrings" + }, + { + "name": "mkdocstrings-python", + "uri": "https://pypi.org/project/mkdocstrings-python" + }, + { + "name": "ml-dtypes", + "uri": "https://pypi.org/project/ml-dtypes" + }, + { + "name": "mleap", + "uri": "https://pypi.org/project/mleap" + }, + { + "name": "mlflow", + "uri": "https://pypi.org/project/mlflow" + }, + { + "name": "mlflow-skinny", + "uri": "https://pypi.org/project/mlflow-skinny" + }, + { + "name": "mlserver", + "uri": "https://pypi.org/project/mlserver" + }, + { + "name": "mltable", + "uri": "https://pypi.org/project/mltable" + }, + { + "name": "mlxtend", + "uri": "https://pypi.org/project/mlxtend" + }, + { + "name": "mmcif", + "uri": "https://pypi.org/project/mmcif" + }, + { + "name": "mmcif-pdbx", + "uri": "https://pypi.org/project/mmcif-pdbx" + }, + { + "name": "mmh3", + "uri": "https://pypi.org/project/mmh3" + }, + { + "name": "mock", + "uri": "https://pypi.org/project/mock" + }, + { + "name": "mockito", + "uri": "https://pypi.org/project/mockito" + }, + { + "name": "model-bakery", + "uri": "https://pypi.org/project/model-bakery" + }, + { + "name": "modin", + "uri": "https://pypi.org/project/modin" + }, + { + "name": "molecule", + "uri": "https://pypi.org/project/molecule" + }, + { + "name": "mongoengine", + "uri": "https://pypi.org/project/mongoengine" + }, + { + "name": "mongomock", + "uri": "https://pypi.org/project/mongomock" + }, + { + "name": "monotonic", + "uri": "https://pypi.org/project/monotonic" + }, + { + "name": "more-itertools", + "uri": "https://pypi.org/project/more-itertools" + }, + { + "name": "moreorless", + "uri": "https://pypi.org/project/moreorless" + }, + { + "name": "morse3", + "uri": "https://pypi.org/project/morse3" + }, + { + "name": "moto", + "uri": "https://pypi.org/project/moto" + }, + { + "name": "motor", + "uri": "https://pypi.org/project/motor" + }, + { + "name": "mouseinfo", + "uri": "https://pypi.org/project/mouseinfo" + }, + { + "name": "moviepy", + "uri": "https://pypi.org/project/moviepy" + }, + { + "name": "mpmath", + "uri": "https://pypi.org/project/mpmath" + }, + { + "name": "msal", + "uri": "https://pypi.org/project/msal" + }, + { + "name": "msal-extensions", + "uri": "https://pypi.org/project/msal-extensions" + }, + { + "name": "msgpack", + "uri": "https://pypi.org/project/msgpack" + }, + { + "name": "msgpack-numpy", + "uri": "https://pypi.org/project/msgpack-numpy" + }, + { + "name": "msgpack-python", + "uri": "https://pypi.org/project/msgpack-python" + }, + { + "name": "msgraph-core", + "uri": "https://pypi.org/project/msgraph-core" + }, + { + "name": "msgraph-sdk", + "uri": "https://pypi.org/project/msgraph-sdk" + }, + { + "name": "msgspec", + "uri": "https://pypi.org/project/msgspec" + }, + { + "name": "msoffcrypto-tool", + "uri": "https://pypi.org/project/msoffcrypto-tool" + }, + { + "name": "msrest", + "uri": "https://pypi.org/project/msrest" + }, + { + "name": "msrestazure", + "uri": "https://pypi.org/project/msrestazure" + }, + { + "name": "mss", + "uri": "https://pypi.org/project/mss" + }, + { + "name": "multi-key-dict", + "uri": "https://pypi.org/project/multi-key-dict" + }, + { + "name": "multidict", + "uri": "https://pypi.org/project/multidict" + }, + { + "name": "multimapping", + "uri": "https://pypi.org/project/multimapping" + }, + { + "name": "multimethod", + "uri": "https://pypi.org/project/multimethod" + }, + { + "name": "multipart", + "uri": "https://pypi.org/project/multipart" + }, + { + "name": "multipledispatch", + "uri": "https://pypi.org/project/multipledispatch" + }, + { + "name": "multiprocess", + "uri": "https://pypi.org/project/multiprocess" + }, + { + "name": "multitasking", + "uri": "https://pypi.org/project/multitasking" + }, + { + "name": "multivolumefile", + "uri": "https://pypi.org/project/multivolumefile" + }, + { + "name": "munch", + "uri": "https://pypi.org/project/munch" + }, + { + "name": "munkres", + "uri": "https://pypi.org/project/munkres" + }, + { + "name": "murmurhash", + "uri": "https://pypi.org/project/murmurhash" + }, + { + "name": "mutagen", + "uri": "https://pypi.org/project/mutagen" + }, + { + "name": "mxnet", + "uri": "https://pypi.org/project/mxnet" + }, + { + "name": "mygene", + "uri": "https://pypi.org/project/mygene" + }, + { + "name": "mypy", + "uri": "https://pypi.org/project/mypy" + }, + { + "name": "mypy-boto3-apigateway", + "uri": "https://pypi.org/project/mypy-boto3-apigateway" + }, + { + "name": "mypy-boto3-appconfig", + "uri": "https://pypi.org/project/mypy-boto3-appconfig" + }, + { + "name": "mypy-boto3-appflow", + "uri": "https://pypi.org/project/mypy-boto3-appflow" + }, + { + "name": "mypy-boto3-athena", + "uri": "https://pypi.org/project/mypy-boto3-athena" + }, + { + "name": "mypy-boto3-cloudformation", + "uri": "https://pypi.org/project/mypy-boto3-cloudformation" + }, + { + "name": "mypy-boto3-dataexchange", + "uri": "https://pypi.org/project/mypy-boto3-dataexchange" + }, + { + "name": "mypy-boto3-dynamodb", + "uri": "https://pypi.org/project/mypy-boto3-dynamodb" + }, + { + "name": "mypy-boto3-ec2", + "uri": "https://pypi.org/project/mypy-boto3-ec2" + }, + { + "name": "mypy-boto3-ecr", + "uri": "https://pypi.org/project/mypy-boto3-ecr" + }, + { + "name": "mypy-boto3-events", + "uri": "https://pypi.org/project/mypy-boto3-events" + }, + { + "name": "mypy-boto3-glue", + "uri": "https://pypi.org/project/mypy-boto3-glue" + }, + { + "name": "mypy-boto3-iam", + "uri": "https://pypi.org/project/mypy-boto3-iam" + }, + { + "name": "mypy-boto3-kinesis", + "uri": "https://pypi.org/project/mypy-boto3-kinesis" + }, + { + "name": "mypy-boto3-lambda", + "uri": "https://pypi.org/project/mypy-boto3-lambda" + }, + { + "name": "mypy-boto3-rds", + "uri": "https://pypi.org/project/mypy-boto3-rds" + }, + { + "name": "mypy-boto3-redshift-data", + "uri": "https://pypi.org/project/mypy-boto3-redshift-data" + }, + { + "name": "mypy-boto3-s3", + "uri": "https://pypi.org/project/mypy-boto3-s3" + }, + { + "name": "mypy-boto3-schemas", + "uri": "https://pypi.org/project/mypy-boto3-schemas" + }, + { + "name": "mypy-boto3-secretsmanager", + "uri": "https://pypi.org/project/mypy-boto3-secretsmanager" + }, + { + "name": "mypy-boto3-signer", + "uri": "https://pypi.org/project/mypy-boto3-signer" + }, + { + "name": "mypy-boto3-sqs", + "uri": "https://pypi.org/project/mypy-boto3-sqs" + }, + { + "name": "mypy-boto3-ssm", + "uri": "https://pypi.org/project/mypy-boto3-ssm" + }, + { + "name": "mypy-boto3-stepfunctions", + "uri": "https://pypi.org/project/mypy-boto3-stepfunctions" + }, + { + "name": "mypy-boto3-sts", + "uri": "https://pypi.org/project/mypy-boto3-sts" + }, + { + "name": "mypy-boto3-xray", + "uri": "https://pypi.org/project/mypy-boto3-xray" + }, + { + "name": "mypy-extensions", + "uri": "https://pypi.org/project/mypy-extensions" + }, + { + "name": "mypy-protobuf", + "uri": "https://pypi.org/project/mypy-protobuf" + }, + { + "name": "mysql", + "uri": "https://pypi.org/project/mysql" + }, + { + "name": "mysql-connector", + "uri": "https://pypi.org/project/mysql-connector" + }, + { + "name": "mysql-connector-python", + "uri": "https://pypi.org/project/mysql-connector-python" + }, + { + "name": "mysqlclient", + "uri": "https://pypi.org/project/mysqlclient" + }, + { + "name": "myst-parser", + "uri": "https://pypi.org/project/myst-parser" + }, + { + "name": "naked", + "uri": "https://pypi.org/project/naked" + }, + { + "name": "nameparser", + "uri": "https://pypi.org/project/nameparser" + }, + { + "name": "namex", + "uri": "https://pypi.org/project/namex" + }, + { + "name": "nanoid", + "uri": "https://pypi.org/project/nanoid" + }, + { + "name": "narwhals", + "uri": "https://pypi.org/project/narwhals" + }, + { + "name": "natsort", + "uri": "https://pypi.org/project/natsort" + }, + { + "name": "natto-py", + "uri": "https://pypi.org/project/natto-py" + }, + { + "name": "nbclassic", + "uri": "https://pypi.org/project/nbclassic" + }, + { + "name": "nbclient", + "uri": "https://pypi.org/project/nbclient" + }, + { + "name": "nbconvert", + "uri": "https://pypi.org/project/nbconvert" + }, + { + "name": "nbformat", + "uri": "https://pypi.org/project/nbformat" + }, + { + "name": "nbsphinx", + "uri": "https://pypi.org/project/nbsphinx" + }, + { + "name": "ndg-httpsclient", + "uri": "https://pypi.org/project/ndg-httpsclient" + }, + { + "name": "ndindex", + "uri": "https://pypi.org/project/ndindex" + }, + { + "name": "ndjson", + "uri": "https://pypi.org/project/ndjson" + }, + { + "name": "neo4j", + "uri": "https://pypi.org/project/neo4j" + }, + { + "name": "nest-asyncio", + "uri": "https://pypi.org/project/nest-asyncio" + }, + { + "name": "netaddr", + "uri": "https://pypi.org/project/netaddr" + }, + { + "name": "netcdf4", + "uri": "https://pypi.org/project/netcdf4" + }, + { + "name": "netifaces", + "uri": "https://pypi.org/project/netifaces" + }, + { + "name": "netsuitesdk", + "uri": "https://pypi.org/project/netsuitesdk" + }, + { + "name": "networkx", + "uri": "https://pypi.org/project/networkx" + }, + { + "name": "newrelic", + "uri": "https://pypi.org/project/newrelic" + }, + { + "name": "newrelic-telemetry-sdk", + "uri": "https://pypi.org/project/newrelic-telemetry-sdk" + }, + { + "name": "nh3", + "uri": "https://pypi.org/project/nh3" + }, + { + "name": "nibabel", + "uri": "https://pypi.org/project/nibabel" + }, + { + "name": "ninja", + "uri": "https://pypi.org/project/ninja" + }, + { + "name": "nltk", + "uri": "https://pypi.org/project/nltk" + }, + { + "name": "node-semver", + "uri": "https://pypi.org/project/node-semver" + }, + { + "name": "nodeenv", + "uri": "https://pypi.org/project/nodeenv" + }, + { + "name": "nose", + "uri": "https://pypi.org/project/nose" + }, + { + "name": "nose2", + "uri": "https://pypi.org/project/nose2" + }, + { + "name": "notebook", + "uri": "https://pypi.org/project/notebook" + }, + { + "name": "notebook-shim", + "uri": "https://pypi.org/project/notebook-shim" + }, + { + "name": "notifiers", + "uri": "https://pypi.org/project/notifiers" + }, + { + "name": "notion-client", + "uri": "https://pypi.org/project/notion-client" + }, + { + "name": "nox", + "uri": "https://pypi.org/project/nox" + }, + { + "name": "nptyping", + "uri": "https://pypi.org/project/nptyping" + }, + { + "name": "ntlm-auth", + "uri": "https://pypi.org/project/ntlm-auth" + }, + { + "name": "ntplib", + "uri": "https://pypi.org/project/ntplib" + }, + { + "name": "nulltype", + "uri": "https://pypi.org/project/nulltype" + }, + { + "name": "num2words", + "uri": "https://pypi.org/project/num2words" + }, + { + "name": "numba", + "uri": "https://pypi.org/project/numba" + }, + { + "name": "numcodecs", + "uri": "https://pypi.org/project/numcodecs" + }, + { + "name": "numdifftools", + "uri": "https://pypi.org/project/numdifftools" + }, + { + "name": "numexpr", + "uri": "https://pypi.org/project/numexpr" + }, + { + "name": "numpy", + "uri": "https://pypi.org/project/numpy" + }, + { + "name": "numpy-financial", + "uri": "https://pypi.org/project/numpy-financial" + }, + { + "name": "numpy-quaternion", + "uri": "https://pypi.org/project/numpy-quaternion" + }, + { + "name": "numpydoc", + "uri": "https://pypi.org/project/numpydoc" + }, + { + "name": "nvidia-cublas-cu11", + "uri": "https://pypi.org/project/nvidia-cublas-cu11" + }, + { + "name": "nvidia-cublas-cu12", + "uri": "https://pypi.org/project/nvidia-cublas-cu12" + }, + { + "name": "nvidia-cuda-cupti-cu11", + "uri": "https://pypi.org/project/nvidia-cuda-cupti-cu11" + }, + { + "name": "nvidia-cuda-cupti-cu12", + "uri": "https://pypi.org/project/nvidia-cuda-cupti-cu12" + }, + { + "name": "nvidia-cuda-nvrtc-cu11", + "uri": "https://pypi.org/project/nvidia-cuda-nvrtc-cu11" + }, + { + "name": "nvidia-cuda-nvrtc-cu12", + "uri": "https://pypi.org/project/nvidia-cuda-nvrtc-cu12" + }, + { + "name": "nvidia-cuda-runtime-cu11", + "uri": "https://pypi.org/project/nvidia-cuda-runtime-cu11" + }, + { + "name": "nvidia-cuda-runtime-cu12", + "uri": "https://pypi.org/project/nvidia-cuda-runtime-cu12" + }, + { + "name": "nvidia-cudnn-cu11", + "uri": "https://pypi.org/project/nvidia-cudnn-cu11" + }, + { + "name": "nvidia-cudnn-cu12", + "uri": "https://pypi.org/project/nvidia-cudnn-cu12" + }, + { + "name": "nvidia-cufft-cu11", + "uri": "https://pypi.org/project/nvidia-cufft-cu11" + }, + { + "name": "nvidia-cufft-cu12", + "uri": "https://pypi.org/project/nvidia-cufft-cu12" + }, + { + "name": "nvidia-curand-cu11", + "uri": "https://pypi.org/project/nvidia-curand-cu11" + }, + { + "name": "nvidia-curand-cu12", + "uri": "https://pypi.org/project/nvidia-curand-cu12" + }, + { + "name": "nvidia-cusolver-cu11", + "uri": "https://pypi.org/project/nvidia-cusolver-cu11" + }, + { + "name": "nvidia-cusolver-cu12", + "uri": "https://pypi.org/project/nvidia-cusolver-cu12" + }, + { + "name": "nvidia-cusparse-cu11", + "uri": "https://pypi.org/project/nvidia-cusparse-cu11" + }, + { + "name": "nvidia-cusparse-cu12", + "uri": "https://pypi.org/project/nvidia-cusparse-cu12" + }, + { + "name": "nvidia-ml-py", + "uri": "https://pypi.org/project/nvidia-ml-py" + }, + { + "name": "nvidia-nccl-cu11", + "uri": "https://pypi.org/project/nvidia-nccl-cu11" + }, + { + "name": "nvidia-nccl-cu12", + "uri": "https://pypi.org/project/nvidia-nccl-cu12" + }, + { + "name": "nvidia-nvjitlink-cu12", + "uri": "https://pypi.org/project/nvidia-nvjitlink-cu12" + }, + { + "name": "nvidia-nvtx-cu11", + "uri": "https://pypi.org/project/nvidia-nvtx-cu11" + }, + { + "name": "nvidia-nvtx-cu12", + "uri": "https://pypi.org/project/nvidia-nvtx-cu12" + }, + { + "name": "o365", + "uri": "https://pypi.org/project/o365" + }, + { + "name": "oauth2client", + "uri": "https://pypi.org/project/oauth2client" + }, + { + "name": "oauthlib", + "uri": "https://pypi.org/project/oauthlib" + }, + { + "name": "objsize", + "uri": "https://pypi.org/project/objsize" + }, + { + "name": "oci", + "uri": "https://pypi.org/project/oci" + }, + { + "name": "odfpy", + "uri": "https://pypi.org/project/odfpy" + }, + { + "name": "office365-rest-python-client", + "uri": "https://pypi.org/project/office365-rest-python-client" + }, + { + "name": "okta", + "uri": "https://pypi.org/project/okta" + }, + { + "name": "oldest-supported-numpy", + "uri": "https://pypi.org/project/oldest-supported-numpy" + }, + { + "name": "olefile", + "uri": "https://pypi.org/project/olefile" + }, + { + "name": "omegaconf", + "uri": "https://pypi.org/project/omegaconf" + }, + { + "name": "onnx", + "uri": "https://pypi.org/project/onnx" + }, + { + "name": "onnxconverter-common", + "uri": "https://pypi.org/project/onnxconverter-common" + }, + { + "name": "onnxruntime", + "uri": "https://pypi.org/project/onnxruntime" + }, + { + "name": "onnxruntime-gpu", + "uri": "https://pypi.org/project/onnxruntime-gpu" + }, + { + "name": "open-clip-torch", + "uri": "https://pypi.org/project/open-clip-torch" + }, + { + "name": "open3d", + "uri": "https://pypi.org/project/open3d" + }, + { + "name": "openai", + "uri": "https://pypi.org/project/openai" + }, + { + "name": "openapi-schema-pydantic", + "uri": "https://pypi.org/project/openapi-schema-pydantic" + }, + { + "name": "openapi-schema-validator", + "uri": "https://pypi.org/project/openapi-schema-validator" + }, + { + "name": "openapi-spec-validator", + "uri": "https://pypi.org/project/openapi-spec-validator" + }, + { + "name": "opencensus", + "uri": "https://pypi.org/project/opencensus" + }, + { + "name": "opencensus-context", + "uri": "https://pypi.org/project/opencensus-context" + }, + { + "name": "opencensus-ext-azure", + "uri": "https://pypi.org/project/opencensus-ext-azure" + }, + { + "name": "opencensus-ext-logging", + "uri": "https://pypi.org/project/opencensus-ext-logging" + }, + { + "name": "opencv-contrib-python", + "uri": "https://pypi.org/project/opencv-contrib-python" + }, + { + "name": "opencv-contrib-python-headless", + "uri": "https://pypi.org/project/opencv-contrib-python-headless" + }, + { + "name": "opencv-python", + "uri": "https://pypi.org/project/opencv-python" + }, + { + "name": "opencv-python-headless", + "uri": "https://pypi.org/project/opencv-python-headless" + }, + { + "name": "openinference-instrumentation", + "uri": "https://pypi.org/project/openinference-instrumentation" + }, + { + "name": "openinference-semantic-conventions", + "uri": "https://pypi.org/project/openinference-semantic-conventions" + }, + { + "name": "openlineage-airflow", + "uri": "https://pypi.org/project/openlineage-airflow" + }, + { + "name": "openlineage-integration-common", + "uri": "https://pypi.org/project/openlineage-integration-common" + }, + { + "name": "openlineage-python", + "uri": "https://pypi.org/project/openlineage-python" + }, + { + "name": "openlineage-sql", + "uri": "https://pypi.org/project/openlineage-sql" + }, + { + "name": "openpyxl", + "uri": "https://pypi.org/project/openpyxl" + }, + { + "name": "opensearch-py", + "uri": "https://pypi.org/project/opensearch-py" + }, + { + "name": "openstacksdk", + "uri": "https://pypi.org/project/openstacksdk" + }, + { + "name": "opentelemetry-api", + "uri": "https://pypi.org/project/opentelemetry-api" + }, + { + "name": "opentelemetry-distro", + "uri": "https://pypi.org/project/opentelemetry-distro" + }, + { + "name": "opentelemetry-exporter-gcp-trace", + "uri": "https://pypi.org/project/opentelemetry-exporter-gcp-trace" + }, + { + "name": "opentelemetry-exporter-otlp", + "uri": "https://pypi.org/project/opentelemetry-exporter-otlp" + }, + { + "name": "opentelemetry-exporter-otlp-proto-common", + "uri": "https://pypi.org/project/opentelemetry-exporter-otlp-proto-common" + }, + { + "name": "opentelemetry-exporter-otlp-proto-grpc", + "uri": "https://pypi.org/project/opentelemetry-exporter-otlp-proto-grpc" + }, + { + "name": "opentelemetry-exporter-otlp-proto-http", + "uri": "https://pypi.org/project/opentelemetry-exporter-otlp-proto-http" + }, + { + "name": "opentelemetry-instrumentation", + "uri": "https://pypi.org/project/opentelemetry-instrumentation" + }, + { + "name": "opentelemetry-instrumentation-aiohttp-client", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-aiohttp-client" + }, + { + "name": "opentelemetry-instrumentation-asgi", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-asgi" + }, + { + "name": "opentelemetry-instrumentation-aws-lambda", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-aws-lambda" + }, + { + "name": "opentelemetry-instrumentation-botocore", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-botocore" + }, + { + "name": "opentelemetry-instrumentation-dbapi", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-dbapi" + }, + { + "name": "opentelemetry-instrumentation-django", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-django" + }, + { + "name": "opentelemetry-instrumentation-fastapi", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-fastapi" + }, + { + "name": "opentelemetry-instrumentation-flask", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-flask" + }, + { + "name": "opentelemetry-instrumentation-grpc", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-grpc" + }, + { + "name": "opentelemetry-instrumentation-httpx", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-httpx" + }, + { + "name": "opentelemetry-instrumentation-jinja2", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-jinja2" + }, + { + "name": "opentelemetry-instrumentation-logging", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-logging" + }, + { + "name": "opentelemetry-instrumentation-psycopg2", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-psycopg2" + }, + { + "name": "opentelemetry-instrumentation-redis", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-redis" + }, + { + "name": "opentelemetry-instrumentation-requests", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-requests" + }, + { + "name": "opentelemetry-instrumentation-sqlalchemy", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-sqlalchemy" + }, + { + "name": "opentelemetry-instrumentation-sqlite3", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-sqlite3" + }, + { + "name": "opentelemetry-instrumentation-urllib", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-urllib" + }, + { + "name": "opentelemetry-instrumentation-urllib3", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-urllib3" + }, + { + "name": "opentelemetry-instrumentation-wsgi", + "uri": "https://pypi.org/project/opentelemetry-instrumentation-wsgi" + }, + { + "name": "opentelemetry-propagator-aws-xray", + "uri": "https://pypi.org/project/opentelemetry-propagator-aws-xray" + }, + { + "name": "opentelemetry-propagator-b3", + "uri": "https://pypi.org/project/opentelemetry-propagator-b3" + }, + { + "name": "opentelemetry-proto", + "uri": "https://pypi.org/project/opentelemetry-proto" + }, + { + "name": "opentelemetry-resource-detector-azure", + "uri": "https://pypi.org/project/opentelemetry-resource-detector-azure" + }, + { + "name": "opentelemetry-resourcedetector-gcp", + "uri": "https://pypi.org/project/opentelemetry-resourcedetector-gcp" + }, + { + "name": "opentelemetry-sdk", + "uri": "https://pypi.org/project/opentelemetry-sdk" + }, + { + "name": "opentelemetry-sdk-extension-aws", + "uri": "https://pypi.org/project/opentelemetry-sdk-extension-aws" + }, + { + "name": "opentelemetry-semantic-conventions", + "uri": "https://pypi.org/project/opentelemetry-semantic-conventions" + }, + { + "name": "opentelemetry-util-http", + "uri": "https://pypi.org/project/opentelemetry-util-http" + }, + { + "name": "opentracing", + "uri": "https://pypi.org/project/opentracing" + }, + { + "name": "openturns", + "uri": "https://pypi.org/project/openturns" + }, + { + "name": "openvino", + "uri": "https://pypi.org/project/openvino" + }, + { + "name": "openvino-telemetry", + "uri": "https://pypi.org/project/openvino-telemetry" + }, + { + "name": "openxlab", + "uri": "https://pypi.org/project/openxlab" + }, + { + "name": "opsgenie-sdk", + "uri": "https://pypi.org/project/opsgenie-sdk" + }, + { + "name": "opt-einsum", + "uri": "https://pypi.org/project/opt-einsum" + }, + { + "name": "optax", + "uri": "https://pypi.org/project/optax" + }, + { + "name": "optimum", + "uri": "https://pypi.org/project/optimum" + }, + { + "name": "optree", + "uri": "https://pypi.org/project/optree" + }, + { + "name": "optuna", + "uri": "https://pypi.org/project/optuna" + }, + { + "name": "oracledb", + "uri": "https://pypi.org/project/oracledb" + }, + { + "name": "orbax-checkpoint", + "uri": "https://pypi.org/project/orbax-checkpoint" + }, + { + "name": "ordered-set", + "uri": "https://pypi.org/project/ordered-set" + }, + { + "name": "orderedmultidict", + "uri": "https://pypi.org/project/orderedmultidict" + }, + { + "name": "orderly-set", + "uri": "https://pypi.org/project/orderly-set" + }, + { + "name": "orjson", + "uri": "https://pypi.org/project/orjson" + }, + { + "name": "ortools", + "uri": "https://pypi.org/project/ortools" + }, + { + "name": "os-service-types", + "uri": "https://pypi.org/project/os-service-types" + }, + { + "name": "oscrypto", + "uri": "https://pypi.org/project/oscrypto" + }, + { + "name": "oslo-config", + "uri": "https://pypi.org/project/oslo-config" + }, + { + "name": "oslo-i18n", + "uri": "https://pypi.org/project/oslo-i18n" + }, + { + "name": "oslo-serialization", + "uri": "https://pypi.org/project/oslo-serialization" + }, + { + "name": "oslo-utils", + "uri": "https://pypi.org/project/oslo-utils" + }, + { + "name": "osmium", + "uri": "https://pypi.org/project/osmium" + }, + { + "name": "osqp", + "uri": "https://pypi.org/project/osqp" + }, + { + "name": "oss2", + "uri": "https://pypi.org/project/oss2" + }, + { + "name": "outcome", + "uri": "https://pypi.org/project/outcome" + }, + { + "name": "outlines", + "uri": "https://pypi.org/project/outlines" + }, + { + "name": "overrides", + "uri": "https://pypi.org/project/overrides" + }, + { + "name": "oyaml", + "uri": "https://pypi.org/project/oyaml" + }, + { + "name": "p4python", + "uri": "https://pypi.org/project/p4python" + }, + { + "name": "packageurl-python", + "uri": "https://pypi.org/project/packageurl-python" + }, + { + "name": "packaging", + "uri": "https://pypi.org/project/packaging" + }, + { + "name": "paddleocr", + "uri": "https://pypi.org/project/paddleocr" + }, + { + "name": "paginate", + "uri": "https://pypi.org/project/paginate" + }, + { + "name": "paho-mqtt", + "uri": "https://pypi.org/project/paho-mqtt" + }, + { + "name": "palettable", + "uri": "https://pypi.org/project/palettable" + }, + { + "name": "pamqp", + "uri": "https://pypi.org/project/pamqp" + }, + { + "name": "pandas", + "uri": "https://pypi.org/project/pandas" + }, + { + "name": "pandas-gbq", + "uri": "https://pypi.org/project/pandas-gbq" + }, + { + "name": "pandas-stubs", + "uri": "https://pypi.org/project/pandas-stubs" + }, + { + "name": "pandasql", + "uri": "https://pypi.org/project/pandasql" + }, + { + "name": "pandera", + "uri": "https://pypi.org/project/pandera" + }, + { + "name": "pandocfilters", + "uri": "https://pypi.org/project/pandocfilters" + }, + { + "name": "panel", + "uri": "https://pypi.org/project/panel" + }, + { + "name": "pantab", + "uri": "https://pypi.org/project/pantab" + }, + { + "name": "papermill", + "uri": "https://pypi.org/project/papermill" + }, + { + "name": "param", + "uri": "https://pypi.org/project/param" + }, + { + "name": "parameterized", + "uri": "https://pypi.org/project/parameterized" + }, + { + "name": "paramiko", + "uri": "https://pypi.org/project/paramiko" + }, + { + "name": "parse", + "uri": "https://pypi.org/project/parse" + }, + { + "name": "parse-type", + "uri": "https://pypi.org/project/parse-type" + }, + { + "name": "parsedatetime", + "uri": "https://pypi.org/project/parsedatetime" + }, + { + "name": "parsel", + "uri": "https://pypi.org/project/parsel" + }, + { + "name": "parsimonious", + "uri": "https://pypi.org/project/parsimonious" + }, + { + "name": "parsley", + "uri": "https://pypi.org/project/parsley" + }, + { + "name": "parso", + "uri": "https://pypi.org/project/parso" + }, + { + "name": "partd", + "uri": "https://pypi.org/project/partd" + }, + { + "name": "parver", + "uri": "https://pypi.org/project/parver" + }, + { + "name": "passlib", + "uri": "https://pypi.org/project/passlib" + }, + { + "name": "paste", + "uri": "https://pypi.org/project/paste" + }, + { + "name": "pastedeploy", + "uri": "https://pypi.org/project/pastedeploy" + }, + { + "name": "pastel", + "uri": "https://pypi.org/project/pastel" + }, + { + "name": "patch-ng", + "uri": "https://pypi.org/project/patch-ng" + }, + { + "name": "patchelf", + "uri": "https://pypi.org/project/patchelf" + }, + { + "name": "path", + "uri": "https://pypi.org/project/path" + }, + { + "name": "path-dict", + "uri": "https://pypi.org/project/path-dict" + }, + { + "name": "pathable", + "uri": "https://pypi.org/project/pathable" + }, + { + "name": "pathlib", + "uri": "https://pypi.org/project/pathlib" + }, + { + "name": "pathlib-abc", + "uri": "https://pypi.org/project/pathlib-abc" + }, + { + "name": "pathlib-mate", + "uri": "https://pypi.org/project/pathlib-mate" + }, + { + "name": "pathlib2", + "uri": "https://pypi.org/project/pathlib2" + }, + { + "name": "pathos", + "uri": "https://pypi.org/project/pathos" + }, + { + "name": "pathspec", + "uri": "https://pypi.org/project/pathspec" + }, + { + "name": "pathtools", + "uri": "https://pypi.org/project/pathtools" + }, + { + "name": "pathvalidate", + "uri": "https://pypi.org/project/pathvalidate" + }, + { + "name": "pathy", + "uri": "https://pypi.org/project/pathy" + }, + { + "name": "patool", + "uri": "https://pypi.org/project/patool" + }, + { + "name": "patsy", + "uri": "https://pypi.org/project/patsy" + }, + { + "name": "pbr", + "uri": "https://pypi.org/project/pbr" + }, + { + "name": "pbs-installer", + "uri": "https://pypi.org/project/pbs-installer" + }, + { + "name": "pdb2pqr", + "uri": "https://pypi.org/project/pdb2pqr" + }, + { + "name": "pdf2image", + "uri": "https://pypi.org/project/pdf2image" + }, + { + "name": "pdfkit", + "uri": "https://pypi.org/project/pdfkit" + }, + { + "name": "pdfminer-six", + "uri": "https://pypi.org/project/pdfminer-six" + }, + { + "name": "pdfplumber", + "uri": "https://pypi.org/project/pdfplumber" + }, + { + "name": "pdm", + "uri": "https://pypi.org/project/pdm" + }, + { + "name": "pdpyras", + "uri": "https://pypi.org/project/pdpyras" + }, + { + "name": "peewee", + "uri": "https://pypi.org/project/peewee" + }, + { + "name": "pefile", + "uri": "https://pypi.org/project/pefile" + }, + { + "name": "peft", + "uri": "https://pypi.org/project/peft" + }, + { + "name": "pendulum", + "uri": "https://pypi.org/project/pendulum" + }, + { + "name": "pentapy", + "uri": "https://pypi.org/project/pentapy" + }, + { + "name": "pep517", + "uri": "https://pypi.org/project/pep517" + }, + { + "name": "pep8", + "uri": "https://pypi.org/project/pep8" + }, + { + "name": "pep8-naming", + "uri": "https://pypi.org/project/pep8-naming" + }, + { + "name": "peppercorn", + "uri": "https://pypi.org/project/peppercorn" + }, + { + "name": "persistence", + "uri": "https://pypi.org/project/persistence" + }, + { + "name": "persistent", + "uri": "https://pypi.org/project/persistent" + }, + { + "name": "pex", + "uri": "https://pypi.org/project/pex" + }, + { + "name": "pexpect", + "uri": "https://pypi.org/project/pexpect" + }, + { + "name": "pfzy", + "uri": "https://pypi.org/project/pfzy" + }, + { + "name": "pg8000", + "uri": "https://pypi.org/project/pg8000" + }, + { + "name": "pgpy", + "uri": "https://pypi.org/project/pgpy" + }, + { + "name": "pgvector", + "uri": "https://pypi.org/project/pgvector" + }, + { + "name": "phik", + "uri": "https://pypi.org/project/phik" + }, + { + "name": "phonenumbers", + "uri": "https://pypi.org/project/phonenumbers" + }, + { + "name": "phonenumberslite", + "uri": "https://pypi.org/project/phonenumberslite" + }, + { + "name": "pickleshare", + "uri": "https://pypi.org/project/pickleshare" + }, + { + "name": "piexif", + "uri": "https://pypi.org/project/piexif" + }, + { + "name": "pika", + "uri": "https://pypi.org/project/pika" + }, + { + "name": "pikepdf", + "uri": "https://pypi.org/project/pikepdf" + }, + { + "name": "pillow", + "uri": "https://pypi.org/project/pillow" + }, + { + "name": "pillow-avif-plugin", + "uri": "https://pypi.org/project/pillow-avif-plugin" + }, + { + "name": "pillow-heif", + "uri": "https://pypi.org/project/pillow-heif" + }, + { + "name": "pinecone-client", + "uri": "https://pypi.org/project/pinecone-client" + }, + { + "name": "pint", + "uri": "https://pypi.org/project/pint" + }, + { + "name": "pip", + "uri": "https://pypi.org/project/pip" + }, + { + "name": "pip-api", + "uri": "https://pypi.org/project/pip-api" + }, + { + "name": "pip-requirements-parser", + "uri": "https://pypi.org/project/pip-requirements-parser" + }, + { + "name": "pip-tools", + "uri": "https://pypi.org/project/pip-tools" + }, + { + "name": "pipdeptree", + "uri": "https://pypi.org/project/pipdeptree" + }, + { + "name": "pipelinewise-singer-python", + "uri": "https://pypi.org/project/pipelinewise-singer-python" + }, + { + "name": "pipenv", + "uri": "https://pypi.org/project/pipenv" + }, + { + "name": "pipreqs", + "uri": "https://pypi.org/project/pipreqs" + }, + { + "name": "pipx", + "uri": "https://pypi.org/project/pipx" + }, + { + "name": "pkce", + "uri": "https://pypi.org/project/pkce" + }, + { + "name": "pkgconfig", + "uri": "https://pypi.org/project/pkgconfig" + }, + { + "name": "pkginfo", + "uri": "https://pypi.org/project/pkginfo" + }, + { + "name": "pkgutil-resolve-name", + "uri": "https://pypi.org/project/pkgutil-resolve-name" + }, + { + "name": "plac", + "uri": "https://pypi.org/project/plac" + }, + { + "name": "plaster", + "uri": "https://pypi.org/project/plaster" + }, + { + "name": "plaster-pastedeploy", + "uri": "https://pypi.org/project/plaster-pastedeploy" + }, + { + "name": "platformdirs", + "uri": "https://pypi.org/project/platformdirs" + }, + { + "name": "playwright", + "uri": "https://pypi.org/project/playwright" + }, + { + "name": "plotly", + "uri": "https://pypi.org/project/plotly" + }, + { + "name": "plotnine", + "uri": "https://pypi.org/project/plotnine" + }, + { + "name": "pluggy", + "uri": "https://pypi.org/project/pluggy" + }, + { + "name": "pluginbase", + "uri": "https://pypi.org/project/pluginbase" + }, + { + "name": "plumbum", + "uri": "https://pypi.org/project/plumbum" + }, + { + "name": "ply", + "uri": "https://pypi.org/project/ply" + }, + { + "name": "pmdarima", + "uri": "https://pypi.org/project/pmdarima" + }, + { + "name": "poetry", + "uri": "https://pypi.org/project/poetry" + }, + { + "name": "poetry-core", + "uri": "https://pypi.org/project/poetry-core" + }, + { + "name": "poetry-dynamic-versioning", + "uri": "https://pypi.org/project/poetry-dynamic-versioning" + }, + { + "name": "poetry-plugin-export", + "uri": "https://pypi.org/project/poetry-plugin-export" + }, + { + "name": "poetry-plugin-pypi-mirror", + "uri": "https://pypi.org/project/poetry-plugin-pypi-mirror" + }, + { + "name": "polars", + "uri": "https://pypi.org/project/polars" + }, + { + "name": "polib", + "uri": "https://pypi.org/project/polib" + }, + { + "name": "policy-sentry", + "uri": "https://pypi.org/project/policy-sentry" + }, + { + "name": "polling", + "uri": "https://pypi.org/project/polling" + }, + { + "name": "polling2", + "uri": "https://pypi.org/project/polling2" + }, + { + "name": "polyline", + "uri": "https://pypi.org/project/polyline" + }, + { + "name": "pony", + "uri": "https://pypi.org/project/pony" + }, + { + "name": "pooch", + "uri": "https://pypi.org/project/pooch" + }, + { + "name": "port-for", + "uri": "https://pypi.org/project/port-for" + }, + { + "name": "portalocker", + "uri": "https://pypi.org/project/portalocker" + }, + { + "name": "portend", + "uri": "https://pypi.org/project/portend" + }, + { + "name": "portpicker", + "uri": "https://pypi.org/project/portpicker" + }, + { + "name": "posthog", + "uri": "https://pypi.org/project/posthog" + }, + { + "name": "pox", + "uri": "https://pypi.org/project/pox" + }, + { + "name": "ppft", + "uri": "https://pypi.org/project/ppft" + }, + { + "name": "pprintpp", + "uri": "https://pypi.org/project/pprintpp" + }, + { + "name": "prance", + "uri": "https://pypi.org/project/prance" + }, + { + "name": "pre-commit", + "uri": "https://pypi.org/project/pre-commit" + }, + { + "name": "pre-commit-hooks", + "uri": "https://pypi.org/project/pre-commit-hooks" + }, + { + "name": "prefect", + "uri": "https://pypi.org/project/prefect" + }, + { + "name": "prefect-aws", + "uri": "https://pypi.org/project/prefect-aws" + }, + { + "name": "prefect-gcp", + "uri": "https://pypi.org/project/prefect-gcp" + }, + { + "name": "premailer", + "uri": "https://pypi.org/project/premailer" + }, + { + "name": "preshed", + "uri": "https://pypi.org/project/preshed" + }, + { + "name": "presto-python-client", + "uri": "https://pypi.org/project/presto-python-client" + }, + { + "name": "pretend", + "uri": "https://pypi.org/project/pretend" + }, + { + "name": "pretty-html-table", + "uri": "https://pypi.org/project/pretty-html-table" + }, + { + "name": "prettytable", + "uri": "https://pypi.org/project/prettytable" + }, + { + "name": "primepy", + "uri": "https://pypi.org/project/primepy" + }, + { + "name": "priority", + "uri": "https://pypi.org/project/priority" + }, + { + "name": "prisma", + "uri": "https://pypi.org/project/prisma" + }, + { + "name": "prison", + "uri": "https://pypi.org/project/prison" + }, + { + "name": "probableparsing", + "uri": "https://pypi.org/project/probableparsing" + }, + { + "name": "proglog", + "uri": "https://pypi.org/project/proglog" + }, + { + "name": "progress", + "uri": "https://pypi.org/project/progress" + }, + { + "name": "progressbar2", + "uri": "https://pypi.org/project/progressbar2" + }, + { + "name": "prometheus-client", + "uri": "https://pypi.org/project/prometheus-client" + }, + { + "name": "prometheus-fastapi-instrumentator", + "uri": "https://pypi.org/project/prometheus-fastapi-instrumentator" + }, + { + "name": "prometheus-flask-exporter", + "uri": "https://pypi.org/project/prometheus-flask-exporter" + }, + { + "name": "promise", + "uri": "https://pypi.org/project/promise" + }, + { + "name": "prompt-toolkit", + "uri": "https://pypi.org/project/prompt-toolkit" + }, + { + "name": "pronouncing", + "uri": "https://pypi.org/project/pronouncing" + }, + { + "name": "property-manager", + "uri": "https://pypi.org/project/property-manager" + }, + { + "name": "prophet", + "uri": "https://pypi.org/project/prophet" + }, + { + "name": "propka", + "uri": "https://pypi.org/project/propka" + }, + { + "name": "prospector", + "uri": "https://pypi.org/project/prospector" + }, + { + "name": "protego", + "uri": "https://pypi.org/project/protego" + }, + { + "name": "proto-plus", + "uri": "https://pypi.org/project/proto-plus" + }, + { + "name": "protobuf", + "uri": "https://pypi.org/project/protobuf" + }, + { + "name": "protobuf3-to-dict", + "uri": "https://pypi.org/project/protobuf3-to-dict" + }, + { + "name": "psutil", + "uri": "https://pypi.org/project/psutil" + }, + { + "name": "psycopg", + "uri": "https://pypi.org/project/psycopg" + }, + { + "name": "psycopg-binary", + "uri": "https://pypi.org/project/psycopg-binary" + }, + { + "name": "psycopg-pool", + "uri": "https://pypi.org/project/psycopg-pool" + }, + { + "name": "psycopg2", + "uri": "https://pypi.org/project/psycopg2" + }, + { + "name": "psycopg2-binary", + "uri": "https://pypi.org/project/psycopg2-binary" + }, + { + "name": "ptpython", + "uri": "https://pypi.org/project/ptpython" + }, + { + "name": "ptyprocess", + "uri": "https://pypi.org/project/ptyprocess" + }, + { + "name": "publication", + "uri": "https://pypi.org/project/publication" + }, + { + "name": "publicsuffix2", + "uri": "https://pypi.org/project/publicsuffix2" + }, + { + "name": "publish-event-sns", + "uri": "https://pypi.org/project/publish-event-sns" + }, + { + "name": "pulp", + "uri": "https://pypi.org/project/pulp" + }, + { + "name": "pulsar-client", + "uri": "https://pypi.org/project/pulsar-client" + }, + { + "name": "pulumi", + "uri": "https://pypi.org/project/pulumi" + }, + { + "name": "pure-eval", + "uri": "https://pypi.org/project/pure-eval" + }, + { + "name": "pure-sasl", + "uri": "https://pypi.org/project/pure-sasl" + }, + { + "name": "pusher", + "uri": "https://pypi.org/project/pusher" + }, + { + "name": "pvlib", + "uri": "https://pypi.org/project/pvlib" + }, + { + "name": "py", + "uri": "https://pypi.org/project/py" + }, + { + "name": "py-cpuinfo", + "uri": "https://pypi.org/project/py-cpuinfo" + }, + { + "name": "py-models-parser", + "uri": "https://pypi.org/project/py-models-parser" + }, + { + "name": "py-partiql-parser", + "uri": "https://pypi.org/project/py-partiql-parser" + }, + { + "name": "py-serializable", + "uri": "https://pypi.org/project/py-serializable" + }, + { + "name": "py-spy", + "uri": "https://pypi.org/project/py-spy" + }, + { + "name": "py4j", + "uri": "https://pypi.org/project/py4j" + }, + { + "name": "py7zr", + "uri": "https://pypi.org/project/py7zr" + }, + { + "name": "pyaes", + "uri": "https://pypi.org/project/pyaes" + }, + { + "name": "pyahocorasick", + "uri": "https://pypi.org/project/pyahocorasick" + }, + { + "name": "pyairports", + "uri": "https://pypi.org/project/pyairports" + }, + { + "name": "pyairtable", + "uri": "https://pypi.org/project/pyairtable" + }, + { + "name": "pyaml", + "uri": "https://pypi.org/project/pyaml" + }, + { + "name": "pyannote-audio", + "uri": "https://pypi.org/project/pyannote-audio" + }, + { + "name": "pyannote-core", + "uri": "https://pypi.org/project/pyannote-core" + }, + { + "name": "pyannote-database", + "uri": "https://pypi.org/project/pyannote-database" + }, + { + "name": "pyannote-metrics", + "uri": "https://pypi.org/project/pyannote-metrics" + }, + { + "name": "pyannote-pipeline", + "uri": "https://pypi.org/project/pyannote-pipeline" + }, + { + "name": "pyapacheatlas", + "uri": "https://pypi.org/project/pyapacheatlas" + }, + { + "name": "pyarrow", + "uri": "https://pypi.org/project/pyarrow" + }, + { + "name": "pyarrow-hotfix", + "uri": "https://pypi.org/project/pyarrow-hotfix" + }, + { + "name": "pyasn1", + "uri": "https://pypi.org/project/pyasn1" + }, + { + "name": "pyasn1-modules", + "uri": "https://pypi.org/project/pyasn1-modules" + }, + { + "name": "pyathena", + "uri": "https://pypi.org/project/pyathena" + }, + { + "name": "pyautogui", + "uri": "https://pypi.org/project/pyautogui" + }, + { + "name": "pyawscron", + "uri": "https://pypi.org/project/pyawscron" + }, + { + "name": "pybase64", + "uri": "https://pypi.org/project/pybase64" + }, + { + "name": "pybcj", + "uri": "https://pypi.org/project/pybcj" + }, + { + "name": "pybind11", + "uri": "https://pypi.org/project/pybind11" + }, + { + "name": "pybloom-live", + "uri": "https://pypi.org/project/pybloom-live" + }, + { + "name": "pybtex", + "uri": "https://pypi.org/project/pybtex" + }, + { + "name": "pybytebuffer", + "uri": "https://pypi.org/project/pybytebuffer" + }, + { + "name": "pycairo", + "uri": "https://pypi.org/project/pycairo" + }, + { + "name": "pycares", + "uri": "https://pypi.org/project/pycares" + }, + { + "name": "pycep-parser", + "uri": "https://pypi.org/project/pycep-parser" + }, + { + "name": "pyclipper", + "uri": "https://pypi.org/project/pyclipper" + }, + { + "name": "pyclothoids", + "uri": "https://pypi.org/project/pyclothoids" + }, + { + "name": "pycocotools", + "uri": "https://pypi.org/project/pycocotools" + }, + { + "name": "pycodestyle", + "uri": "https://pypi.org/project/pycodestyle" + }, + { + "name": "pycomposefile", + "uri": "https://pypi.org/project/pycomposefile" + }, + { + "name": "pycountry", + "uri": "https://pypi.org/project/pycountry" + }, + { + "name": "pycparser", + "uri": "https://pypi.org/project/pycparser" + }, + { + "name": "pycrypto", + "uri": "https://pypi.org/project/pycrypto" + }, + { + "name": "pycryptodome", + "uri": "https://pypi.org/project/pycryptodome" + }, + { + "name": "pycryptodomex", + "uri": "https://pypi.org/project/pycryptodomex" + }, + { + "name": "pycurl", + "uri": "https://pypi.org/project/pycurl" + }, + { + "name": "pydantic", + "uri": "https://pypi.org/project/pydantic" + }, + { + "name": "pydantic-core", + "uri": "https://pypi.org/project/pydantic-core" + }, + { + "name": "pydantic-extra-types", + "uri": "https://pypi.org/project/pydantic-extra-types" + }, + { + "name": "pydantic-openapi-helper", + "uri": "https://pypi.org/project/pydantic-openapi-helper" + }, + { + "name": "pydantic-settings", + "uri": "https://pypi.org/project/pydantic-settings" + }, + { + "name": "pydash", + "uri": "https://pypi.org/project/pydash" + }, + { + "name": "pydata-google-auth", + "uri": "https://pypi.org/project/pydata-google-auth" + }, + { + "name": "pydata-sphinx-theme", + "uri": "https://pypi.org/project/pydata-sphinx-theme" + }, + { + "name": "pydeck", + "uri": "https://pypi.org/project/pydeck" + }, + { + "name": "pydeequ", + "uri": "https://pypi.org/project/pydeequ" + }, + { + "name": "pydevd", + "uri": "https://pypi.org/project/pydevd" + }, + { + "name": "pydicom", + "uri": "https://pypi.org/project/pydicom" + }, + { + "name": "pydispatcher", + "uri": "https://pypi.org/project/pydispatcher" + }, + { + "name": "pydocstyle", + "uri": "https://pypi.org/project/pydocstyle" + }, + { + "name": "pydot", + "uri": "https://pypi.org/project/pydot" + }, + { + "name": "pydriller", + "uri": "https://pypi.org/project/pydriller" + }, + { + "name": "pydruid", + "uri": "https://pypi.org/project/pydruid" + }, + { + "name": "pydub", + "uri": "https://pypi.org/project/pydub" + }, + { + "name": "pydyf", + "uri": "https://pypi.org/project/pydyf" + }, + { + "name": "pyee", + "uri": "https://pypi.org/project/pyee" + }, + { + "name": "pyelftools", + "uri": "https://pypi.org/project/pyelftools" + }, + { + "name": "pyerfa", + "uri": "https://pypi.org/project/pyerfa" + }, + { + "name": "pyfakefs", + "uri": "https://pypi.org/project/pyfakefs" + }, + { + "name": "pyfiglet", + "uri": "https://pypi.org/project/pyfiglet" + }, + { + "name": "pyflakes", + "uri": "https://pypi.org/project/pyflakes" + }, + { + "name": "pyformance", + "uri": "https://pypi.org/project/pyformance" + }, + { + "name": "pygame", + "uri": "https://pypi.org/project/pygame" + }, + { + "name": "pygeohash", + "uri": "https://pypi.org/project/pygeohash" + }, + { + "name": "pygetwindow", + "uri": "https://pypi.org/project/pygetwindow" + }, + { + "name": "pygit2", + "uri": "https://pypi.org/project/pygit2" + }, + { + "name": "pygithub", + "uri": "https://pypi.org/project/pygithub" + }, + { + "name": "pyglet", + "uri": "https://pypi.org/project/pyglet" + }, + { + "name": "pygments", + "uri": "https://pypi.org/project/pygments" + }, + { + "name": "pygobject", + "uri": "https://pypi.org/project/pygobject" + }, + { + "name": "pygsheets", + "uri": "https://pypi.org/project/pygsheets" + }, + { + "name": "pygtrie", + "uri": "https://pypi.org/project/pygtrie" + }, + { + "name": "pyhamcrest", + "uri": "https://pypi.org/project/pyhamcrest" + }, + { + "name": "pyhanko", + "uri": "https://pypi.org/project/pyhanko" + }, + { + "name": "pyhanko-certvalidator", + "uri": "https://pypi.org/project/pyhanko-certvalidator" + }, + { + "name": "pyhcl", + "uri": "https://pypi.org/project/pyhcl" + }, + { + "name": "pyhive", + "uri": "https://pypi.org/project/pyhive" + }, + { + "name": "pyhocon", + "uri": "https://pypi.org/project/pyhocon" + }, + { + "name": "pyhumps", + "uri": "https://pypi.org/project/pyhumps" + }, + { + "name": "pyiceberg", + "uri": "https://pypi.org/project/pyiceberg" + }, + { + "name": "pyinstaller", + "uri": "https://pypi.org/project/pyinstaller" + }, + { + "name": "pyinstaller-hooks-contrib", + "uri": "https://pypi.org/project/pyinstaller-hooks-contrib" + }, + { + "name": "pyinstrument", + "uri": "https://pypi.org/project/pyinstrument" + }, + { + "name": "pyjarowinkler", + "uri": "https://pypi.org/project/pyjarowinkler" + }, + { + "name": "pyjsparser", + "uri": "https://pypi.org/project/pyjsparser" + }, + { + "name": "pyjwt", + "uri": "https://pypi.org/project/pyjwt" + }, + { + "name": "pykakasi", + "uri": "https://pypi.org/project/pykakasi" + }, + { + "name": "pykwalify", + "uri": "https://pypi.org/project/pykwalify" + }, + { + "name": "pylev", + "uri": "https://pypi.org/project/pylev" + }, + { + "name": "pylint", + "uri": "https://pypi.org/project/pylint" + }, + { + "name": "pylint-django", + "uri": "https://pypi.org/project/pylint-django" + }, + { + "name": "pylint-plugin-utils", + "uri": "https://pypi.org/project/pylint-plugin-utils" + }, + { + "name": "pylru", + "uri": "https://pypi.org/project/pylru" + }, + { + "name": "pyluach", + "uri": "https://pypi.org/project/pyluach" + }, + { + "name": "pymatting", + "uri": "https://pypi.org/project/pymatting" + }, + { + "name": "pymdown-extensions", + "uri": "https://pypi.org/project/pymdown-extensions" + }, + { + "name": "pymeeus", + "uri": "https://pypi.org/project/pymeeus" + }, + { + "name": "pymemcache", + "uri": "https://pypi.org/project/pymemcache" + }, + { + "name": "pymilvus", + "uri": "https://pypi.org/project/pymilvus" + }, + { + "name": "pyminizip", + "uri": "https://pypi.org/project/pyminizip" + }, + { + "name": "pymisp", + "uri": "https://pypi.org/project/pymisp" + }, + { + "name": "pymongo", + "uri": "https://pypi.org/project/pymongo" + }, + { + "name": "pymongo-auth-aws", + "uri": "https://pypi.org/project/pymongo-auth-aws" + }, + { + "name": "pympler", + "uri": "https://pypi.org/project/pympler" + }, + { + "name": "pymsgbox", + "uri": "https://pypi.org/project/pymsgbox" + }, + { + "name": "pymssql", + "uri": "https://pypi.org/project/pymssql" + }, + { + "name": "pymsteams", + "uri": "https://pypi.org/project/pymsteams" + }, + { + "name": "pymupdf", + "uri": "https://pypi.org/project/pymupdf" + }, + { + "name": "pymupdfb", + "uri": "https://pypi.org/project/pymupdfb" + }, + { + "name": "pymysql", + "uri": "https://pypi.org/project/pymysql" + }, + { + "name": "pynacl", + "uri": "https://pypi.org/project/pynacl" + }, + { + "name": "pynamodb", + "uri": "https://pypi.org/project/pynamodb" + }, + { + "name": "pynetbox", + "uri": "https://pypi.org/project/pynetbox" + }, + { + "name": "pynndescent", + "uri": "https://pypi.org/project/pynndescent" + }, + { + "name": "pynput-robocorp-fork", + "uri": "https://pypi.org/project/pynput-robocorp-fork" + }, + { + "name": "pynvim", + "uri": "https://pypi.org/project/pynvim" + }, + { + "name": "pynvml", + "uri": "https://pypi.org/project/pynvml" + }, + { + "name": "pyod", + "uri": "https://pypi.org/project/pyod" + }, + { + "name": "pyodbc", + "uri": "https://pypi.org/project/pyodbc" + }, + { + "name": "pyogrio", + "uri": "https://pypi.org/project/pyogrio" + }, + { + "name": "pyopengl", + "uri": "https://pypi.org/project/pyopengl" + }, + { + "name": "pyopenssl", + "uri": "https://pypi.org/project/pyopenssl" + }, + { + "name": "pyorc", + "uri": "https://pypi.org/project/pyorc" + }, + { + "name": "pyotp", + "uri": "https://pypi.org/project/pyotp" + }, + { + "name": "pypandoc", + "uri": "https://pypi.org/project/pypandoc" + }, + { + "name": "pyparsing", + "uri": "https://pypi.org/project/pyparsing" + }, + { + "name": "pypdf", + "uri": "https://pypi.org/project/pypdf" + }, + { + "name": "pypdf2", + "uri": "https://pypi.org/project/pypdf2" + }, + { + "name": "pypdfium2", + "uri": "https://pypi.org/project/pypdfium2" + }, + { + "name": "pyperclip", + "uri": "https://pypi.org/project/pyperclip" + }, + { + "name": "pyphen", + "uri": "https://pypi.org/project/pyphen" + }, + { + "name": "pypika", + "uri": "https://pypi.org/project/pypika" + }, + { + "name": "pypinyin", + "uri": "https://pypi.org/project/pypinyin" + }, + { + "name": "pypiwin32", + "uri": "https://pypi.org/project/pypiwin32" + }, + { + "name": "pypng", + "uri": "https://pypi.org/project/pypng" + }, + { + "name": "pyppeteer", + "uri": "https://pypi.org/project/pyppeteer" + }, + { + "name": "pyppmd", + "uri": "https://pypi.org/project/pyppmd" + }, + { + "name": "pyproj", + "uri": "https://pypi.org/project/pyproj" + }, + { + "name": "pyproject-api", + "uri": "https://pypi.org/project/pyproject-api" + }, + { + "name": "pyproject-hooks", + "uri": "https://pypi.org/project/pyproject-hooks" + }, + { + "name": "pyproject-metadata", + "uri": "https://pypi.org/project/pyproject-metadata" + }, + { + "name": "pypyp", + "uri": "https://pypi.org/project/pypyp" + }, + { + "name": "pyqt5", + "uri": "https://pypi.org/project/pyqt5" + }, + { + "name": "pyqt5-qt5", + "uri": "https://pypi.org/project/pyqt5-qt5" + }, + { + "name": "pyqt5-sip", + "uri": "https://pypi.org/project/pyqt5-sip" + }, + { + "name": "pyqt6", + "uri": "https://pypi.org/project/pyqt6" + }, + { + "name": "pyqt6-qt6", + "uri": "https://pypi.org/project/pyqt6-qt6" + }, + { + "name": "pyqt6-sip", + "uri": "https://pypi.org/project/pyqt6-sip" + }, + { + "name": "pyquaternion", + "uri": "https://pypi.org/project/pyquaternion" + }, + { + "name": "pyquery", + "uri": "https://pypi.org/project/pyquery" + }, + { + "name": "pyramid", + "uri": "https://pypi.org/project/pyramid" + }, + { + "name": "pyrate-limiter", + "uri": "https://pypi.org/project/pyrate-limiter" + }, + { + "name": "pyreadline3", + "uri": "https://pypi.org/project/pyreadline3" + }, + { + "name": "pyrect", + "uri": "https://pypi.org/project/pyrect" + }, + { + "name": "pyrfc3339", + "uri": "https://pypi.org/project/pyrfc3339" + }, + { + "name": "pyright", + "uri": "https://pypi.org/project/pyright" + }, + { + "name": "pyroaring", + "uri": "https://pypi.org/project/pyroaring" + }, + { + "name": "pyrsistent", + "uri": "https://pypi.org/project/pyrsistent" + }, + { + "name": "pyrtf3", + "uri": "https://pypi.org/project/pyrtf3" + }, + { + "name": "pysaml2", + "uri": "https://pypi.org/project/pysaml2" + }, + { + "name": "pysbd", + "uri": "https://pypi.org/project/pysbd" + }, + { + "name": "pyscaffold", + "uri": "https://pypi.org/project/pyscaffold" + }, + { + "name": "pyscreeze", + "uri": "https://pypi.org/project/pyscreeze" + }, + { + "name": "pyserial", + "uri": "https://pypi.org/project/pyserial" + }, + { + "name": "pyserial-asyncio", + "uri": "https://pypi.org/project/pyserial-asyncio" + }, + { + "name": "pysftp", + "uri": "https://pypi.org/project/pysftp" + }, + { + "name": "pyshp", + "uri": "https://pypi.org/project/pyshp" + }, + { + "name": "pyside6", + "uri": "https://pypi.org/project/pyside6" + }, + { + "name": "pyside6-addons", + "uri": "https://pypi.org/project/pyside6-addons" + }, + { + "name": "pyside6-essentials", + "uri": "https://pypi.org/project/pyside6-essentials" + }, + { + "name": "pysmb", + "uri": "https://pypi.org/project/pysmb" + }, + { + "name": "pysmi", + "uri": "https://pypi.org/project/pysmi" + }, + { + "name": "pysnmp", + "uri": "https://pypi.org/project/pysnmp" + }, + { + "name": "pysocks", + "uri": "https://pypi.org/project/pysocks" + }, + { + "name": "pyspark", + "uri": "https://pypi.org/project/pyspark" + }, + { + "name": "pyspark-dist-explore", + "uri": "https://pypi.org/project/pyspark-dist-explore" + }, + { + "name": "pyspellchecker", + "uri": "https://pypi.org/project/pyspellchecker" + }, + { + "name": "pyspnego", + "uri": "https://pypi.org/project/pyspnego" + }, + { + "name": "pystache", + "uri": "https://pypi.org/project/pystache" + }, + { + "name": "pystan", + "uri": "https://pypi.org/project/pystan" + }, + { + "name": "pyston", + "uri": "https://pypi.org/project/pyston" + }, + { + "name": "pyston-autoload", + "uri": "https://pypi.org/project/pyston-autoload" + }, + { + "name": "pytablewriter", + "uri": "https://pypi.org/project/pytablewriter" + }, + { + "name": "pytd", + "uri": "https://pypi.org/project/pytd" + }, + { + "name": "pytelegrambotapi", + "uri": "https://pypi.org/project/pytelegrambotapi" + }, + { + "name": "pytesseract", + "uri": "https://pypi.org/project/pytesseract" + }, + { + "name": "pytest", + "uri": "https://pypi.org/project/pytest" + }, + { + "name": "pytest-aiohttp", + "uri": "https://pypi.org/project/pytest-aiohttp" + }, + { + "name": "pytest-alembic", + "uri": "https://pypi.org/project/pytest-alembic" + }, + { + "name": "pytest-ansible", + "uri": "https://pypi.org/project/pytest-ansible" + }, + { + "name": "pytest-assume", + "uri": "https://pypi.org/project/pytest-assume" + }, + { + "name": "pytest-asyncio", + "uri": "https://pypi.org/project/pytest-asyncio" + }, + { + "name": "pytest-azurepipelines", + "uri": "https://pypi.org/project/pytest-azurepipelines" + }, + { + "name": "pytest-base-url", + "uri": "https://pypi.org/project/pytest-base-url" + }, + { + "name": "pytest-bdd", + "uri": "https://pypi.org/project/pytest-bdd" + }, + { + "name": "pytest-benchmark", + "uri": "https://pypi.org/project/pytest-benchmark" + }, + { + "name": "pytest-check", + "uri": "https://pypi.org/project/pytest-check" + }, + { + "name": "pytest-cov", + "uri": "https://pypi.org/project/pytest-cov" + }, + { + "name": "pytest-custom-exit-code", + "uri": "https://pypi.org/project/pytest-custom-exit-code" + }, + { + "name": "pytest-dependency", + "uri": "https://pypi.org/project/pytest-dependency" + }, + { + "name": "pytest-django", + "uri": "https://pypi.org/project/pytest-django" + }, + { + "name": "pytest-dotenv", + "uri": "https://pypi.org/project/pytest-dotenv" + }, + { + "name": "pytest-env", + "uri": "https://pypi.org/project/pytest-env" + }, + { + "name": "pytest-flask", + "uri": "https://pypi.org/project/pytest-flask" + }, + { + "name": "pytest-forked", + "uri": "https://pypi.org/project/pytest-forked" + }, + { + "name": "pytest-freezegun", + "uri": "https://pypi.org/project/pytest-freezegun" + }, + { + "name": "pytest-html", + "uri": "https://pypi.org/project/pytest-html" + }, + { + "name": "pytest-httpserver", + "uri": "https://pypi.org/project/pytest-httpserver" + }, + { + "name": "pytest-httpx", + "uri": "https://pypi.org/project/pytest-httpx" + }, + { + "name": "pytest-icdiff", + "uri": "https://pypi.org/project/pytest-icdiff" + }, + { + "name": "pytest-instafail", + "uri": "https://pypi.org/project/pytest-instafail" + }, + { + "name": "pytest-json-report", + "uri": "https://pypi.org/project/pytest-json-report" + }, + { + "name": "pytest-localserver", + "uri": "https://pypi.org/project/pytest-localserver" + }, + { + "name": "pytest-messenger", + "uri": "https://pypi.org/project/pytest-messenger" + }, + { + "name": "pytest-metadata", + "uri": "https://pypi.org/project/pytest-metadata" + }, + { + "name": "pytest-mock", + "uri": "https://pypi.org/project/pytest-mock" + }, + { + "name": "pytest-mypy", + "uri": "https://pypi.org/project/pytest-mypy" + }, + { + "name": "pytest-order", + "uri": "https://pypi.org/project/pytest-order" + }, + { + "name": "pytest-ordering", + "uri": "https://pypi.org/project/pytest-ordering" + }, + { + "name": "pytest-parallel", + "uri": "https://pypi.org/project/pytest-parallel" + }, + { + "name": "pytest-playwright", + "uri": "https://pypi.org/project/pytest-playwright" + }, + { + "name": "pytest-random-order", + "uri": "https://pypi.org/project/pytest-random-order" + }, + { + "name": "pytest-randomly", + "uri": "https://pypi.org/project/pytest-randomly" + }, + { + "name": "pytest-repeat", + "uri": "https://pypi.org/project/pytest-repeat" + }, + { + "name": "pytest-rerunfailures", + "uri": "https://pypi.org/project/pytest-rerunfailures" + }, + { + "name": "pytest-runner", + "uri": "https://pypi.org/project/pytest-runner" + }, + { + "name": "pytest-socket", + "uri": "https://pypi.org/project/pytest-socket" + }, + { + "name": "pytest-split", + "uri": "https://pypi.org/project/pytest-split" + }, + { + "name": "pytest-subtests", + "uri": "https://pypi.org/project/pytest-subtests" + }, + { + "name": "pytest-sugar", + "uri": "https://pypi.org/project/pytest-sugar" + }, + { + "name": "pytest-timeout", + "uri": "https://pypi.org/project/pytest-timeout" + }, + { + "name": "pytest-xdist", + "uri": "https://pypi.org/project/pytest-xdist" + }, + { + "name": "python-arango", + "uri": "https://pypi.org/project/python-arango" + }, + { + "name": "python-bidi", + "uri": "https://pypi.org/project/python-bidi" + }, + { + "name": "python-box", + "uri": "https://pypi.org/project/python-box" + }, + { + "name": "python-can", + "uri": "https://pypi.org/project/python-can" + }, + { + "name": "python-certifi-win32", + "uri": "https://pypi.org/project/python-certifi-win32" + }, + { + "name": "python-consul", + "uri": "https://pypi.org/project/python-consul" + }, + { + "name": "python-crfsuite", + "uri": "https://pypi.org/project/python-crfsuite" + }, + { + "name": "python-crontab", + "uri": "https://pypi.org/project/python-crontab" + }, + { + "name": "python-daemon", + "uri": "https://pypi.org/project/python-daemon" + }, + { + "name": "python-dateutil", + "uri": "https://pypi.org/project/python-dateutil" + }, + { + "name": "python-decouple", + "uri": "https://pypi.org/project/python-decouple" + }, + { + "name": "python-docx", + "uri": "https://pypi.org/project/python-docx" + }, + { + "name": "python-dotenv", + "uri": "https://pypi.org/project/python-dotenv" + }, + { + "name": "python-editor", + "uri": "https://pypi.org/project/python-editor" + }, + { + "name": "python-engineio", + "uri": "https://pypi.org/project/python-engineio" + }, + { + "name": "python-gettext", + "uri": "https://pypi.org/project/python-gettext" + }, + { + "name": "python-gitlab", + "uri": "https://pypi.org/project/python-gitlab" + }, + { + "name": "python-gnupg", + "uri": "https://pypi.org/project/python-gnupg" + }, + { + "name": "python-hcl2", + "uri": "https://pypi.org/project/python-hcl2" + }, + { + "name": "python-http-client", + "uri": "https://pypi.org/project/python-http-client" + }, + { + "name": "python-igraph", + "uri": "https://pypi.org/project/python-igraph" + }, + { + "name": "python-ipware", + "uri": "https://pypi.org/project/python-ipware" + }, + { + "name": "python-iso639", + "uri": "https://pypi.org/project/python-iso639" + }, + { + "name": "python-jenkins", + "uri": "https://pypi.org/project/python-jenkins" + }, + { + "name": "python-jose", + "uri": "https://pypi.org/project/python-jose" + }, + { + "name": "python-json-logger", + "uri": "https://pypi.org/project/python-json-logger" + }, + { + "name": "python-keycloak", + "uri": "https://pypi.org/project/python-keycloak" + }, + { + "name": "python-keystoneclient", + "uri": "https://pypi.org/project/python-keystoneclient" + }, + { + "name": "python-ldap", + "uri": "https://pypi.org/project/python-ldap" + }, + { + "name": "python-levenshtein", + "uri": "https://pypi.org/project/python-levenshtein" + }, + { + "name": "python-logging-loki", + "uri": "https://pypi.org/project/python-logging-loki" + }, + { + "name": "python-lsp-jsonrpc", + "uri": "https://pypi.org/project/python-lsp-jsonrpc" + }, + { + "name": "python-magic", + "uri": "https://pypi.org/project/python-magic" + }, + { + "name": "python-memcached", + "uri": "https://pypi.org/project/python-memcached" + }, + { + "name": "python-miio", + "uri": "https://pypi.org/project/python-miio" + }, + { + "name": "python-multipart", + "uri": "https://pypi.org/project/python-multipart" + }, + { + "name": "python-nvd3", + "uri": "https://pypi.org/project/python-nvd3" + }, + { + "name": "python-on-whales", + "uri": "https://pypi.org/project/python-on-whales" + }, + { + "name": "python-pam", + "uri": "https://pypi.org/project/python-pam" + }, + { + "name": "python-pptx", + "uri": "https://pypi.org/project/python-pptx" + }, + { + "name": "python-rapidjson", + "uri": "https://pypi.org/project/python-rapidjson" + }, + { + "name": "python-slugify", + "uri": "https://pypi.org/project/python-slugify" + }, + { + "name": "python-snappy", + "uri": "https://pypi.org/project/python-snappy" + }, + { + "name": "python-socketio", + "uri": "https://pypi.org/project/python-socketio" + }, + { + "name": "python-stdnum", + "uri": "https://pypi.org/project/python-stdnum" + }, + { + "name": "python-string-utils", + "uri": "https://pypi.org/project/python-string-utils" + }, + { + "name": "python-telegram-bot", + "uri": "https://pypi.org/project/python-telegram-bot" + }, + { + "name": "python-ulid", + "uri": "https://pypi.org/project/python-ulid" + }, + { + "name": "python-utils", + "uri": "https://pypi.org/project/python-utils" + }, + { + "name": "python-xlib", + "uri": "https://pypi.org/project/python-xlib" + }, + { + "name": "python3-logstash", + "uri": "https://pypi.org/project/python3-logstash" + }, + { + "name": "python3-openid", + "uri": "https://pypi.org/project/python3-openid" + }, + { + "name": "python3-saml", + "uri": "https://pypi.org/project/python3-saml" + }, + { + "name": "pythonnet", + "uri": "https://pypi.org/project/pythonnet" + }, + { + "name": "pythran-openblas", + "uri": "https://pypi.org/project/pythran-openblas" + }, + { + "name": "pytimeparse", + "uri": "https://pypi.org/project/pytimeparse" + }, + { + "name": "pytimeparse2", + "uri": "https://pypi.org/project/pytimeparse2" + }, + { + "name": "pytoolconfig", + "uri": "https://pypi.org/project/pytoolconfig" + }, + { + "name": "pytorch-lightning", + "uri": "https://pypi.org/project/pytorch-lightning" + }, + { + "name": "pytorch-metric-learning", + "uri": "https://pypi.org/project/pytorch-metric-learning" + }, + { + "name": "pytube", + "uri": "https://pypi.org/project/pytube" + }, + { + "name": "pytweening", + "uri": "https://pypi.org/project/pytweening" + }, + { + "name": "pytz", + "uri": "https://pypi.org/project/pytz" + }, + { + "name": "pytz-deprecation-shim", + "uri": "https://pypi.org/project/pytz-deprecation-shim" + }, + { + "name": "pytzdata", + "uri": "https://pypi.org/project/pytzdata" + }, + { + "name": "pyu2f", + "uri": "https://pypi.org/project/pyu2f" + }, + { + "name": "pyudev", + "uri": "https://pypi.org/project/pyudev" + }, + { + "name": "pyunormalize", + "uri": "https://pypi.org/project/pyunormalize" + }, + { + "name": "pyusb", + "uri": "https://pypi.org/project/pyusb" + }, + { + "name": "pyvinecopulib", + "uri": "https://pypi.org/project/pyvinecopulib" + }, + { + "name": "pyvirtualdisplay", + "uri": "https://pypi.org/project/pyvirtualdisplay" + }, + { + "name": "pyvis", + "uri": "https://pypi.org/project/pyvis" + }, + { + "name": "pyvisa", + "uri": "https://pypi.org/project/pyvisa" + }, + { + "name": "pyviz-comms", + "uri": "https://pypi.org/project/pyviz-comms" + }, + { + "name": "pyvmomi", + "uri": "https://pypi.org/project/pyvmomi" + }, + { + "name": "pywavelets", + "uri": "https://pypi.org/project/pywavelets" + }, + { + "name": "pywin32", + "uri": "https://pypi.org/project/pywin32" + }, + { + "name": "pywin32-ctypes", + "uri": "https://pypi.org/project/pywin32-ctypes" + }, + { + "name": "pywinauto", + "uri": "https://pypi.org/project/pywinauto" + }, + { + "name": "pywinpty", + "uri": "https://pypi.org/project/pywinpty" + }, + { + "name": "pywinrm", + "uri": "https://pypi.org/project/pywinrm" + }, + { + "name": "pyxdg", + "uri": "https://pypi.org/project/pyxdg" + }, + { + "name": "pyxlsb", + "uri": "https://pypi.org/project/pyxlsb" + }, + { + "name": "pyyaml", + "uri": "https://pypi.org/project/pyyaml" + }, + { + "name": "pyyaml-env-tag", + "uri": "https://pypi.org/project/pyyaml-env-tag" + }, + { + "name": "pyzipper", + "uri": "https://pypi.org/project/pyzipper" + }, + { + "name": "pyzmq", + "uri": "https://pypi.org/project/pyzmq" + }, + { + "name": "pyzstd", + "uri": "https://pypi.org/project/pyzstd" + }, + { + "name": "qdldl", + "uri": "https://pypi.org/project/qdldl" + }, + { + "name": "qdrant-client", + "uri": "https://pypi.org/project/qdrant-client" + }, + { + "name": "qiskit", + "uri": "https://pypi.org/project/qiskit" + }, + { + "name": "qrcode", + "uri": "https://pypi.org/project/qrcode" + }, + { + "name": "qtconsole", + "uri": "https://pypi.org/project/qtconsole" + }, + { + "name": "qtpy", + "uri": "https://pypi.org/project/qtpy" + }, + { + "name": "quantlib", + "uri": "https://pypi.org/project/quantlib" + }, + { + "name": "quart", + "uri": "https://pypi.org/project/quart" + }, + { + "name": "qudida", + "uri": "https://pypi.org/project/qudida" + }, + { + "name": "querystring-parser", + "uri": "https://pypi.org/project/querystring-parser" + }, + { + "name": "questionary", + "uri": "https://pypi.org/project/questionary" + }, + { + "name": "queuelib", + "uri": "https://pypi.org/project/queuelib" + }, + { + "name": "quinn", + "uri": "https://pypi.org/project/quinn" + }, + { + "name": "radon", + "uri": "https://pypi.org/project/radon" + }, + { + "name": "random-password-generator", + "uri": "https://pypi.org/project/random-password-generator" + }, + { + "name": "rangehttpserver", + "uri": "https://pypi.org/project/rangehttpserver" + }, + { + "name": "rapidfuzz", + "uri": "https://pypi.org/project/rapidfuzz" + }, + { + "name": "rasterio", + "uri": "https://pypi.org/project/rasterio" + }, + { + "name": "ratelim", + "uri": "https://pypi.org/project/ratelim" + }, + { + "name": "ratelimit", + "uri": "https://pypi.org/project/ratelimit" + }, + { + "name": "ratelimiter", + "uri": "https://pypi.org/project/ratelimiter" + }, + { + "name": "raven", + "uri": "https://pypi.org/project/raven" + }, + { + "name": "ray", + "uri": "https://pypi.org/project/ray" + }, + { + "name": "rcssmin", + "uri": "https://pypi.org/project/rcssmin" + }, + { + "name": "rdflib", + "uri": "https://pypi.org/project/rdflib" + }, + { + "name": "rdkit", + "uri": "https://pypi.org/project/rdkit" + }, + { + "name": "reactivex", + "uri": "https://pypi.org/project/reactivex" + }, + { + "name": "readchar", + "uri": "https://pypi.org/project/readchar" + }, + { + "name": "readme-renderer", + "uri": "https://pypi.org/project/readme-renderer" + }, + { + "name": "readthedocs-sphinx-ext", + "uri": "https://pypi.org/project/readthedocs-sphinx-ext" + }, + { + "name": "realtime", + "uri": "https://pypi.org/project/realtime" + }, + { + "name": "recommonmark", + "uri": "https://pypi.org/project/recommonmark" + }, + { + "name": "recordlinkage", + "uri": "https://pypi.org/project/recordlinkage" + }, + { + "name": "red-discordbot", + "uri": "https://pypi.org/project/red-discordbot" + }, + { + "name": "redis", + "uri": "https://pypi.org/project/redis" + }, + { + "name": "redis-py-cluster", + "uri": "https://pypi.org/project/redis-py-cluster" + }, + { + "name": "redshift-connector", + "uri": "https://pypi.org/project/redshift-connector" + }, + { + "name": "referencing", + "uri": "https://pypi.org/project/referencing" + }, + { + "name": "regex", + "uri": "https://pypi.org/project/regex" + }, + { + "name": "regress", + "uri": "https://pypi.org/project/regress" + }, + { + "name": "rembg", + "uri": "https://pypi.org/project/rembg" + }, + { + "name": "reportlab", + "uri": "https://pypi.org/project/reportlab" + }, + { + "name": "repoze-lru", + "uri": "https://pypi.org/project/repoze-lru" + }, + { + "name": "requests", + "uri": "https://pypi.org/project/requests" + }, + { + "name": "requests-auth-aws-sigv4", + "uri": "https://pypi.org/project/requests-auth-aws-sigv4" + }, + { + "name": "requests-aws-sign", + "uri": "https://pypi.org/project/requests-aws-sign" + }, + { + "name": "requests-aws4auth", + "uri": "https://pypi.org/project/requests-aws4auth" + }, + { + "name": "requests-cache", + "uri": "https://pypi.org/project/requests-cache" + }, + { + "name": "requests-file", + "uri": "https://pypi.org/project/requests-file" + }, + { + "name": "requests-futures", + "uri": "https://pypi.org/project/requests-futures" + }, + { + "name": "requests-html", + "uri": "https://pypi.org/project/requests-html" + }, + { + "name": "requests-mock", + "uri": "https://pypi.org/project/requests-mock" + }, + { + "name": "requests-ntlm", + "uri": "https://pypi.org/project/requests-ntlm" + }, + { + "name": "requests-oauthlib", + "uri": "https://pypi.org/project/requests-oauthlib" + }, + { + "name": "requests-pkcs12", + "uri": "https://pypi.org/project/requests-pkcs12" + }, + { + "name": "requests-sigv4", + "uri": "https://pypi.org/project/requests-sigv4" + }, + { + "name": "requests-toolbelt", + "uri": "https://pypi.org/project/requests-toolbelt" + }, + { + "name": "requests-unixsocket", + "uri": "https://pypi.org/project/requests-unixsocket" + }, + { + "name": "requestsexceptions", + "uri": "https://pypi.org/project/requestsexceptions" + }, + { + "name": "requirements-parser", + "uri": "https://pypi.org/project/requirements-parser" + }, + { + "name": "resampy", + "uri": "https://pypi.org/project/resampy" + }, + { + "name": "resize-right", + "uri": "https://pypi.org/project/resize-right" + }, + { + "name": "resolvelib", + "uri": "https://pypi.org/project/resolvelib" + }, + { + "name": "responses", + "uri": "https://pypi.org/project/responses" + }, + { + "name": "respx", + "uri": "https://pypi.org/project/respx" + }, + { + "name": "restrictedpython", + "uri": "https://pypi.org/project/restrictedpython" + }, + { + "name": "result", + "uri": "https://pypi.org/project/result" + }, + { + "name": "retry", + "uri": "https://pypi.org/project/retry" + }, + { + "name": "retry-decorator", + "uri": "https://pypi.org/project/retry-decorator" + }, + { + "name": "retry2", + "uri": "https://pypi.org/project/retry2" + }, + { + "name": "retrying", + "uri": "https://pypi.org/project/retrying" + }, + { + "name": "rfc3339", + "uri": "https://pypi.org/project/rfc3339" + }, + { + "name": "rfc3339-validator", + "uri": "https://pypi.org/project/rfc3339-validator" + }, + { + "name": "rfc3986", + "uri": "https://pypi.org/project/rfc3986" + }, + { + "name": "rfc3986-validator", + "uri": "https://pypi.org/project/rfc3986-validator" + }, + { + "name": "rfc3987", + "uri": "https://pypi.org/project/rfc3987" + }, + { + "name": "rich", + "uri": "https://pypi.org/project/rich" + }, + { + "name": "rich-argparse", + "uri": "https://pypi.org/project/rich-argparse" + }, + { + "name": "rich-click", + "uri": "https://pypi.org/project/rich-click" + }, + { + "name": "riot", + "uri": "https://pypi.org/project/riot" + }, + { + "name": "rjsmin", + "uri": "https://pypi.org/project/rjsmin" + }, + { + "name": "rlp", + "uri": "https://pypi.org/project/rlp" + }, + { + "name": "rmsd", + "uri": "https://pypi.org/project/rmsd" + }, + { + "name": "robocorp-storage", + "uri": "https://pypi.org/project/robocorp-storage" + }, + { + "name": "robotframework", + "uri": "https://pypi.org/project/robotframework" + }, + { + "name": "robotframework-pythonlibcore", + "uri": "https://pypi.org/project/robotframework-pythonlibcore" + }, + { + "name": "robotframework-requests", + "uri": "https://pypi.org/project/robotframework-requests" + }, + { + "name": "robotframework-seleniumlibrary", + "uri": "https://pypi.org/project/robotframework-seleniumlibrary" + }, + { + "name": "robotframework-seleniumtestability", + "uri": "https://pypi.org/project/robotframework-seleniumtestability" + }, + { + "name": "rollbar", + "uri": "https://pypi.org/project/rollbar" + }, + { + "name": "roman", + "uri": "https://pypi.org/project/roman" + }, + { + "name": "rope", + "uri": "https://pypi.org/project/rope" + }, + { + "name": "rouge-score", + "uri": "https://pypi.org/project/rouge-score" + }, + { + "name": "routes", + "uri": "https://pypi.org/project/routes" + }, + { + "name": "rpaframework", + "uri": "https://pypi.org/project/rpaframework" + }, + { + "name": "rpaframework-core", + "uri": "https://pypi.org/project/rpaframework-core" + }, + { + "name": "rpaframework-pdf", + "uri": "https://pypi.org/project/rpaframework-pdf" + }, + { + "name": "rpds-py", + "uri": "https://pypi.org/project/rpds-py" + }, + { + "name": "rply", + "uri": "https://pypi.org/project/rply" + }, + { + "name": "rpyc", + "uri": "https://pypi.org/project/rpyc" + }, + { + "name": "rq", + "uri": "https://pypi.org/project/rq" + }, + { + "name": "rsa", + "uri": "https://pypi.org/project/rsa" + }, + { + "name": "rstr", + "uri": "https://pypi.org/project/rstr" + }, + { + "name": "rtree", + "uri": "https://pypi.org/project/rtree" + }, + { + "name": "ruamel-yaml", + "uri": "https://pypi.org/project/ruamel-yaml" + }, + { + "name": "ruamel-yaml-clib", + "uri": "https://pypi.org/project/ruamel-yaml-clib" + }, + { + "name": "ruff", + "uri": "https://pypi.org/project/ruff" + }, + { + "name": "runs", + "uri": "https://pypi.org/project/runs" + }, + { + "name": "ruptures", + "uri": "https://pypi.org/project/ruptures" + }, + { + "name": "rustworkx", + "uri": "https://pypi.org/project/rustworkx" + }, + { + "name": "ruyaml", + "uri": "https://pypi.org/project/ruyaml" + }, + { + "name": "rx", + "uri": "https://pypi.org/project/rx" + }, + { + "name": "s3cmd", + "uri": "https://pypi.org/project/s3cmd" + }, + { + "name": "s3fs", + "uri": "https://pypi.org/project/s3fs" + }, + { + "name": "s3path", + "uri": "https://pypi.org/project/s3path" + }, + { + "name": "s3transfer", + "uri": "https://pypi.org/project/s3transfer" + }, + { + "name": "sacrebleu", + "uri": "https://pypi.org/project/sacrebleu" + }, + { + "name": "sacremoses", + "uri": "https://pypi.org/project/sacremoses" + }, + { + "name": "safetensors", + "uri": "https://pypi.org/project/safetensors" + }, + { + "name": "safety", + "uri": "https://pypi.org/project/safety" + }, + { + "name": "safety-schemas", + "uri": "https://pypi.org/project/safety-schemas" + }, + { + "name": "sagemaker", + "uri": "https://pypi.org/project/sagemaker" + }, + { + "name": "sagemaker-core", + "uri": "https://pypi.org/project/sagemaker-core" + }, + { + "name": "sagemaker-mlflow", + "uri": "https://pypi.org/project/sagemaker-mlflow" + }, + { + "name": "salesforce-bulk", + "uri": "https://pypi.org/project/salesforce-bulk" + }, + { + "name": "sampleproject", + "uri": "https://pypi.org/project/sampleproject" + }, + { + "name": "sanic", + "uri": "https://pypi.org/project/sanic" + }, + { + "name": "sanic-routing", + "uri": "https://pypi.org/project/sanic-routing" + }, + { + "name": "sarif-om", + "uri": "https://pypi.org/project/sarif-om" + }, + { + "name": "sasl", + "uri": "https://pypi.org/project/sasl" + }, + { + "name": "scandir", + "uri": "https://pypi.org/project/scandir" + }, + { + "name": "scapy", + "uri": "https://pypi.org/project/scapy" + }, + { + "name": "schedule", + "uri": "https://pypi.org/project/schedule" + }, + { + "name": "schema", + "uri": "https://pypi.org/project/schema" + }, + { + "name": "schematics", + "uri": "https://pypi.org/project/schematics" + }, + { + "name": "schemdraw", + "uri": "https://pypi.org/project/schemdraw" + }, + { + "name": "scikit-build", + "uri": "https://pypi.org/project/scikit-build" + }, + { + "name": "scikit-build-core", + "uri": "https://pypi.org/project/scikit-build-core" + }, + { + "name": "scikit-image", + "uri": "https://pypi.org/project/scikit-image" + }, + { + "name": "scikit-learn", + "uri": "https://pypi.org/project/scikit-learn" + }, + { + "name": "scikit-optimize", + "uri": "https://pypi.org/project/scikit-optimize" + }, + { + "name": "scipy", + "uri": "https://pypi.org/project/scipy" + }, + { + "name": "scons", + "uri": "https://pypi.org/project/scons" + }, + { + "name": "scp", + "uri": "https://pypi.org/project/scp" + }, + { + "name": "scramp", + "uri": "https://pypi.org/project/scramp" + }, + { + "name": "scrapy", + "uri": "https://pypi.org/project/scrapy" + }, + { + "name": "scrypt", + "uri": "https://pypi.org/project/scrypt" + }, + { + "name": "scs", + "uri": "https://pypi.org/project/scs" + }, + { + "name": "seaborn", + "uri": "https://pypi.org/project/seaborn" + }, + { + "name": "secretstorage", + "uri": "https://pypi.org/project/secretstorage" + }, + { + "name": "segment-analytics-python", + "uri": "https://pypi.org/project/segment-analytics-python" + }, + { + "name": "segment-anything", + "uri": "https://pypi.org/project/segment-anything" + }, + { + "name": "selenium", + "uri": "https://pypi.org/project/selenium" + }, + { + "name": "selenium-wire", + "uri": "https://pypi.org/project/selenium-wire" + }, + { + "name": "seleniumbase", + "uri": "https://pypi.org/project/seleniumbase" + }, + { + "name": "semantic-version", + "uri": "https://pypi.org/project/semantic-version" + }, + { + "name": "semgrep", + "uri": "https://pypi.org/project/semgrep" + }, + { + "name": "semver", + "uri": "https://pypi.org/project/semver" + }, + { + "name": "send2trash", + "uri": "https://pypi.org/project/send2trash" + }, + { + "name": "sendgrid", + "uri": "https://pypi.org/project/sendgrid" + }, + { + "name": "sentence-transformers", + "uri": "https://pypi.org/project/sentence-transformers" + }, + { + "name": "sentencepiece", + "uri": "https://pypi.org/project/sentencepiece" + }, + { + "name": "sentinels", + "uri": "https://pypi.org/project/sentinels" + }, + { + "name": "sentry-sdk", + "uri": "https://pypi.org/project/sentry-sdk" + }, + { + "name": "seqio-nightly", + "uri": "https://pypi.org/project/seqio-nightly" + }, + { + "name": "serial", + "uri": "https://pypi.org/project/serial" + }, + { + "name": "service-identity", + "uri": "https://pypi.org/project/service-identity" + }, + { + "name": "setproctitle", + "uri": "https://pypi.org/project/setproctitle" + }, + { + "name": "setuptools", + "uri": "https://pypi.org/project/setuptools" + }, + { + "name": "setuptools-git", + "uri": "https://pypi.org/project/setuptools-git" + }, + { + "name": "setuptools-git-versioning", + "uri": "https://pypi.org/project/setuptools-git-versioning" + }, + { + "name": "setuptools-rust", + "uri": "https://pypi.org/project/setuptools-rust" + }, + { + "name": "setuptools-scm", + "uri": "https://pypi.org/project/setuptools-scm" + }, + { + "name": "setuptools-scm-git-archive", + "uri": "https://pypi.org/project/setuptools-scm-git-archive" + }, + { + "name": "sgmllib3k", + "uri": "https://pypi.org/project/sgmllib3k" + }, + { + "name": "sgp4", + "uri": "https://pypi.org/project/sgp4" + }, + { + "name": "sgqlc", + "uri": "https://pypi.org/project/sgqlc" + }, + { + "name": "sh", + "uri": "https://pypi.org/project/sh" + }, + { + "name": "shap", + "uri": "https://pypi.org/project/shap" + }, + { + "name": "shapely", + "uri": "https://pypi.org/project/shapely" + }, + { + "name": "shareplum", + "uri": "https://pypi.org/project/shareplum" + }, + { + "name": "sharepy", + "uri": "https://pypi.org/project/sharepy" + }, + { + "name": "shellescape", + "uri": "https://pypi.org/project/shellescape" + }, + { + "name": "shellingham", + "uri": "https://pypi.org/project/shellingham" + }, + { + "name": "shiboken6", + "uri": "https://pypi.org/project/shiboken6" + }, + { + "name": "shortuuid", + "uri": "https://pypi.org/project/shortuuid" + }, + { + "name": "shtab", + "uri": "https://pypi.org/project/shtab" + }, + { + "name": "shyaml", + "uri": "https://pypi.org/project/shyaml" + }, + { + "name": "signalfx", + "uri": "https://pypi.org/project/signalfx" + }, + { + "name": "signxml", + "uri": "https://pypi.org/project/signxml" + }, + { + "name": "silpa-common", + "uri": "https://pypi.org/project/silpa-common" + }, + { + "name": "simple-ddl-parser", + "uri": "https://pypi.org/project/simple-ddl-parser" + }, + { + "name": "simple-parsing", + "uri": "https://pypi.org/project/simple-parsing" + }, + { + "name": "simple-salesforce", + "uri": "https://pypi.org/project/simple-salesforce" + }, + { + "name": "simple-term-menu", + "uri": "https://pypi.org/project/simple-term-menu" + }, + { + "name": "simple-websocket", + "uri": "https://pypi.org/project/simple-websocket" + }, + { + "name": "simpleeval", + "uri": "https://pypi.org/project/simpleeval" + }, + { + "name": "simplegeneric", + "uri": "https://pypi.org/project/simplegeneric" + }, + { + "name": "simplejson", + "uri": "https://pypi.org/project/simplejson" + }, + { + "name": "simpy", + "uri": "https://pypi.org/project/simpy" + }, + { + "name": "singer-python", + "uri": "https://pypi.org/project/singer-python" + }, + { + "name": "singer-sdk", + "uri": "https://pypi.org/project/singer-sdk" + }, + { + "name": "singledispatch", + "uri": "https://pypi.org/project/singledispatch" + }, + { + "name": "singleton-decorator", + "uri": "https://pypi.org/project/singleton-decorator" + }, + { + "name": "six", + "uri": "https://pypi.org/project/six" + }, + { + "name": "skl2onnx", + "uri": "https://pypi.org/project/skl2onnx" + }, + { + "name": "sklearn", + "uri": "https://pypi.org/project/sklearn" + }, + { + "name": "sktime", + "uri": "https://pypi.org/project/sktime" + }, + { + "name": "skyfield", + "uri": "https://pypi.org/project/skyfield" + }, + { + "name": "slack-bolt", + "uri": "https://pypi.org/project/slack-bolt" + }, + { + "name": "slack-sdk", + "uri": "https://pypi.org/project/slack-sdk" + }, + { + "name": "slackclient", + "uri": "https://pypi.org/project/slackclient" + }, + { + "name": "slacker", + "uri": "https://pypi.org/project/slacker" + }, + { + "name": "slicer", + "uri": "https://pypi.org/project/slicer" + }, + { + "name": "slotted", + "uri": "https://pypi.org/project/slotted" + }, + { + "name": "smart-open", + "uri": "https://pypi.org/project/smart-open" + }, + { + "name": "smartsheet-python-sdk", + "uri": "https://pypi.org/project/smartsheet-python-sdk" + }, + { + "name": "smbprotocol", + "uri": "https://pypi.org/project/smbprotocol" + }, + { + "name": "smdebug-rulesconfig", + "uri": "https://pypi.org/project/smdebug-rulesconfig" + }, + { + "name": "smmap", + "uri": "https://pypi.org/project/smmap" + }, + { + "name": "smmap2", + "uri": "https://pypi.org/project/smmap2" + }, + { + "name": "sniffio", + "uri": "https://pypi.org/project/sniffio" + }, + { + "name": "snowballstemmer", + "uri": "https://pypi.org/project/snowballstemmer" + }, + { + "name": "snowflake", + "uri": "https://pypi.org/project/snowflake" + }, + { + "name": "snowflake-connector-python", + "uri": "https://pypi.org/project/snowflake-connector-python" + }, + { + "name": "snowflake-core", + "uri": "https://pypi.org/project/snowflake-core" + }, + { + "name": "snowflake-legacy", + "uri": "https://pypi.org/project/snowflake-legacy" + }, + { + "name": "snowflake-snowpark-python", + "uri": "https://pypi.org/project/snowflake-snowpark-python" + }, + { + "name": "snowflake-sqlalchemy", + "uri": "https://pypi.org/project/snowflake-sqlalchemy" + }, + { + "name": "snuggs", + "uri": "https://pypi.org/project/snuggs" + }, + { + "name": "social-auth-app-django", + "uri": "https://pypi.org/project/social-auth-app-django" + }, + { + "name": "social-auth-core", + "uri": "https://pypi.org/project/social-auth-core" + }, + { + "name": "socksio", + "uri": "https://pypi.org/project/socksio" + }, + { + "name": "soda-core", + "uri": "https://pypi.org/project/soda-core" + }, + { + "name": "soda-core-spark", + "uri": "https://pypi.org/project/soda-core-spark" + }, + { + "name": "soda-core-spark-df", + "uri": "https://pypi.org/project/soda-core-spark-df" + }, + { + "name": "sodapy", + "uri": "https://pypi.org/project/sodapy" + }, + { + "name": "sortedcontainers", + "uri": "https://pypi.org/project/sortedcontainers" + }, + { + "name": "sounddevice", + "uri": "https://pypi.org/project/sounddevice" + }, + { + "name": "soundex", + "uri": "https://pypi.org/project/soundex" + }, + { + "name": "soundfile", + "uri": "https://pypi.org/project/soundfile" + }, + { + "name": "soupsieve", + "uri": "https://pypi.org/project/soupsieve" + }, + { + "name": "soxr", + "uri": "https://pypi.org/project/soxr" + }, + { + "name": "spacy", + "uri": "https://pypi.org/project/spacy" + }, + { + "name": "spacy-legacy", + "uri": "https://pypi.org/project/spacy-legacy" + }, + { + "name": "spacy-loggers", + "uri": "https://pypi.org/project/spacy-loggers" + }, + { + "name": "spacy-transformers", + "uri": "https://pypi.org/project/spacy-transformers" + }, + { + "name": "spacy-wordnet", + "uri": "https://pypi.org/project/spacy-wordnet" + }, + { + "name": "spandrel", + "uri": "https://pypi.org/project/spandrel" + }, + { + "name": "spark-nlp", + "uri": "https://pypi.org/project/spark-nlp" + }, + { + "name": "spark-sklearn", + "uri": "https://pypi.org/project/spark-sklearn" + }, + { + "name": "sparkorm", + "uri": "https://pypi.org/project/sparkorm" + }, + { + "name": "sparqlwrapper", + "uri": "https://pypi.org/project/sparqlwrapper" + }, + { + "name": "spdx-tools", + "uri": "https://pypi.org/project/spdx-tools" + }, + { + "name": "speechbrain", + "uri": "https://pypi.org/project/speechbrain" + }, + { + "name": "speechrecognition", + "uri": "https://pypi.org/project/speechrecognition" + }, + { + "name": "spellchecker", + "uri": "https://pypi.org/project/spellchecker" + }, + { + "name": "sphinx", + "uri": "https://pypi.org/project/sphinx" + }, + { + "name": "sphinx-argparse", + "uri": "https://pypi.org/project/sphinx-argparse" + }, + { + "name": "sphinx-autobuild", + "uri": "https://pypi.org/project/sphinx-autobuild" + }, + { + "name": "sphinx-autodoc-typehints", + "uri": "https://pypi.org/project/sphinx-autodoc-typehints" + }, + { + "name": "sphinx-basic-ng", + "uri": "https://pypi.org/project/sphinx-basic-ng" + }, + { + "name": "sphinx-book-theme", + "uri": "https://pypi.org/project/sphinx-book-theme" + }, + { + "name": "sphinx-copybutton", + "uri": "https://pypi.org/project/sphinx-copybutton" + }, + { + "name": "sphinx-design", + "uri": "https://pypi.org/project/sphinx-design" + }, + { + "name": "sphinx-rtd-theme", + "uri": "https://pypi.org/project/sphinx-rtd-theme" + }, + { + "name": "sphinx-tabs", + "uri": "https://pypi.org/project/sphinx-tabs" + }, + { + "name": "sphinxcontrib-applehelp", + "uri": "https://pypi.org/project/sphinxcontrib-applehelp" + }, + { + "name": "sphinxcontrib-bibtex", + "uri": "https://pypi.org/project/sphinxcontrib-bibtex" + }, + { + "name": "sphinxcontrib-devhelp", + "uri": "https://pypi.org/project/sphinxcontrib-devhelp" + }, + { + "name": "sphinxcontrib-htmlhelp", + "uri": "https://pypi.org/project/sphinxcontrib-htmlhelp" + }, + { + "name": "sphinxcontrib-jquery", + "uri": "https://pypi.org/project/sphinxcontrib-jquery" + }, + { + "name": "sphinxcontrib-jsmath", + "uri": "https://pypi.org/project/sphinxcontrib-jsmath" + }, + { + "name": "sphinxcontrib-mermaid", + "uri": "https://pypi.org/project/sphinxcontrib-mermaid" + }, + { + "name": "sphinxcontrib-qthelp", + "uri": "https://pypi.org/project/sphinxcontrib-qthelp" + }, + { + "name": "sphinxcontrib-serializinghtml", + "uri": "https://pypi.org/project/sphinxcontrib-serializinghtml" + }, + { + "name": "sphinxcontrib-websupport", + "uri": "https://pypi.org/project/sphinxcontrib-websupport" + }, + { + "name": "spindry", + "uri": "https://pypi.org/project/spindry" + }, + { + "name": "spinners", + "uri": "https://pypi.org/project/spinners" + }, + { + "name": "splunk-handler", + "uri": "https://pypi.org/project/splunk-handler" + }, + { + "name": "splunk-sdk", + "uri": "https://pypi.org/project/splunk-sdk" + }, + { + "name": "spotinst-agent", + "uri": "https://pypi.org/project/spotinst-agent" + }, + { + "name": "sql-metadata", + "uri": "https://pypi.org/project/sql-metadata" + }, + { + "name": "sqlalchemy", + "uri": "https://pypi.org/project/sqlalchemy" + }, + { + "name": "sqlalchemy-bigquery", + "uri": "https://pypi.org/project/sqlalchemy-bigquery" + }, + { + "name": "sqlalchemy-jsonfield", + "uri": "https://pypi.org/project/sqlalchemy-jsonfield" + }, + { + "name": "sqlalchemy-migrate", + "uri": "https://pypi.org/project/sqlalchemy-migrate" + }, + { + "name": "sqlalchemy-redshift", + "uri": "https://pypi.org/project/sqlalchemy-redshift" + }, + { + "name": "sqlalchemy-spanner", + "uri": "https://pypi.org/project/sqlalchemy-spanner" + }, + { + "name": "sqlalchemy-utils", + "uri": "https://pypi.org/project/sqlalchemy-utils" + }, + { + "name": "sqlalchemy2-stubs", + "uri": "https://pypi.org/project/sqlalchemy2-stubs" + }, + { + "name": "sqlfluff", + "uri": "https://pypi.org/project/sqlfluff" + }, + { + "name": "sqlfluff-templater-dbt", + "uri": "https://pypi.org/project/sqlfluff-templater-dbt" + }, + { + "name": "sqlglot", + "uri": "https://pypi.org/project/sqlglot" + }, + { + "name": "sqlglotrs", + "uri": "https://pypi.org/project/sqlglotrs" + }, + { + "name": "sqlite-utils", + "uri": "https://pypi.org/project/sqlite-utils" + }, + { + "name": "sqlitedict", + "uri": "https://pypi.org/project/sqlitedict" + }, + { + "name": "sqllineage", + "uri": "https://pypi.org/project/sqllineage" + }, + { + "name": "sqlmodel", + "uri": "https://pypi.org/project/sqlmodel" + }, + { + "name": "sqlparams", + "uri": "https://pypi.org/project/sqlparams" + }, + { + "name": "sqlparse", + "uri": "https://pypi.org/project/sqlparse" + }, + { + "name": "srsly", + "uri": "https://pypi.org/project/srsly" + }, + { + "name": "sse-starlette", + "uri": "https://pypi.org/project/sse-starlette" + }, + { + "name": "sseclient-py", + "uri": "https://pypi.org/project/sseclient-py" + }, + { + "name": "sshpubkeys", + "uri": "https://pypi.org/project/sshpubkeys" + }, + { + "name": "sshtunnel", + "uri": "https://pypi.org/project/sshtunnel" + }, + { + "name": "stack-data", + "uri": "https://pypi.org/project/stack-data" + }, + { + "name": "stanio", + "uri": "https://pypi.org/project/stanio" + }, + { + "name": "starkbank-ecdsa", + "uri": "https://pypi.org/project/starkbank-ecdsa" + }, + { + "name": "starlette", + "uri": "https://pypi.org/project/starlette" + }, + { + "name": "starlette-exporter", + "uri": "https://pypi.org/project/starlette-exporter" + }, + { + "name": "statsd", + "uri": "https://pypi.org/project/statsd" + }, + { + "name": "statsforecast", + "uri": "https://pypi.org/project/statsforecast" + }, + { + "name": "statsmodels", + "uri": "https://pypi.org/project/statsmodels" + }, + { + "name": "std-uritemplate", + "uri": "https://pypi.org/project/std-uritemplate" + }, + { + "name": "stdlib-list", + "uri": "https://pypi.org/project/stdlib-list" + }, + { + "name": "stdlibs", + "uri": "https://pypi.org/project/stdlibs" + }, + { + "name": "stepfunctions", + "uri": "https://pypi.org/project/stepfunctions" + }, + { + "name": "stevedore", + "uri": "https://pypi.org/project/stevedore" + }, + { + "name": "stk", + "uri": "https://pypi.org/project/stk" + }, + { + "name": "stko", + "uri": "https://pypi.org/project/stko" + }, + { + "name": "stomp-py", + "uri": "https://pypi.org/project/stomp-py" + }, + { + "name": "stone", + "uri": "https://pypi.org/project/stone" + }, + { + "name": "strawberry-graphql", + "uri": "https://pypi.org/project/strawberry-graphql" + }, + { + "name": "streamerate", + "uri": "https://pypi.org/project/streamerate" + }, + { + "name": "streamlit", + "uri": "https://pypi.org/project/streamlit" + }, + { + "name": "strenum", + "uri": "https://pypi.org/project/strenum" + }, + { + "name": "strict-rfc3339", + "uri": "https://pypi.org/project/strict-rfc3339" + }, + { + "name": "strictyaml", + "uri": "https://pypi.org/project/strictyaml" + }, + { + "name": "stringcase", + "uri": "https://pypi.org/project/stringcase" + }, + { + "name": "strip-hints", + "uri": "https://pypi.org/project/strip-hints" + }, + { + "name": "stripe", + "uri": "https://pypi.org/project/stripe" + }, + { + "name": "striprtf", + "uri": "https://pypi.org/project/striprtf" + }, + { + "name": "structlog", + "uri": "https://pypi.org/project/structlog" + }, + { + "name": "subprocess-tee", + "uri": "https://pypi.org/project/subprocess-tee" + }, + { + "name": "subprocess32", + "uri": "https://pypi.org/project/subprocess32" + }, + { + "name": "sudachidict-core", + "uri": "https://pypi.org/project/sudachidict-core" + }, + { + "name": "sudachipy", + "uri": "https://pypi.org/project/sudachipy" + }, + { + "name": "suds-community", + "uri": "https://pypi.org/project/suds-community" + }, + { + "name": "suds-jurko", + "uri": "https://pypi.org/project/suds-jurko" + }, + { + "name": "suds-py3", + "uri": "https://pypi.org/project/suds-py3" + }, + { + "name": "supabase", + "uri": "https://pypi.org/project/supabase" + }, + { + "name": "supafunc", + "uri": "https://pypi.org/project/supafunc" + }, + { + "name": "supervision", + "uri": "https://pypi.org/project/supervision" + }, + { + "name": "supervisor", + "uri": "https://pypi.org/project/supervisor" + }, + { + "name": "svglib", + "uri": "https://pypi.org/project/svglib" + }, + { + "name": "svgwrite", + "uri": "https://pypi.org/project/svgwrite" + }, + { + "name": "swagger-spec-validator", + "uri": "https://pypi.org/project/swagger-spec-validator" + }, + { + "name": "swagger-ui-bundle", + "uri": "https://pypi.org/project/swagger-ui-bundle" + }, + { + "name": "swebench", + "uri": "https://pypi.org/project/swebench" + }, + { + "name": "swifter", + "uri": "https://pypi.org/project/swifter" + }, + { + "name": "symengine", + "uri": "https://pypi.org/project/symengine" + }, + { + "name": "sympy", + "uri": "https://pypi.org/project/sympy" + }, + { + "name": "table-meta", + "uri": "https://pypi.org/project/table-meta" + }, + { + "name": "tableau-api-lib", + "uri": "https://pypi.org/project/tableau-api-lib" + }, + { + "name": "tableauhyperapi", + "uri": "https://pypi.org/project/tableauhyperapi" + }, + { + "name": "tableauserverclient", + "uri": "https://pypi.org/project/tableauserverclient" + }, + { + "name": "tabledata", + "uri": "https://pypi.org/project/tabledata" + }, + { + "name": "tables", + "uri": "https://pypi.org/project/tables" + }, + { + "name": "tablib", + "uri": "https://pypi.org/project/tablib" + }, + { + "name": "tabulate", + "uri": "https://pypi.org/project/tabulate" + }, + { + "name": "tangled-up-in-unicode", + "uri": "https://pypi.org/project/tangled-up-in-unicode" + }, + { + "name": "tb-nightly", + "uri": "https://pypi.org/project/tb-nightly" + }, + { + "name": "tbats", + "uri": "https://pypi.org/project/tbats" + }, + { + "name": "tblib", + "uri": "https://pypi.org/project/tblib" + }, + { + "name": "tcolorpy", + "uri": "https://pypi.org/project/tcolorpy" + }, + { + "name": "tdqm", + "uri": "https://pypi.org/project/tdqm" + }, + { + "name": "tecton", + "uri": "https://pypi.org/project/tecton" + }, + { + "name": "tempita", + "uri": "https://pypi.org/project/tempita" + }, + { + "name": "tempora", + "uri": "https://pypi.org/project/tempora" + }, + { + "name": "temporalio", + "uri": "https://pypi.org/project/temporalio" + }, + { + "name": "tenacity", + "uri": "https://pypi.org/project/tenacity" + }, + { + "name": "tensorboard", + "uri": "https://pypi.org/project/tensorboard" + }, + { + "name": "tensorboard-data-server", + "uri": "https://pypi.org/project/tensorboard-data-server" + }, + { + "name": "tensorboard-plugin-wit", + "uri": "https://pypi.org/project/tensorboard-plugin-wit" + }, + { + "name": "tensorboardx", + "uri": "https://pypi.org/project/tensorboardx" + }, + { + "name": "tensorflow", + "uri": "https://pypi.org/project/tensorflow" + }, + { + "name": "tensorflow-addons", + "uri": "https://pypi.org/project/tensorflow-addons" + }, + { + "name": "tensorflow-cpu", + "uri": "https://pypi.org/project/tensorflow-cpu" + }, + { + "name": "tensorflow-datasets", + "uri": "https://pypi.org/project/tensorflow-datasets" + }, + { + "name": "tensorflow-estimator", + "uri": "https://pypi.org/project/tensorflow-estimator" + }, + { + "name": "tensorflow-hub", + "uri": "https://pypi.org/project/tensorflow-hub" + }, + { + "name": "tensorflow-intel", + "uri": "https://pypi.org/project/tensorflow-intel" + }, + { + "name": "tensorflow-io", + "uri": "https://pypi.org/project/tensorflow-io" + }, + { + "name": "tensorflow-io-gcs-filesystem", + "uri": "https://pypi.org/project/tensorflow-io-gcs-filesystem" + }, + { + "name": "tensorflow-metadata", + "uri": "https://pypi.org/project/tensorflow-metadata" + }, + { + "name": "tensorflow-model-optimization", + "uri": "https://pypi.org/project/tensorflow-model-optimization" + }, + { + "name": "tensorflow-probability", + "uri": "https://pypi.org/project/tensorflow-probability" + }, + { + "name": "tensorflow-serving-api", + "uri": "https://pypi.org/project/tensorflow-serving-api" + }, + { + "name": "tensorflow-text", + "uri": "https://pypi.org/project/tensorflow-text" + }, + { + "name": "tensorflowonspark", + "uri": "https://pypi.org/project/tensorflowonspark" + }, + { + "name": "tensorstore", + "uri": "https://pypi.org/project/tensorstore" + }, + { + "name": "teradatasql", + "uri": "https://pypi.org/project/teradatasql" + }, + { + "name": "teradatasqlalchemy", + "uri": "https://pypi.org/project/teradatasqlalchemy" + }, + { + "name": "termcolor", + "uri": "https://pypi.org/project/termcolor" + }, + { + "name": "terminado", + "uri": "https://pypi.org/project/terminado" + }, + { + "name": "terminaltables", + "uri": "https://pypi.org/project/terminaltables" + }, + { + "name": "testcontainers", + "uri": "https://pypi.org/project/testcontainers" + }, + { + "name": "testfixtures", + "uri": "https://pypi.org/project/testfixtures" + }, + { + "name": "testpath", + "uri": "https://pypi.org/project/testpath" + }, + { + "name": "testtools", + "uri": "https://pypi.org/project/testtools" + }, + { + "name": "text-unidecode", + "uri": "https://pypi.org/project/text-unidecode" + }, + { + "name": "textblob", + "uri": "https://pypi.org/project/textblob" + }, + { + "name": "textdistance", + "uri": "https://pypi.org/project/textdistance" + }, + { + "name": "textparser", + "uri": "https://pypi.org/project/textparser" + }, + { + "name": "texttable", + "uri": "https://pypi.org/project/texttable" + }, + { + "name": "textual", + "uri": "https://pypi.org/project/textual" + }, + { + "name": "textwrap3", + "uri": "https://pypi.org/project/textwrap3" + }, + { + "name": "tf-keras", + "uri": "https://pypi.org/project/tf-keras" + }, + { + "name": "tfx-bsl", + "uri": "https://pypi.org/project/tfx-bsl" + }, + { + "name": "thefuzz", + "uri": "https://pypi.org/project/thefuzz" + }, + { + "name": "thinc", + "uri": "https://pypi.org/project/thinc" + }, + { + "name": "thop", + "uri": "https://pypi.org/project/thop" + }, + { + "name": "threadpoolctl", + "uri": "https://pypi.org/project/threadpoolctl" + }, + { + "name": "thrift", + "uri": "https://pypi.org/project/thrift" + }, + { + "name": "thrift-sasl", + "uri": "https://pypi.org/project/thrift-sasl" + }, + { + "name": "throttlex", + "uri": "https://pypi.org/project/throttlex" + }, + { + "name": "tifffile", + "uri": "https://pypi.org/project/tifffile" + }, + { + "name": "tiktoken", + "uri": "https://pypi.org/project/tiktoken" + }, + { + "name": "time-machine", + "uri": "https://pypi.org/project/time-machine" + }, + { + "name": "timeout-decorator", + "uri": "https://pypi.org/project/timeout-decorator" + }, + { + "name": "timezonefinder", + "uri": "https://pypi.org/project/timezonefinder" + }, + { + "name": "timm", + "uri": "https://pypi.org/project/timm" + }, + { + "name": "tink", + "uri": "https://pypi.org/project/tink" + }, + { + "name": "tinycss2", + "uri": "https://pypi.org/project/tinycss2" + }, + { + "name": "tinydb", + "uri": "https://pypi.org/project/tinydb" + }, + { + "name": "tippo", + "uri": "https://pypi.org/project/tippo" + }, + { + "name": "tk", + "uri": "https://pypi.org/project/tk" + }, + { + "name": "tld", + "uri": "https://pypi.org/project/tld" + }, + { + "name": "tldextract", + "uri": "https://pypi.org/project/tldextract" + }, + { + "name": "tlparse", + "uri": "https://pypi.org/project/tlparse" + }, + { + "name": "tokenize-rt", + "uri": "https://pypi.org/project/tokenize-rt" + }, + { + "name": "tokenizers", + "uri": "https://pypi.org/project/tokenizers" + }, + { + "name": "tomesd", + "uri": "https://pypi.org/project/tomesd" + }, + { + "name": "toml", + "uri": "https://pypi.org/project/toml" + }, + { + "name": "tomli", + "uri": "https://pypi.org/project/tomli" + }, + { + "name": "tomli-w", + "uri": "https://pypi.org/project/tomli-w" + }, + { + "name": "tomlkit", + "uri": "https://pypi.org/project/tomlkit" + }, + { + "name": "toolz", + "uri": "https://pypi.org/project/toolz" + }, + { + "name": "toposort", + "uri": "https://pypi.org/project/toposort" + }, + { + "name": "torch", + "uri": "https://pypi.org/project/torch" + }, + { + "name": "torch-audiomentations", + "uri": "https://pypi.org/project/torch-audiomentations" + }, + { + "name": "torch-model-archiver", + "uri": "https://pypi.org/project/torch-model-archiver" + }, + { + "name": "torch-pitch-shift", + "uri": "https://pypi.org/project/torch-pitch-shift" + }, + { + "name": "torchaudio", + "uri": "https://pypi.org/project/torchaudio" + }, + { + "name": "torchdiffeq", + "uri": "https://pypi.org/project/torchdiffeq" + }, + { + "name": "torchmetrics", + "uri": "https://pypi.org/project/torchmetrics" + }, + { + "name": "torchsde", + "uri": "https://pypi.org/project/torchsde" + }, + { + "name": "torchtext", + "uri": "https://pypi.org/project/torchtext" + }, + { + "name": "torchvision", + "uri": "https://pypi.org/project/torchvision" + }, + { + "name": "tornado", + "uri": "https://pypi.org/project/tornado" + }, + { + "name": "tox", + "uri": "https://pypi.org/project/tox" + }, + { + "name": "tqdm", + "uri": "https://pypi.org/project/tqdm" + }, + { + "name": "traceback2", + "uri": "https://pypi.org/project/traceback2" + }, + { + "name": "trafilatura", + "uri": "https://pypi.org/project/trafilatura" + }, + { + "name": "trailrunner", + "uri": "https://pypi.org/project/trailrunner" + }, + { + "name": "traitlets", + "uri": "https://pypi.org/project/traitlets" + }, + { + "name": "traittypes", + "uri": "https://pypi.org/project/traittypes" + }, + { + "name": "trampoline", + "uri": "https://pypi.org/project/trampoline" + }, + { + "name": "transaction", + "uri": "https://pypi.org/project/transaction" + }, + { + "name": "transformers", + "uri": "https://pypi.org/project/transformers" + }, + { + "name": "transitions", + "uri": "https://pypi.org/project/transitions" + }, + { + "name": "translate", + "uri": "https://pypi.org/project/translate" + }, + { + "name": "translationstring", + "uri": "https://pypi.org/project/translationstring" + }, + { + "name": "tree-sitter", + "uri": "https://pypi.org/project/tree-sitter" + }, + { + "name": "tree-sitter-python", + "uri": "https://pypi.org/project/tree-sitter-python" + }, + { + "name": "treelib", + "uri": "https://pypi.org/project/treelib" + }, + { + "name": "triad", + "uri": "https://pypi.org/project/triad" + }, + { + "name": "trimesh", + "uri": "https://pypi.org/project/trimesh" + }, + { + "name": "trino", + "uri": "https://pypi.org/project/trino" + }, + { + "name": "trio", + "uri": "https://pypi.org/project/trio" + }, + { + "name": "trio-websocket", + "uri": "https://pypi.org/project/trio-websocket" + }, + { + "name": "triton", + "uri": "https://pypi.org/project/triton" + }, + { + "name": "tritonclient", + "uri": "https://pypi.org/project/tritonclient" + }, + { + "name": "trl", + "uri": "https://pypi.org/project/trl" + }, + { + "name": "troposphere", + "uri": "https://pypi.org/project/troposphere" + }, + { + "name": "trove-classifiers", + "uri": "https://pypi.org/project/trove-classifiers" + }, + { + "name": "truststore", + "uri": "https://pypi.org/project/truststore" + }, + { + "name": "tsx", + "uri": "https://pypi.org/project/tsx" + }, + { + "name": "tweepy", + "uri": "https://pypi.org/project/tweepy" + }, + { + "name": "twilio", + "uri": "https://pypi.org/project/twilio" + }, + { + "name": "twine", + "uri": "https://pypi.org/project/twine" + }, + { + "name": "twisted", + "uri": "https://pypi.org/project/twisted" + }, + { + "name": "txaio", + "uri": "https://pypi.org/project/txaio" + }, + { + "name": "typed-ast", + "uri": "https://pypi.org/project/typed-ast" + }, + { + "name": "typedload", + "uri": "https://pypi.org/project/typedload" + }, + { + "name": "typeguard", + "uri": "https://pypi.org/project/typeguard" + }, + { + "name": "typeid-python", + "uri": "https://pypi.org/project/typeid-python" + }, + { + "name": "typepy", + "uri": "https://pypi.org/project/typepy" + }, + { + "name": "typer", + "uri": "https://pypi.org/project/typer" + }, + { + "name": "types-aiobotocore", + "uri": "https://pypi.org/project/types-aiobotocore" + }, + { + "name": "types-aiobotocore-s3", + "uri": "https://pypi.org/project/types-aiobotocore-s3" + }, + { + "name": "types-awscrt", + "uri": "https://pypi.org/project/types-awscrt" + }, + { + "name": "types-beautifulsoup4", + "uri": "https://pypi.org/project/types-beautifulsoup4" + }, + { + "name": "types-cachetools", + "uri": "https://pypi.org/project/types-cachetools" + }, + { + "name": "types-cffi", + "uri": "https://pypi.org/project/types-cffi" + }, + { + "name": "types-colorama", + "uri": "https://pypi.org/project/types-colorama" + }, + { + "name": "types-cryptography", + "uri": "https://pypi.org/project/types-cryptography" + }, + { + "name": "types-dataclasses", + "uri": "https://pypi.org/project/types-dataclasses" + }, + { + "name": "types-decorator", + "uri": "https://pypi.org/project/types-decorator" + }, + { + "name": "types-deprecated", + "uri": "https://pypi.org/project/types-deprecated" + }, + { + "name": "types-docutils", + "uri": "https://pypi.org/project/types-docutils" + }, + { + "name": "types-html5lib", + "uri": "https://pypi.org/project/types-html5lib" + }, + { + "name": "types-jinja2", + "uri": "https://pypi.org/project/types-jinja2" + }, + { + "name": "types-jsonschema", + "uri": "https://pypi.org/project/types-jsonschema" + }, + { + "name": "types-markdown", + "uri": "https://pypi.org/project/types-markdown" + }, + { + "name": "types-markupsafe", + "uri": "https://pypi.org/project/types-markupsafe" + }, + { + "name": "types-mock", + "uri": "https://pypi.org/project/types-mock" + }, + { + "name": "types-paramiko", + "uri": "https://pypi.org/project/types-paramiko" + }, + { + "name": "types-pillow", + "uri": "https://pypi.org/project/types-pillow" + }, + { + "name": "types-protobuf", + "uri": "https://pypi.org/project/types-protobuf" + }, + { + "name": "types-psutil", + "uri": "https://pypi.org/project/types-psutil" + }, + { + "name": "types-psycopg2", + "uri": "https://pypi.org/project/types-psycopg2" + }, + { + "name": "types-pygments", + "uri": "https://pypi.org/project/types-pygments" + }, + { + "name": "types-pyopenssl", + "uri": "https://pypi.org/project/types-pyopenssl" + }, + { + "name": "types-pyserial", + "uri": "https://pypi.org/project/types-pyserial" + }, + { + "name": "types-python-dateutil", + "uri": "https://pypi.org/project/types-python-dateutil" + }, + { + "name": "types-pytz", + "uri": "https://pypi.org/project/types-pytz" + }, + { + "name": "types-pyyaml", + "uri": "https://pypi.org/project/types-pyyaml" + }, + { + "name": "types-redis", + "uri": "https://pypi.org/project/types-redis" + }, + { + "name": "types-requests", + "uri": "https://pypi.org/project/types-requests" + }, + { + "name": "types-retry", + "uri": "https://pypi.org/project/types-retry" + }, + { + "name": "types-s3transfer", + "uri": "https://pypi.org/project/types-s3transfer" + }, + { + "name": "types-setuptools", + "uri": "https://pypi.org/project/types-setuptools" + }, + { + "name": "types-simplejson", + "uri": "https://pypi.org/project/types-simplejson" + }, + { + "name": "types-six", + "uri": "https://pypi.org/project/types-six" + }, + { + "name": "types-tabulate", + "uri": "https://pypi.org/project/types-tabulate" + }, + { + "name": "types-toml", + "uri": "https://pypi.org/project/types-toml" + }, + { + "name": "types-ujson", + "uri": "https://pypi.org/project/types-ujson" + }, + { + "name": "types-urllib3", + "uri": "https://pypi.org/project/types-urllib3" + }, + { + "name": "typing", + "uri": "https://pypi.org/project/typing" + }, + { + "name": "typing-extensions", + "uri": "https://pypi.org/project/typing-extensions" + }, + { + "name": "typing-inspect", + "uri": "https://pypi.org/project/typing-inspect" + }, + { + "name": "typing-utils", + "uri": "https://pypi.org/project/typing-utils" + }, + { + "name": "typish", + "uri": "https://pypi.org/project/typish" + }, + { + "name": "tyro", + "uri": "https://pypi.org/project/tyro" + }, + { + "name": "tzdata", + "uri": "https://pypi.org/project/tzdata" + }, + { + "name": "tzfpy", + "uri": "https://pypi.org/project/tzfpy" + }, + { + "name": "tzlocal", + "uri": "https://pypi.org/project/tzlocal" + }, + { + "name": "ua-parser", + "uri": "https://pypi.org/project/ua-parser" + }, + { + "name": "uamqp", + "uri": "https://pypi.org/project/uamqp" + }, + { + "name": "uc-micro-py", + "uri": "https://pypi.org/project/uc-micro-py" + }, + { + "name": "ufmt", + "uri": "https://pypi.org/project/ufmt" + }, + { + "name": "uhashring", + "uri": "https://pypi.org/project/uhashring" + }, + { + "name": "ujson", + "uri": "https://pypi.org/project/ujson" + }, + { + "name": "ultralytics", + "uri": "https://pypi.org/project/ultralytics" + }, + { + "name": "ultralytics-thop", + "uri": "https://pypi.org/project/ultralytics-thop" + }, + { + "name": "umap-learn", + "uri": "https://pypi.org/project/umap-learn" + }, + { + "name": "uncertainties", + "uri": "https://pypi.org/project/uncertainties" + }, + { + "name": "undetected-chromedriver", + "uri": "https://pypi.org/project/undetected-chromedriver" + }, + { + "name": "unearth", + "uri": "https://pypi.org/project/unearth" + }, + { + "name": "unicodecsv", + "uri": "https://pypi.org/project/unicodecsv" + }, + { + "name": "unidecode", + "uri": "https://pypi.org/project/unidecode" + }, + { + "name": "unidiff", + "uri": "https://pypi.org/project/unidiff" + }, + { + "name": "unittest-xml-reporting", + "uri": "https://pypi.org/project/unittest-xml-reporting" + }, + { + "name": "unittest2", + "uri": "https://pypi.org/project/unittest2" + }, + { + "name": "universal-pathlib", + "uri": "https://pypi.org/project/universal-pathlib" + }, + { + "name": "unstructured", + "uri": "https://pypi.org/project/unstructured" + }, + { + "name": "unstructured-client", + "uri": "https://pypi.org/project/unstructured-client" + }, + { + "name": "update-checker", + "uri": "https://pypi.org/project/update-checker" + }, + { + "name": "uplink", + "uri": "https://pypi.org/project/uplink" + }, + { + "name": "uproot", + "uri": "https://pypi.org/project/uproot" + }, + { + "name": "uptime-kuma-api", + "uri": "https://pypi.org/project/uptime-kuma-api" + }, + { + "name": "uri-template", + "uri": "https://pypi.org/project/uri-template" + }, + { + "name": "uritemplate", + "uri": "https://pypi.org/project/uritemplate" + }, + { + "name": "uritools", + "uri": "https://pypi.org/project/uritools" + }, + { + "name": "url-normalize", + "uri": "https://pypi.org/project/url-normalize" + }, + { + "name": "urllib3", + "uri": "https://pypi.org/project/urllib3" + }, + { + "name": "urllib3-secure-extra", + "uri": "https://pypi.org/project/urllib3-secure-extra" + }, + { + "name": "urwid", + "uri": "https://pypi.org/project/urwid" + }, + { + "name": "usaddress", + "uri": "https://pypi.org/project/usaddress" + }, + { + "name": "user-agents", + "uri": "https://pypi.org/project/user-agents" + }, + { + "name": "userpath", + "uri": "https://pypi.org/project/userpath" + }, + { + "name": "usort", + "uri": "https://pypi.org/project/usort" + }, + { + "name": "utilsforecast", + "uri": "https://pypi.org/project/utilsforecast" + }, + { + "name": "uuid", + "uri": "https://pypi.org/project/uuid" + }, + { + "name": "uuid6", + "uri": "https://pypi.org/project/uuid6" + }, + { + "name": "uv", + "uri": "https://pypi.org/project/uv" + }, + { + "name": "uvicorn", + "uri": "https://pypi.org/project/uvicorn" + }, + { + "name": "uvloop", + "uri": "https://pypi.org/project/uvloop" + }, + { + "name": "uwsgi", + "uri": "https://pypi.org/project/uwsgi" + }, + { + "name": "validate-email", + "uri": "https://pypi.org/project/validate-email" + }, + { + "name": "validators", + "uri": "https://pypi.org/project/validators" + }, + { + "name": "vcrpy", + "uri": "https://pypi.org/project/vcrpy" + }, + { + "name": "venusian", + "uri": "https://pypi.org/project/venusian" + }, + { + "name": "verboselogs", + "uri": "https://pypi.org/project/verboselogs" + }, + { + "name": "versioneer", + "uri": "https://pypi.org/project/versioneer" + }, + { + "name": "versioneer-518", + "uri": "https://pypi.org/project/versioneer-518" + }, + { + "name": "vertexai", + "uri": "https://pypi.org/project/vertexai" + }, + { + "name": "vine", + "uri": "https://pypi.org/project/vine" + }, + { + "name": "virtualenv", + "uri": "https://pypi.org/project/virtualenv" + }, + { + "name": "virtualenv-clone", + "uri": "https://pypi.org/project/virtualenv-clone" + }, + { + "name": "visions", + "uri": "https://pypi.org/project/visions" + }, + { + "name": "vllm", + "uri": "https://pypi.org/project/vllm" + }, + { + "name": "voluptuous", + "uri": "https://pypi.org/project/voluptuous" + }, + { + "name": "vtk", + "uri": "https://pypi.org/project/vtk" + }, + { + "name": "vulture", + "uri": "https://pypi.org/project/vulture" + }, + { + "name": "w3lib", + "uri": "https://pypi.org/project/w3lib" + }, + { + "name": "waitress", + "uri": "https://pypi.org/project/waitress" + }, + { + "name": "wand", + "uri": "https://pypi.org/project/wand" + }, + { + "name": "wandb", + "uri": "https://pypi.org/project/wandb" + }, + { + "name": "wasabi", + "uri": "https://pypi.org/project/wasabi" + }, + { + "name": "wasmtime", + "uri": "https://pypi.org/project/wasmtime" + }, + { + "name": "watchdog", + "uri": "https://pypi.org/project/watchdog" + }, + { + "name": "watchfiles", + "uri": "https://pypi.org/project/watchfiles" + }, + { + "name": "watchgod", + "uri": "https://pypi.org/project/watchgod" + }, + { + "name": "watchtower", + "uri": "https://pypi.org/project/watchtower" + }, + { + "name": "wcmatch", + "uri": "https://pypi.org/project/wcmatch" + }, + { + "name": "wcwidth", + "uri": "https://pypi.org/project/wcwidth" + }, + { + "name": "weasel", + "uri": "https://pypi.org/project/weasel" + }, + { + "name": "weasyprint", + "uri": "https://pypi.org/project/weasyprint" + }, + { + "name": "weaviate-client", + "uri": "https://pypi.org/project/weaviate-client" + }, + { + "name": "web3", + "uri": "https://pypi.org/project/web3" + }, + { + "name": "webargs", + "uri": "https://pypi.org/project/webargs" + }, + { + "name": "webcolors", + "uri": "https://pypi.org/project/webcolors" + }, + { + "name": "webdataset", + "uri": "https://pypi.org/project/webdataset" + }, + { + "name": "webdriver-manager", + "uri": "https://pypi.org/project/webdriver-manager" + }, + { + "name": "webencodings", + "uri": "https://pypi.org/project/webencodings" + }, + { + "name": "webhelpers2", + "uri": "https://pypi.org/project/webhelpers2" + }, + { + "name": "webob", + "uri": "https://pypi.org/project/webob" + }, + { + "name": "webrtcvad-wheels", + "uri": "https://pypi.org/project/webrtcvad-wheels" + }, + { + "name": "websocket-client", + "uri": "https://pypi.org/project/websocket-client" + }, + { + "name": "websockets", + "uri": "https://pypi.org/project/websockets" + }, + { + "name": "webtest", + "uri": "https://pypi.org/project/webtest" + }, + { + "name": "werkzeug", + "uri": "https://pypi.org/project/werkzeug" + }, + { + "name": "west", + "uri": "https://pypi.org/project/west" + }, + { + "name": "wget", + "uri": "https://pypi.org/project/wget" + }, + { + "name": "wheel", + "uri": "https://pypi.org/project/wheel" + }, + { + "name": "whitenoise", + "uri": "https://pypi.org/project/whitenoise" + }, + { + "name": "widgetsnbextension", + "uri": "https://pypi.org/project/widgetsnbextension" + }, + { + "name": "wikitextparser", + "uri": "https://pypi.org/project/wikitextparser" + }, + { + "name": "wirerope", + "uri": "https://pypi.org/project/wirerope" + }, + { + "name": "wmi", + "uri": "https://pypi.org/project/wmi" + }, + { + "name": "wmill", + "uri": "https://pypi.org/project/wmill" + }, + { + "name": "wordcloud", + "uri": "https://pypi.org/project/wordcloud" + }, + { + "name": "workalendar", + "uri": "https://pypi.org/project/workalendar" + }, + { + "name": "wrapt", + "uri": "https://pypi.org/project/wrapt" + }, + { + "name": "ws4py", + "uri": "https://pypi.org/project/ws4py" + }, + { + "name": "wsgiproxy2", + "uri": "https://pypi.org/project/wsgiproxy2" + }, + { + "name": "wsproto", + "uri": "https://pypi.org/project/wsproto" + }, + { + "name": "wtforms", + "uri": "https://pypi.org/project/wtforms" + }, + { + "name": "wurlitzer", + "uri": "https://pypi.org/project/wurlitzer" + }, + { + "name": "xarray", + "uri": "https://pypi.org/project/xarray" + }, + { + "name": "xarray-einstats", + "uri": "https://pypi.org/project/xarray-einstats" + }, + { + "name": "xatlas", + "uri": "https://pypi.org/project/xatlas" + }, + { + "name": "xattr", + "uri": "https://pypi.org/project/xattr" + }, + { + "name": "xformers", + "uri": "https://pypi.org/project/xformers" + }, + { + "name": "xgboost", + "uri": "https://pypi.org/project/xgboost" + }, + { + "name": "xhtml2pdf", + "uri": "https://pypi.org/project/xhtml2pdf" + }, + { + "name": "xlrd", + "uri": "https://pypi.org/project/xlrd" + }, + { + "name": "xlsxwriter", + "uri": "https://pypi.org/project/xlsxwriter" + }, + { + "name": "xlutils", + "uri": "https://pypi.org/project/xlutils" + }, + { + "name": "xlwt", + "uri": "https://pypi.org/project/xlwt" + }, + { + "name": "xmlschema", + "uri": "https://pypi.org/project/xmlschema" + }, + { + "name": "xmlsec", + "uri": "https://pypi.org/project/xmlsec" + }, + { + "name": "xmltodict", + "uri": "https://pypi.org/project/xmltodict" + }, + { + "name": "xmod", + "uri": "https://pypi.org/project/xmod" + }, + { + "name": "xmodem", + "uri": "https://pypi.org/project/xmodem" + }, + { + "name": "xxhash", + "uri": "https://pypi.org/project/xxhash" + }, + { + "name": "xyzservices", + "uri": "https://pypi.org/project/xyzservices" + }, + { + "name": "y-py", + "uri": "https://pypi.org/project/y-py" + }, + { + "name": "yacs", + "uri": "https://pypi.org/project/yacs" + }, + { + "name": "yamale", + "uri": "https://pypi.org/project/yamale" + }, + { + "name": "yamllint", + "uri": "https://pypi.org/project/yamllint" + }, + { + "name": "yapf", + "uri": "https://pypi.org/project/yapf" + }, + { + "name": "yappi", + "uri": "https://pypi.org/project/yappi" + }, + { + "name": "yarg", + "uri": "https://pypi.org/project/yarg" + }, + { + "name": "yarl", + "uri": "https://pypi.org/project/yarl" + }, + { + "name": "yarn-api-client", + "uri": "https://pypi.org/project/yarn-api-client" + }, + { + "name": "yaspin", + "uri": "https://pypi.org/project/yaspin" + }, + { + "name": "ydata-profiling", + "uri": "https://pypi.org/project/ydata-profiling" + }, + { + "name": "yfinance", + "uri": "https://pypi.org/project/yfinance" + }, + { + "name": "youtube-dl", + "uri": "https://pypi.org/project/youtube-dl" + }, + { + "name": "youtube-transcript-api", + "uri": "https://pypi.org/project/youtube-transcript-api" + }, + { + "name": "ypy-websocket", + "uri": "https://pypi.org/project/ypy-websocket" + }, + { + "name": "yq", + "uri": "https://pypi.org/project/yq" + }, + { + "name": "yt-dlp", + "uri": "https://pypi.org/project/yt-dlp" + }, + { + "name": "z3-solver", + "uri": "https://pypi.org/project/z3-solver" + }, + { + "name": "z3c-pt", + "uri": "https://pypi.org/project/z3c-pt" + }, + { + "name": "zarr", + "uri": "https://pypi.org/project/zarr" + }, + { + "name": "zc-lockfile", + "uri": "https://pypi.org/project/zc-lockfile" + }, + { + "name": "zconfig", + "uri": "https://pypi.org/project/zconfig" + }, + { + "name": "zeep", + "uri": "https://pypi.org/project/zeep" + }, + { + "name": "zenpy", + "uri": "https://pypi.org/project/zenpy" + }, + { + "name": "zeroconf", + "uri": "https://pypi.org/project/zeroconf" + }, + { + "name": "zexceptions", + "uri": "https://pypi.org/project/zexceptions" + }, + { + "name": "zha-quirks", + "uri": "https://pypi.org/project/zha-quirks" + }, + { + "name": "zict", + "uri": "https://pypi.org/project/zict" + }, + { + "name": "zigpy", + "uri": "https://pypi.org/project/zigpy" + }, + { + "name": "zigpy-deconz", + "uri": "https://pypi.org/project/zigpy-deconz" + }, + { + "name": "zigpy-xbee", + "uri": "https://pypi.org/project/zigpy-xbee" + }, + { + "name": "zigpy-znp", + "uri": "https://pypi.org/project/zigpy-znp" + }, + { + "name": "zipfile-deflate64", + "uri": "https://pypi.org/project/zipfile-deflate64" + }, + { + "name": "zipfile36", + "uri": "https://pypi.org/project/zipfile36" + }, + { + "name": "zipp", + "uri": "https://pypi.org/project/zipp" + }, + { + "name": "zodb", + "uri": "https://pypi.org/project/zodb" + }, + { + "name": "zodbpickle", + "uri": "https://pypi.org/project/zodbpickle" + }, + { + "name": "zope", + "uri": "https://pypi.org/project/zope" + }, + { + "name": "zope-annotation", + "uri": "https://pypi.org/project/zope-annotation" + }, + { + "name": "zope-browser", + "uri": "https://pypi.org/project/zope-browser" + }, + { + "name": "zope-browsermenu", + "uri": "https://pypi.org/project/zope-browsermenu" + }, + { + "name": "zope-browserpage", + "uri": "https://pypi.org/project/zope-browserpage" + }, + { + "name": "zope-browserresource", + "uri": "https://pypi.org/project/zope-browserresource" + }, + { + "name": "zope-cachedescriptors", + "uri": "https://pypi.org/project/zope-cachedescriptors" + }, + { + "name": "zope-component", + "uri": "https://pypi.org/project/zope-component" + }, + { + "name": "zope-configuration", + "uri": "https://pypi.org/project/zope-configuration" + }, + { + "name": "zope-container", + "uri": "https://pypi.org/project/zope-container" + }, + { + "name": "zope-contentprovider", + "uri": "https://pypi.org/project/zope-contentprovider" + }, + { + "name": "zope-contenttype", + "uri": "https://pypi.org/project/zope-contenttype" + }, + { + "name": "zope-datetime", + "uri": "https://pypi.org/project/zope-datetime" + }, + { + "name": "zope-deferredimport", + "uri": "https://pypi.org/project/zope-deferredimport" + }, + { + "name": "zope-deprecation", + "uri": "https://pypi.org/project/zope-deprecation" + }, + { + "name": "zope-dottedname", + "uri": "https://pypi.org/project/zope-dottedname" + }, + { + "name": "zope-event", + "uri": "https://pypi.org/project/zope-event" + }, + { + "name": "zope-exceptions", + "uri": "https://pypi.org/project/zope-exceptions" + }, + { + "name": "zope-filerepresentation", + "uri": "https://pypi.org/project/zope-filerepresentation" + }, + { + "name": "zope-globalrequest", + "uri": "https://pypi.org/project/zope-globalrequest" + }, + { + "name": "zope-hookable", + "uri": "https://pypi.org/project/zope-hookable" + }, + { + "name": "zope-i18n", + "uri": "https://pypi.org/project/zope-i18n" + }, + { + "name": "zope-i18nmessageid", + "uri": "https://pypi.org/project/zope-i18nmessageid" + }, + { + "name": "zope-interface", + "uri": "https://pypi.org/project/zope-interface" + }, + { + "name": "zope-lifecycleevent", + "uri": "https://pypi.org/project/zope-lifecycleevent" + }, + { + "name": "zope-location", + "uri": "https://pypi.org/project/zope-location" + }, + { + "name": "zope-pagetemplate", + "uri": "https://pypi.org/project/zope-pagetemplate" + }, + { + "name": "zope-processlifetime", + "uri": "https://pypi.org/project/zope-processlifetime" + }, + { + "name": "zope-proxy", + "uri": "https://pypi.org/project/zope-proxy" + }, + { + "name": "zope-ptresource", + "uri": "https://pypi.org/project/zope-ptresource" + }, + { + "name": "zope-publisher", + "uri": "https://pypi.org/project/zope-publisher" + }, + { + "name": "zope-schema", + "uri": "https://pypi.org/project/zope-schema" + }, + { + "name": "zope-security", + "uri": "https://pypi.org/project/zope-security" + }, + { + "name": "zope-sequencesort", + "uri": "https://pypi.org/project/zope-sequencesort" + }, + { + "name": "zope-site", + "uri": "https://pypi.org/project/zope-site" + }, + { + "name": "zope-size", + "uri": "https://pypi.org/project/zope-size" + }, + { + "name": "zope-structuredtext", + "uri": "https://pypi.org/project/zope-structuredtext" + }, + { + "name": "zope-tal", + "uri": "https://pypi.org/project/zope-tal" + }, + { + "name": "zope-tales", + "uri": "https://pypi.org/project/zope-tales" + }, + { + "name": "zope-testbrowser", + "uri": "https://pypi.org/project/zope-testbrowser" + }, + { + "name": "zope-testing", + "uri": "https://pypi.org/project/zope-testing" + }, + { + "name": "zope-traversing", + "uri": "https://pypi.org/project/zope-traversing" + }, + { + "name": "zope-viewlet", + "uri": "https://pypi.org/project/zope-viewlet" + }, + { + "name": "zopfli", + "uri": "https://pypi.org/project/zopfli" + }, + { + "name": "zstandard", + "uri": "https://pypi.org/project/zstandard" + }, + { + "name": "zstd", + "uri": "https://pypi.org/project/zstd" + }, + { + "name": "zthreading", + "uri": "https://pypi.org/project/zthreading" + } +] \ No newline at end of file diff --git a/files/conda_packages.json b/files/conda_packages.json new file mode 100644 index 0000000..fa944bd --- /dev/null +++ b/files/conda_packages.json @@ -0,0 +1,3584 @@ +[ + { "name": "7zip", "uri": "https://anaconda.org/anaconda/7zip", "description": "7-Zip is a file archiver with a high compression ratio." }, + { "name": "abseil-cpp", "uri": "https://anaconda.org/anaconda/abseil-cpp", "description": "Abseil Common Libraries (C++)" }, + { "name": "absl-py", "uri": "https://anaconda.org/anaconda/absl-py", "description": "Abseil Common Libraries (Python)" }, + { "name": "access", "uri": "https://anaconda.org/anaconda/access", "description": "classical and novel measures of spatial accessibility to services" }, + { "name": "acl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/acl-amzn2-aarch64", "description": "(CDT) Access control list utilities" }, + { "name": "adagio", "uri": "https://anaconda.org/anaconda/adagio", "description": "A Dag IO framework for Fugue projects." }, + { "name": "adal", "uri": "https://anaconda.org/anaconda/adal", "description": "The ADAL for Python library makes it easy for python application to authenticate\nto Azure Active Directory (AAD) in order to access AAD protected web resources." }, + { "name": "adtk", "uri": "https://anaconda.org/anaconda/adtk", "description": "A package for unsupervised time series anomaly detection" }, + { "name": "adwaita-icon-theme", "uri": "https://anaconda.org/anaconda/adwaita-icon-theme", "description": "The default icon theme used by the GNOME desktop" }, + { "name": "aenum", "uri": "https://anaconda.org/anaconda/aenum", "description": "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants" }, + { "name": "aext-assistant", "uri": "https://anaconda.org/anaconda/aext-assistant", "description": "Anaconda extensions assistant library" }, + { "name": "aext-assistant-server", "uri": "https://anaconda.org/anaconda/aext-assistant-server", "description": "Anaconda extensions assistant server" }, + { "name": "aext-core", "uri": "https://anaconda.org/anaconda/aext-core", "description": "Anaconda extensions core library" }, + { "name": "aext-core-server", "uri": "https://anaconda.org/anaconda/aext-core-server", "description": "Anaconda Toolbox backend lib core server component" }, + { "name": "aext-panels", "uri": "https://anaconda.org/anaconda/aext-panels", "description": "The aext-panels component of anaconda-toolbox" }, + { "name": "aext-panels-server", "uri": "https://anaconda.org/anaconda/aext-panels-server", "description": "The aext-panels-server component of anaconda-toolbox" }, + { "name": "aext-project-filebrowser-server", "uri": "https://anaconda.org/anaconda/aext-project-filebrowser-server", "description": "The aext-project-filebrowser-server component of anaconda-toolbox" }, + { "name": "aext-share-notebook", "uri": "https://anaconda.org/anaconda/aext-share-notebook", "description": "The aext-share-notebook component of anaconda-toolbox" }, + { "name": "aext-share-notebook-server", "uri": "https://anaconda.org/anaconda/aext-share-notebook-server", "description": "Anaconda extensions share notebook server" }, + { "name": "aext-shared", "uri": "https://anaconda.org/anaconda/aext-shared", "description": "Anaconda extensions shared library" }, + { "name": "agate", "uri": "https://anaconda.org/anaconda/agate", "description": "A data analysis library that is optimized for humans instead of machines." }, + { "name": "agate-dbf", "uri": "https://anaconda.org/anaconda/agate-dbf", "description": "agate-dbf adds read support for dbf files to agate." }, + { "name": "agate-excel", "uri": "https://anaconda.org/anaconda/agate-excel", "description": "agate-excel adds read support for Excel files (xls and xlsx) to agate." }, + { "name": "aiobotocore", "uri": "https://anaconda.org/anaconda/aiobotocore", "description": "Async client for aws services using botocore and aiohttp" }, + { "name": "aiodns", "uri": "https://anaconda.org/anaconda/aiodns", "description": "Simple DNS resolver for asyncio" }, + { "name": "aiofiles", "uri": "https://anaconda.org/anaconda/aiofiles", "description": "File support for asyncio" }, + { "name": "aiohappyeyeballs", "uri": "https://anaconda.org/anaconda/aiohappyeyeballs", "description": "Happy Eyeballs for asyncio" }, + { "name": "aiohttp", "uri": "https://anaconda.org/anaconda/aiohttp", "description": "Async http client/server framework (asyncio)" }, + { "name": "aiohttp-cors", "uri": "https://anaconda.org/anaconda/aiohttp-cors", "description": "CORS support for aiohttp" }, + { "name": "aiohttp-jinja2", "uri": "https://anaconda.org/anaconda/aiohttp-jinja2", "description": "jinja2 template renderer for aiohttp.web (http server for asyncio)" }, + { "name": "aioitertools", "uri": "https://anaconda.org/anaconda/aioitertools", "description": "asyncio version of the standard multiprocessing module" }, + { "name": "aiopg", "uri": "https://anaconda.org/anaconda/aiopg", "description": "Postgres integration with asyncio." }, + { "name": "aioredis", "uri": "https://anaconda.org/anaconda/aioredis", "description": "asyncio (PEP 3156) Redis support" }, + { "name": "aiorwlock", "uri": "https://anaconda.org/anaconda/aiorwlock", "description": "Read write lock for asyncio." }, + { "name": "aiosignal", "uri": "https://anaconda.org/anaconda/aiosignal", "description": "aiosignal: a list of registered asynchronous callbacks" }, + { "name": "aiosqlite", "uri": "https://anaconda.org/anaconda/aiosqlite", "description": "asyncio bridge to the standard sqlite3 module" }, + { "name": "airflow", "uri": "https://anaconda.org/anaconda/airflow", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-apache-atlas", "uri": "https://anaconda.org/anaconda/airflow-with-apache-atlas", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-apache-webhdfs", "uri": "https://anaconda.org/anaconda/airflow-with-apache-webhdfs", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-async", "uri": "https://anaconda.org/anaconda/airflow-with-async", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-azure-mgmt-containerinstance", "uri": "https://anaconda.org/anaconda/airflow-with-azure-mgmt-containerinstance", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-azure_blob_storage", "uri": "https://anaconda.org/anaconda/airflow-with-azure_blob_storage", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-azure_cosmos", "uri": "https://anaconda.org/anaconda/airflow-with-azure_cosmos", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-cassandra", "uri": "https://anaconda.org/anaconda/airflow-with-cassandra", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-celery", "uri": "https://anaconda.org/anaconda/airflow-with-celery", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-cgroups", "uri": "https://anaconda.org/anaconda/airflow-with-cgroups", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-cloudant", "uri": "https://anaconda.org/anaconda/airflow-with-cloudant", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-cncf-kubernetes", "uri": "https://anaconda.org/anaconda/airflow-with-cncf-kubernetes", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-crypto", "uri": "https://anaconda.org/anaconda/airflow-with-crypto", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-dask", "uri": "https://anaconda.org/anaconda/airflow-with-dask", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-databricks", "uri": "https://anaconda.org/anaconda/airflow-with-databricks", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-datadog", "uri": "https://anaconda.org/anaconda/airflow-with-datadog", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-deprecated-api", "uri": "https://anaconda.org/anaconda/airflow-with-deprecated-api", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-docker", "uri": "https://anaconda.org/anaconda/airflow-with-docker", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-druid", "uri": "https://anaconda.org/anaconda/airflow-with-druid", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-elasticsearch", "uri": "https://anaconda.org/anaconda/airflow-with-elasticsearch", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-emr", "uri": "https://anaconda.org/anaconda/airflow-with-emr", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-github_enterprise", "uri": "https://anaconda.org/anaconda/airflow-with-github_enterprise", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-google_auth", "uri": "https://anaconda.org/anaconda/airflow-with-google_auth", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-hdfs", "uri": "https://anaconda.org/anaconda/airflow-with-hdfs", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-jdbc", "uri": "https://anaconda.org/anaconda/airflow-with-jdbc", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-jenkins", "uri": "https://anaconda.org/anaconda/airflow-with-jenkins", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-jira", "uri": "https://anaconda.org/anaconda/airflow-with-jira", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-kerberos", "uri": "https://anaconda.org/anaconda/airflow-with-kerberos", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-kubernetes", "uri": "https://anaconda.org/anaconda/airflow-with-kubernetes", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-ldap", "uri": "https://anaconda.org/anaconda/airflow-with-ldap", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-leveldb", "uri": "https://anaconda.org/anaconda/airflow-with-leveldb", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-mongo", "uri": "https://anaconda.org/anaconda/airflow-with-mongo", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-mssql", "uri": "https://anaconda.org/anaconda/airflow-with-mssql", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-mysql", "uri": "https://anaconda.org/anaconda/airflow-with-mysql", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-pandas", "uri": "https://anaconda.org/anaconda/airflow-with-pandas", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-password", "uri": "https://anaconda.org/anaconda/airflow-with-password", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-postgres", "uri": "https://anaconda.org/anaconda/airflow-with-postgres", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-qds", "uri": "https://anaconda.org/anaconda/airflow-with-qds", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-rabbitmq", "uri": "https://anaconda.org/anaconda/airflow-with-rabbitmq", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-redis", "uri": "https://anaconda.org/anaconda/airflow-with-redis", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-salesforce", "uri": "https://anaconda.org/anaconda/airflow-with-salesforce", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-samba", "uri": "https://anaconda.org/anaconda/airflow-with-samba", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-sendgrid", "uri": "https://anaconda.org/anaconda/airflow-with-sendgrid", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-sentry", "uri": "https://anaconda.org/anaconda/airflow-with-sentry", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-slack", "uri": "https://anaconda.org/anaconda/airflow-with-slack", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-ssh", "uri": "https://anaconda.org/anaconda/airflow-with-ssh", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-statsd", "uri": "https://anaconda.org/anaconda/airflow-with-statsd", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-vertica", "uri": "https://anaconda.org/anaconda/airflow-with-vertica", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-virtualenv", "uri": "https://anaconda.org/anaconda/airflow-with-virtualenv", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-webhdfs", "uri": "https://anaconda.org/anaconda/airflow-with-webhdfs", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "airflow-with-winrm", "uri": "https://anaconda.org/anaconda/airflow-with-winrm", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "alabaster", "uri": "https://anaconda.org/anaconda/alabaster", "description": "Lightweight, configurable Sphinx theme" }, + { "name": "alembic", "uri": "https://anaconda.org/anaconda/alembic", "description": "A database migration tool for SQLAlchemy." }, + { "name": "allure-behave", "uri": "https://anaconda.org/anaconda/allure-behave", "description": "Allure integrations for Python test frameworks" }, + { "name": "allure-nose2", "uri": "https://anaconda.org/anaconda/allure-nose2", "description": "Allure integrations for Python test frameworks" }, + { "name": "allure-pytest", "uri": "https://anaconda.org/anaconda/allure-pytest", "description": "Allure integrations for Python test frameworks" }, + { "name": "allure-pytest-bdd", "uri": "https://anaconda.org/anaconda/allure-pytest-bdd", "description": "Allure integrations for Python test frameworks" }, + { "name": "allure-python-commons", "uri": "https://anaconda.org/anaconda/allure-python-commons", "description": "Allure integrations for Python test frameworks" }, + { "name": "allure-robotframework", "uri": "https://anaconda.org/anaconda/allure-robotframework", "description": "Allure integrations for Python test frameworks" }, + { "name": "alsa-lib-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/alsa-lib-amzn2-aarch64", "description": "(CDT) The Advanced Linux Sound Architecture (ALSA) library" }, + { "name": "alsa-lib-cos6-x86_64", "uri": "https://anaconda.org/anaconda/alsa-lib-cos6-x86_64", "description": "(CDT) The Advanced Linux Sound Architecture (ALSA) library" }, + { "name": "alsa-lib-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/alsa-lib-cos7-ppc64le", "description": "(CDT) The Advanced Linux Sound Architecture (ALSA) library" }, + { "name": "alsa-lib-cos7-s390x", "uri": "https://anaconda.org/anaconda/alsa-lib-cos7-s390x", "description": "(CDT) The Advanced Linux Sound Architecture (ALSA) library" }, + { "name": "alsa-lib-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/alsa-lib-devel-amzn2-aarch64", "description": "(CDT) Development files from the ALSA library" }, + { "name": "alsa-lib-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/alsa-lib-devel-cos7-ppc64le", "description": "(CDT) Development files from the ALSA library" }, + { "name": "alsa-lib-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/alsa-lib-devel-cos7-s390x", "description": "(CDT) Development files from the ALSA library" }, + { "name": "alsa-utils-cos6-i686", "uri": "https://anaconda.org/anaconda/alsa-utils-cos6-i686", "description": "(CDT) Advanced Linux Sound Architecture (ALSA) utilities" }, + { "name": "alsa-utils-cos6-x86_64", "uri": "https://anaconda.org/anaconda/alsa-utils-cos6-x86_64", "description": "(CDT) Advanced Linux Sound Architecture (ALSA) utilities" }, + { "name": "alsa-utils-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/alsa-utils-cos7-ppc64le", "description": "(CDT) Advanced Linux Sound Architecture (ALSA) utilities" }, + { "name": "altair", "uri": "https://anaconda.org/anaconda/altair", "description": "A declarative statistical visualization library for Python" }, + { "name": "altgraph", "uri": "https://anaconda.org/anaconda/altgraph", "description": "Python graph (network) package" }, + { "name": "ampl-mp", "uri": "https://anaconda.org/anaconda/ampl-mp", "description": "An open-source library for mathematical programming." }, + { "name": "amply", "uri": "https://anaconda.org/anaconda/amply", "description": "Amply allows you to load and manipulate AMPL/GLPK data as Python data structures" }, + { "name": "amqp", "uri": "https://anaconda.org/anaconda/amqp", "description": "Low-level AMQP client for Python (fork of amqplib)" }, + { "name": "anaconda", "uri": "https://anaconda.org/anaconda/anaconda", "description": "Simplifies package management and deployment of Anaconda" }, + { "name": "anaconda-anon-usage", "uri": "https://anaconda.org/anaconda/anaconda-anon-usage", "description": "basic anonymous telemetry for conda clients" }, + { "name": "anaconda-catalogs", "uri": "https://anaconda.org/anaconda/anaconda-catalogs", "description": "Client library to interface with Anaconda Cloud catalogs service" }, + { "name": "anaconda-clean", "uri": "https://anaconda.org/anaconda/anaconda-clean", "description": "Delete Anaconda configuration files" }, + { "name": "anaconda-cli-base", "uri": "https://anaconda.org/anaconda/anaconda-cli-base", "description": "A base CLI entrypoint supporting Anaconda CLI plugins" }, + { "name": "anaconda-client", "uri": "https://anaconda.org/anaconda/anaconda-client", "description": "anaconda.org command line client library" }, + { "name": "anaconda-cloud", "uri": "https://anaconda.org/anaconda/anaconda-cloud", "description": "Anaconda Cloud client tools" }, + { "name": "anaconda-cloud-auth", "uri": "https://anaconda.org/anaconda/anaconda-cloud-auth", "description": "A client auth library for Anaconda.cloud APIs" }, + { "name": "anaconda-cloud-cli", "uri": "https://anaconda.org/anaconda/anaconda-cloud-cli", "description": "The Anaconda Cloud CLI" }, + { "name": "anaconda-distribution-installer", "uri": "https://anaconda.org/anaconda/anaconda-distribution-installer", "description": "create installer from conda packages" }, + { "name": "anaconda-doc", "uri": "https://anaconda.org/anaconda/anaconda-doc", "description": "No Summary" }, + { "name": "anaconda-docs", "uri": "https://anaconda.org/anaconda/anaconda-docs", "description": "No Summary" }, + { "name": "anaconda-enterprise-cli", "uri": "https://anaconda.org/anaconda/anaconda-enterprise-cli", "description": "CLI tool for working with the Anaconda Enterprise DSP repository" }, + { "name": "anaconda-ident", "uri": "https://anaconda.org/anaconda/anaconda-ident", "description": "simple, opt-in user identification for conda clients" }, + { "name": "anaconda-linter", "uri": "https://anaconda.org/anaconda/anaconda-linter", "description": "A conda feedstock linter written in pure Python." }, + { "name": "anaconda-mirror", "uri": "https://anaconda.org/anaconda/anaconda-mirror", "description": "The official mirroring tool for Anaconda package repositories" }, + { "name": "anaconda-navigator", "uri": "https://anaconda.org/anaconda/anaconda-navigator", "description": "Anaconda Navigator" }, + { "name": "anaconda-oss-docs", "uri": "https://anaconda.org/anaconda/anaconda-oss-docs", "description": "No Summary" }, + { "name": "anaconda-project", "uri": "https://anaconda.org/anaconda/anaconda-project", "description": "Tool for encapsulating, running, and reproducing data science projects" }, + { "name": "anaconda-toolbox", "uri": "https://anaconda.org/anaconda/anaconda-toolbox", "description": "Anaconda Assistant: JupyterLab supercharged with a suite of Anaconda extensions, starting with the Anaconda Assistant AI chatbot." }, + { "name": "anaconda_powershell_prompt", "uri": "https://anaconda.org/anaconda/anaconda_powershell_prompt", "description": "PowerShell shortcut creator for Anaconda" }, + { "name": "anaconda_prompt", "uri": "https://anaconda.org/anaconda/anaconda_prompt", "description": "Terminal shortcut creator for Anaconda" }, + { "name": "aniso8601", "uri": "https://anaconda.org/anaconda/aniso8601", "description": "A library for parsing ISO 8601 strings." }, + { "name": "annotated-types", "uri": "https://anaconda.org/anaconda/annotated-types", "description": "Reusable constraint types to use with typing.Annotated" }, + { "name": "ansi2html", "uri": "https://anaconda.org/anaconda/ansi2html", "description": "Convert text with ANSI color codes to HTML or to LaTeX." }, + { "name": "ansicon", "uri": "https://anaconda.org/anaconda/ansicon", "description": "Python wrapper for loading Jason Hood's ANSICON" }, + { "name": "ant", "uri": "https://anaconda.org/anaconda/ant", "description": "Java build tool" }, + { "name": "antlr4-python3-runtime", "uri": "https://anaconda.org/anaconda/antlr4-python3-runtime", "description": "Python runtime for ANTLR." }, + { "name": "anyio", "uri": "https://anaconda.org/anaconda/anyio", "description": "High level compatibility layer for multiple asynchronous event loop implementations on Python" }, + { "name": "anyjson", "uri": "https://anaconda.org/anaconda/anyjson", "description": "Wraps the best available JSON implementation available in a common interface" }, + { "name": "anyqt", "uri": "https://anaconda.org/anaconda/anyqt", "description": "PyQt5/PyQt6 compatibility layer." }, + { "name": "aom", "uri": "https://anaconda.org/anaconda/aom", "description": "Alliance for Open Media video codec" }, + { "name": "apache-airflow", "uri": "https://anaconda.org/anaconda/apache-airflow", "description": "Airflow is a platform to programmatically author, schedule and monitor\nworkflows" }, + { "name": "apache-airflow-providers-apache-hdfs", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-apache-hdfs", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-apache-hdfs package" }, + { "name": "apache-airflow-providers-common-sql", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-common-sql", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-common-sql package" }, + { "name": "apache-airflow-providers-ftp", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-ftp", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-ftp package" }, + { "name": "apache-airflow-providers-http", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-http", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-http package" }, + { "name": "apache-airflow-providers-imap", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-imap", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-imap package" }, + { "name": "apache-airflow-providers-sqlite", "uri": "https://anaconda.org/anaconda/apache-airflow-providers-sqlite", "description": "Provider for Apache Airflow. Implements apache-airflow-providers-sqlite package" }, + { "name": "apache-libcloud", "uri": "https://anaconda.org/anaconda/apache-libcloud", "description": "Python library for interacting with many of the popular cloud service providers using a unified API" }, + { "name": "apipkg", "uri": "https://anaconda.org/anaconda/apipkg", "description": "With apipkg you can control the exported namespace of a python package and greatly reduce the number of imports for your users." }, + { "name": "apispec", "uri": "https://anaconda.org/anaconda/apispec", "description": "A pluggable API specification generator" }, + { "name": "applaunchservices", "uri": "https://anaconda.org/anaconda/applaunchservices", "description": "Simple package for registering an app with apple Launch Services to handle UTI and URL" }, + { "name": "appnope", "uri": "https://anaconda.org/anaconda/appnope", "description": "Disable App Nap on OS X 10.9" }, + { "name": "appscript", "uri": "https://anaconda.org/anaconda/appscript", "description": "Control AppleScriptable applications from Python." }, + { "name": "apscheduler", "uri": "https://anaconda.org/anaconda/apscheduler", "description": "In-process task scheduler with Cron-like capabilities" }, + { "name": "archspec", "uri": "https://anaconda.org/anaconda/archspec", "description": "A library to query system architecture" }, + { "name": "aredis", "uri": "https://anaconda.org/anaconda/aredis", "description": "Python async client for Redis key-value store" }, + { "name": "argh", "uri": "https://anaconda.org/anaconda/argh", "description": "An unobtrusive argparse wrapper with natural syntax" }, + { "name": "argon2-cffi", "uri": "https://anaconda.org/anaconda/argon2-cffi", "description": "The secure Argon2 password hashing algorithm." }, + { "name": "argon2-cffi-bindings", "uri": "https://anaconda.org/anaconda/argon2-cffi-bindings", "description": "Low-level Python CFFI Bindings for Argon2" }, + { "name": "argon2_cffi", "uri": "https://anaconda.org/anaconda/argon2_cffi", "description": "The secure Argon2 password hashing algorithm." }, + { "name": "armpl", "uri": "https://anaconda.org/anaconda/armpl", "description": "Free Arm Performance Libraries" }, + { "name": "arpack", "uri": "https://anaconda.org/anaconda/arpack", "description": "Fortran77 subroutines designed to solve large scale eigenvalue problems" }, + { "name": "array-api-strict", "uri": "https://anaconda.org/anaconda/array-api-strict", "description": "A strict, minimal implementation of the Python array API standard." }, + { "name": "arrow", "uri": "https://anaconda.org/anaconda/arrow", "description": "Better dates & times for Python" }, + { "name": "arrow-cpp", "uri": "https://anaconda.org/anaconda/arrow-cpp", "description": "C++ libraries for Apache Arrow" }, + { "name": "arviz", "uri": "https://anaconda.org/anaconda/arviz", "description": "Exploratory analysis of Bayesian models with Python" }, + { "name": "asciitree", "uri": "https://anaconda.org/anaconda/asciitree", "description": "Draws ASCII trees." }, + { "name": "asgiref", "uri": "https://anaconda.org/anaconda/asgiref", "description": "ASGI in-memory channel layer" }, + { "name": "asn1crypto", "uri": "https://anaconda.org/anaconda/asn1crypto", "description": "Python ASN.1 library with a focus on performance and a pythonic API" }, + { "name": "assimp", "uri": "https://anaconda.org/anaconda/assimp", "description": "A library to import and export various 3d-model-formats including scene-post-processing to generate missing render data." }, + { "name": "astor", "uri": "https://anaconda.org/anaconda/astor", "description": "Read, rewrite, and write Python ASTs nicely" }, + { "name": "astroid", "uri": "https://anaconda.org/anaconda/astroid", "description": "A abstract syntax tree for Python with inference support." }, + { "name": "astropy", "uri": "https://anaconda.org/anaconda/astropy", "description": "Community-developed Python Library for Astronomy" }, + { "name": "astropy-iers-data", "uri": "https://anaconda.org/anaconda/astropy-iers-data", "description": "IERS Earth Rotation and Leap Second tables for the astropy core package" }, + { "name": "asttokens", "uri": "https://anaconda.org/anaconda/asttokens", "description": "The asttokens module annotates Python abstract syntax trees (ASTs) with the positions of tokens and text in the source code that generated them." }, + { "name": "astunparse", "uri": "https://anaconda.org/anaconda/astunparse", "description": "An AST unparser for Python." }, + { "name": "asv", "uri": "https://anaconda.org/anaconda/asv", "description": "A simple Python benchmarking tool with web-based reporting" }, + { "name": "async-lru", "uri": "https://anaconda.org/anaconda/async-lru", "description": "Simple lru_cache for asyncio" }, + { "name": "async-timeout", "uri": "https://anaconda.org/anaconda/async-timeout", "description": "Timeout context manager for asyncio programs" }, + { "name": "async_generator", "uri": "https://anaconda.org/anaconda/async_generator", "description": "Async generators and context managers for Python 3.5+" }, + { "name": "asynch", "uri": "https://anaconda.org/anaconda/asynch", "description": "An asyncio ClickHouse Python Driver with native (TCP) interface support." }, + { "name": "asyncpg", "uri": "https://anaconda.org/anaconda/asyncpg", "description": "A fast PostgreSQL Database Client Library for Python/asyncio." }, + { "name": "asyncpgsa", "uri": "https://anaconda.org/anaconda/asyncpgsa", "description": "A fast PostgreSQL Database Client Library for Python/asyncio." }, + { "name": "asyncssh", "uri": "https://anaconda.org/anaconda/asyncssh", "description": "Asynchronous SSHv2 client and server library" }, + { "name": "asynctest", "uri": "https://anaconda.org/anaconda/asynctest", "description": "Enhance the standard unittest package with features for testing asyncio libraries" }, + { "name": "at-spi2-atk", "uri": "https://anaconda.org/anaconda/at-spi2-atk", "description": "bridge for AT-SPI and ATK accessibility technologies" }, + { "name": "at-spi2-core", "uri": "https://anaconda.org/anaconda/at-spi2-core", "description": "D-Bus-based implementation of AT-SPI accessibility framework" }, + { "name": "atk", "uri": "https://anaconda.org/anaconda/atk", "description": "Accessibility Toolkit." }, + { "name": "atk-1.0", "uri": "https://anaconda.org/anaconda/atk-1.0", "description": "Accessibility Toolkit." }, + { "name": "atk-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/atk-amzn2-aarch64", "description": "(CDT) Interfaces for accessibility support" }, + { "name": "atk-cos6-i686", "uri": "https://anaconda.org/anaconda/atk-cos6-i686", "description": "(CDT) Interfaces for accessibility support" }, + { "name": "atk-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/atk-cos7-ppc64le", "description": "(CDT) Interfaces for accessibility support" }, + { "name": "atk-cos7-s390x", "uri": "https://anaconda.org/anaconda/atk-cos7-s390x", "description": "(CDT) Interfaces for accessibility support" }, + { "name": "atk-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/atk-devel-amzn2-aarch64", "description": "(CDT) Development files for the ATK accessibility toolkit" }, + { "name": "atk-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/atk-devel-cos7-ppc64le", "description": "(CDT) Development files for the ATK accessibility toolkit" }, + { "name": "atk-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/atk-devel-cos7-s390x", "description": "(CDT) Development files for the ATK accessibility toolkit" }, + { "name": "atkmm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/atkmm-amzn2-aarch64", "description": "(CDT) C++ interface for the ATK library" }, + { "name": "atkmm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/atkmm-devel-amzn2-aarch64", "description": "(CDT) Development files for atkmm" }, + { "name": "atlasclient", "uri": "https://anaconda.org/anaconda/atlasclient", "description": "Apache Atlas client in Python" }, + { "name": "atom", "uri": "https://anaconda.org/anaconda/atom", "description": "Memory efficient Python objects" }, + { "name": "atomicwrites", "uri": "https://anaconda.org/anaconda/atomicwrites", "description": "Atomic file writes" }, + { "name": "attrs", "uri": "https://anaconda.org/anaconda/attrs", "description": "attrs is the Python package that will bring back the joy of writing classes by relieving you from the drudgery of implementing object protocols (aka dunder methods)." }, + { "name": "audit-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/audit-libs-amzn2-aarch64", "description": "(CDT) Dynamic library for libaudit" }, + { "name": "audit-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/audit-libs-cos6-i686", "description": "(CDT) Dynamic library for libaudit" }, + { "name": "audit-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/audit-libs-cos6-x86_64", "description": "(CDT) Dynamic library for libaudit" }, + { "name": "authlib", "uri": "https://anaconda.org/anaconda/authlib", "description": "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included. https://authlib.org/" }, + { "name": "autocfg", "uri": "https://anaconda.org/anaconda/autocfg", "description": "All you need is a minimal config system for automl." }, + { "name": "autoconf-archive", "uri": "https://anaconda.org/anaconda/autoconf-archive", "description": "Collection of over 500 reusable autoconf macros" }, + { "name": "autograd", "uri": "https://anaconda.org/anaconda/autograd", "description": "Efficiently computes derivatives of numpy code." }, + { "name": "autograd-gamma", "uri": "https://anaconda.org/anaconda/autograd-gamma", "description": "autograd compatible approximations to the derivatives of the Gamma-family of functions." }, + { "name": "automat", "uri": "https://anaconda.org/anaconda/automat", "description": "self-service finite-state machines for the programmer on the go" }, + { "name": "autopep8", "uri": "https://anaconda.org/anaconda/autopep8", "description": "A tool that automatically formats Python code to conform to the PEP 8 style guide" }, + { "name": "autotools_clang_conda", "uri": "https://anaconda.org/anaconda/autotools_clang_conda", "description": "Scripts to compile autotools projects on windows using clang and llvm tools" }, + { "name": "autovizwidget", "uri": "https://anaconda.org/anaconda/autovizwidget", "description": "AutoVizWidget: An Auto-Visualization library for pandas dataframes" }, + { "name": "avahi-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/avahi-libs-amzn2-aarch64", "description": "(CDT) Libraries for avahi run-time use" }, + { "name": "avahi-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/avahi-libs-cos6-i686", "description": "(CDT) Libraries for avahi run-time use" }, + { "name": "avahi-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/avahi-libs-cos6-x86_64", "description": "(CDT) Libraries for avahi run-time use" }, + { "name": "avahi-libs-cos7-s390x", "uri": "https://anaconda.org/anaconda/avahi-libs-cos7-s390x", "description": "(CDT) Libraries for avahi run-time use" }, + { "name": "aws-c-auth", "uri": "https://anaconda.org/anaconda/aws-c-auth", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing." }, + { "name": "aws-c-cal", "uri": "https://anaconda.org/anaconda/aws-c-cal", "description": "Aws Crypto Abstraction Layer" }, + { "name": "aws-c-common", "uri": "https://anaconda.org/anaconda/aws-c-common", "description": "Core c99 package for AWS SDK for C. Includes cross-platform primitives, configuration, data structures, and error handling." }, + { "name": "aws-c-compression", "uri": "https://anaconda.org/anaconda/aws-c-compression", "description": "C99 implementation of huffman encoding/decoding" }, + { "name": "aws-c-event-stream", "uri": "https://anaconda.org/anaconda/aws-c-event-stream", "description": "C99 implementation of the vnd.amazon.eventstream content-type." }, + { "name": "aws-c-http", "uri": "https://anaconda.org/anaconda/aws-c-http", "description": "C99 implementation of the HTTP protocol" }, + { "name": "aws-c-io", "uri": "https://anaconda.org/anaconda/aws-c-io", "description": "This is a module for the AWS SDK for C. It handles all IO and TLS work for application protocols." }, + { "name": "aws-c-mqtt", "uri": "https://anaconda.org/anaconda/aws-c-mqtt", "description": "C99 implementation of the MQTT" }, + { "name": "aws-c-s3", "uri": "https://anaconda.org/anaconda/aws-c-s3", "description": "C99 library implementation for communicating with the S3 service." }, + { "name": "aws-c-sdkutils", "uri": "https://anaconda.org/anaconda/aws-c-sdkutils", "description": "This is a module for the AWS SDK for C." }, + { "name": "aws-checksums", "uri": "https://anaconda.org/anaconda/aws-checksums", "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. C interface with language bindings for each of our SDKs." }, + { "name": "aws-crt-cpp", "uri": "https://anaconda.org/anaconda/aws-crt-cpp", "description": "C++ wrapper around the aws-c-* libraries." }, + { "name": "aws-requests-auth", "uri": "https://anaconda.org/anaconda/aws-requests-auth", "description": "AWS signature version 4 signing process for the python requests module" }, + { "name": "aws-sam-translator", "uri": "https://anaconda.org/anaconda/aws-sam-translator", "description": "AWS Serverless Application Model (AWS SAM) prescribes rules for expressing Serverless applications on AWS." }, + { "name": "aws-sdk-cpp", "uri": "https://anaconda.org/anaconda/aws-sdk-cpp", "description": "C++ library that makes it easy to integrate C++ applications with AWS services" }, + { "name": "aws-xray-sdk", "uri": "https://anaconda.org/anaconda/aws-xray-sdk", "description": "The AWS X-Ray SDK for Python (the SDK) enables Python developers to record and emit information from within their applications to the AWS X-Ray service." }, + { "name": "azure-common", "uri": "https://anaconda.org/anaconda/azure-common", "description": "Microsoft Azure Client Library for Python (Common)" }, + { "name": "azure-core", "uri": "https://anaconda.org/anaconda/azure-core", "description": "Microsoft Azure Core Library for Python" }, + { "name": "azure-cosmos", "uri": "https://anaconda.org/anaconda/azure-cosmos", "description": "Microsoft Azure Cosmos Python SDK" }, + { "name": "azure-functions", "uri": "https://anaconda.org/anaconda/azure-functions", "description": "Azure Functions for Python" }, + { "name": "azure-storage-blob", "uri": "https://anaconda.org/anaconda/azure-storage-blob", "description": "Microsoft Azure Blob Storage Client Library for Python" }, + { "name": "babel", "uri": "https://anaconda.org/anaconda/babel", "description": "Utilities to internationalize and localize Python applications" }, + { "name": "backcall", "uri": "https://anaconda.org/anaconda/backcall", "description": "Specifications for callback functions passed in to an API" }, + { "name": "backoff", "uri": "https://anaconda.org/anaconda/backoff", "description": "Function decoration for backoff and retry" }, + { "name": "backports", "uri": "https://anaconda.org/anaconda/backports", "description": "Namespace for backported Python features." }, + { "name": "backports.lzma", "uri": "https://anaconda.org/anaconda/backports.lzma", "description": "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files." }, + { "name": "backports.os", "uri": "https://anaconda.org/anaconda/backports.os", "description": "Backport of new features in Python's os module" }, + { "name": "backports.shutil_which", "uri": "https://anaconda.org/anaconda/backports.shutil_which", "description": "Backport of shutil.which from Python 3.3" }, + { "name": "backports.tarfile", "uri": "https://anaconda.org/anaconda/backports.tarfile", "description": "Backport of CPython tarfile module" }, + { "name": "backports.tempfile", "uri": "https://anaconda.org/anaconda/backports.tempfile", "description": "Backports of new features in Python's tempfile module" }, + { "name": "backports.weakref", "uri": "https://anaconda.org/anaconda/backports.weakref", "description": "Backport of new features in Python's weakref module" }, + { "name": "backports.zoneinfo", "uri": "https://anaconda.org/anaconda/backports.zoneinfo", "description": "Backport of the standard library zoneinfo module" }, + { "name": "basemap", "uri": "https://anaconda.org/anaconda/basemap", "description": "Plot on map projections using matplotlib" }, + { "name": "basemap-data", "uri": "https://anaconda.org/anaconda/basemap-data", "description": "Plot on map projections (with coastlines and political boundaries) using matplotlib." }, + { "name": "basemap-data-hires", "uri": "https://anaconda.org/anaconda/basemap-data-hires", "description": "Plot on map projections (with coastlines and political boundaries) using matplotlib." }, + { "name": "basesystem-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/basesystem-amzn2-aarch64", "description": "(CDT) The skeleton package which defines a simple Amazon Linux system" }, + { "name": "bash", "uri": "https://anaconda.org/anaconda/bash", "description": "Bourne Again Shell" }, + { "name": "baycomp", "uri": "https://anaconda.org/anaconda/baycomp", "description": "Library for Bayesian comparison of predictive models" }, + { "name": "bazel", "uri": "https://anaconda.org/anaconda/bazel", "description": "build system originally authored by Google" }, + { "name": "bazel-toolchain", "uri": "https://anaconda.org/anaconda/bazel-toolchain", "description": "Helper script to generate a crosscompile toolchain for Bazel with the currently activated compiler settings." }, + { "name": "bcj-cffi", "uri": "https://anaconda.org/anaconda/bcj-cffi", "description": "bcj algorithm library" }, + { "name": "bcrypt", "uri": "https://anaconda.org/anaconda/bcrypt", "description": "Modern password hashing for your software and your servers" }, + { "name": "beautifulsoup4", "uri": "https://anaconda.org/anaconda/beautifulsoup4", "description": "Python library designed for screen-scraping" }, + { "name": "behave", "uri": "https://anaconda.org/anaconda/behave", "description": "behave is behaviour-driven development, Python style" }, + { "name": "beniget", "uri": "https://anaconda.org/anaconda/beniget", "description": "Extract semantic information about static Python code" }, + { "name": "bidict", "uri": "https://anaconda.org/anaconda/bidict", "description": "Efficient, Pythonic bidirectional map implementation and related functionality" }, + { "name": "billiard", "uri": "https://anaconda.org/anaconda/billiard", "description": "Python multiprocessing fork with improvements and bugfixes" }, + { "name": "binaryornot", "uri": "https://anaconda.org/anaconda/binaryornot", "description": "Ultra-lightweight pure Python package to check if a file is binary or text." }, + { "name": "binsort", "uri": "https://anaconda.org/anaconda/binsort", "description": "Binsort - sort files by binary similarity" }, + { "name": "binutils", "uri": "https://anaconda.org/anaconda/binutils", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "binutils_impl_linux-32", "uri": "https://anaconda.org/anaconda/binutils_impl_linux-32", "description": "The GNU Binutils are a collection of binary tools." }, + { "name": "binutils_impl_linux-64", "uri": "https://anaconda.org/anaconda/binutils_impl_linux-64", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "binutils_impl_linux-aarch64", "uri": "https://anaconda.org/anaconda/binutils_impl_linux-aarch64", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "binutils_impl_linux-ppc64le", "uri": "https://anaconda.org/anaconda/binutils_impl_linux-ppc64le", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "binutils_impl_linux-s390x", "uri": "https://anaconda.org/anaconda/binutils_impl_linux-s390x", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "binutils_linux-32", "uri": "https://anaconda.org/anaconda/binutils_linux-32", "description": "The GNU Binutils are a collection of binary tools (activation scripts)" }, + { "name": "binutils_linux-64", "uri": "https://anaconda.org/anaconda/binutils_linux-64", "description": "The GNU Binutils are a collection of binary tools (activation scripts)" }, + { "name": "binutils_linux-aarch64", "uri": "https://anaconda.org/anaconda/binutils_linux-aarch64", "description": "The GNU Binutils are a collection of binary tools (activation scripts)" }, + { "name": "binutils_linux-ppc64le", "uri": "https://anaconda.org/anaconda/binutils_linux-ppc64le", "description": "The GNU Binutils are a collection of binary tools (activation scripts)" }, + { "name": "binutils_linux-s390x", "uri": "https://anaconda.org/anaconda/binutils_linux-s390x", "description": "The GNU Binutils are a collection of binary tools (activation scripts)" }, + { "name": "biopython", "uri": "https://anaconda.org/anaconda/biopython", "description": "Collection of freely available tools for computational molecular biology" }, + { "name": "bisonpp", "uri": "https://anaconda.org/anaconda/bisonpp", "description": "The original bison++ project, brought up to date with modern compilers" }, + { "name": "bitarray", "uri": "https://anaconda.org/anaconda/bitarray", "description": "efficient arrays of booleans -- C extension" }, + { "name": "bkcharts", "uri": "https://anaconda.org/anaconda/bkcharts", "description": "No Summary" }, + { "name": "black", "uri": "https://anaconda.org/anaconda/black", "description": "The Uncompromising Code Formatter" }, + { "name": "blas", "uri": "https://anaconda.org/anaconda/blas", "description": "Linear Algebra PACKage" }, + { "name": "blas-devel", "uri": "https://anaconda.org/anaconda/blas-devel", "description": "Linear Algebra PACKage" }, + { "name": "bleach", "uri": "https://anaconda.org/anaconda/bleach", "description": "Easy, whitelist-based HTML-sanitizing tool" }, + { "name": "blessed", "uri": "https://anaconda.org/anaconda/blessed", "description": "Easy, practical library for making terminal apps, by providing an elegant, well-documented interface to Colors, Keyboard input, and screen Positioning capabilities." }, + { "name": "blessings", "uri": "https://anaconda.org/anaconda/blessings", "description": "A thin, practical wrapper around terminal capabilities in Python" }, + { "name": "blinker", "uri": "https://anaconda.org/anaconda/blinker", "description": "Fast, simple object-to-object and broadcast signaling" }, + { "name": "bokeh", "uri": "https://anaconda.org/anaconda/bokeh", "description": "Bokeh is an interactive visualization library for modern web browsers." }, + { "name": "boltons", "uri": "https://anaconda.org/anaconda/boltons", "description": "boltons should be builtins. Boltons is a set of over 160 BSD-licensed, pure-Python utilities in the same spirit as--and yet conspicuously missing from--the standard library." }, + { "name": "boolean.py", "uri": "https://anaconda.org/anaconda/boolean.py", "description": "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL." }, + { "name": "boost", "uri": "https://anaconda.org/anaconda/boost", "description": "Free peer-reviewed portable C++ source libraries." }, + { "name": "boost-cpp", "uri": "https://anaconda.org/anaconda/boost-cpp", "description": "Free peer-reviewed portable C++ source libraries." }, + { "name": "boost_mp11", "uri": "https://anaconda.org/anaconda/boost_mp11", "description": "C++11 metaprogramming library" }, + { "name": "boto3", "uri": "https://anaconda.org/anaconda/boto3", "description": "Amazon Web Services SDK for Python" }, + { "name": "botocore", "uri": "https://anaconda.org/anaconda/botocore", "description": "Low-level, data-driven core of boto 3." }, + { "name": "bottle", "uri": "https://anaconda.org/anaconda/bottle", "description": "Bottle is a fast, simple and lightweight WSGI micro web-framework for Python." }, + { "name": "bottleneck", "uri": "https://anaconda.org/anaconda/bottleneck", "description": "Fast NumPy array functions written in Cython." }, + { "name": "bpython", "uri": "https://anaconda.org/anaconda/bpython", "description": "Fancy Interface to the Python Interpreter" }, + { "name": "branca", "uri": "https://anaconda.org/anaconda/branca", "description": "This library is a spinoff from folium with the non-map-specific features" }, + { "name": "brotli", "uri": "https://anaconda.org/anaconda/brotli", "description": "Brotli compression format" }, + { "name": "brotli-bin", "uri": "https://anaconda.org/anaconda/brotli-bin", "description": "Brotli compression format" }, + { "name": "brotli-python", "uri": "https://anaconda.org/anaconda/brotli-python", "description": "Brotli compression format" }, + { "name": "brotlicffi", "uri": "https://anaconda.org/anaconda/brotlicffi", "description": "Python CFFI bindings to the Brotli library" }, + { "name": "brotlipy", "uri": "https://anaconda.org/anaconda/brotlipy", "description": "Python bindings to the Brotli compression library" }, + { "name": "brunsli", "uri": "https://anaconda.org/anaconda/brunsli", "description": "Practical JPEG Repacker" }, + { "name": "bs4", "uri": "https://anaconda.org/anaconda/bs4", "description": "Python library designed for screen-scraping" }, + { "name": "bsdiff4", "uri": "https://anaconda.org/anaconda/bsdiff4", "description": "binary diff and patch using the BSDIFF4-format" }, + { "name": "btrees", "uri": "https://anaconda.org/anaconda/btrees", "description": "scalable persistent object containers" }, + { "name": "build", "uri": "https://anaconda.org/anaconda/build", "description": "A simple, correct PEP517 package builder" }, + { "name": "bwidget", "uri": "https://anaconda.org/anaconda/bwidget", "description": "Simple Widgets for Tcl/Tk." }, + { "name": "bytecode", "uri": "https://anaconda.org/anaconda/bytecode", "description": "A Python module to generate and modify Python bytecode." }, + { "name": "bzip2", "uri": "https://anaconda.org/anaconda/bzip2", "description": "high-quality data compressor" }, + { "name": "bzip2-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/bzip2-libs-amzn2-aarch64", "description": "(CDT) Libraries for applications using bzip2" }, + { "name": "c-ares", "uri": "https://anaconda.org/anaconda/c-ares", "description": "This is c-ares, an asynchronous resolver library" }, + { "name": "c-ares-static", "uri": "https://anaconda.org/anaconda/c-ares-static", "description": "This is c-ares, an asynchronous resolver library" }, + { "name": "c-blosc2", "uri": "https://anaconda.org/anaconda/c-blosc2", "description": "A simple, compressed, fast and persistent data store library for C" }, + { "name": "c99-to-c89", "uri": "https://anaconda.org/anaconda/c99-to-c89", "description": "Tool to convert C99 code to MSVC-compatible C89, with many Anaconda Distribution fixes" }, + { "name": "ca-certificates", "uri": "https://anaconda.org/anaconda/ca-certificates", "description": "Certificates for use with other packages." }, + { "name": "ca-certificates-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/ca-certificates-amzn2-aarch64", "description": "(CDT) The Mozilla CA root certificate bundle" }, + { "name": "ca-certificates-cos6-x86_64", "uri": "https://anaconda.org/anaconda/ca-certificates-cos6-x86_64", "description": "(CDT) The Mozilla CA root certificate bundle" }, + { "name": "ca-certificates-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/ca-certificates-cos7-ppc64le", "description": "(CDT) The Mozilla CA root certificate bundle" }, + { "name": "ca-certificates-cos7-s390x", "uri": "https://anaconda.org/anaconda/ca-certificates-cos7-s390x", "description": "(CDT) The Mozilla CA root certificate bundle" }, + { "name": "cachecontrol", "uri": "https://anaconda.org/anaconda/cachecontrol", "description": "The httplib2 caching algorithms packaged up for use with requests" }, + { "name": "cachecontrol-with-filecache", "uri": "https://anaconda.org/anaconda/cachecontrol-with-filecache", "description": "The httplib2 caching algorithms packaged up for use with requests" }, + { "name": "cachecontrol-with-redis", "uri": "https://anaconda.org/anaconda/cachecontrol-with-redis", "description": "The httplib2 caching algorithms packaged up for use with requests" }, + { "name": "cachelib", "uri": "https://anaconda.org/anaconda/cachelib", "description": "A collection of cache libraries in the same API interface." }, + { "name": "cachetools", "uri": "https://anaconda.org/anaconda/cachetools", "description": "Extensible memoizing collections and decorators" }, + { "name": "cachy", "uri": "https://anaconda.org/anaconda/cachy", "description": "Cachy provides a simple yet effective caching library" }, + { "name": "cairo", "uri": "https://anaconda.org/anaconda/cairo", "description": "Cairo is a 2D graphics library with support for multiple output devices." }, + { "name": "cairo-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cairo-amzn2-aarch64", "description": "(CDT) A 2D graphics library" }, + { "name": "cairo-cos6-i686", "uri": "https://anaconda.org/anaconda/cairo-cos6-i686", "description": "(CDT) A 2D graphics library" }, + { "name": "cairo-cos6-x86_64", "uri": "https://anaconda.org/anaconda/cairo-cos6-x86_64", "description": "(CDT) A 2D graphics library" }, + { "name": "cairo-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/cairo-cos7-ppc64le", "description": "(CDT) A 2D graphics library" }, + { "name": "cairo-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cairo-devel-amzn2-aarch64", "description": "(CDT) Development files for cairo" }, + { "name": "cairo-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/cairo-devel-cos7-ppc64le", "description": "(CDT) Development files for cairo" }, + { "name": "cairo-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/cairo-devel-cos7-s390x", "description": "(CDT) Development files for cairo" }, + { "name": "cairomm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cairomm-amzn2-aarch64", "description": "(CDT) C++ API for the cairo graphics library" }, + { "name": "cairomm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cairomm-devel-amzn2-aarch64", "description": "(CDT) Headers for developing programs that will use cairomm" }, + { "name": "calver", "uri": "https://anaconda.org/anaconda/calver", "description": "Setuptools extension for CalVer package versions" }, + { "name": "canmatrix", "uri": "https://anaconda.org/anaconda/canmatrix", "description": "Converting Can (Controller Area Network) Database Formats .arxml .dbc .dbf .kcd ..." }, + { "name": "capnproto", "uri": "https://anaconda.org/anaconda/capnproto", "description": "An insanely fast data interchange format and capability-based RPC system." }, + { "name": "captum", "uri": "https://anaconda.org/anaconda/captum", "description": "Model interpretability for PyTorch" }, + { "name": "capturer", "uri": "https://anaconda.org/anaconda/capturer", "description": "Easily capture stdout/stderr of the current process and subprocesses." }, + { "name": "cargo-bundle-licenses", "uri": "https://anaconda.org/anaconda/cargo-bundle-licenses", "description": "Bundle thirdparty licenses for Cargo projects into a single file." }, + { "name": "cargo-bundle-licenses-gnu", "uri": "https://anaconda.org/anaconda/cargo-bundle-licenses-gnu", "description": "Bundle thirdparty licenses for Cargo projects into a single file." }, + { "name": "cartopy", "uri": "https://anaconda.org/anaconda/cartopy", "description": "A library providing cartographic tools for python" }, + { "name": "case", "uri": "https://anaconda.org/anaconda/case", "description": "Python unittest Utilities" }, + { "name": "cassandra-driver", "uri": "https://anaconda.org/anaconda/cassandra-driver", "description": "Python driver for Cassandra" }, + { "name": "catalogue", "uri": "https://anaconda.org/anaconda/catalogue", "description": "Super lightweight function registries for your library" }, + { "name": "catboost", "uri": "https://anaconda.org/anaconda/catboost", "description": "Gradient boosting on decision trees library" }, + { "name": "category_encoders", "uri": "https://anaconda.org/anaconda/category_encoders", "description": "A collection sklearn transformers to encode categorical variables as numeric" }, + { "name": "cattrs", "uri": "https://anaconda.org/anaconda/cattrs", "description": "Complex custom class converters for attrs." }, + { "name": "ccache", "uri": "https://anaconda.org/anaconda/ccache", "description": "A compiler cache" }, + { "name": "cccl", "uri": "https://anaconda.org/anaconda/cccl", "description": "CUDA C++ Core Libraries" }, + { "name": "cchardet", "uri": "https://anaconda.org/anaconda/cchardet", "description": "cChardet is high speed universal character encoding detector" }, + { "name": "cctools", "uri": "https://anaconda.org/anaconda/cctools", "description": "Native assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "cctools_linux-64", "uri": "https://anaconda.org/anaconda/cctools_linux-64", "description": "Assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "cctools_linux-aarch64", "uri": "https://anaconda.org/anaconda/cctools_linux-aarch64", "description": "Assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "cctools_linux-ppc64le", "uri": "https://anaconda.org/anaconda/cctools_linux-ppc64le", "description": "Assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "cctools_osx-64", "uri": "https://anaconda.org/anaconda/cctools_osx-64", "description": "Assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "cctools_osx-arm64", "uri": "https://anaconda.org/anaconda/cctools_osx-arm64", "description": "Assembler, archiver, ranlib, libtool, otool et al for Darwin Mach-O files" }, + { "name": "celery", "uri": "https://anaconda.org/anaconda/celery", "description": "Distributed Task Queue" }, + { "name": "celery-redbeat", "uri": "https://anaconda.org/anaconda/celery-redbeat", "description": "A Celery Beat Scheduler using Redis for persistent storage" }, + { "name": "centos-release-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/centos-release-cos7-ppc64le", "description": "(CDT) CentOS Linux release file" }, + { "name": "cerberus", "uri": "https://anaconda.org/anaconda/cerberus", "description": "Lightweight, extensible schema and data validation tool for Python dictionaries." }, + { "name": "ceres-solver", "uri": "https://anaconda.org/anaconda/ceres-solver", "description": "A large scale non-linear optimization library" }, + { "name": "certifi", "uri": "https://anaconda.org/anaconda/certifi", "description": "Python package for providing Mozilla's CA Bundle." }, + { "name": "certipy", "uri": "https://anaconda.org/anaconda/certipy", "description": "Simple, fast, extensible JSON encoder/decoder for Python" }, + { "name": "cffi", "uri": "https://anaconda.org/anaconda/cffi", "description": "Foreign Function Interface for Python calling C code." }, + { "name": "cfgv", "uri": "https://anaconda.org/anaconda/cfgv", "description": "Validate configuration and produce human readable error messages." }, + { "name": "cfitsio", "uri": "https://anaconda.org/anaconda/cfitsio", "description": "A library for reading and writing FITS files" }, + { "name": "cfn-lint", "uri": "https://anaconda.org/anaconda/cfn-lint", "description": "CloudFormation Linter" }, + { "name": "cftime", "uri": "https://anaconda.org/anaconda/cftime", "description": "Time-handling functionality from netcdf4-python" }, + { "name": "cgroupspy", "uri": "https://anaconda.org/anaconda/cgroupspy", "description": "Python library for managing cgroups" }, + { "name": "chai", "uri": "https://anaconda.org/anaconda/chai", "description": "Easy to use mocking, stubbing and spying framework." }, + { "name": "chainer", "uri": "https://anaconda.org/anaconda/chainer", "description": "A flexible framework of neural networks" }, + { "name": "chardet", "uri": "https://anaconda.org/anaconda/chardet", "description": "Universal character encoding detector" }, + { "name": "charls", "uri": "https://anaconda.org/anaconda/charls", "description": "CharLS is a C++ implementation of the JPEG-LS standard for lossless and near-lossless image compression and decompression. JPEG-LS is a low-complexity image compression standard that matches JPEG 2000 compression ratios." }, + { "name": "charset-normalizer", "uri": "https://anaconda.org/anaconda/charset-normalizer", "description": "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." }, + { "name": "cheroot", "uri": "https://anaconda.org/anaconda/cheroot", "description": "Highly-optimized, pure-python HTTP server" }, + { "name": "cherrypy", "uri": "https://anaconda.org/anaconda/cherrypy", "description": "Object-Oriented HTTP framework" }, + { "name": "chex", "uri": "https://anaconda.org/anaconda/chex", "description": "Chex: Testing made fun, in JAX!" }, + { "name": "chkconfig-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/chkconfig-cos7-ppc64le", "description": "(CDT) A system tool for maintaining the /etc/rc*.d hierarchy" }, + { "name": "chkconfig-cos7-s390x", "uri": "https://anaconda.org/anaconda/chkconfig-cos7-s390x", "description": "(CDT) A system tool for maintaining the /etc/rc*.d hierarchy" }, + { "name": "chromedriver-binary", "uri": "https://anaconda.org/anaconda/chromedriver-binary", "description": "No Summary" }, + { "name": "ciocheck", "uri": "https://anaconda.org/anaconda/ciocheck", "description": "Continuum Analytics linter/formater/tester helper" }, + { "name": "ciso8601", "uri": "https://anaconda.org/anaconda/ciso8601", "description": "Fast ISO8601 date time parser for Python written in C" }, + { "name": "clang", "uri": "https://anaconda.org/anaconda/clang", "description": "Development headers and libraries for Clang" }, + { "name": "clang-12", "uri": "https://anaconda.org/anaconda/clang-12", "description": "Development headers and libraries for Clang" }, + { "name": "clang-14", "uri": "https://anaconda.org/anaconda/clang-14", "description": "Development headers and libraries for Clang" }, + { "name": "clang-dbg_osx-64", "uri": "https://anaconda.org/anaconda/clang-dbg_osx-64", "description": "No Summary" }, + { "name": "clang-format", "uri": "https://anaconda.org/anaconda/clang-format", "description": "Development headers and libraries for Clang" }, + { "name": "clang-format-14", "uri": "https://anaconda.org/anaconda/clang-format-14", "description": "Development headers and libraries for Clang" }, + { "name": "clang-tools", "uri": "https://anaconda.org/anaconda/clang-tools", "description": "Development headers and libraries for Clang" }, + { "name": "clang_bootstrap_osx-64", "uri": "https://anaconda.org/anaconda/clang_bootstrap_osx-64", "description": "clang compiler components in one package for bootstrapping clang" }, + { "name": "clang_bootstrap_osx-arm64", "uri": "https://anaconda.org/anaconda/clang_bootstrap_osx-arm64", "description": "clang compiler components in one package for bootstrapping clang" }, + { "name": "clang_osx-64", "uri": "https://anaconda.org/anaconda/clang_osx-64", "description": "clang compilers for conda-build 3" }, + { "name": "clang_osx-arm64", "uri": "https://anaconda.org/anaconda/clang_osx-arm64", "description": "clang compilers for conda-build 3" }, + { "name": "clang_win-64", "uri": "https://anaconda.org/anaconda/clang_win-64", "description": "clang (cross) compiler for windows with MSVC ABI compatbility" }, + { "name": "clangdev", "uri": "https://anaconda.org/anaconda/clangdev", "description": "Development headers and libraries for Clang" }, + { "name": "clangxx", "uri": "https://anaconda.org/anaconda/clangxx", "description": "Development headers and libraries for Clang" }, + { "name": "clangxx-dbg_osx-64", "uri": "https://anaconda.org/anaconda/clangxx-dbg_osx-64", "description": "No Summary" }, + { "name": "clangxx_osx-64", "uri": "https://anaconda.org/anaconda/clangxx_osx-64", "description": "clang compilers for conda-build 3" }, + { "name": "clangxx_osx-arm64", "uri": "https://anaconda.org/anaconda/clangxx_osx-arm64", "description": "clang compilers for conda-build 3" }, + { "name": "cleo", "uri": "https://anaconda.org/anaconda/cleo", "description": "Cleo allows you to create beautiful and testable command-line interfaces." }, + { "name": "cli11", "uri": "https://anaconda.org/anaconda/cli11", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." }, + { "name": "click", "uri": "https://anaconda.org/anaconda/click", "description": "Python composable command line interface toolkit" }, + { "name": "click-default-group", "uri": "https://anaconda.org/anaconda/click-default-group", "description": "Extends click.Group to invoke a command without explicit subcommand name.'" }, + { "name": "click-didyoumean", "uri": "https://anaconda.org/anaconda/click-didyoumean", "description": "Enable git-like did-you-mean feature in click." }, + { "name": "click-repl", "uri": "https://anaconda.org/anaconda/click-repl", "description": "REPL plugin for Click" }, + { "name": "clickclick", "uri": "https://anaconda.org/anaconda/clickclick", "description": "Click utility functions" }, + { "name": "clickhouse-cityhash", "uri": "https://anaconda.org/anaconda/clickhouse-cityhash", "description": "Python-bindings for CityHash, a fast non-cryptographic hash algorithm" }, + { "name": "clickhouse-driver", "uri": "https://anaconda.org/anaconda/clickhouse-driver", "description": "Python driver with native interface for ClickHouse" }, + { "name": "clickhouse-sqlalchemy", "uri": "https://anaconda.org/anaconda/clickhouse-sqlalchemy", "description": "Simple ClickHouse SQLAlchemy Dialect" }, + { "name": "clikit", "uri": "https://anaconda.org/anaconda/clikit", "description": "CliKit is a group of utilities to build beautiful and testable command line interfaces." }, + { "name": "cloudant", "uri": "https://anaconda.org/anaconda/cloudant", "description": "Asynchronous Cloudant / CouchDB Interface" }, + { "name": "cloudpathlib", "uri": "https://anaconda.org/anaconda/cloudpathlib", "description": "pathlib.Path-style classes for interacting with files in different cloud storage services." }, + { "name": "cloudpathlib-all", "uri": "https://anaconda.org/anaconda/cloudpathlib-all", "description": "pathlib.Path-style classes for interacting with files in different cloud storage services." }, + { "name": "cloudpathlib-azure", "uri": "https://anaconda.org/anaconda/cloudpathlib-azure", "description": "pathlib.Path-style classes for interacting with files in different cloud storage services." }, + { "name": "cloudpathlib-gs", "uri": "https://anaconda.org/anaconda/cloudpathlib-gs", "description": "pathlib.Path-style classes for interacting with files in different cloud storage services." }, + { "name": "cloudpathlib-s3", "uri": "https://anaconda.org/anaconda/cloudpathlib-s3", "description": "pathlib.Path-style classes for interacting with files in different cloud storage services." }, + { "name": "cloudpickle", "uri": "https://anaconda.org/anaconda/cloudpickle", "description": "Extended pickling support for Python objects" }, + { "name": "clr_loader", "uri": "https://anaconda.org/anaconda/clr_loader", "description": "Generic pure Python loader for .NET runtimes" }, + { "name": "cmaes", "uri": "https://anaconda.org/anaconda/cmaes", "description": "Lightweight Covariance Matrix Adaptation Evolution Strategy (CMA-ES) implementation for Python 3." }, + { "name": "cmake", "uri": "https://anaconda.org/anaconda/cmake", "description": "CMake is an extensible, open-source system that manages the build process" }, + { "name": "cmake-binary", "uri": "https://anaconda.org/anaconda/cmake-binary", "description": "CMake is an extensible, open-source system that manages the build process" }, + { "name": "cmake-no-system", "uri": "https://anaconda.org/anaconda/cmake-no-system", "description": "CMake built without system libraries for use when building CMake dependencies." }, + { "name": "cmake_setuptools", "uri": "https://anaconda.org/anaconda/cmake_setuptools", "description": "Provides some usable cmake related build extensions" }, + { "name": "cmarkgfm", "uri": "https://anaconda.org/anaconda/cmarkgfm", "description": "Minimalist Python bindings to GitHub’s fork of cmark." }, + { "name": "cmdstan", "uri": "https://anaconda.org/anaconda/cmdstan", "description": "CmdStan, the command line interface to Stan" }, + { "name": "cmdstanpy", "uri": "https://anaconda.org/anaconda/cmdstanpy", "description": "CmdStanPy is a lightweight interface to Stan for Python users which\nprovides the necessary objects and functions to compile a Stan program\nand fit the model to data using CmdStan." }, + { "name": "cmyt", "uri": "https://anaconda.org/anaconda/cmyt", "description": "A collection of Matplotlib colormaps from the yt project" }, + { "name": "codecov", "uri": "https://anaconda.org/anaconda/codecov", "description": "Hosted coverage reports for Github, Bitbucket and Gitlab" }, + { "name": "coin-or-cbc", "uri": "https://anaconda.org/anaconda/coin-or-cbc", "description": "COIN-OR branch and cut (Cbc)" }, + { "name": "coin-or-cgl", "uri": "https://anaconda.org/anaconda/coin-or-cgl", "description": "COIN-OR Cut Generation Library (Cgl)" }, + { "name": "coin-or-clp", "uri": "https://anaconda.org/anaconda/coin-or-clp", "description": "COIN-OR linear programming (Clp)" }, + { "name": "coin-or-osi", "uri": "https://anaconda.org/anaconda/coin-or-osi", "description": "Coin OR Open Solver Interface (OSI)" }, + { "name": "coin-or-utils", "uri": "https://anaconda.org/anaconda/coin-or-utils", "description": "COIN-OR Utilities (CoinUtils)" }, + { "name": "coincbc", "uri": "https://anaconda.org/anaconda/coincbc", "description": "COIN-OR branch and cut (Cbc)" }, + { "name": "colorama", "uri": "https://anaconda.org/anaconda/colorama", "description": "Cross-platform colored terminal text" }, + { "name": "colorcet", "uri": "https://anaconda.org/anaconda/colorcet", "description": "Collection of perceptually uniform colormaps" }, + { "name": "coloredlogs", "uri": "https://anaconda.org/anaconda/coloredlogs", "description": "Colored terminal output for Python's logging module" }, + { "name": "colorful", "uri": "https://anaconda.org/anaconda/colorful", "description": "Terminal string styling done right, in Python" }, + { "name": "colorlog", "uri": "https://anaconda.org/anaconda/colorlog", "description": "Log formatting with colors!" }, + { "name": "colorspacious", "uri": "https://anaconda.org/anaconda/colorspacious", "description": "A powerful, accurate, and easy-to-use Python library for doing colorspace conversions" }, + { "name": "colour", "uri": "https://anaconda.org/anaconda/colour", "description": "Python color representations manipulation library (RGB, HSL, web, ...)" }, + { "name": "comm", "uri": "https://anaconda.org/anaconda/comm", "description": "Python Comm implementation for the Jupyter kernel protocol" }, + { "name": "commonmark", "uri": "https://anaconda.org/anaconda/commonmark", "description": "Python parser for the CommonMark Markdown spec" }, + { "name": "compiler-rt", "uri": "https://anaconda.org/anaconda/compiler-rt", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_linux-64", "uri": "https://anaconda.org/anaconda/compiler-rt_linux-64", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_linux-aarch64", "uri": "https://anaconda.org/anaconda/compiler-rt_linux-aarch64", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_linux-ppc64le", "uri": "https://anaconda.org/anaconda/compiler-rt_linux-ppc64le", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_osx-64", "uri": "https://anaconda.org/anaconda/compiler-rt_osx-64", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_osx-arm64", "uri": "https://anaconda.org/anaconda/compiler-rt_osx-arm64", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_win-32", "uri": "https://anaconda.org/anaconda/compiler-rt_win-32", "description": "compiler-rt runtime libraries" }, + { "name": "compiler-rt_win-64", "uri": "https://anaconda.org/anaconda/compiler-rt_win-64", "description": "compiler-rt runtime libraries" }, + { "name": "composeml", "uri": "https://anaconda.org/anaconda/composeml", "description": "An open source python library for automated prediction engineering." }, + { "name": "comtypes", "uri": "https://anaconda.org/anaconda/comtypes", "description": "pure Python COM package" }, + { "name": "conda", "uri": "https://anaconda.org/anaconda/conda", "description": "OS-agnostic, system-level binary package and environment manager." }, + { "name": "conda-anaconda-telemetry", "uri": "https://anaconda.org/anaconda/conda-anaconda-telemetry", "description": "Anaconda Telemetry conda plugin" }, + { "name": "conda-anaconda-tos", "uri": "https://anaconda.org/anaconda/conda-anaconda-tos", "description": "Anaconda Terms of Service conda plugin" }, + { "name": "conda-audit", "uri": "https://anaconda.org/anaconda/conda-audit", "description": "Construct SBOM from Conda env with CVEs" }, + { "name": "conda-auth", "uri": "https://anaconda.org/anaconda/conda-auth", "description": "Conda plugin for improved access to private channels" }, + { "name": "conda-build", "uri": "https://anaconda.org/anaconda/conda-build", "description": "tools for building conda packages" }, + { "name": "conda-content-trust", "uri": "https://anaconda.org/anaconda/conda-content-trust", "description": "Signing and verification tools for conda" }, + { "name": "conda-index", "uri": "https://anaconda.org/anaconda/conda-index", "description": "Create `repodata.json` for collections of conda packages." }, + { "name": "conda-libmamba-solver", "uri": "https://anaconda.org/anaconda/conda-libmamba-solver", "description": "The fast mamba solver, now in conda!" }, + { "name": "conda-lock", "uri": "https://anaconda.org/anaconda/conda-lock", "description": "Lightweight lockfile for conda environments" }, + { "name": "conda-pack", "uri": "https://anaconda.org/anaconda/conda-pack", "description": "Package conda environments for redistribution" }, + { "name": "conda-package-handling", "uri": "https://anaconda.org/anaconda/conda-package-handling", "description": "Create and extract conda packages of various formats." }, + { "name": "conda-package-streaming", "uri": "https://anaconda.org/anaconda/conda-package-streaming", "description": "An efficient library to read from new and old format .conda and .tar.bz2 conda packages." }, + { "name": "conda-prefix-replacement", "uri": "https://anaconda.org/anaconda/conda-prefix-replacement", "description": "Detect and replace prefix paths embedded in files" }, + { "name": "conda-project", "uri": "https://anaconda.org/anaconda/conda-project", "description": "Tool for encapsulating, running, and reproducing projects with conda environments" }, + { "name": "conda-recipe-manager", "uri": "https://anaconda.org/anaconda/conda-recipe-manager", "description": "Helper tool for recipes on aggregate." }, + { "name": "conda-repo-cli", "uri": "https://anaconda.org/anaconda/conda-repo-cli", "description": "Anaconda Repository command line client library" }, + { "name": "conda-souschef", "uri": "https://anaconda.org/anaconda/conda-souschef", "description": "Project to handle conda recipes" }, + { "name": "conda-standalone", "uri": "https://anaconda.org/anaconda/conda-standalone", "description": "Entry point and dependency collection for PyInstaller-based standalone conda." }, + { "name": "conda-token", "uri": "https://anaconda.org/anaconda/conda-token", "description": "Set repository access token" }, + { "name": "confection", "uri": "https://anaconda.org/anaconda/confection", "description": "The sweetest config system for Python" }, + { "name": "configspace", "uri": "https://anaconda.org/anaconda/configspace", "description": "Creation and manipulation of parameter configuration spaces for automated algorithm configuration and hyperparameter tuning." }, + { "name": "configupdater", "uri": "https://anaconda.org/anaconda/configupdater", "description": "Parser like ConfigParser but for updating configuration files" }, + { "name": "configurable-http-proxy", "uri": "https://anaconda.org/anaconda/configurable-http-proxy", "description": "node-http-proxy plus a REST API" }, + { "name": "confuse", "uri": "https://anaconda.org/anaconda/confuse", "description": "painless YAML configuration" }, + { "name": "conllu", "uri": "https://anaconda.org/anaconda/conllu", "description": "CoNLL-U Parser parses a CoNLL-U formatted string into a nested python dictionary" }, + { "name": "connexion", "uri": "https://anaconda.org/anaconda/connexion", "description": "Swagger/OpenAPI First framework for Python on top of Flask with automatic endpoint validation & OAuth2 support" }, + { "name": "cons", "uri": "https://anaconda.org/anaconda/cons", "description": "An implementation of Lisp/Scheme-like cons in Python." }, + { "name": "console_shortcut", "uri": "https://anaconda.org/anaconda/console_shortcut", "description": "No Summary" }, + { "name": "console_shortcut_miniconda", "uri": "https://anaconda.org/anaconda/console_shortcut_miniconda", "description": "Console shortcut creator for Windows (using menuinst)" }, + { "name": "constantly", "uri": "https://anaconda.org/anaconda/constantly", "description": "Symbolic constants in Python" }, + { "name": "constructor", "uri": "https://anaconda.org/anaconda/constructor", "description": "create installer from conda packages" }, + { "name": "contextlib2", "uri": "https://anaconda.org/anaconda/contextlib2", "description": "Backports and enhancements for the contextlib module" }, + { "name": "contextvars", "uri": "https://anaconda.org/anaconda/contextvars", "description": "PEP 567 Backport" }, + { "name": "contourpy", "uri": "https://anaconda.org/anaconda/contourpy", "description": "Python library for calculating contours of 2D quadrilateral grids." }, + { "name": "convertdate", "uri": "https://anaconda.org/anaconda/convertdate", "description": "Converts between Gregorian dates and other calendar systems.Calendars included: Baha'i, French Republican, Hebrew, Indian Civil, Islamic, ISO, Julian, Mayan and Persian." }, + { "name": "cookiecutter", "uri": "https://anaconda.org/anaconda/cookiecutter", "description": "A command-line utility that creates projects from cookiecutters (project templates), e.g. creating a Python package project from a Python package project template." }, + { "name": "copy-jdk-configs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/copy-jdk-configs-cos6-x86_64", "description": "(CDT) JDKs configuration files copier" }, + { "name": "copy-jdk-configs-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/copy-jdk-configs-cos7-ppc64le", "description": "(CDT) JDKs configuration files copier" }, + { "name": "copy-jdk-configs-cos7-s390x", "uri": "https://anaconda.org/anaconda/copy-jdk-configs-cos7-s390x", "description": "(CDT) JDKs configuration files copier" }, + { "name": "coremltools", "uri": "https://anaconda.org/anaconda/coremltools", "description": "Core ML is an Apple framework to integrate machine learning models into your app. Core ML provides a unified representation for all models." }, + { "name": "coreutils", "uri": "https://anaconda.org/anaconda/coreutils", "description": "The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system." }, + { "name": "coreutils-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/coreutils-amzn2-aarch64", "description": "(CDT) A set of basic GNU tools commonly used in shell scripts" }, + { "name": "cornac", "uri": "https://anaconda.org/anaconda/cornac", "description": "A Comparative Framework for Multimodal Recommender Systems" }, + { "name": "cornice", "uri": "https://anaconda.org/anaconda/cornice", "description": "build and document Web Services with Pyramid" }, + { "name": "coverage", "uri": "https://anaconda.org/anaconda/coverage", "description": "Code coverage measurement for Python" }, + { "name": "coveralls", "uri": "https://anaconda.org/anaconda/coveralls", "description": "Show coverage stats online via coveralls.io" }, + { "name": "covid-sim", "uri": "https://anaconda.org/anaconda/covid-sim", "description": "COVID-19 CovidSim Model" }, + { "name": "covid-sim-data", "uri": "https://anaconda.org/anaconda/covid-sim-data", "description": "COVID-19 CovidSim Model" }, + { "name": "cpp-expected", "uri": "https://anaconda.org/anaconda/cpp-expected", "description": "C++11/14/17 std::expected with functional-style extensions" }, + { "name": "cpp-filesystem", "uri": "https://anaconda.org/anaconda/cpp-filesystem", "description": "An implementation of C++17 std::filesystem" }, + { "name": "cppy", "uri": "https://anaconda.org/anaconda/cppy", "description": "C++ headers for C extension development" }, + { "name": "cracklib-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cracklib-amzn2-aarch64", "description": "(CDT) A password-checking library" }, + { "name": "cracklib-cos6-x86_64", "uri": "https://anaconda.org/anaconda/cracklib-cos6-x86_64", "description": "(CDT) A password-checking library" }, + { "name": "cracklib-dicts-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cracklib-dicts-amzn2-aarch64", "description": "(CDT) The standard CrackLib dictionaries" }, + { "name": "cracklib-dicts-cos6-x86_64", "uri": "https://anaconda.org/anaconda/cracklib-dicts-cos6-x86_64", "description": "(CDT) The standard CrackLib dictionaries" }, + { "name": "cramjam", "uri": "https://anaconda.org/anaconda/cramjam", "description": "python bindings to rust-implemented compression" }, + { "name": "crashtest", "uri": "https://anaconda.org/anaconda/crashtest", "description": "Manage Python errors with ease" }, + { "name": "crender", "uri": "https://anaconda.org/anaconda/crender", "description": "The crender tool for creating and checking conda recipes" }, + { "name": "cron-descriptor", "uri": "https://anaconda.org/anaconda/cron-descriptor", "description": "A Python library that converts cron expressions into human readable strings." }, + { "name": "croniter", "uri": "https://anaconda.org/anaconda/croniter", "description": "croniter provides iteration for datetime object with cron like format" }, + { "name": "crosstool-ng", "uri": "https://anaconda.org/anaconda/crosstool-ng", "description": "A versatile (cross-)toolchain generator." }, + { "name": "cryptography", "uri": "https://anaconda.org/anaconda/cryptography", "description": "Provides cryptographic recipes and primitives to Python developers" }, + { "name": "cryptography-vectors", "uri": "https://anaconda.org/anaconda/cryptography-vectors", "description": "Test vectors for cryptography." }, + { "name": "cryptominisat", "uri": "https://anaconda.org/anaconda/cryptominisat", "description": "An advanced SAT Solver https://www.msoos.org" }, + { "name": "cryptsetup-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cryptsetup-libs-amzn2-aarch64", "description": "(CDT) Cryptsetup shared library" }, + { "name": "cssselect", "uri": "https://anaconda.org/anaconda/cssselect", "description": "CSS Selectors for Python" }, + { "name": "csvkit", "uri": "https://anaconda.org/anaconda/csvkit", "description": "A suite of command-line tools for working with CSV, the king of tabular file formats." }, + { "name": "ctypesgen", "uri": "https://anaconda.org/anaconda/ctypesgen", "description": "Python wrapper generator for ctypes" }, + { "name": "ctypesgen-pypdfium2-team", "uri": "https://anaconda.org/anaconda/ctypesgen-pypdfium2-team", "description": "Python wrapper generator for ctypes" }, + { "name": "cuda", "uri": "https://anaconda.org/anaconda/cuda", "description": "Meta-package containing all the available packages for native CUDA development" }, + { "name": "cuda-cccl", "uri": "https://anaconda.org/anaconda/cuda-cccl", "description": "CUDA C++ Core Libraries" }, + { "name": "cuda-cccl_linux-64", "uri": "https://anaconda.org/anaconda/cuda-cccl_linux-64", "description": "CUDA C++ Core Libraries" }, + { "name": "cuda-cccl_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-cccl_linux-aarch64", "description": "CUDA C++ Core Libraries" }, + { "name": "cuda-cccl_win-64", "uri": "https://anaconda.org/anaconda/cuda-cccl_win-64", "description": "CUDA C++ Core Libraries" }, + { "name": "cuda-command-line-tools", "uri": "https://anaconda.org/anaconda/cuda-command-line-tools", "description": "Meta-package containing the command line tools to debug CUDA applications" }, + { "name": "cuda-compat", "uri": "https://anaconda.org/anaconda/cuda-compat", "description": "CUDA Compatibility Platform" }, + { "name": "cuda-compat-impl", "uri": "https://anaconda.org/anaconda/cuda-compat-impl", "description": "CUDA Compatibility Platform" }, + { "name": "cuda-compiler", "uri": "https://anaconda.org/anaconda/cuda-compiler", "description": "A meta-package containing tools to start developing a CUDA application" }, + { "name": "cuda-crt", "uri": "https://anaconda.org/anaconda/cuda-crt", "description": "CUDA internal headers." }, + { "name": "cuda-crt-dev_linux-64", "uri": "https://anaconda.org/anaconda/cuda-crt-dev_linux-64", "description": "CUDA internal headers." }, + { "name": "cuda-crt-dev_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-crt-dev_linux-aarch64", "description": "CUDA internal headers." }, + { "name": "cuda-crt-dev_win-64", "uri": "https://anaconda.org/anaconda/cuda-crt-dev_win-64", "description": "CUDA internal headers." }, + { "name": "cuda-crt-tools", "uri": "https://anaconda.org/anaconda/cuda-crt-tools", "description": "CUDA internal tools." }, + { "name": "cuda-cudart", "uri": "https://anaconda.org/anaconda/cuda-cudart", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-dev", "uri": "https://anaconda.org/anaconda/cuda-cudart-dev", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-dev_linux-64", "uri": "https://anaconda.org/anaconda/cuda-cudart-dev_linux-64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-dev_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-cudart-dev_linux-aarch64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-dev_win-64", "uri": "https://anaconda.org/anaconda/cuda-cudart-dev_win-64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-static", "uri": "https://anaconda.org/anaconda/cuda-cudart-static", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-static_linux-64", "uri": "https://anaconda.org/anaconda/cuda-cudart-static_linux-64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-static_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-cudart-static_linux-aarch64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart-static_win-64", "uri": "https://anaconda.org/anaconda/cuda-cudart-static_win-64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-cudart_linux-64", "uri": "https://anaconda.org/anaconda/cuda-cudart_linux-64", "description": "CUDA Runtime architecture dependent libraries" }, + { "name": "cuda-cudart_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-cudart_linux-aarch64", "description": "CUDA Runtime architecture dependent libraries" }, + { "name": "cuda-cudart_win-64", "uri": "https://anaconda.org/anaconda/cuda-cudart_win-64", "description": "CUDA Runtime architecture dependent libraries" }, + { "name": "cuda-cuobjdump", "uri": "https://anaconda.org/anaconda/cuda-cuobjdump", "description": "Extracts information from CUDA binary files" }, + { "name": "cuda-cupti", "uri": "https://anaconda.org/anaconda/cuda-cupti", "description": "Provides libraries to enable third party tools using GPU profiling APIs." }, + { "name": "cuda-cupti-dev", "uri": "https://anaconda.org/anaconda/cuda-cupti-dev", "description": "Provides libraries to enable third party tools using GPU profiling APIs." }, + { "name": "cuda-cupti-doc", "uri": "https://anaconda.org/anaconda/cuda-cupti-doc", "description": "Provides libraries to enable third party tools using GPU profiling APIs." }, + { "name": "cuda-cupti-static", "uri": "https://anaconda.org/anaconda/cuda-cupti-static", "description": "Provides libraries to enable third party tools using GPU profiling APIs." }, + { "name": "cuda-cuxxfilt", "uri": "https://anaconda.org/anaconda/cuda-cuxxfilt", "description": "cu++filt decodes low-level identifiers that have been mangled by CUDA C++" }, + { "name": "cuda-driver-dev", "uri": "https://anaconda.org/anaconda/cuda-driver-dev", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-driver-dev_linux-64", "uri": "https://anaconda.org/anaconda/cuda-driver-dev_linux-64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-driver-dev_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-driver-dev_linux-aarch64", "description": "CUDA Runtime Native Libraries" }, + { "name": "cuda-gdb", "uri": "https://anaconda.org/anaconda/cuda-gdb", "description": "CUDA-GDB is the NVIDIA tool for debugging CUDA applications" }, + { "name": "cuda-gdb-src", "uri": "https://anaconda.org/anaconda/cuda-gdb-src", "description": "CUDA-GDB is the NVIDIA tool for debugging CUDA applications" }, + { "name": "cuda-libraries", "uri": "https://anaconda.org/anaconda/cuda-libraries", "description": "Meta-package containing all available library runtime packages." }, + { "name": "cuda-libraries-dev", "uri": "https://anaconda.org/anaconda/cuda-libraries-dev", "description": "Meta-package containing all available library development packages." }, + { "name": "cuda-libraries-static", "uri": "https://anaconda.org/anaconda/cuda-libraries-static", "description": "Meta-package containing all available library static packages." }, + { "name": "cuda-minimal-build", "uri": "https://anaconda.org/anaconda/cuda-minimal-build", "description": "Meta-package containing the minimal necessary to build basic CUDA apps." }, + { "name": "cuda-nsight", "uri": "https://anaconda.org/anaconda/cuda-nsight", "description": "A unified CPU plus GPU IDE for developing CUDA applications" }, + { "name": "cuda-nvcc", "uri": "https://anaconda.org/anaconda/cuda-nvcc", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvcc-dev_linux-64", "uri": "https://anaconda.org/anaconda/cuda-nvcc-dev_linux-64", "description": "Target architecture dependent parts of CUDA NVCC compiler." }, + { "name": "cuda-nvcc-dev_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-nvcc-dev_linux-aarch64", "description": "Target architecture dependent parts of CUDA NVCC compiler." }, + { "name": "cuda-nvcc-dev_win-64", "uri": "https://anaconda.org/anaconda/cuda-nvcc-dev_win-64", "description": "Target architecture dependent parts of CUDA NVCC compiler." }, + { "name": "cuda-nvcc-impl", "uri": "https://anaconda.org/anaconda/cuda-nvcc-impl", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvcc-tools", "uri": "https://anaconda.org/anaconda/cuda-nvcc-tools", "description": "Architecture independent part of CUDA NVCC compiler." }, + { "name": "cuda-nvcc_linux-64", "uri": "https://anaconda.org/anaconda/cuda-nvcc_linux-64", "description": "Compiler activation scripts for CUDA applications." }, + { "name": "cuda-nvcc_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-nvcc_linux-aarch64", "description": "Compiler activation scripts for CUDA applications." }, + { "name": "cuda-nvcc_win-64", "uri": "https://anaconda.org/anaconda/cuda-nvcc_win-64", "description": "Compiler activation scripts for CUDA applications." }, + { "name": "cuda-nvdisasm", "uri": "https://anaconda.org/anaconda/cuda-nvdisasm", "description": "nvdisasm extracts information from standalone cubin files" }, + { "name": "cuda-nvml-dev", "uri": "https://anaconda.org/anaconda/cuda-nvml-dev", "description": "NVML native dev links, headers" }, + { "name": "cuda-nvprof", "uri": "https://anaconda.org/anaconda/cuda-nvprof", "description": "Tool for collecting and viewing CUDA application profiling data" }, + { "name": "cuda-nvprune", "uri": "https://anaconda.org/anaconda/cuda-nvprune", "description": "Prunes host object files and libraries to only contain device code" }, + { "name": "cuda-nvrtc", "uri": "https://anaconda.org/anaconda/cuda-nvrtc", "description": "NVRTC native runtime libraries" }, + { "name": "cuda-nvrtc-dev", "uri": "https://anaconda.org/anaconda/cuda-nvrtc-dev", "description": "NVRTC native runtime libraries" }, + { "name": "cuda-nvrtc-static", "uri": "https://anaconda.org/anaconda/cuda-nvrtc-static", "description": "NVRTC native runtime libraries" }, + { "name": "cuda-nvtx", "uri": "https://anaconda.org/anaconda/cuda-nvtx", "description": "A C-based API for annotating events, code ranges, and resources" }, + { "name": "cuda-nvtx-dev", "uri": "https://anaconda.org/anaconda/cuda-nvtx-dev", "description": "A C-based API for annotating events, code ranges, and resources" }, + { "name": "cuda-nvvm", "uri": "https://anaconda.org/anaconda/cuda-nvvm", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvm-dev_linux-64", "uri": "https://anaconda.org/anaconda/cuda-nvvm-dev_linux-64", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvm-dev_linux-aarch64", "uri": "https://anaconda.org/anaconda/cuda-nvvm-dev_linux-aarch64", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvm-dev_win-64", "uri": "https://anaconda.org/anaconda/cuda-nvvm-dev_win-64", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvm-impl", "uri": "https://anaconda.org/anaconda/cuda-nvvm-impl", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvm-tools", "uri": "https://anaconda.org/anaconda/cuda-nvvm-tools", "description": "Compiler for CUDA applications." }, + { "name": "cuda-nvvp", "uri": "https://anaconda.org/anaconda/cuda-nvvp", "description": "NVIDIA Visual Profiler to visualize and optimize the performance of your application." }, + { "name": "cuda-opencl", "uri": "https://anaconda.org/anaconda/cuda-opencl", "description": "CUDA OpenCL native Libraries" }, + { "name": "cuda-opencl-dev", "uri": "https://anaconda.org/anaconda/cuda-opencl-dev", "description": "CUDA OpenCL native Libraries" }, + { "name": "cuda-profiler-api", "uri": "https://anaconda.org/anaconda/cuda-profiler-api", "description": "CUDA Profiler API Headers." }, + { "name": "cuda-runtime", "uri": "https://anaconda.org/anaconda/cuda-runtime", "description": "Meta-package containing all runtime library packages." }, + { "name": "cuda-sanitizer-api", "uri": "https://anaconda.org/anaconda/cuda-sanitizer-api", "description": "Provides a set of APIs to enable third party tools to write GPU sanitizing tools" }, + { "name": "cuda-toolkit", "uri": "https://anaconda.org/anaconda/cuda-toolkit", "description": "Meta-package containing all toolkit packages for CUDA development" }, + { "name": "cuda-tools", "uri": "https://anaconda.org/anaconda/cuda-tools", "description": "Meta-package containing all CUDA command line and visual tools." }, + { "name": "cuda-version", "uri": "https://anaconda.org/anaconda/cuda-version", "description": "A meta-package for pinning to a CUDA release version" }, + { "name": "cuda-visual-tools", "uri": "https://anaconda.org/anaconda/cuda-visual-tools", "description": "Contains the visual tools to debug and profile CUDA applications" }, + { "name": "cudnn", "uri": "https://anaconda.org/anaconda/cudnn", "description": "NVIDIA's cuDNN deep neural network acceleration library" }, + { "name": "cunit", "uri": "https://anaconda.org/anaconda/cunit", "description": "A Unit Testing Framework for C" }, + { "name": "cups-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cups-devel-amzn2-aarch64", "description": "(CDT) CUPS printing system - development environment" }, + { "name": "cups-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/cups-devel-cos6-i686", "description": "(CDT) Common Unix Printing System - development environment" }, + { "name": "cups-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/cups-devel-cos6-x86_64", "description": "(CDT) Common Unix Printing System - development environment" }, + { "name": "cups-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/cups-devel-cos7-s390x", "description": "(CDT) CUPS printing system - development environment" }, + { "name": "cups-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/cups-libs-amzn2-aarch64", "description": "(CDT) CUPS printing system - libraries" }, + { "name": "cups-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/cups-libs-cos6-i686", "description": "(CDT) Common Unix Printing System - libraries" }, + { "name": "cups-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/cups-libs-cos6-x86_64", "description": "(CDT) Common Unix Printing System - libraries" }, + { "name": "cupti", "uri": "https://anaconda.org/anaconda/cupti", "description": "development environment for GPU-accelerated applications, CUPTI components" }, + { "name": "cupy", "uri": "https://anaconda.org/anaconda/cupy", "description": "CuPy is an implementation of a NumPy-compatible multi-dimensional array on CUDA." }, + { "name": "curio", "uri": "https://anaconda.org/anaconda/curio", "description": "The coroutine concurrency library." }, + { "name": "curl", "uri": "https://anaconda.org/anaconda/curl", "description": "tool and library for transferring data with URL syntax" }, + { "name": "curtsies", "uri": "https://anaconda.org/anaconda/curtsies", "description": "Curses-like terminal wrapper, with colored strings!" }, + { "name": "cutensor", "uri": "https://anaconda.org/anaconda/cutensor", "description": "Tensor Linear Algebra on NVIDIA GPUs" }, + { "name": "cvxcanon", "uri": "https://anaconda.org/anaconda/cvxcanon", "description": "Low-level library to perform the matrix building step in CVXPY" }, + { "name": "cvxopt", "uri": "https://anaconda.org/anaconda/cvxopt", "description": "Convex optimization package" }, + { "name": "cx_oracle", "uri": "https://anaconda.org/anaconda/cx_oracle", "description": "Python interface to Oracle" }, + { "name": "cymem", "uri": "https://anaconda.org/anaconda/cymem", "description": "Manage calls to calloc/free through Cython" }, + { "name": "cyrus-sasl", "uri": "https://anaconda.org/anaconda/cyrus-sasl", "description": "This is the Cyrus SASL API implementation. It can be used on the client or server side to provide\nauthentication and authorization services. See RFC 4422 for more information." }, + { "name": "cython", "uri": "https://anaconda.org/anaconda/cython", "description": "The Cython compiler for writing C extensions for the Python language" }, + { "name": "cython-blis", "uri": "https://anaconda.org/anaconda/cython-blis", "description": "Fast matrix-multiplication as a self-contained Python library - no system dependencies!" }, + { "name": "cytoolz", "uri": "https://anaconda.org/anaconda/cytoolz", "description": "Cython implementation of Toolz. High performance functional utilities" }, + { "name": "d2to1", "uri": "https://anaconda.org/anaconda/d2to1", "description": "Allows using distutils2-like setup.cfg files for a package's metadata with a distribute/setuptools setup.py" }, + { "name": "daal", "uri": "https://anaconda.org/anaconda/daal", "description": "DAAL runtime libraries" }, + { "name": "daal-devel", "uri": "https://anaconda.org/anaconda/daal-devel", "description": "Devel package for building things linked against DAAL shared libraries" }, + { "name": "daal-include", "uri": "https://anaconda.org/anaconda/daal-include", "description": "Headers for building against DAAL libraries" }, + { "name": "daal-static", "uri": "https://anaconda.org/anaconda/daal-static", "description": "Static libraries for DAAL" }, + { "name": "daal4py", "uri": "https://anaconda.org/anaconda/daal4py", "description": "A convenient Python API to Intel (R) oneAPI Data Analytics Library" }, + { "name": "dacite", "uri": "https://anaconda.org/anaconda/dacite", "description": "Simple creation of data classes from dictionaries." }, + { "name": "dal", "uri": "https://anaconda.org/anaconda/dal", "description": "Intel® oneDAL runtime libraries" }, + { "name": "dal-devel", "uri": "https://anaconda.org/anaconda/dal-devel", "description": "Devel package for building things linked against Intel® oneDAL shared libraries" }, + { "name": "dal-include", "uri": "https://anaconda.org/anaconda/dal-include", "description": "Headers for building against Intel® oneDAL libraries" }, + { "name": "dal-static", "uri": "https://anaconda.org/anaconda/dal-static", "description": "Static libraries for Intel® oneDAL" }, + { "name": "dash", "uri": "https://anaconda.org/anaconda/dash", "description": "A Python framework for building reactive web-apps." }, + { "name": "dash-bio", "uri": "https://anaconda.org/anaconda/dash-bio", "description": "dash_bio" }, + { "name": "dash-core-components", "uri": "https://anaconda.org/anaconda/dash-core-components", "description": "Dash UI core component suite" }, + { "name": "dash-html-components", "uri": "https://anaconda.org/anaconda/dash-html-components", "description": "Dash UI HTML component suite" }, + { "name": "dash-renderer", "uri": "https://anaconda.org/anaconda/dash-renderer", "description": "Front-end component renderer for dash" }, + { "name": "dash-table", "uri": "https://anaconda.org/anaconda/dash-table", "description": "A First-Class Interactive DataTable for Dash" }, + { "name": "dash_cytoscape", "uri": "https://anaconda.org/anaconda/dash_cytoscape", "description": "A Component Library for Dash aimed at facilitating network visualization in Python, wrapped around Cytoscape.js" }, + { "name": "dask", "uri": "https://anaconda.org/anaconda/dask", "description": "Parallel PyData with Task Scheduling" }, + { "name": "dask-core", "uri": "https://anaconda.org/anaconda/dask-core", "description": "Parallel Python with task scheduling" }, + { "name": "dask-expr", "uri": "https://anaconda.org/anaconda/dask-expr", "description": "High Level Expressions for Dask" }, + { "name": "dask-glm", "uri": "https://anaconda.org/anaconda/dask-glm", "description": "Generalized Linear Models in Dask" }, + { "name": "dask-image", "uri": "https://anaconda.org/anaconda/dask-image", "description": "Distributed image processing" }, + { "name": "dask-jobqueue", "uri": "https://anaconda.org/anaconda/dask-jobqueue", "description": "Easy deployment of Dask Distributed on job queuing systems like PBS, Slurm, LSF and SGE." }, + { "name": "dask-ml", "uri": "https://anaconda.org/anaconda/dask-ml", "description": "Distributed and parallel machine learning using dask." }, + { "name": "dask-searchcv", "uri": "https://anaconda.org/anaconda/dask-searchcv", "description": "Tools for doing hyperparameter search with Scikit-Learn and Dask" }, + { "name": "databricks-cli", "uri": "https://anaconda.org/anaconda/databricks-cli", "description": "A command line interface for Databricks" }, + { "name": "databricks-sdk", "uri": "https://anaconda.org/anaconda/databricks-sdk", "description": "Databricks SDK for Python (Experimental)" }, + { "name": "dataclasses", "uri": "https://anaconda.org/anaconda/dataclasses", "description": "An implementation of PEP 557: Data Classes" }, + { "name": "dataclasses-json", "uri": "https://anaconda.org/anaconda/dataclasses-json", "description": "Easily serialize dataclasses to and from JSON" }, + { "name": "datadog", "uri": "https://anaconda.org/anaconda/datadog", "description": "The Datadog Python library" }, + { "name": "datasets", "uri": "https://anaconda.org/anaconda/datasets", "description": "HuggingFace community-driven open-source library of datasets" }, + { "name": "datashader", "uri": "https://anaconda.org/anaconda/datashader", "description": "Data visualization toolchain based on aggregating into a grid" }, + { "name": "datashape", "uri": "https://anaconda.org/anaconda/datashape", "description": "No Summary" }, + { "name": "dateparser", "uri": "https://anaconda.org/anaconda/dateparser", "description": "Date parsing library designed to parse dates from HTML pages" }, + { "name": "dateutils", "uri": "https://anaconda.org/anaconda/dateutils", "description": "Various utilities for working with date and datetime objects" }, + { "name": "datrie", "uri": "https://anaconda.org/anaconda/datrie", "description": "Super-fast, efficiently stored Trie for Python, uses libdatrie" }, + { "name": "dav1d", "uri": "https://anaconda.org/anaconda/dav1d", "description": "dav1d is the fastest AV1 decoder on all platforms" }, + { "name": "dawg-python", "uri": "https://anaconda.org/anaconda/dawg-python", "description": "Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library or DAWG Python extension." }, + { "name": "db4-cos6-x86_64", "uri": "https://anaconda.org/anaconda/db4-cos6-x86_64", "description": "(CDT) The Berkeley DB database library (version 4) for C" }, + { "name": "db4-cxx-cos6-x86_64", "uri": "https://anaconda.org/anaconda/db4-cxx-cos6-x86_64", "description": "(CDT) The Berkeley DB database library (version 4) for C++" }, + { "name": "db4-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/db4-devel-cos6-x86_64", "description": "(CDT) C development files for the Berkeley DB (version 4) library" }, + { "name": "dbfread", "uri": "https://anaconda.org/anaconda/dbfread", "description": "read data from dbf files" }, + { "name": "dbt-extractor", "uri": "https://anaconda.org/anaconda/dbt-extractor", "description": "Jinja value templates for dbt model files" }, + { "name": "dbus", "uri": "https://anaconda.org/anaconda/dbus", "description": "Simple message bus system for applications to talk to one another" }, + { "name": "dbus-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/dbus-amzn2-aarch64", "description": "(CDT) D-BUS message bus" }, + { "name": "dbus-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/dbus-libs-amzn2-aarch64", "description": "(CDT) Libraries for accessing D-BUS" }, + { "name": "dbus-python", "uri": "https://anaconda.org/anaconda/dbus-python", "description": "Python bindings for dbus" }, + { "name": "debugpy", "uri": "https://anaconda.org/anaconda/debugpy", "description": "An implementation of the Debug Adapter Protocol for Python" }, + { "name": "deepdiff", "uri": "https://anaconda.org/anaconda/deepdiff", "description": "Deep Difference and Search of any Python object/data." }, + { "name": "defusedxml", "uri": "https://anaconda.org/anaconda/defusedxml", "description": "XML bomb protection for Python stdlib modules" }, + { "name": "dejavu-fonts-common-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/dejavu-fonts-common-amzn2-aarch64", "description": "(CDT) Common files for the Dejavu font set" }, + { "name": "dejavu-sans-fonts-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/dejavu-sans-fonts-amzn2-aarch64", "description": "(CDT) Variable-width sans-serif font faces" }, + { "name": "deprecated", "uri": "https://anaconda.org/anaconda/deprecated", "description": "Python @deprecated decorator to deprecate old python classes, functions or methods." }, + { "name": "deprecation", "uri": "https://anaconda.org/anaconda/deprecation", "description": "A library to handle automated deprecations" }, + { "name": "descartes", "uri": "https://anaconda.org/anaconda/descartes", "description": "Use geometric objects as matplotlib paths and patches." }, + { "name": "device-mapper-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/device-mapper-libs-amzn2-aarch64", "description": "(CDT) Device-mapper shared library" }, + { "name": "devil", "uri": "https://anaconda.org/anaconda/devil", "description": "A full featured cross-platform image library." }, + { "name": "dictdiffer", "uri": "https://anaconda.org/anaconda/dictdiffer", "description": "Dictdiffer is a helper module that helps you to diff and patch dictionaries." }, + { "name": "dicttoxml", "uri": "https://anaconda.org/anaconda/dicttoxml", "description": "Converts a Python dictionary or other native data type into a valid XML string." }, + { "name": "diff-match-patch", "uri": "https://anaconda.org/anaconda/diff-match-patch", "description": "Diff Match Patch is a high-performance library in multiple languages that manipulates plain text" }, + { "name": "diffusers", "uri": "https://anaconda.org/anaconda/diffusers", "description": "Diffusers provides pretrained vision diffusion models, and serves as a modular toolbox for inference and training." }, + { "name": "diffusers-base", "uri": "https://anaconda.org/anaconda/diffusers-base", "description": "Diffusers provides pretrained vision diffusion models, and serves as a modular toolbox for inference and training." }, + { "name": "diffusers-torch", "uri": "https://anaconda.org/anaconda/diffusers-torch", "description": "Diffusers provides pretrained vision diffusion models, and serves as a modular toolbox for inference and training." }, + { "name": "diffutils-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/diffutils-amzn2-aarch64", "description": "(CDT) A GNU collection of diff utilities" }, + { "name": "dill", "uri": "https://anaconda.org/anaconda/dill", "description": "Serialize all of python (almost)" }, + { "name": "dis3", "uri": "https://anaconda.org/anaconda/dis3", "description": "Python 2.7 backport of the \"dis\" module from Python 3.5+" }, + { "name": "distconfig3", "uri": "https://anaconda.org/anaconda/distconfig3", "description": "Library to manage configuration using Zookeeper, Etcd, Consul" }, + { "name": "distlib", "uri": "https://anaconda.org/anaconda/distlib", "description": "Distribution utilities for python" }, + { "name": "distributed", "uri": "https://anaconda.org/anaconda/distributed", "description": "A distributed task scheduler for Dask" }, + { "name": "distro", "uri": "https://anaconda.org/anaconda/distro", "description": "A much more elaborate replacement for removed Python's 'platform.linux_distribution()' method" }, + { "name": "django", "uri": "https://anaconda.org/anaconda/django", "description": "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." }, + { "name": "django-pyodbc-azure", "uri": "https://anaconda.org/anaconda/django-pyodbc-azure", "description": "Django backend for Microsoft SQL Server and Azure SQL Database using pyodbc" }, + { "name": "dlpack", "uri": "https://anaconda.org/anaconda/dlpack", "description": "DLPack - Open In Memory Tensor Structure" }, + { "name": "dm-tree", "uri": "https://anaconda.org/anaconda/dm-tree", "description": "Tree is a library for working with nested data structures." }, + { "name": "dmglib", "uri": "https://anaconda.org/anaconda/dmglib", "description": "Python library to work with macOS DMG disk images" }, + { "name": "dnspython", "uri": "https://anaconda.org/anaconda/dnspython", "description": "DNS toolkit" }, + { "name": "docker-py", "uri": "https://anaconda.org/anaconda/docker-py", "description": "Python client for Docker." }, + { "name": "docker-pycreds", "uri": "https://anaconda.org/anaconda/docker-pycreds", "description": "Python bindings for the docker credentials store API" }, + { "name": "docopt", "uri": "https://anaconda.org/anaconda/docopt", "description": "No Summary" }, + { "name": "docstring-to-markdown", "uri": "https://anaconda.org/anaconda/docstring-to-markdown", "description": "On the fly conversion of Python docstrings to markdown" }, + { "name": "docutils", "uri": "https://anaconda.org/anaconda/docutils", "description": "Docutils -- Python Documentation Utilities" }, + { "name": "doit", "uri": "https://anaconda.org/anaconda/doit", "description": "doit - Automation Tool" }, + { "name": "dos2unix", "uri": "https://anaconda.org/anaconda/dos2unix", "description": "Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa." }, + { "name": "double-conversion", "uri": "https://anaconda.org/anaconda/double-conversion", "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles." }, + { "name": "dpcpp-cpp-rt", "uri": "https://anaconda.org/anaconda/dpcpp-cpp-rt", "description": "Runtime for Intel® oneAPI DPC++/C++ Compiler" }, + { "name": "dpcpp_impl_linux-64", "uri": "https://anaconda.org/anaconda/dpcpp_impl_linux-64", "description": "Implementation for Intel® oneAPI DPC++/C++ Compiler" }, + { "name": "dpcpp_impl_win-64", "uri": "https://anaconda.org/anaconda/dpcpp_impl_win-64", "description": "Implementation for Intel® oneAPI DPC++/C++ Compiler" }, + { "name": "dpcpp_linux-64", "uri": "https://anaconda.org/anaconda/dpcpp_linux-64", "description": "Activation for Intel® oneAPI DPC++/C++ Compiler" }, + { "name": "dpcpp_win-64", "uri": "https://anaconda.org/anaconda/dpcpp_win-64", "description": "Activation for Intel® oneAPI DPC++/C++ Compiler" }, + { "name": "dpctl", "uri": "https://anaconda.org/anaconda/dpctl", "description": "A lightweight Python wrapper for a subset of SYCL API." }, + { "name": "dpl-include", "uri": "https://anaconda.org/anaconda/dpl-include", "description": "Intel® DPC++ Compilers (dpl component)" }, + { "name": "dpnp", "uri": "https://anaconda.org/anaconda/dpnp", "description": "NumPy Drop-In Replacement for Intel(R) XPU" }, + { "name": "draco", "uri": "https://anaconda.org/anaconda/draco", "description": "A library for compressing and decompressing 3D geometric meshes and point clouds" }, + { "name": "drmaa", "uri": "https://anaconda.org/anaconda/drmaa", "description": "Python wrapper around the C DRMAA library" }, + { "name": "dropbox", "uri": "https://anaconda.org/anaconda/dropbox", "description": "Official Dropbox API Client" }, + { "name": "dsdp", "uri": "https://anaconda.org/anaconda/dsdp", "description": "Software for semidefinite programming" }, + { "name": "dulwich", "uri": "https://anaconda.org/anaconda/dulwich", "description": "Python Git Library" }, + { "name": "duma_linux-32", "uri": "https://anaconda.org/anaconda/duma_linux-32", "description": "DUMA is an open-source library to detect buffer overruns and under-runs in C and C++ programs." }, + { "name": "duma_linux-64", "uri": "https://anaconda.org/anaconda/duma_linux-64", "description": "DUMA is an open-source library to detect buffer overruns and under-runs in C and C++ programs." }, + { "name": "duma_linux-aarch64", "uri": "https://anaconda.org/anaconda/duma_linux-aarch64", "description": "DUMA is an open-source library to detect buffer overruns and under-runs in C and C++ programs." }, + { "name": "duma_linux-ppc64le", "uri": "https://anaconda.org/anaconda/duma_linux-ppc64le", "description": "DUMA is an open-source library to detect buffer overruns and under-runs in C and C++ programs." }, + { "name": "duma_linux-s390x", "uri": "https://anaconda.org/anaconda/duma_linux-s390x", "description": "DUMA is an open-source library to detect buffer overruns and under-runs in C and C++ programs." }, + { "name": "dunamai", "uri": "https://anaconda.org/anaconda/dunamai", "description": "Dynamic versioning library and CLI" }, + { "name": "easyocr", "uri": "https://anaconda.org/anaconda/easyocr", "description": "End-to-End Multi-Lingual Optical Character Recognition (OCR) Solution" }, + { "name": "ecdsa", "uri": "https://anaconda.org/anaconda/ecdsa", "description": "ECDSA cryptographic signature library (pure python)" }, + { "name": "echo", "uri": "https://anaconda.org/anaconda/echo", "description": "Callback Properties in Python" }, + { "name": "ecos", "uri": "https://anaconda.org/anaconda/ecos", "description": "Python interface for ECOS a lightweight conic solver for second-order cone programming" }, + { "name": "editables", "uri": "https://anaconda.org/anaconda/editables", "description": "A Python library for creating \"editable wheels\"" }, + { "name": "editdistance", "uri": "https://anaconda.org/anaconda/editdistance", "description": "Fast implementation of the edit distance(Levenshtein distance)" }, + { "name": "efficientnet", "uri": "https://anaconda.org/anaconda/efficientnet", "description": "EfficientNet model re-implementation. Keras and TensorFlow Keras." }, + { "name": "eigen", "uri": "https://anaconda.org/anaconda/eigen", "description": "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." }, + { "name": "elasticsearch", "uri": "https://anaconda.org/anaconda/elasticsearch", "description": "Python client for Elasticsearch" }, + { "name": "elasticsearch-async", "uri": "https://anaconda.org/anaconda/elasticsearch-async", "description": "Async backend for elasticsearch-py" }, + { "name": "elasticsearch-dsl", "uri": "https://anaconda.org/anaconda/elasticsearch-dsl", "description": "Higher-level Python client for Elasticsearch" }, + { "name": "elementpath", "uri": "https://anaconda.org/anaconda/elementpath", "description": "XPath 1.0/2.0 parsers and selectors for ElementTree" }, + { "name": "elfutils-default-yama-scope-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/elfutils-default-yama-scope-amzn2-aarch64", "description": "(CDT) Default yama attach scope sysctl setting" }, + { "name": "elfutils-libelf-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/elfutils-libelf-amzn2-aarch64", "description": "(CDT) Library to read and write ELF files" }, + { "name": "elfutils-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/elfutils-libs-amzn2-aarch64", "description": "(CDT) Libraries to handle compiled objects" }, + { "name": "email-validator", "uri": "https://anaconda.org/anaconda/email-validator", "description": "A robust email syntax and deliverability validation library for 3.x." }, + { "name": "email_validator", "uri": "https://anaconda.org/anaconda/email_validator", "description": "A robust email syntax and deliverability validation library for 3.x." }, + { "name": "emfile", "uri": "https://anaconda.org/anaconda/emfile", "description": "Basic utility to read tomography data from files in `*.em` format." }, + { "name": "enaml", "uri": "https://anaconda.org/anaconda/enaml", "description": "Declarative DSL for building rich user interfaces in Python" }, + { "name": "enscons", "uri": "https://anaconda.org/anaconda/enscons", "description": "Tools for building Python packages with SCons. Experimental." }, + { "name": "ensureconda", "uri": "https://anaconda.org/anaconda/ensureconda", "description": "Install and run applications packaged with conda in isolated environments" }, + { "name": "entrypoints", "uri": "https://anaconda.org/anaconda/entrypoints", "description": "Discover and load entry points from installed packages." }, + { "name": "enum34", "uri": "https://anaconda.org/anaconda/enum34", "description": "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" }, + { "name": "ephem", "uri": "https://anaconda.org/anaconda/ephem", "description": "Basic astronomical computations for Python" }, + { "name": "epoxy", "uri": "https://anaconda.org/anaconda/epoxy", "description": "A library for handling OpenGL function pointer management for you." }, + { "name": "esda", "uri": "https://anaconda.org/anaconda/esda", "description": "Exploratory Spatial Data Analysis" }, + { "name": "essential_generators", "uri": "https://anaconda.org/anaconda/essential_generators", "description": "Generate fake data for application testing based on simple but flexible templates." }, + { "name": "et_xmlfile", "uri": "https://anaconda.org/anaconda/et_xmlfile", "description": "An implementation of lxml.xmlfile for the standard library" }, + { "name": "etuples", "uri": "https://anaconda.org/anaconda/etuples", "description": "Python S-expression emulation using tuple-like objects." }, + { "name": "evaluate", "uri": "https://anaconda.org/anaconda/evaluate", "description": "HuggingFace community-driven open-source library of evaluation" }, + { "name": "eventlet", "uri": "https://anaconda.org/anaconda/eventlet", "description": "Highly concurrent networking library" }, + { "name": "exceptiongroup", "uri": "https://anaconda.org/anaconda/exceptiongroup", "description": "Backport of PEP 654 (exception groups)" }, + { "name": "execnet", "uri": "https://anaconda.org/anaconda/execnet", "description": "distributed Python deployment and communication" }, + { "name": "executing", "uri": "https://anaconda.org/anaconda/executing", "description": "Get the currently executing AST node of a frame, and other information" }, + { "name": "expandvars", "uri": "https://anaconda.org/anaconda/expandvars", "description": "Expand system variables Unix style" }, + { "name": "expat", "uri": "https://anaconda.org/anaconda/expat", "description": "Expat XML parser library in C" }, + { "name": "expat-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/expat-amzn2-aarch64", "description": "(CDT) An XML parser library" }, + { "name": "expat-cos6-i686", "uri": "https://anaconda.org/anaconda/expat-cos6-i686", "description": "(CDT) An XML parser library" }, + { "name": "expat-cos6-x86_64", "uri": "https://anaconda.org/anaconda/expat-cos6-x86_64", "description": "(CDT) An XML parser library" }, + { "name": "expat-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/expat-cos7-ppc64le", "description": "(CDT) An XML parser library" }, + { "name": "expat-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/expat-devel-cos6-i686", "description": "(CDT) Libraries and header files to develop applications using expat" }, + { "name": "expat-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/expat-devel-cos6-x86_64", "description": "(CDT) Libraries and header files to develop applications using expat" }, + { "name": "expat-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/expat-devel-cos7-ppc64le", "description": "(CDT) Libraries and header files to develop applications using expat" }, + { "name": "expecttest", "uri": "https://anaconda.org/anaconda/expecttest", "description": "This library implements expect tests (also known as \"golden\" tests)." }, + { "name": "extension-helpers", "uri": "https://anaconda.org/anaconda/extension-helpers", "description": "Utilities for building and installing packages with compiled extensions" }, + { "name": "factory_boy", "uri": "https://anaconda.org/anaconda/factory_boy", "description": "A versatile test fixtures replacement based on thoughtbot's factory_girl for Ruby." }, + { "name": "faker", "uri": "https://anaconda.org/anaconda/faker", "description": "Faker is a Python package that generates fake data for you" }, + { "name": "farama-notifications", "uri": "https://anaconda.org/anaconda/farama-notifications", "description": "Notifications for all Farama Foundation maintained libraries." }, + { "name": "fast-histogram", "uri": "https://anaconda.org/anaconda/fast-histogram", "description": "Fast 1D and 2D histogram functions in Python" }, + { "name": "fastapi", "uri": "https://anaconda.org/anaconda/fastapi", "description": "FastAPI framework, high performance, easy to learn, fast to code, ready for production" }, + { "name": "fastavro", "uri": "https://anaconda.org/anaconda/fastavro", "description": "Fast read/write of AVRO files" }, + { "name": "fastcache", "uri": "https://anaconda.org/anaconda/fastcache", "description": "C implementation of Python 3 lru_cache" }, + { "name": "fastcluster", "uri": "https://anaconda.org/anaconda/fastcluster", "description": "Fast hierarchical clustering routines for R and Python" }, + { "name": "fastcore", "uri": "https://anaconda.org/anaconda/fastcore", "description": "Python supercharged for fastai development" }, + { "name": "fastdownload", "uri": "https://anaconda.org/anaconda/fastdownload", "description": "A general purpose data downloading library." }, + { "name": "fasteners", "uri": "https://anaconda.org/anaconda/fasteners", "description": "A python package that provides useful locks." }, + { "name": "fastparquet", "uri": "https://anaconda.org/anaconda/fastparquet", "description": "Python interface to the parquet format" }, + { "name": "fastprogress", "uri": "https://anaconda.org/anaconda/fastprogress", "description": "A fast and simple progress bar for Jupyter Notebook and console." }, + { "name": "fastrlock", "uri": "https://anaconda.org/anaconda/fastrlock", "description": "This is a C-level implementation of a fast, re-entrant, optimistic lock for CPython" }, + { "name": "fasttsne", "uri": "https://anaconda.org/anaconda/fasttsne", "description": "Fast, parallel implementations of tSNE" }, + { "name": "favicon", "uri": "https://anaconda.org/anaconda/favicon", "description": "Get a website's favicon." }, + { "name": "featuretools", "uri": "https://anaconda.org/anaconda/featuretools", "description": "a framework for automated feature engineering" }, + { "name": "feedparser", "uri": "https://anaconda.org/anaconda/feedparser", "description": "parse feeds in Python" }, + { "name": "ffmpeg", "uri": "https://anaconda.org/anaconda/ffmpeg", "description": "Cross-platform solution to record, convert and stream audio and video." }, + { "name": "fftw", "uri": "https://anaconda.org/anaconda/fftw", "description": "The fastest Fourier transform in the west." }, + { "name": "file", "uri": "https://anaconda.org/anaconda/file", "description": "Fine Free File Command" }, + { "name": "filelock", "uri": "https://anaconda.org/anaconda/filelock", "description": "A platform independent file lock." }, + { "name": "filesystem-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/filesystem-amzn2-aarch64", "description": "(CDT) The basic directory layout for a Linux system" }, + { "name": "findpython", "uri": "https://anaconda.org/anaconda/findpython", "description": "A utility to find python versions on your system" }, + { "name": "fiona", "uri": "https://anaconda.org/anaconda/fiona", "description": "Fiona reads and writes spatial data files" }, + { "name": "flake8", "uri": "https://anaconda.org/anaconda/flake8", "description": "Your Tool For Style Guide Enforcement" }, + { "name": "flake8-import-order", "uri": "https://anaconda.org/anaconda/flake8-import-order", "description": "A flake8 and Pylama plugin that checks the ordering of your imports." }, + { "name": "flake8-polyfill", "uri": "https://anaconda.org/anaconda/flake8-polyfill", "description": "Provides some compatibility helpers for Flake8 plugins that intend to support Flake8 2.x and 3.x simultaneously." }, + { "name": "flaky", "uri": "https://anaconda.org/anaconda/flaky", "description": "Plugin for nose or py.test that automatically reruns flaky tests." }, + { "name": "flask", "uri": "https://anaconda.org/anaconda/flask", "description": "A simple framework for building complex web applications." }, + { "name": "flask-admin", "uri": "https://anaconda.org/anaconda/flask-admin", "description": "Simple and extensible admin interface framework for Flask" }, + { "name": "flask-appbuilder", "uri": "https://anaconda.org/anaconda/flask-appbuilder", "description": "Simple and rapid application development framework, built on top of Flask." }, + { "name": "flask-apscheduler", "uri": "https://anaconda.org/anaconda/flask-apscheduler", "description": "Flask-APScheduler is a Flask extension which adds support for the APScheduler" }, + { "name": "flask-babel", "uri": "https://anaconda.org/anaconda/flask-babel", "description": "Adds i18n/l10n support to Flask applications" }, + { "name": "flask-bcrypt", "uri": "https://anaconda.org/anaconda/flask-bcrypt", "description": "Bcrypt hashing for Flask." }, + { "name": "flask-caching", "uri": "https://anaconda.org/anaconda/flask-caching", "description": "Adds caching support to your Flask application" }, + { "name": "flask-compress", "uri": "https://anaconda.org/anaconda/flask-compress", "description": "Compress responses in your Flask app with gzip." }, + { "name": "flask-json", "uri": "https://anaconda.org/anaconda/flask-json", "description": "Better JSON support for Flask" }, + { "name": "flask-jwt-extended", "uri": "https://anaconda.org/anaconda/flask-jwt-extended", "description": "A Flask JWT extension" }, + { "name": "flask-login", "uri": "https://anaconda.org/anaconda/flask-login", "description": "User session management for Flask" }, + { "name": "flask-openid", "uri": "https://anaconda.org/anaconda/flask-openid", "description": "OpenID support for Flask" }, + { "name": "flask-restful", "uri": "https://anaconda.org/anaconda/flask-restful", "description": "Simple framework for creating REST APIs" }, + { "name": "flask-restx", "uri": "https://anaconda.org/anaconda/flask-restx", "description": "Fully featured framework for fast, easy and documented API development with Flask" }, + { "name": "flask-session", "uri": "https://anaconda.org/anaconda/flask-session", "description": "Adds server-side session support to your Flask application" }, + { "name": "flask-socketio", "uri": "https://anaconda.org/anaconda/flask-socketio", "description": "Socket.IO integration for Flask applications" }, + { "name": "flask-sqlalchemy", "uri": "https://anaconda.org/anaconda/flask-sqlalchemy", "description": "Adds SQLAlchemy support to your Flask application" }, + { "name": "flask-swagger", "uri": "https://anaconda.org/anaconda/flask-swagger", "description": "Extract swagger specs from your flask project" }, + { "name": "flask-wtf", "uri": "https://anaconda.org/anaconda/flask-wtf", "description": "Simple integration of Flask and WTForms" }, + { "name": "flask_cors", "uri": "https://anaconda.org/anaconda/flask_cors", "description": "Cross Origin Resource Sharing ( CORS ) support for Flask" }, + { "name": "flatbuffers", "uri": "https://anaconda.org/anaconda/flatbuffers", "description": "FlatBuffers is an efficient cross platform serialization library." }, + { "name": "flit", "uri": "https://anaconda.org/anaconda/flit", "description": "Simplified packaging of Python modules" }, + { "name": "flit-core", "uri": "https://anaconda.org/anaconda/flit-core", "description": "Simplified packaging of Python modules" }, + { "name": "flit-scm", "uri": "https://anaconda.org/anaconda/flit-scm", "description": "A PEP 518 build backend that uses setuptools_scm to generate a version file\nfrom your version control system, then flit_core to build the package." }, + { "name": "flite", "uri": "https://anaconda.org/anaconda/flite", "description": "No Summary" }, + { "name": "flower", "uri": "https://anaconda.org/anaconda/flower", "description": "Celery Flower" }, + { "name": "fmt", "uri": "https://anaconda.org/anaconda/fmt", "description": "{fmt} is an open-source formatting library for C++" }, + { "name": "folium", "uri": "https://anaconda.org/anaconda/folium", "description": "Make beautiful maps with Leaflet.js and Python" }, + { "name": "font-ttf-inconsolata", "uri": "https://anaconda.org/anaconda/font-ttf-inconsolata", "description": "Monospace font for pretty code listings" }, + { "name": "fontconfig", "uri": "https://anaconda.org/anaconda/fontconfig", "description": "A library for configuring and customizing font access." }, + { "name": "fontconfig-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/fontconfig-amzn2-aarch64", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-cos6-x86_64", "uri": "https://anaconda.org/anaconda/fontconfig-cos6-x86_64", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/fontconfig-cos7-ppc64le", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/fontconfig-devel-amzn2-aarch64", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/fontconfig-devel-cos6-i686", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/fontconfig-devel-cos6-x86_64", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontconfig-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/fontconfig-devel-cos7-ppc64le", "description": "(CDT) Font configuration and customization library" }, + { "name": "fontpackages-filesystem-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/fontpackages-filesystem-amzn2-aarch64", "description": "(CDT) Directories used by font packages" }, + { "name": "fonts-anaconda", "uri": "https://anaconda.org/anaconda/fonts-anaconda", "description": "No Summary" }, + { "name": "fonts-conda-ecosystem", "uri": "https://anaconda.org/anaconda/fonts-conda-ecosystem", "description": "Meta package pointing to the ecosystem specific font package" }, + { "name": "fonttools", "uri": "https://anaconda.org/anaconda/fonttools", "description": "fontTools is a library for manipulating fonts, written in Python." }, + { "name": "formulaic", "uri": "https://anaconda.org/anaconda/formulaic", "description": "A high-performance implementation of Wilkinson formulas for Python." }, + { "name": "freeglut", "uri": "https://anaconda.org/anaconda/freeglut", "description": "A GUI based on OpenGL." }, + { "name": "freetds", "uri": "https://anaconda.org/anaconda/freetds", "description": "FreeTDS is a free implementation of Sybase's DB-Library, CT-Library, and ODBC libraries" }, + { "name": "freetype-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/freetype-amzn2-aarch64", "description": "(CDT) A free and portable font rendering engine" }, + { "name": "freetype-cos6-i686", "uri": "https://anaconda.org/anaconda/freetype-cos6-i686", "description": "(CDT) A free and portable font rendering engine" }, + { "name": "freetype-cos6-x86_64", "uri": "https://anaconda.org/anaconda/freetype-cos6-x86_64", "description": "(CDT) A free and portable font rendering engine" }, + { "name": "freetype-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/freetype-cos7-ppc64le", "description": "(CDT) A free and portable font rendering engine" }, + { "name": "freetype-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/freetype-devel-amzn2-aarch64", "description": "(CDT) FreeType development libraries and header files" }, + { "name": "freetype-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/freetype-devel-cos6-i686", "description": "(CDT) FreeType development libraries and header files" }, + { "name": "freetype-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/freetype-devel-cos6-x86_64", "description": "(CDT) FreeType development libraries and header files" }, + { "name": "freetype-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/freetype-devel-cos7-ppc64le", "description": "(CDT) FreeType development libraries and header files" }, + { "name": "freetype-py", "uri": "https://anaconda.org/anaconda/freetype-py", "description": "Python binding for the freetype library" }, + { "name": "freexl", "uri": "https://anaconda.org/anaconda/freexl", "description": "Extract valid data from within Spreadsheets." }, + { "name": "freezegun", "uri": "https://anaconda.org/anaconda/freezegun", "description": "Let your Python tests travel through time" }, + { "name": "fribidi", "uri": "https://anaconda.org/anaconda/fribidi", "description": "The Free Implementation of the Unicode Bidirectional Algorithm." }, + { "name": "fribidi-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/fribidi-amzn2-aarch64", "description": "(CDT) Library implementing the Unicode Bidirectional Algorithm" }, + { "name": "frozendict", "uri": "https://anaconda.org/anaconda/frozendict", "description": "An immutable dictionary" }, + { "name": "frozenlist", "uri": "https://anaconda.org/anaconda/frozenlist", "description": "A list-like structure which implements collections.abc.MutableSequence" }, + { "name": "fs", "uri": "https://anaconda.org/anaconda/fs", "description": "Filesystem abstraction layer for Python" }, + { "name": "fsspec", "uri": "https://anaconda.org/anaconda/fsspec", "description": "A specification for pythonic filesystems" }, + { "name": "fuel", "uri": "https://anaconda.org/anaconda/fuel", "description": "No Summary" }, + { "name": "fugue", "uri": "https://anaconda.org/anaconda/fugue", "description": "An abstraction layer for distributed computation" }, + { "name": "fugue-sql-antlr", "uri": "https://anaconda.org/anaconda/fugue-sql-antlr", "description": "Fugue SQL Antlr Parser" }, + { "name": "func_timeout", "uri": "https://anaconda.org/anaconda/func_timeout", "description": "Python module to support running any existing function with a given timeout." }, + { "name": "furl", "uri": "https://anaconda.org/anaconda/furl", "description": "URL manipulation made simple." }, + { "name": "future", "uri": "https://anaconda.org/anaconda/future", "description": "Clean single-source support for Python 3 and 2" }, + { "name": "fuzzywuzzy", "uri": "https://anaconda.org/anaconda/fuzzywuzzy", "description": "Fuzzy string matching in python" }, + { "name": "fzf", "uri": "https://anaconda.org/anaconda/fzf", "description": "A command-line fuzzy finder" }, + { "name": "g2clib", "uri": "https://anaconda.org/anaconda/g2clib", "description": "C decoder/encoder routines for GRIB edition 2." }, + { "name": "gast", "uri": "https://anaconda.org/anaconda/gast", "description": "A generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST)." }, + { "name": "gawk", "uri": "https://anaconda.org/anaconda/gawk", "description": "The awk utility interprets a special-purpose programming language that\nmakes it easy to handle simple data-reformatting jobs." }, + { "name": "gawk-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gawk-amzn2-aarch64", "description": "(CDT) The GNU version of the awk text processing utility" }, + { "name": "gcab", "uri": "https://anaconda.org/anaconda/gcab", "description": "A GObject library to create cabinet files" }, + { "name": "gcc-dbg_linux-32", "uri": "https://anaconda.org/anaconda/gcc-dbg_linux-32", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc-dbg_linux-64", "uri": "https://anaconda.org/anaconda/gcc-dbg_linux-64", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc-dbg_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gcc-dbg_linux-ppc64le", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc_bootstrap_linux-64", "uri": "https://anaconda.org/anaconda/gcc_bootstrap_linux-64", "description": "GCC bootstrap compilers for building deps" }, + { "name": "gcc_bootstrap_linux-aarch64", "uri": "https://anaconda.org/anaconda/gcc_bootstrap_linux-aarch64", "description": "GCC bootstrap compilers for building deps" }, + { "name": "gcc_bootstrap_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gcc_bootstrap_linux-ppc64le", "description": "GCC bootstrap compilers for building deps" }, + { "name": "gcc_bootstrap_linux-s390x", "uri": "https://anaconda.org/anaconda/gcc_bootstrap_linux-s390x", "description": "GCC bootstrap compilers for building deps" }, + { "name": "gcc_impl_linux-32", "uri": "https://anaconda.org/anaconda/gcc_impl_linux-32", "description": "GNU C Compiler" }, + { "name": "gcc_impl_linux-64", "uri": "https://anaconda.org/anaconda/gcc_impl_linux-64", "description": "GNU C Compiler" }, + { "name": "gcc_impl_linux-aarch64", "uri": "https://anaconda.org/anaconda/gcc_impl_linux-aarch64", "description": "GNU C Compiler" }, + { "name": "gcc_impl_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gcc_impl_linux-ppc64le", "description": "GNU C Compiler" }, + { "name": "gcc_impl_linux-s390x", "uri": "https://anaconda.org/anaconda/gcc_impl_linux-s390x", "description": "GNU C Compiler" }, + { "name": "gcc_linux-32", "uri": "https://anaconda.org/anaconda/gcc_linux-32", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc_linux-64", "uri": "https://anaconda.org/anaconda/gcc_linux-64", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc_linux-aarch64", "uri": "https://anaconda.org/anaconda/gcc_linux-aarch64", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gcc_linux-ppc64le", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gcc_linux-s390x", "uri": "https://anaconda.org/anaconda/gcc_linux-s390x", "description": "GNU C Compiler (activation scripts)" }, + { "name": "gconf2-cos6-i686", "uri": "https://anaconda.org/anaconda/gconf2-cos6-i686", "description": "(CDT) A process-transparent configuration system" }, + { "name": "gconf2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gconf2-cos6-x86_64", "description": "(CDT) A process-transparent configuration system" }, + { "name": "gconf2-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gconf2-cos7-ppc64le", "description": "(CDT) A process-transparent configuration system" }, + { "name": "gdal", "uri": "https://anaconda.org/anaconda/gdal", "description": "The Geospatial Data Abstraction Library (GDAL)" }, + { "name": "gdb", "uri": "https://anaconda.org/anaconda/gdb", "description": "The GNU Project Debugger" }, + { "name": "gdb-pretty-printer", "uri": "https://anaconda.org/anaconda/gdb-pretty-printer", "description": "GNU Compiler Collection Python Pretty Printers" }, + { "name": "gdb_linux-32", "uri": "https://anaconda.org/anaconda/gdb_linux-32", "description": "The GNU Project Debugger" }, + { "name": "gdb_linux-64", "uri": "https://anaconda.org/anaconda/gdb_linux-64", "description": "The GNU Project Debugger" }, + { "name": "gdb_linux-aarch64", "uri": "https://anaconda.org/anaconda/gdb_linux-aarch64", "description": "The GNU Project Debugger" }, + { "name": "gdb_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gdb_linux-ppc64le", "description": "The GNU Project Debugger" }, + { "name": "gdb_linux-s390x", "uri": "https://anaconda.org/anaconda/gdb_linux-s390x", "description": "The GNU Project Debugger" }, + { "name": "gdb_server_linux-64", "uri": "https://anaconda.org/anaconda/gdb_server_linux-64", "description": "The GNU Project Debugger" }, + { "name": "gdb_server_linux-aarch64", "uri": "https://anaconda.org/anaconda/gdb_server_linux-aarch64", "description": "The GNU Project Debugger" }, + { "name": "gdb_server_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gdb_server_linux-ppc64le", "description": "The GNU Project Debugger" }, + { "name": "gdb_server_linux-s390x", "uri": "https://anaconda.org/anaconda/gdb_server_linux-s390x", "description": "The GNU Project Debugger" }, + { "name": "gdbm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gdbm-amzn2-aarch64", "description": "(CDT) A GNU set of database routines which use extensible hashing" }, + { "name": "gdk-pixbuf", "uri": "https://anaconda.org/anaconda/gdk-pixbuf", "description": "GdkPixbuf is a library for image loading and manipulation." }, + { "name": "gdk-pixbuf2-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gdk-pixbuf2-amzn2-aarch64", "description": "(CDT) An image loading library" }, + { "name": "gdk-pixbuf2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gdk-pixbuf2-cos6-x86_64", "description": "(CDT) An image loading library" }, + { "name": "gdk-pixbuf2-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gdk-pixbuf2-devel-amzn2-aarch64", "description": "(CDT) Development files for gdk-pixbuf" }, + { "name": "gdk-pixbuf2-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gdk-pixbuf2-devel-cos6-x86_64", "description": "(CDT) Development files for gdk-pixbuf" }, + { "name": "gds-tools", "uri": "https://anaconda.org/anaconda/gds-tools", "description": "Library for NVIDIA GPUDirect Storage" }, + { "name": "gensim", "uri": "https://anaconda.org/anaconda/gensim", "description": "Topic Modelling for Humans" }, + { "name": "genson", "uri": "https://anaconda.org/anaconda/genson", "description": "GenSON is a powerful, user-friendly JSON Schema generator." }, + { "name": "geoalchemy2", "uri": "https://anaconda.org/anaconda/geoalchemy2", "description": "Using SQLAlchemy with Spatial Databases" }, + { "name": "geographiclib", "uri": "https://anaconda.org/anaconda/geographiclib", "description": "The geodesic routines from GeographicLib" }, + { "name": "geopandas", "uri": "https://anaconda.org/anaconda/geopandas", "description": "Geographic pandas extensions" }, + { "name": "geopandas-base", "uri": "https://anaconda.org/anaconda/geopandas-base", "description": "Geographic pandas extensions" }, + { "name": "geopy", "uri": "https://anaconda.org/anaconda/geopy", "description": "Python Geocoding Toolbox." }, + { "name": "geos", "uri": "https://anaconda.org/anaconda/geos", "description": "Geometry Engine - Open Source" }, + { "name": "geotiff", "uri": "https://anaconda.org/anaconda/geotiff", "description": "TIFF based interchange format for georeferenced raster imagery" }, + { "name": "geoviews", "uri": "https://anaconda.org/anaconda/geoviews", "description": "GeoViews is a Python library that makes it easy to explore and visualize geographical, meteorological, and oceanographic datasets, such as those used in weather, climate, and remote sensing research." }, + { "name": "geoviews-core", "uri": "https://anaconda.org/anaconda/geoviews-core", "description": "GeoViews is a Python library that makes it easy to explore and visualize geographical, meteorological, and oceanographic datasets, such as those used in weather, climate, and remote sensing research." }, + { "name": "getopt-win32", "uri": "https://anaconda.org/anaconda/getopt-win32", "description": "A port of getopt for Visual C++" }, + { "name": "gettext", "uri": "https://anaconda.org/anaconda/gettext", "description": "Internationalization package" }, + { "name": "gettext-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gettext-amzn2-aarch64", "description": "(CDT) GNU libraries and utilities for producing multi-lingual messages" }, + { "name": "gettext-common-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gettext-common-devel-cos7-ppc64le", "description": "(CDT) Common development files for gettext" }, + { "name": "gettext-cos6-i686", "uri": "https://anaconda.org/anaconda/gettext-cos6-i686", "description": "(CDT) GNU libraries and utilities for producing multi-lingual messages" }, + { "name": "gettext-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gettext-cos6-x86_64", "description": "(CDT) GNU libraries and utilities for producing multi-lingual messages" }, + { "name": "gettext-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gettext-cos7-ppc64le", "description": "(CDT) GNU libraries and utilities for producing multi-lingual messages" }, + { "name": "gettext-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/gettext-devel-cos6-i686", "description": "(CDT) Development files for gettext" }, + { "name": "gettext-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gettext-devel-cos6-x86_64", "description": "(CDT) Development files for gettext" }, + { "name": "gettext-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gettext-devel-cos7-ppc64le", "description": "(CDT) Development files for gettext" }, + { "name": "gettext-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gettext-libs-amzn2-aarch64", "description": "(CDT) Libraries for gettext" }, + { "name": "gettext-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/gettext-libs-cos6-i686", "description": "(CDT) Libraries for gettext" }, + { "name": "gettext-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gettext-libs-cos6-x86_64", "description": "(CDT) Libraries for gettext" }, + { "name": "gettext-libs-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gettext-libs-cos7-ppc64le", "description": "(CDT) Libraries for gettext" }, + { "name": "gevent", "uri": "https://anaconda.org/anaconda/gevent", "description": "Coroutine-based network library" }, + { "name": "geventhttpclient", "uri": "https://anaconda.org/anaconda/geventhttpclient", "description": "A high performance, concurrent http client library for python with gevent" }, + { "name": "gflags", "uri": "https://anaconda.org/anaconda/gflags", "description": "A C++ library that implements commandline flags processing." }, + { "name": "gfortran", "uri": "https://anaconda.org/anaconda/gfortran", "description": "Fortran compiler from the GNU Compiler Collection" }, + { "name": "gfortran-dbg_linux-32", "uri": "https://anaconda.org/anaconda/gfortran-dbg_linux-32", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran-dbg_linux-64", "uri": "https://anaconda.org/anaconda/gfortran-dbg_linux-64", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran-dbg_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gfortran-dbg_linux-ppc64le", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_impl_linux-32", "uri": "https://anaconda.org/anaconda/gfortran_impl_linux-32", "description": "GNU Fortran Compiler" }, + { "name": "gfortran_impl_linux-64", "uri": "https://anaconda.org/anaconda/gfortran_impl_linux-64", "description": "GNU Fortran Compiler" }, + { "name": "gfortran_impl_linux-aarch64", "uri": "https://anaconda.org/anaconda/gfortran_impl_linux-aarch64", "description": "GNU Fortran Compiler" }, + { "name": "gfortran_impl_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gfortran_impl_linux-ppc64le", "description": "GNU Fortran Compiler" }, + { "name": "gfortran_impl_linux-s390x", "uri": "https://anaconda.org/anaconda/gfortran_impl_linux-s390x", "description": "GNU Fortran Compiler" }, + { "name": "gfortran_impl_osx-64", "uri": "https://anaconda.org/anaconda/gfortran_impl_osx-64", "description": "Fortran compiler and libraries from the GNU Compiler Collection" }, + { "name": "gfortran_impl_osx-arm64", "uri": "https://anaconda.org/anaconda/gfortran_impl_osx-arm64", "description": "Fortran compiler and libraries from the GNU Compiler Collection" }, + { "name": "gfortran_linux-32", "uri": "https://anaconda.org/anaconda/gfortran_linux-32", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_linux-64", "uri": "https://anaconda.org/anaconda/gfortran_linux-64", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_linux-aarch64", "uri": "https://anaconda.org/anaconda/gfortran_linux-aarch64", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gfortran_linux-ppc64le", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_linux-s390x", "uri": "https://anaconda.org/anaconda/gfortran_linux-s390x", "description": "GNU Fortran Compiler (activation scripts)" }, + { "name": "gfortran_osx-arm64", "uri": "https://anaconda.org/anaconda/gfortran_osx-arm64", "description": "Fortran compiler from the GNU Compiler Collection" }, + { "name": "ghc", "uri": "https://anaconda.org/anaconda/ghc", "description": "Glorious Glasgow Haskell Compilation System" }, + { "name": "gi-docgen", "uri": "https://anaconda.org/anaconda/gi-docgen", "description": "Documentation tool for GObject-based libraries" }, + { "name": "giddy", "uri": "https://anaconda.org/anaconda/giddy", "description": "GeospatIal Distribution DYnamics (giddy) in PySAL" }, + { "name": "giflib", "uri": "https://anaconda.org/anaconda/giflib", "description": "Library for reading and writing gif images" }, + { "name": "git", "uri": "https://anaconda.org/anaconda/git", "description": "distributed version control system" }, + { "name": "git-cola", "uri": "https://anaconda.org/anaconda/git-cola", "description": "No Summary" }, + { "name": "git-lfs", "uri": "https://anaconda.org/anaconda/git-lfs", "description": "Git extension for versioning large files" }, + { "name": "gitdb", "uri": "https://anaconda.org/anaconda/gitdb", "description": "Git Object Database" }, + { "name": "gitpython", "uri": "https://anaconda.org/anaconda/gitpython", "description": "GitPython is a python library used to interact with Git repositories." }, + { "name": "gl-manpages-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gl-manpages-amzn2-aarch64", "description": "(CDT) OpenGL manpages" }, + { "name": "gl2ps", "uri": "https://anaconda.org/anaconda/gl2ps", "description": "OpenGL to PostScript Printing Library" }, + { "name": "glew", "uri": "https://anaconda.org/anaconda/glew", "description": "The OpenGL Extension Wrangler Library" }, + { "name": "glib", "uri": "https://anaconda.org/anaconda/glib", "description": "Provides core application building blocks for libraries and applications written in C." }, + { "name": "glib-networking-cos6-i686", "uri": "https://anaconda.org/anaconda/glib-networking-cos6-i686", "description": "(CDT) Networking support for GLib" }, + { "name": "glib-networking-cos6-x86_64", "uri": "https://anaconda.org/anaconda/glib-networking-cos6-x86_64", "description": "(CDT) Networking support for GLib" }, + { "name": "glib-tools", "uri": "https://anaconda.org/anaconda/glib-tools", "description": "Provides core application building blocks for libraries and applications written in C." }, + { "name": "glib2-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glib2-amzn2-aarch64", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/glib2-cos7-ppc64le", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-cos7-s390x", "uri": "https://anaconda.org/anaconda/glib2-cos7-s390x", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glib2-devel-amzn2-aarch64", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/glib2-devel-cos6-i686", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/glib2-devel-cos6-x86_64", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/glib2-devel-cos7-ppc64le", "description": "(CDT) A library of handy utility functions" }, + { "name": "glib2-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/glib2-devel-cos7-s390x", "description": "(CDT) A library of handy utility functions" }, + { "name": "glibc-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glibc-amzn2-aarch64", "description": "(CDT) The GNU libc libraries" }, + { "name": "glibc-common-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glibc-common-amzn2-aarch64", "description": "(CDT) Common binaries and locale data for glibc" }, + { "name": "glibc-minimal-langpack-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glibc-minimal-langpack-amzn2-aarch64", "description": "(CDT) Minimal language packs for glibc." }, + { "name": "glibmm24-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glibmm24-amzn2-aarch64", "description": "(CDT) C++ interface for the GLib library" }, + { "name": "glibmm24-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/glibmm24-devel-amzn2-aarch64", "description": "(CDT) Headers for developing programs that will use glibmm24" }, + { "name": "glog", "uri": "https://anaconda.org/anaconda/glog", "description": "C++ implementation of the Google logging module." }, + { "name": "glpk", "uri": "https://anaconda.org/anaconda/glpk", "description": "GNU Linear Programming Kit" }, + { "name": "glue-core", "uri": "https://anaconda.org/anaconda/glue-core", "description": "Multi-dimensional linked data exploration" }, + { "name": "glue-vispy-viewers", "uri": "https://anaconda.org/anaconda/glue-vispy-viewers", "description": "3D viewers for Glue" }, + { "name": "gluonts", "uri": "https://anaconda.org/anaconda/gluonts", "description": "GluonTS is a Python toolkit for probabilistic time series modeling, built around Apache MXNet (incubating)." }, + { "name": "gmock", "uri": "https://anaconda.org/anaconda/gmock", "description": "Google's C++ test framework" }, + { "name": "gmp-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gmp-amzn2-aarch64", "description": "(CDT) A GNU arbitrary precision library" }, + { "name": "gmpy2", "uri": "https://anaconda.org/anaconda/gmpy2", "description": "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x" }, + { "name": "gn", "uri": "https://anaconda.org/anaconda/gn", "description": "GN is a meta-build system that generates build files for Ninja." }, + { "name": "gnuconfig", "uri": "https://anaconda.org/anaconda/gnuconfig", "description": "Updated config.sub and config.guess file from GNU" }, + { "name": "gnutls", "uri": "https://anaconda.org/anaconda/gnutls", "description": "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols" }, + { "name": "gnutls-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gnutls-amzn2-aarch64", "description": "(CDT) A TLS protocol implementation" }, + { "name": "gnutls-cos6-i686", "uri": "https://anaconda.org/anaconda/gnutls-cos6-i686", "description": "(CDT) A TLS protocol implementation" }, + { "name": "gnutls-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gnutls-cos6-x86_64", "description": "(CDT) A TLS protocol implementation" }, + { "name": "gnutls-cos7-s390x", "uri": "https://anaconda.org/anaconda/gnutls-cos7-s390x", "description": "(CDT) A TLS protocol implementation" }, + { "name": "go", "uri": "https://anaconda.org/anaconda/go", "description": "The Go Programming Language" }, + { "name": "go-cgo", "uri": "https://anaconda.org/anaconda/go-cgo", "description": "The Go Programming Language (cgo)" }, + { "name": "go-cgo_linux-64", "uri": "https://anaconda.org/anaconda/go-cgo_linux-64", "description": "The Go (cgo) compiler activation scripts for conda-build." }, + { "name": "go-cgo_linux-aarch64", "uri": "https://anaconda.org/anaconda/go-cgo_linux-aarch64", "description": "The Go (cgo) compiler activation scripts for conda-build." }, + { "name": "go-cgo_osx-64", "uri": "https://anaconda.org/anaconda/go-cgo_osx-64", "description": "The Go (cgo) compiler activation scripts for conda-build." }, + { "name": "go-cgo_osx-arm64", "uri": "https://anaconda.org/anaconda/go-cgo_osx-arm64", "description": "The Go (cgo) compiler activation scripts for conda-build." }, + { "name": "go-cgo_win-64", "uri": "https://anaconda.org/anaconda/go-cgo_win-64", "description": "The Go (cgo) compiler activation scripts for conda-build." }, + { "name": "go-core", "uri": "https://anaconda.org/anaconda/go-core", "description": "The Go Programming Language" }, + { "name": "go-licenses", "uri": "https://anaconda.org/anaconda/go-licenses", "description": "A tool to collect licenses from the dependency tree of a Go package in order to comply with redistribution terms." }, + { "name": "go-nocgo", "uri": "https://anaconda.org/anaconda/go-nocgo", "description": "The Go Programming Language (nocgo)" }, + { "name": "go-nocgo_linux-64", "uri": "https://anaconda.org/anaconda/go-nocgo_linux-64", "description": "The Go (nocgo) compiler activation scripts for conda-build." }, + { "name": "go-nocgo_linux-aarch64", "uri": "https://anaconda.org/anaconda/go-nocgo_linux-aarch64", "description": "The Go (nocgo) compiler activation scripts for conda-build." }, + { "name": "go-nocgo_osx-64", "uri": "https://anaconda.org/anaconda/go-nocgo_osx-64", "description": "The Go (nocgo) compiler activation scripts for conda-build." }, + { "name": "go-nocgo_osx-arm64", "uri": "https://anaconda.org/anaconda/go-nocgo_osx-arm64", "description": "The Go (nocgo) compiler activation scripts for conda-build." }, + { "name": "go-nocgo_win-64", "uri": "https://anaconda.org/anaconda/go-nocgo_win-64", "description": "The Go (nocgo) compiler activation scripts for conda-build." }, + { "name": "go_linux-32", "uri": "https://anaconda.org/anaconda/go_linux-32", "description": "The Go Programming Language" }, + { "name": "go_linux-64", "uri": "https://anaconda.org/anaconda/go_linux-64", "description": "The Go Programming Language" }, + { "name": "go_linux-ppc64le", "uri": "https://anaconda.org/anaconda/go_linux-ppc64le", "description": "The Go Programming Language" }, + { "name": "go_osx-64", "uri": "https://anaconda.org/anaconda/go_osx-64", "description": "The Go Programming Language" }, + { "name": "go_win-32", "uri": "https://anaconda.org/anaconda/go_win-32", "description": "The Go Programming Language" }, + { "name": "go_win-64", "uri": "https://anaconda.org/anaconda/go_win-64", "description": "The Go Programming Language" }, + { "name": "gobject-introspection", "uri": "https://anaconda.org/anaconda/gobject-introspection", "description": "Middleware for binding GObject-based code to other languages." }, + { "name": "google-api-core", "uri": "https://anaconda.org/anaconda/google-api-core", "description": "Core Library for Google Client Libraries" }, + { "name": "google-api-core-grpc", "uri": "https://anaconda.org/anaconda/google-api-core-grpc", "description": "Core Library for Google Client Libraries with grpc" }, + { "name": "google-api-core-grpcgcp", "uri": "https://anaconda.org/anaconda/google-api-core-grpcgcp", "description": "Core Library for Google Client Libraries with grpcio-gcp" }, + { "name": "google-api-core-grpcio-gcp", "uri": "https://anaconda.org/anaconda/google-api-core-grpcio-gcp", "description": "Core Library for Google Client Libraries with grpcio-gcp" }, + { "name": "google-auth", "uri": "https://anaconda.org/anaconda/google-auth", "description": "Google authentication library for Python" }, + { "name": "google-auth-oauthlib", "uri": "https://anaconda.org/anaconda/google-auth-oauthlib", "description": "Google Authentication Library, oauthlib integration with google-auth" }, + { "name": "google-cloud-core", "uri": "https://anaconda.org/anaconda/google-cloud-core", "description": "API Client library for Google Cloud: Core Helpers" }, + { "name": "google-cloud-storage", "uri": "https://anaconda.org/anaconda/google-cloud-storage", "description": "Python Client for Google Cloud Storage" }, + { "name": "google-crc32c", "uri": "https://anaconda.org/anaconda/google-crc32c", "description": "Python wrapper for a hardware-based implementation of the CRC32C hashing algorithm" }, + { "name": "google-pasta", "uri": "https://anaconda.org/anaconda/google-pasta", "description": "pasta is an AST-based Python refactoring library" }, + { "name": "google-resumable-media", "uri": "https://anaconda.org/anaconda/google-resumable-media", "description": "Utilities for Google Media Downloads and Resumable Uploads" }, + { "name": "googleapis-common-protos", "uri": "https://anaconda.org/anaconda/googleapis-common-protos", "description": "Common protobufs used in Google APIs" }, + { "name": "googleapis-common-protos-grpc", "uri": "https://anaconda.org/anaconda/googleapis-common-protos-grpc", "description": "Extra grpc requirements for googleapis-common-protos" }, + { "name": "gperf", "uri": "https://anaconda.org/anaconda/gperf", "description": "GNU gperf is a perfect hash function generator." }, + { "name": "gperf-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gperf-cos6-x86_64", "description": "(CDT) A perfect hash function generator" }, + { "name": "gperf-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gperf-cos7-ppc64le", "description": "(CDT) A perfect hash function generator" }, + { "name": "gptcache", "uri": "https://anaconda.org/anaconda/gptcache", "description": "GPTCache is a project dedicated to building a semantic cache for storing LLM responses." }, + { "name": "gpustat", "uri": "https://anaconda.org/anaconda/gpustat", "description": "A simple command-line utility for querying and monitoring GPU status." }, + { "name": "graphene", "uri": "https://anaconda.org/anaconda/graphene", "description": "GraphQL Framework for Python" }, + { "name": "graphite2", "uri": "https://anaconda.org/anaconda/graphite2", "description": "A \"smart font\" system that handles the complexities of lesser-known languages of the world." }, + { "name": "graphite2-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/graphite2-amzn2-aarch64", "description": "(CDT) Font rendering capabilities for complex non-Roman writing systems" }, + { "name": "graphlib-backport", "uri": "https://anaconda.org/anaconda/graphlib-backport", "description": "Backport of the Python 3.9 graphlib module for Python 3.6+" }, + { "name": "graphql-core", "uri": "https://anaconda.org/anaconda/graphql-core", "description": "A Python 3.6+ port of the GraphQL.js reference implementation of GraphQL." }, + { "name": "graphql-relay", "uri": "https://anaconda.org/anaconda/graphql-relay", "description": "Relay library for graphql-core" }, + { "name": "graphviz", "uri": "https://anaconda.org/anaconda/graphviz", "description": "Open Source graph visualization software." }, + { "name": "grayskull", "uri": "https://anaconda.org/anaconda/grayskull", "description": "Project to generate recipes for conda." }, + { "name": "greenlet", "uri": "https://anaconda.org/anaconda/greenlet", "description": "Lightweight in-process concurrent programming" }, + { "name": "grep-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/grep-amzn2-aarch64", "description": "(CDT) Pattern matching utilities" }, + { "name": "greyskull", "uri": "https://anaconda.org/anaconda/greyskull", "description": "Project to generate recipes for conda." }, + { "name": "groff", "uri": "https://anaconda.org/anaconda/groff", "description": "Groff (GNU troff) is a typesetting system" }, + { "name": "grpc-cpp", "uri": "https://anaconda.org/anaconda/grpc-cpp", "description": "gRPC - A high-performance, open-source universal RPC framework" }, + { "name": "grpcio", "uri": "https://anaconda.org/anaconda/grpcio", "description": "gRPC - A high-performance, open-source universal RPC framework" }, + { "name": "grpcio-gcp", "uri": "https://anaconda.org/anaconda/grpcio-gcp", "description": "gRPC extensions for Google Cloud Platform" }, + { "name": "grpcio-status", "uri": "https://anaconda.org/anaconda/grpcio-status", "description": "Status proto mapping for gRPC" }, + { "name": "grpcio-tools", "uri": "https://anaconda.org/anaconda/grpcio-tools", "description": "Protobuf code generator for gRPC" }, + { "name": "gsl", "uri": "https://anaconda.org/anaconda/gsl", "description": "GNU Scientific Library" }, + { "name": "gst-plugins-base", "uri": "https://anaconda.org/anaconda/gst-plugins-base", "description": "GStreamer Base Plug-ins" }, + { "name": "gst-plugins-good", "uri": "https://anaconda.org/anaconda/gst-plugins-good", "description": "GStreamer Good Plug-ins" }, + { "name": "gstreamer", "uri": "https://anaconda.org/anaconda/gstreamer", "description": "Library for constructing graphs of media-handling components" }, + { "name": "gtest", "uri": "https://anaconda.org/anaconda/gtest", "description": "Google's C++ test framework" }, + { "name": "gtk-update-icon-cache-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gtk-update-icon-cache-amzn2-aarch64", "description": "(CDT) Icon theme caching utility" }, + { "name": "gtk2", "uri": "https://anaconda.org/anaconda/gtk2", "description": "Primary library used to construct user interfaces in GNOME applications" }, + { "name": "gtk2-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gtk2-amzn2-aarch64", "description": "(CDT) The GIMP ToolKit (GTK+), a library for creating GUIs for X" }, + { "name": "gtk2-cos6-i686", "uri": "https://anaconda.org/anaconda/gtk2-cos6-i686", "description": "(CDT) The GIMP ToolKit (GTK+), a library for creating GUIs for X" }, + { "name": "gtk2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gtk2-cos6-x86_64", "description": "(CDT) The GIMP ToolKit (GTK+), a library for creating GUIs for X" }, + { "name": "gtk2-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gtk2-cos7-ppc64le", "description": "(CDT) The GIMP ToolKit (GTK+), a library for creating GUIs for X" }, + { "name": "gtk2-cos7-s390x", "uri": "https://anaconda.org/anaconda/gtk2-cos7-s390x", "description": "(CDT) The GIMP ToolKit (GTK+), a library for creating GUIs for X" }, + { "name": "gtk2-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gtk2-devel-amzn2-aarch64", "description": "(CDT) Development files for GTK+" }, + { "name": "gtk2-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/gtk2-devel-cos6-i686", "description": "(CDT) Development files for GTK+" }, + { "name": "gtk2-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/gtk2-devel-cos7-ppc64le", "description": "(CDT) Development files for GTK+" }, + { "name": "gtk2-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/gtk2-devel-cos7-s390x", "description": "(CDT) Development files for GTK+" }, + { "name": "gtk3", "uri": "https://anaconda.org/anaconda/gtk3", "description": "Version 3 of the Gtk+ graphical toolkit" }, + { "name": "gtkmm24-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gtkmm24-amzn2-aarch64", "description": "(CDT) C++ interface for GTK2 (a GUI library for X)" }, + { "name": "gtkmm24-cos6-x86_64", "uri": "https://anaconda.org/anaconda/gtkmm24-cos6-x86_64", "description": "(CDT) C++ interface for GTK2 (a GUI library for X)" }, + { "name": "gtkmm24-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gtkmm24-devel-amzn2-aarch64", "description": "(CDT) Headers for developing programs that will use gtkmm24." }, + { "name": "gtkmm24-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/gtkmm24-devel-cos6-i686", "description": "(CDT) Headers for developing programs that will use gtkmm24." }, + { "name": "gtkmm24-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/gtkmm24-devel-cos7-s390x", "description": "(CDT) Headers for developing programs that will use gtkmm24." }, + { "name": "gts", "uri": "https://anaconda.org/anaconda/gts", "description": "GNU Triangulated Surface Library" }, + { "name": "gunicorn", "uri": "https://anaconda.org/anaconda/gunicorn", "description": "WSGI HTTP Server for UNIX" }, + { "name": "gxx-dbg_linux-32", "uri": "https://anaconda.org/anaconda/gxx-dbg_linux-32", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx-dbg_linux-64", "uri": "https://anaconda.org/anaconda/gxx-dbg_linux-64", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx-dbg_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gxx-dbg_linux-ppc64le", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx_impl_linux-32", "uri": "https://anaconda.org/anaconda/gxx_impl_linux-32", "description": "GNU C++ Compiler" }, + { "name": "gxx_impl_linux-64", "uri": "https://anaconda.org/anaconda/gxx_impl_linux-64", "description": "GNU C++ Compiler" }, + { "name": "gxx_impl_linux-aarch64", "uri": "https://anaconda.org/anaconda/gxx_impl_linux-aarch64", "description": "GNU C++ Compiler" }, + { "name": "gxx_impl_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gxx_impl_linux-ppc64le", "description": "GNU C++ Compiler" }, + { "name": "gxx_impl_linux-s390x", "uri": "https://anaconda.org/anaconda/gxx_impl_linux-s390x", "description": "GNU C++ Compiler" }, + { "name": "gxx_linux-32", "uri": "https://anaconda.org/anaconda/gxx_linux-32", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx_linux-64", "uri": "https://anaconda.org/anaconda/gxx_linux-64", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx_linux-aarch64", "uri": "https://anaconda.org/anaconda/gxx_linux-aarch64", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx_linux-ppc64le", "uri": "https://anaconda.org/anaconda/gxx_linux-ppc64le", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gxx_linux-s390x", "uri": "https://anaconda.org/anaconda/gxx_linux-s390x", "description": "GNU C++ Compiler (activation scripts)" }, + { "name": "gymnasium", "uri": "https://anaconda.org/anaconda/gymnasium", "description": "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)" }, + { "name": "gymnasium-notices", "uri": "https://anaconda.org/anaconda/gymnasium-notices", "description": "Notices for gymnasium" }, + { "name": "gzip-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/gzip-amzn2-aarch64", "description": "(CDT) The GNU data compression program" }, + { "name": "h11", "uri": "https://anaconda.org/anaconda/h11", "description": "A pure-Python HTTP/1.1 protocol library." }, + { "name": "h2", "uri": "https://anaconda.org/anaconda/h2", "description": "HTTP/2 State-Machine based protocol implementation" }, + { "name": "h5netcdf", "uri": "https://anaconda.org/anaconda/h5netcdf", "description": "Pythonic interface to netCDF4 via h5py" }, + { "name": "h5py", "uri": "https://anaconda.org/anaconda/h5py", "description": "Read and write HDF5 files from Python" }, + { "name": "harfbuzz", "uri": "https://anaconda.org/anaconda/harfbuzz", "description": "A text shaping library." }, + { "name": "harfbuzz-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/harfbuzz-amzn2-aarch64", "description": "(CDT) Text shaping library" }, + { "name": "harfbuzz-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/harfbuzz-cos7-ppc64le", "description": "(CDT) Text shaping library" }, + { "name": "hatch-fancy-pypi-readme", "uri": "https://anaconda.org/anaconda/hatch-fancy-pypi-readme", "description": "Fancy PyPI READMEs with Hatch" }, + { "name": "hatch-jupyter-builder", "uri": "https://anaconda.org/anaconda/hatch-jupyter-builder", "description": "A hatch plugin to help build Jupyter packages" }, + { "name": "hatch-nodejs-version", "uri": "https://anaconda.org/anaconda/hatch-nodejs-version", "description": "Hatch plugin for versioning from a package.json file" }, + { "name": "hatch-requirements-txt", "uri": "https://anaconda.org/anaconda/hatch-requirements-txt", "description": "Hatchling plugin to read project dependencies from requirements.txt" }, + { "name": "hatch-vcs", "uri": "https://anaconda.org/anaconda/hatch-vcs", "description": "Hatch plugin for versioning with your preferred VCS" }, + { "name": "hatchling", "uri": "https://anaconda.org/anaconda/hatchling", "description": "Modern, extensible Python build backend" }, + { "name": "hdf5", "uri": "https://anaconda.org/anaconda/hdf5", "description": "HDF5 is a data model, library, and file format for storing and managing data" }, + { "name": "hdfeos2", "uri": "https://anaconda.org/anaconda/hdfeos2", "description": "Earth Observing System HDF." }, + { "name": "hdfs3", "uri": "https://anaconda.org/anaconda/hdfs3", "description": "Python wrapper for libhdfs3" }, + { "name": "hdijupyterutils", "uri": "https://anaconda.org/anaconda/hdijupyterutils", "description": "Project with useful classes/methods for all projects created by the HDInsight team at Microsoft around Jupyter" }, + { "name": "hdmedians", "uri": "https://anaconda.org/anaconda/hdmedians", "description": "High-dimensional medians" }, + { "name": "help2man", "uri": "https://anaconda.org/anaconda/help2man", "description": "help2man produces simple manual pages from the --help and --version output of other commands." }, + { "name": "hicolor-icon-theme", "uri": "https://anaconda.org/anaconda/hicolor-icon-theme", "description": "Fallback theme for FreeDesktop.org icon themes" }, + { "name": "hicolor-icon-theme-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/hicolor-icon-theme-amzn2-aarch64", "description": "(CDT) Basic requirement for icon themes" }, + { "name": "hidapi", "uri": "https://anaconda.org/anaconda/hidapi", "description": "Simple lib for communicating with USB and Bluetooth HID devices" }, + { "name": "hijri-converter", "uri": "https://anaconda.org/anaconda/hijri-converter", "description": "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar" }, + { "name": "hiredis", "uri": "https://anaconda.org/anaconda/hiredis", "description": "Python wrapper for hiredis" }, + { "name": "holidays", "uri": "https://anaconda.org/anaconda/holidays", "description": "Generate and work with holidays in Python" }, + { "name": "hologram", "uri": "https://anaconda.org/anaconda/hologram", "description": "JSON schema generation from dataclasses" }, + { "name": "holoviews", "uri": "https://anaconda.org/anaconda/holoviews", "description": "Stop plotting your data - annotate your data and let it visualize itself." }, + { "name": "hpack", "uri": "https://anaconda.org/anaconda/hpack", "description": "HTTP/2 Header Encoding for Python" }, + { "name": "hsluv", "uri": "https://anaconda.org/anaconda/hsluv", "description": "A Python implementation of HSLuv (revision 4)." }, + { "name": "hstspreload", "uri": "https://anaconda.org/anaconda/hstspreload", "description": "Chromium HSTS Preload list as a Python package and updated daily." }, + { "name": "htbuilder", "uri": "https://anaconda.org/anaconda/htbuilder", "description": "A purely-functional HTML builder for Python. Think JSX rather than templates." }, + { "name": "htmlmin", "uri": "https://anaconda.org/anaconda/htmlmin", "description": "A configurable HTML Minifier with safety features" }, + { "name": "htslib", "uri": "https://anaconda.org/anaconda/htslib", "description": "C library for high-throughput sequencing data formats." }, + { "name": "httpcore", "uri": "https://anaconda.org/anaconda/httpcore", "description": "The next generation HTTP client." }, + { "name": "httptools", "uri": "https://anaconda.org/anaconda/httptools", "description": "Fast HTTP parser" }, + { "name": "httpx", "uri": "https://anaconda.org/anaconda/httpx", "description": "A next-generation HTTP client for Python." }, + { "name": "httpx-sse", "uri": "https://anaconda.org/anaconda/httpx-sse", "description": "Consume Server-Sent Event (SSE) messages with HTTPX." }, + { "name": "huggingface_accelerate", "uri": "https://anaconda.org/anaconda/huggingface_accelerate", "description": "Training loop of PyTorch without boilerplate code" }, + { "name": "huggingface_hub", "uri": "https://anaconda.org/anaconda/huggingface_hub", "description": "Client library to download and publish models, datasets and other repos on the huggingface.co hub" }, + { "name": "humanfriendly", "uri": "https://anaconda.org/anaconda/humanfriendly", "description": "Human friendly output for text interfaces using Python." }, + { "name": "humanize", "uri": "https://anaconda.org/anaconda/humanize", "description": "Python humanize utilities" }, + { "name": "hupper", "uri": "https://anaconda.org/anaconda/hupper", "description": "Integrated process monitor for developing and reloading daemons." }, + { "name": "hvplot", "uri": "https://anaconda.org/anaconda/hvplot", "description": "A high-level plotting API for the PyData ecosystem built on HoloViews" }, + { "name": "hwdata-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/hwdata-amzn2-aarch64", "description": "(CDT) Hardware identification and configuration data" }, + { "name": "hyperframe", "uri": "https://anaconda.org/anaconda/hyperframe", "description": "Pure-Python HTTP/2 framing" }, + { "name": "hypothesis", "uri": "https://anaconda.org/anaconda/hypothesis", "description": "A library for property based testing" }, + { "name": "ibis-framework", "uri": "https://anaconda.org/anaconda/ibis-framework", "description": "Productivity-centric Python Big Data Framework" }, + { "name": "icalendar", "uri": "https://anaconda.org/anaconda/icalendar", "description": "iCalendar parser/generator" }, + { "name": "icu", "uri": "https://anaconda.org/anaconda/icu", "description": "International Components for Unicode." }, + { "name": "identify", "uri": "https://anaconda.org/anaconda/identify", "description": "File identification library for Python" }, + { "name": "idna", "uri": "https://anaconda.org/anaconda/idna", "description": "Internationalized Domain Names in Applications (IDNA)." }, + { "name": "idna_ssl", "uri": "https://anaconda.org/anaconda/idna_ssl", "description": "Patch ssl.match_hostname for Unicode(idna) domains support" }, + { "name": "ijson", "uri": "https://anaconda.org/anaconda/ijson", "description": "Ijson is an iterative JSON parser with a standard Python iterator interface." }, + { "name": "imagecodecs", "uri": "https://anaconda.org/anaconda/imagecodecs", "description": "Image transformation, compression, and decompression codecs" }, + { "name": "imagehash", "uri": "https://anaconda.org/anaconda/imagehash", "description": "A Python Perceptual Image Hahsing Module" }, + { "name": "imageio", "uri": "https://anaconda.org/anaconda/imageio", "description": "A Python library for reading and writing image data" }, + { "name": "imagesize", "uri": "https://anaconda.org/anaconda/imagesize", "description": "Getting image size from png/jpeg/jpeg2000/gif file" }, + { "name": "imbalanced-learn", "uri": "https://anaconda.org/anaconda/imbalanced-learn", "description": "Python module to balance data set using under- and over-sampling" }, + { "name": "imgaug", "uri": "https://anaconda.org/anaconda/imgaug", "description": "Image augmentation for machine learning experiments" }, + { "name": "iminuit", "uri": "https://anaconda.org/anaconda/iminuit", "description": "Interactive Minimization Tools based on MINUIT" }, + { "name": "immutables", "uri": "https://anaconda.org/anaconda/immutables", "description": "Immutable Collections" }, + { "name": "importlib-metadata", "uri": "https://anaconda.org/anaconda/importlib-metadata", "description": "A library to access the metadata for a Python package." }, + { "name": "importlib-resources", "uri": "https://anaconda.org/anaconda/importlib-resources", "description": "Backport of Python 3.7's standard library `importlib.resources`" }, + { "name": "importlib_metadata", "uri": "https://anaconda.org/anaconda/importlib_metadata", "description": "A library to access the metadata for a Python package." }, + { "name": "importlib_resources", "uri": "https://anaconda.org/anaconda/importlib_resources", "description": "Backport of Python 3.7's standard library `importlib.resources`" }, + { "name": "incremental", "uri": "https://anaconda.org/anaconda/incremental", "description": "Incremental is a small library that versions your Python projects." }, + { "name": "inequality", "uri": "https://anaconda.org/anaconda/inequality", "description": "Spatial inequality analysis for PySAL A library of spatial analysis functions." }, + { "name": "infinity", "uri": "https://anaconda.org/anaconda/infinity", "description": "All-in-one infinity value for Python. Can be compared to any object." }, + { "name": "inflate64", "uri": "https://anaconda.org/anaconda/inflate64", "description": "deflate64 compression/decompression library" }, + { "name": "inflect", "uri": "https://anaconda.org/anaconda/inflect", "description": "Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words" }, + { "name": "inflection", "uri": "https://anaconda.org/anaconda/inflection", "description": "A port of Ruby on Rails inflector to Python" }, + { "name": "info-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/info-amzn2-aarch64", "description": "(CDT) A stand-alone TTY-based reader for GNU texinfo documentation" }, + { "name": "iniconfig", "uri": "https://anaconda.org/anaconda/iniconfig", "description": "iniconfig: brain-dead simple config-ini parsing" }, + { "name": "inquirer", "uri": "https://anaconda.org/anaconda/inquirer", "description": "Collection of common interactive command line user interfaces, based on Inquirer.js" }, + { "name": "intake", "uri": "https://anaconda.org/anaconda/intake", "description": "Data load and catalog system" }, + { "name": "intake-parquet", "uri": "https://anaconda.org/anaconda/intake-parquet", "description": "Intake parquet plugin" }, + { "name": "intake-xarray", "uri": "https://anaconda.org/anaconda/intake-xarray", "description": "xarray plugins for Intake" }, + { "name": "intel-cmplr-lib-rt", "uri": "https://anaconda.org/anaconda/intel-cmplr-lib-rt", "description": "Runtime for Intel® C++ Compiler Classic" }, + { "name": "intel-cmplr-lic-rt", "uri": "https://anaconda.org/anaconda/intel-cmplr-lic-rt", "description": "Intel End User License Agreement for Developer Tools" }, + { "name": "intel-extension-for-pytorch", "uri": "https://anaconda.org/anaconda/intel-extension-for-pytorch", "description": "Intel® Extension for PyTorch for extra performance boost on Intel hardware." }, + { "name": "intel-fortran-rt", "uri": "https://anaconda.org/anaconda/intel-fortran-rt", "description": "Runtime for Intel® Fortran Compiler Classic and Intel® Fortran Compiler (Beta)" }, + { "name": "intel-fortran_win-32", "uri": "https://anaconda.org/anaconda/intel-fortran_win-32", "description": "Activation and version verification of Intel Fortran compiler" }, + { "name": "intel-fortran_win-64", "uri": "https://anaconda.org/anaconda/intel-fortran_win-64", "description": "Activation and version verification of Intel Fortran compiler" }, + { "name": "intel-opencl-rt", "uri": "https://anaconda.org/anaconda/intel-opencl-rt", "description": "Intel® CPU Runtime for OpenCL™" }, + { "name": "intel-openmp", "uri": "https://anaconda.org/anaconda/intel-openmp", "description": "Math library for Intel and compatible processors" }, + { "name": "interface_meta", "uri": "https://anaconda.org/anaconda/interface_meta", "description": "`interface_meta` provides a convenient way to expose an extensible API with enforced method signatures and consistent documentation." }, + { "name": "intervals", "uri": "https://anaconda.org/anaconda/intervals", "description": "Python tools for handling intervals (ranges of comparable objects)." }, + { "name": "intervaltree", "uri": "https://anaconda.org/anaconda/intervaltree", "description": "Editable interval tree data structure for Python 2 and 3" }, + { "name": "intreehooks", "uri": "https://anaconda.org/anaconda/intreehooks", "description": "Load a PEP 517 backend from inside the source tree" }, + { "name": "invoke", "uri": "https://anaconda.org/anaconda/invoke", "description": "Pythonic task execution" }, + { "name": "ipaddr", "uri": "https://anaconda.org/anaconda/ipaddr", "description": "Google's Python IP address manipulation library" }, + { "name": "ipykernel", "uri": "https://anaconda.org/anaconda/ipykernel", "description": "IPython Kernel for Jupyter" }, + { "name": "ipyleaflet", "uri": "https://anaconda.org/anaconda/ipyleaflet", "description": "A Jupyter / Leaflet bridge enabling interactive maps in the Jupyter notebook." }, + { "name": "ipympl", "uri": "https://anaconda.org/anaconda/ipympl", "description": "Matplotlib Jupyter Extension" }, + { "name": "ipyparallel", "uri": "https://anaconda.org/anaconda/ipyparallel", "description": "Interactive Parallel Computing with IPython" }, + { "name": "ipython", "uri": "https://anaconda.org/anaconda/ipython", "description": "IPython: Productive Interactive Computing" }, + { "name": "ipython-sql", "uri": "https://anaconda.org/anaconda/ipython-sql", "description": "RDBMS access via IPython" }, + { "name": "ipywidgets", "uri": "https://anaconda.org/anaconda/ipywidgets", "description": "Interactive Widgets for the Jupyter Notebook" }, + { "name": "isa-l", "uri": "https://anaconda.org/anaconda/isa-l", "description": "provides tools to minimize disk space use and maximize storage throughput, security, and resilience." }, + { "name": "isodate", "uri": "https://anaconda.org/anaconda/isodate", "description": "An ISO 8601 date/time/duration parser and formatter." }, + { "name": "isort", "uri": "https://anaconda.org/anaconda/isort", "description": "A Python utility / library to sort Python imports." }, + { "name": "itemadapter", "uri": "https://anaconda.org/anaconda/itemadapter", "description": "Common interface for different data containers" }, + { "name": "itemloaders", "uri": "https://anaconda.org/anaconda/itemloaders", "description": "Collect data from HTML and XML sources" }, + { "name": "itsdangerous", "uri": "https://anaconda.org/anaconda/itsdangerous", "description": "Safely pass data to untrusted environments and back." }, + { "name": "jaeger-client", "uri": "https://anaconda.org/anaconda/jaeger-client", "description": "Jaeger Python OpenTracing Tracer implementation" }, + { "name": "jansson", "uri": "https://anaconda.org/anaconda/jansson", "description": "Jansson is a C library for encoding, decoding and manipulating JSON data." }, + { "name": "jaraco.classes", "uri": "https://anaconda.org/anaconda/jaraco.classes", "description": "jaraco.classes" }, + { "name": "jaraco.collections", "uri": "https://anaconda.org/anaconda/jaraco.collections", "description": "Models and classes to supplement the stdlib 'collections' module." }, + { "name": "jaraco.context", "uri": "https://anaconda.org/anaconda/jaraco.context", "description": "Context managers by jaraco" }, + { "name": "jaraco.functools", "uri": "https://anaconda.org/anaconda/jaraco.functools", "description": "Additional functools in the spirit of stdlib's functools." }, + { "name": "jaraco.itertools", "uri": "https://anaconda.org/anaconda/jaraco.itertools", "description": "Additional itertools in the spirit of stdlib's itertools." }, + { "name": "jaraco.test", "uri": "https://anaconda.org/anaconda/jaraco.test", "description": "Testing support by jaraco" }, + { "name": "jaraco.text", "uri": "https://anaconda.org/anaconda/jaraco.text", "description": "Module for text manipulation" }, + { "name": "jasper", "uri": "https://anaconda.org/anaconda/jasper", "description": "A reference implementation of the codec specified in the JPEG-2000 Part-1 standard." }, + { "name": "jasper-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/jasper-libs-amzn2-aarch64", "description": "(CDT) Runtime libraries for jasper" }, + { "name": "java-1.7.0-openjdk-cos6-i686", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-cos6-i686", "description": "(CDT) OpenJDK Runtime Environment" }, + { "name": "java-1.7.0-openjdk-cos6-x86_64", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-cos6-x86_64", "description": "(CDT) OpenJDK Runtime Environment" }, + { "name": "java-1.7.0-openjdk-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-cos7-ppc64le", "description": "(CDT) OpenJDK Runtime Environment" }, + { "name": "java-1.7.0-openjdk-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-devel-cos6-i686", "description": "(CDT) OpenJDK Development Environment" }, + { "name": "java-1.7.0-openjdk-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-devel-cos6-x86_64", "description": "(CDT) OpenJDK Development Environment" }, + { "name": "java-1.7.0-openjdk-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-devel-cos7-ppc64le", "description": "(CDT) OpenJDK Development Environment" }, + { "name": "java-1.7.0-openjdk-headless-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/java-1.7.0-openjdk-headless-cos7-ppc64le", "description": "(CDT) The OpenJDK runtime environment without audio and video support" }, + { "name": "java-1.8.0-openjdk-cos7-s390x", "uri": "https://anaconda.org/anaconda/java-1.8.0-openjdk-cos7-s390x", "description": "(CDT) OpenJDK Runtime Environment 8" }, + { "name": "java-1.8.0-openjdk-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/java-1.8.0-openjdk-devel-cos7-s390x", "description": "(CDT) OpenJDK Development Environment 8" }, + { "name": "java-1.8.0-openjdk-headless-cos7-s390x", "uri": "https://anaconda.org/anaconda/java-1.8.0-openjdk-headless-cos7-s390x", "description": "(CDT) OpenJDK Headless Runtime Environment 8" }, + { "name": "javaobj-py3", "uri": "https://anaconda.org/anaconda/javaobj-py3", "description": "Module for serializing and de-serializing Java objects." }, + { "name": "javapackages-tools-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/javapackages-tools-cos7-ppc64le", "description": "(CDT) Macros and scripts for Java packaging support" }, + { "name": "javapackages-tools-cos7-s390x", "uri": "https://anaconda.org/anaconda/javapackages-tools-cos7-s390x", "description": "(CDT) Macros and scripts for Java packaging support" }, + { "name": "jax", "uri": "https://anaconda.org/anaconda/jax", "description": "Differentiate, compile, and transform Numpy code" }, + { "name": "jax-jumpy", "uri": "https://anaconda.org/anaconda/jax-jumpy", "description": "Common backend for JAX or numpy." }, + { "name": "jaxlib", "uri": "https://anaconda.org/anaconda/jaxlib", "description": "Composable transformations of Python+NumPy programs: differentiate, vectorize, JIT to GPU/TPU, and more" }, + { "name": "jaydebeapi", "uri": "https://anaconda.org/anaconda/jaydebeapi", "description": "A Python DB-APIv2.0 compliant library for JDBC Drivers" }, + { "name": "jbigkit-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/jbigkit-libs-amzn2-aarch64", "description": "(CDT) JBIG1 lossless image compression library" }, + { "name": "jedi", "uri": "https://anaconda.org/anaconda/jedi", "description": "An autocompletion tool for Python that can be used for text editors." }, + { "name": "jeepney", "uri": "https://anaconda.org/anaconda/jeepney", "description": "Pure Python DBus interface" }, + { "name": "jellyfish", "uri": "https://anaconda.org/anaconda/jellyfish", "description": "A library for doing approximate and phonetic matching of strings" }, + { "name": "jemalloc", "uri": "https://anaconda.org/anaconda/jemalloc", "description": "general purpose malloc(3) implementation" }, + { "name": "jinja2", "uri": "https://anaconda.org/anaconda/jinja2", "description": "A very fast and expressive template engine." }, + { "name": "jinja2-time", "uri": "https://anaconda.org/anaconda/jinja2-time", "description": "Jinja2 Extension for Dates and Times" }, + { "name": "jinxed", "uri": "https://anaconda.org/anaconda/jinxed", "description": "Jinxed Terminal Library" }, + { "name": "jira", "uri": "https://anaconda.org/anaconda/jira", "description": "The easiest way to automate JIRA" }, + { "name": "jiter", "uri": "https://anaconda.org/anaconda/jiter", "description": "Fast iterable JSON parser." }, + { "name": "jmespath", "uri": "https://anaconda.org/anaconda/jmespath", "description": "Query language for JSON" }, + { "name": "joblib", "uri": "https://anaconda.org/anaconda/joblib", "description": "Lightweight pipelining: using Python functions as pipeline jobs." }, + { "name": "joserfc", "uri": "https://anaconda.org/anaconda/joserfc", "description": "Implementations of JOSE RFCs in Python" }, + { "name": "jpackage-utils-cos6-i686", "uri": "https://anaconda.org/anaconda/jpackage-utils-cos6-i686", "description": "(CDT) JPackage utilities" }, + { "name": "jpackage-utils-cos6-x86_64", "uri": "https://anaconda.org/anaconda/jpackage-utils-cos6-x86_64", "description": "(CDT) JPackage utilities" }, + { "name": "jpeg", "uri": "https://anaconda.org/anaconda/jpeg", "description": "read/write jpeg COM, EXIF, IPTC medata" }, + { "name": "jpype1", "uri": "https://anaconda.org/anaconda/jpype1", "description": "A Python to Java bridge." }, + { "name": "jq", "uri": "https://anaconda.org/anaconda/jq", "description": "A command-line JSON processor." }, + { "name": "js2py", "uri": "https://anaconda.org/anaconda/js2py", "description": "JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python." }, + { "name": "jschema-to-python", "uri": "https://anaconda.org/anaconda/jschema-to-python", "description": "Generate source code for Python classes from a JSON schema." }, + { "name": "json-c", "uri": "https://anaconda.org/anaconda/json-c", "description": "A JSON implementation in C." }, + { "name": "json-merge-patch", "uri": "https://anaconda.org/anaconda/json-merge-patch", "description": "json-merge-patch library provides functions to merge json in accordance with https://tools.ietf.org/html/rfc7386" }, + { "name": "json-stream-rs-tokenizer", "uri": "https://anaconda.org/anaconda/json-stream-rs-tokenizer", "description": "A faster tokenizer for the json-stream Python library" }, + { "name": "json5", "uri": "https://anaconda.org/anaconda/json5", "description": "A Python implementation of the JSON5 data format" }, + { "name": "jsoncpp", "uri": "https://anaconda.org/anaconda/jsoncpp", "description": "A C++ library for interacting with JSON." }, + { "name": "jsondate", "uri": "https://anaconda.org/anaconda/jsondate", "description": "JSON with datetime support" }, + { "name": "jsondiff", "uri": "https://anaconda.org/anaconda/jsondiff", "description": "Diff JSON and JSON-like structures in Python" }, + { "name": "jsonlines", "uri": "https://anaconda.org/anaconda/jsonlines", "description": "Library with helpers for the jsonlines file format" }, + { "name": "jsonpatch", "uri": "https://anaconda.org/anaconda/jsonpatch", "description": "Apply JSON-Patches (RFC 6902)" }, + { "name": "jsonpath-ng", "uri": "https://anaconda.org/anaconda/jsonpath-ng", "description": "Python JSONPath Next-Generation" }, + { "name": "jsonpickle", "uri": "https://anaconda.org/anaconda/jsonpickle", "description": "Python library for serializing any arbitrary object graph into JSON" }, + { "name": "jsonpointer", "uri": "https://anaconda.org/anaconda/jsonpointer", "description": "Identify specific nodes in a JSON document (RFC 6901)" }, + { "name": "jsonschema", "uri": "https://anaconda.org/anaconda/jsonschema", "description": "An implementation of JSON Schema validation for Python" }, + { "name": "jsonschema-path", "uri": "https://anaconda.org/anaconda/jsonschema-path", "description": "JSONSchema Spec with object-oriented paths" }, + { "name": "jsonschema-specifications", "uri": "https://anaconda.org/anaconda/jsonschema-specifications", "description": "The JSON Schema meta-schemas and vocabularies, exposed as a Registry" }, + { "name": "junit-xml", "uri": "https://anaconda.org/anaconda/junit-xml", "description": "Creates JUnit XML test result documents that can be read by tools such as Jenkins" }, + { "name": "jupyter", "uri": "https://anaconda.org/anaconda/jupyter", "description": "No Summary" }, + { "name": "jupyter-dash", "uri": "https://anaconda.org/anaconda/jupyter-dash", "description": "Dash support for the Jupyter notebook interface" }, + { "name": "jupyter-lsp", "uri": "https://anaconda.org/anaconda/jupyter-lsp", "description": "Multi-Language Server WebSocket proxy for Jupyter Server" }, + { "name": "jupyter-lsp-python", "uri": "https://anaconda.org/anaconda/jupyter-lsp-python", "description": "A metapackage for jupyter-lsp and python-lsp-server" }, + { "name": "jupyter-packaging", "uri": "https://anaconda.org/anaconda/jupyter-packaging", "description": "Jupyter Packaging Utilities" }, + { "name": "jupyter-server-mathjax", "uri": "https://anaconda.org/anaconda/jupyter-server-mathjax", "description": "MathJax resources as a Jupyter Server Extension." }, + { "name": "jupyter-server-proxy", "uri": "https://anaconda.org/anaconda/jupyter-server-proxy", "description": "Jupyter server extension to supervise and proxy web services" }, + { "name": "jupyter_bokeh", "uri": "https://anaconda.org/anaconda/jupyter_bokeh", "description": "A Jupyter extension for rendering Bokeh content." }, + { "name": "jupyter_client", "uri": "https://anaconda.org/anaconda/jupyter_client", "description": "Jupyter protocol implementation and client libraries." }, + { "name": "jupyter_console", "uri": "https://anaconda.org/anaconda/jupyter_console", "description": "Jupyter terminal console" }, + { "name": "jupyter_core", "uri": "https://anaconda.org/anaconda/jupyter_core", "description": "Core common functionality of Jupyter projects." }, + { "name": "jupyter_dashboards_bundlers", "uri": "https://anaconda.org/anaconda/jupyter_dashboards_bundlers", "description": "An add-on for Jupyter Notebook" }, + { "name": "jupyter_events", "uri": "https://anaconda.org/anaconda/jupyter_events", "description": "Jupyter Event System library" }, + { "name": "jupyter_kernel_gateway", "uri": "https://anaconda.org/anaconda/jupyter_kernel_gateway", "description": "Jupyter Kernel Gateway" }, + { "name": "jupyter_server", "uri": "https://anaconda.org/anaconda/jupyter_server", "description": "Jupyter Server" }, + { "name": "jupyter_server_fileid", "uri": "https://anaconda.org/anaconda/jupyter_server_fileid", "description": "A Jupyter Server extension providing an implementation of the File ID service." }, + { "name": "jupyter_server_terminals", "uri": "https://anaconda.org/anaconda/jupyter_server_terminals", "description": "A Jupyter Server Extension Providing Terminals." }, + { "name": "jupyter_server_ydoc", "uri": "https://anaconda.org/anaconda/jupyter_server_ydoc", "description": "A Jupyter Server Extension providing support for Y documents." }, + { "name": "jupyter_telemetry", "uri": "https://anaconda.org/anaconda/jupyter_telemetry", "description": "Telemetry for Jupyter Applications and extensions." }, + { "name": "jupyter_ydoc", "uri": "https://anaconda.org/anaconda/jupyter_ydoc", "description": "Document structures for collaborative editing using Ypy" }, + { "name": "jupyterhub", "uri": "https://anaconda.org/anaconda/jupyterhub", "description": "Multi-user server for Jupyter notebooks" }, + { "name": "jupyterhub-base", "uri": "https://anaconda.org/anaconda/jupyterhub-base", "description": "Multi-user server for Jupyter notebooks" }, + { "name": "jupyterhub-ldapauthenticator", "uri": "https://anaconda.org/anaconda/jupyterhub-ldapauthenticator", "description": "LDAP Authenticator for JupyterHub" }, + { "name": "jupyterhub-singleuser", "uri": "https://anaconda.org/anaconda/jupyterhub-singleuser", "description": "Multi-user server for Jupyter notebooks" }, + { "name": "jupyterlab", "uri": "https://anaconda.org/anaconda/jupyterlab", "description": "An extensible environment for interactive and reproducible computing, based on the Jupyter Notebook and Architecture." }, + { "name": "jupyterlab-geojson", "uri": "https://anaconda.org/anaconda/jupyterlab-geojson", "description": "GeoJSON renderer for JupyterLab" }, + { "name": "jupyterlab-git", "uri": "https://anaconda.org/anaconda/jupyterlab-git", "description": "A Git extension for JupyterLab" }, + { "name": "jupyterlab-variableinspector", "uri": "https://anaconda.org/anaconda/jupyterlab-variableinspector", "description": "Variable Inspector extension for Jupyterlab." }, + { "name": "jupyterlab_code_formatter", "uri": "https://anaconda.org/anaconda/jupyterlab_code_formatter", "description": "A JupyterLab plugin to facilitate invocation of code formatters." }, + { "name": "jupyterlab_launcher", "uri": "https://anaconda.org/anaconda/jupyterlab_launcher", "description": "A Launcher for JupyterLab based applications." }, + { "name": "jupyterlab_pygments", "uri": "https://anaconda.org/anaconda/jupyterlab_pygments", "description": "Pygments syntax coloring scheme making use of the JupyterLab CSS variables" }, + { "name": "jupyterlab_server", "uri": "https://anaconda.org/anaconda/jupyterlab_server", "description": "A set of server components for JupyterLab and JupyterLab like applications." }, + { "name": "jupyterlab_widgets", "uri": "https://anaconda.org/anaconda/jupyterlab_widgets", "description": "JupyterLab extension providing HTML widgets" }, + { "name": "jupytext", "uri": "https://anaconda.org/anaconda/jupytext", "description": "Jupyter notebooks as Markdown documents, Julia, Python or R scripts" }, + { "name": "jxrlib", "uri": "https://anaconda.org/anaconda/jxrlib", "description": "jxrlib - JPEG XR Library by Microsoft, built from Debian hosted sources." }, + { "name": "kagglehub", "uri": "https://anaconda.org/anaconda/kagglehub", "description": "Access Kaggle resources anywhere" }, + { "name": "kealib", "uri": "https://anaconda.org/anaconda/kealib", "description": "The KEA format provides an implementation of the GDAL specification within the the HDF5 file format." }, + { "name": "keras", "uri": "https://anaconda.org/anaconda/keras", "description": "Deep Learning for humans" }, + { "name": "keras-applications", "uri": "https://anaconda.org/anaconda/keras-applications", "description": "Applications module of the Keras deep learning library." }, + { "name": "keras-base", "uri": "https://anaconda.org/anaconda/keras-base", "description": "No Summary" }, + { "name": "keras-gpu", "uri": "https://anaconda.org/anaconda/keras-gpu", "description": "Deep Learning Library for Theano and TensorFlow" }, + { "name": "keras-ocr", "uri": "https://anaconda.org/anaconda/keras-ocr", "description": "A packaged and flexible version of the CRAFT text detector and Keras CRNN recognition model." }, + { "name": "keras-preprocessing", "uri": "https://anaconda.org/anaconda/keras-preprocessing", "description": "Data preprocessing and data augmentation module of the Keras deep learning library" }, + { "name": "kernel-headers-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/kernel-headers-amzn2-aarch64", "description": "(CDT) Header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers-cos6-x86_64", "uri": "https://anaconda.org/anaconda/kernel-headers-cos6-x86_64", "description": "(CDT) Header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/kernel-headers-cos7-ppc64le", "description": "(CDT) Header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers_linux-64", "uri": "https://anaconda.org/anaconda/kernel-headers_linux-64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers_linux-aarch64", "uri": "https://anaconda.org/anaconda/kernel-headers_linux-aarch64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers_linux-ppc64le", "uri": "https://anaconda.org/anaconda/kernel-headers_linux-ppc64le", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "kernel-headers_linux-s390x", "uri": "https://anaconda.org/anaconda/kernel-headers_linux-s390x", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "keyring", "uri": "https://anaconda.org/anaconda/keyring", "description": "Store and access your passwords safely" }, + { "name": "keyrings.alt", "uri": "https://anaconda.org/anaconda/keyrings.alt", "description": "Alternate keyring backend implementations for use with the keyring package." }, + { "name": "keyutils-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/keyutils-libs-amzn2-aarch64", "description": "(CDT) Key utilities library" }, + { "name": "keyutils-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/keyutils-libs-cos6-i686", "description": "(CDT) Key utilities library" }, + { "name": "keyutils-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/keyutils-libs-cos6-x86_64", "description": "(CDT) Key utilities library" }, + { "name": "keyutils-libs-cos7-s390x", "uri": "https://anaconda.org/anaconda/keyutils-libs-cos7-s390x", "description": "(CDT) Key utilities library" }, + { "name": "keyutils-libs-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/keyutils-libs-devel-amzn2-aarch64", "description": "(CDT) Development package for building Linux key management utilities" }, + { "name": "khronos-opencl-icd-loader", "uri": "https://anaconda.org/anaconda/khronos-opencl-icd-loader", "description": "A driver loader for OpenCL" }, + { "name": "kiwisolver", "uri": "https://anaconda.org/anaconda/kiwisolver", "description": "An efficient C++ implementation of the Cassowary constraint solver" }, + { "name": "kmod-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/kmod-amzn2-aarch64", "description": "(CDT) Linux kernel module management utilities" }, + { "name": "kmod-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/kmod-cos7-ppc64le", "description": "(CDT) Linux kernel module management utilities" }, + { "name": "kmod-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/kmod-libs-amzn2-aarch64", "description": "(CDT) Libraries to handle kernel module loading and unloading" }, + { "name": "kmodes", "uri": "https://anaconda.org/anaconda/kmodes", "description": "Python implementations of the k-modes and k-prototypes clustering algorithms for clustering categorical data." }, + { "name": "knit", "uri": "https://anaconda.org/anaconda/knit", "description": "Python interface YARN" }, + { "name": "kombu", "uri": "https://anaconda.org/anaconda/kombu", "description": "Messaging library for Python" }, + { "name": "korean_lunar_calendar", "uri": "https://anaconda.org/anaconda/korean_lunar_calendar", "description": "Korean Lunar Calendar" }, + { "name": "krb5", "uri": "https://anaconda.org/anaconda/krb5", "description": "A network authentication protocol." }, + { "name": "krb5-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/krb5-devel-amzn2-aarch64", "description": "(CDT) Development files needed to compile Kerberos 5 programs" }, + { "name": "krb5-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/krb5-libs-amzn2-aarch64", "description": "(CDT) The non-admin shared libraries used by Kerberos 5" }, + { "name": "krb5-libs-cos6-i686", "uri": "https://anaconda.org/anaconda/krb5-libs-cos6-i686", "description": "(CDT) The non-admin shared libraries used by Kerberos 5" }, + { "name": "krb5-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/krb5-libs-cos6-x86_64", "description": "(CDT) The non-admin shared libraries used by Kerberos 5" }, + { "name": "krb5-libs-cos7-s390x", "uri": "https://anaconda.org/anaconda/krb5-libs-cos7-s390x", "description": "(CDT) The non-admin shared libraries used by Kerberos 5" }, + { "name": "krb5-static", "uri": "https://anaconda.org/anaconda/krb5-static", "description": "A network authentication protocol." }, + { "name": "kt-legacy", "uri": "https://anaconda.org/anaconda/kt-legacy", "description": "Legacy import names for Keras Tuner" }, + { "name": "lame", "uri": "https://anaconda.org/anaconda/lame", "description": "High quality MPEG Audio Layer III (MP3) encoder" }, + { "name": "langchain", "uri": "https://anaconda.org/anaconda/langchain", "description": "Building applications with LLMs through composability" }, + { "name": "langchain-community", "uri": "https://anaconda.org/anaconda/langchain-community", "description": "Community contributed LangChain integrations." }, + { "name": "langchain-core", "uri": "https://anaconda.org/anaconda/langchain-core", "description": "Core APIs for LangChain, the LLM framework for buildilng applications through composability" }, + { "name": "langchain-text-splitters", "uri": "https://anaconda.org/anaconda/langchain-text-splitters", "description": "LangChain text splitting utilities" }, + { "name": "langcodes", "uri": "https://anaconda.org/anaconda/langcodes", "description": "Labels and compares human languages in a standardized way" }, + { "name": "langsmith", "uri": "https://anaconda.org/anaconda/langsmith", "description": "Client library to connect to the LangSmith language model tracing and evaluation API." }, + { "name": "lapack", "uri": "https://anaconda.org/anaconda/lapack", "description": "Linear Algebra PACKage" }, + { "name": "lark", "uri": "https://anaconda.org/anaconda/lark", "description": "a modern parsing library" }, + { "name": "lazrs-python", "uri": "https://anaconda.org/anaconda/lazrs-python", "description": "Python bindings for laz-rs" }, + { "name": "lazy-object-proxy", "uri": "https://anaconda.org/anaconda/lazy-object-proxy", "description": "A fast and thorough lazy object proxy" }, + { "name": "lazy_loader", "uri": "https://anaconda.org/anaconda/lazy_loader", "description": "Easily load subpackages and functions on demand" }, + { "name": "lcms2", "uri": "https://anaconda.org/anaconda/lcms2", "description": "Open Source Color Management Engine" }, + { "name": "ld64", "uri": "https://anaconda.org/anaconda/ld64", "description": "Darwin Mach-O native linker" }, + { "name": "ld64_linux-64", "uri": "https://anaconda.org/anaconda/ld64_linux-64", "description": "Darwin Mach-O cross linker" }, + { "name": "ld64_linux-aarch64", "uri": "https://anaconda.org/anaconda/ld64_linux-aarch64", "description": "Darwin Mach-O cross linker" }, + { "name": "ld64_linux-ppc64le", "uri": "https://anaconda.org/anaconda/ld64_linux-ppc64le", "description": "Darwin Mach-O cross linker" }, + { "name": "ld64_osx-64", "uri": "https://anaconda.org/anaconda/ld64_osx-64", "description": "Darwin Mach-O cross linker" }, + { "name": "ld64_osx-arm64", "uri": "https://anaconda.org/anaconda/ld64_osx-arm64", "description": "Darwin Mach-O cross linker" }, + { "name": "ld_impl_linux-64", "uri": "https://anaconda.org/anaconda/ld_impl_linux-64", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "ld_impl_linux-aarch64", "uri": "https://anaconda.org/anaconda/ld_impl_linux-aarch64", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "ld_impl_linux-ppc64le", "uri": "https://anaconda.org/anaconda/ld_impl_linux-ppc64le", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "ld_impl_linux-s390x", "uri": "https://anaconda.org/anaconda/ld_impl_linux-s390x", "description": "A set of programming tools for creating and managing binary programs, object files,\nlibraries, profile data, and assembly source code." }, + { "name": "ldid", "uri": "https://anaconda.org/anaconda/ldid", "description": "pseudo-codesign Mach-O files" }, + { "name": "leather", "uri": "https://anaconda.org/anaconda/leather", "description": "Python charting for 80% of humans." }, + { "name": "leb128", "uri": "https://anaconda.org/anaconda/leb128", "description": "LEB128(Little Endian Base 128)" }, + { "name": "leptonica", "uri": "https://anaconda.org/anaconda/leptonica", "description": "Useful for image processing and image analysis applications" }, + { "name": "lerc", "uri": "https://anaconda.org/anaconda/lerc", "description": "LERC - Limited Error Raster Compression" }, + { "name": "liac-arff", "uri": "https://anaconda.org/anaconda/liac-arff", "description": "A module for read and write ARFF files in Python." }, + { "name": "libabseil", "uri": "https://anaconda.org/anaconda/libabseil", "description": "Abseil Common Libraries (C++)" }, + { "name": "libabseil-tests", "uri": "https://anaconda.org/anaconda/libabseil-tests", "description": "Abseil Common Libraries (C++)" }, + { "name": "libacl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libacl-amzn2-aarch64", "description": "(CDT) Dynamic library for access control list support" }, + { "name": "libaec", "uri": "https://anaconda.org/anaconda/libaec", "description": "Adaptive Entropy Coding library" }, + { "name": "libaio", "uri": "https://anaconda.org/anaconda/libaio", "description": "Provides the Linux-native API for async I/O" }, + { "name": "libansicon", "uri": "https://anaconda.org/anaconda/libansicon", "description": "ansi console for windows" }, + { "name": "libapr", "uri": "https://anaconda.org/anaconda/libapr", "description": "Maintains a consistent API with predictable behaviour" }, + { "name": "libapriconv", "uri": "https://anaconda.org/anaconda/libapriconv", "description": "Maintains a consistent API with predictable behaviour" }, + { "name": "libaprutil", "uri": "https://anaconda.org/anaconda/libaprutil", "description": "Maintains a consistent API with predictable behaviour" }, + { "name": "libarchive", "uri": "https://anaconda.org/anaconda/libarchive", "description": "Multi-format archive and compression library" }, + { "name": "libart_lgpl-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libart_lgpl-cos6-x86_64", "description": "(CDT) Library of graphics routines used by libgnomecanvas" }, + { "name": "libattr-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libattr-amzn2-aarch64", "description": "(CDT) Dynamic library for extended attribute support" }, + { "name": "libavif", "uri": "https://anaconda.org/anaconda/libavif", "description": "A friendly, portable C implementation of the AV1 Image File Format" }, + { "name": "libblas", "uri": "https://anaconda.org/anaconda/libblas", "description": "Linear Algebra PACKage" }, + { "name": "libblkid-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libblkid-amzn2-aarch64", "description": "(CDT) Block device ID library" }, + { "name": "libblkid-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libblkid-cos6-x86_64", "description": "(CDT) Block device ID library" }, + { "name": "libbonobo-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libbonobo-cos6-x86_64", "description": "(CDT) Bonobo component system" }, + { "name": "libbonobo-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libbonobo-devel-cos6-x86_64", "description": "(CDT) Libraries and headers for libbonobo" }, + { "name": "libboost", "uri": "https://anaconda.org/anaconda/libboost", "description": "Free peer-reviewed portable C++ source libraries." }, + { "name": "libbrotlicommon", "uri": "https://anaconda.org/anaconda/libbrotlicommon", "description": "Brotli compression format" }, + { "name": "libbrotlidec", "uri": "https://anaconda.org/anaconda/libbrotlidec", "description": "Brotli compression format" }, + { "name": "libbrotlienc", "uri": "https://anaconda.org/anaconda/libbrotlienc", "description": "Brotli compression format" }, + { "name": "libcap-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcap-amzn2-aarch64", "description": "(CDT) Library for getting and setting POSIX.1e capabilities" }, + { "name": "libcap-ng-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcap-ng-amzn2-aarch64", "description": "(CDT) An alternate posix capabilities library" }, + { "name": "libcblas", "uri": "https://anaconda.org/anaconda/libcblas", "description": "Linear Algebra PACKage" }, + { "name": "libclang", "uri": "https://anaconda.org/anaconda/libclang", "description": "Development headers and libraries for Clang" }, + { "name": "libclang-cpp", "uri": "https://anaconda.org/anaconda/libclang-cpp", "description": "Development headers and libraries for Clang" }, + { "name": "libclang-cpp10", "uri": "https://anaconda.org/anaconda/libclang-cpp10", "description": "Development headers and libraries for Clang" }, + { "name": "libclang-cpp12", "uri": "https://anaconda.org/anaconda/libclang-cpp12", "description": "Development headers and libraries for Clang" }, + { "name": "libclang-cpp14", "uri": "https://anaconda.org/anaconda/libclang-cpp14", "description": "Development headers and libraries for Clang" }, + { "name": "libclang13", "uri": "https://anaconda.org/anaconda/libclang13", "description": "Development headers and libraries for Clang" }, + { "name": "libcom_err-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcom_err-amzn2-aarch64", "description": "(CDT) Common error description library" }, + { "name": "libcom_err-cos6-i686", "uri": "https://anaconda.org/anaconda/libcom_err-cos6-i686", "description": "(CDT) Common error description library" }, + { "name": "libcom_err-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libcom_err-cos6-x86_64", "description": "(CDT) Common error description library" }, + { "name": "libcom_err-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcom_err-devel-amzn2-aarch64", "description": "(CDT) Common error description library" }, + { "name": "libcrc32c", "uri": "https://anaconda.org/anaconda/libcrc32c", "description": "CRC32C implementation with support for CPU-specific acceleration instructions" }, + { "name": "libcroco-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcroco-amzn2-aarch64", "description": "(CDT) A CSS2 parsing library" }, + { "name": "libcrypt-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcrypt-amzn2-aarch64", "description": "(CDT) Password hashing library (non-NSS version)" }, + { "name": "libcryptominisat", "uri": "https://anaconda.org/anaconda/libcryptominisat", "description": "An advanced SAT Solver https://www.msoos.org" }, + { "name": "libcst", "uri": "https://anaconda.org/anaconda/libcst", "description": "A concrete syntax tree with AST-like properties for Python 3.5, 3.6, 3.7 and 3.8 programs." }, + { "name": "libcublas", "uri": "https://anaconda.org/anaconda/libcublas", "description": "An implementation of BLAS (Basic Linear Algebra Subprograms) on top of the NVIDIA CUDA runtime." }, + { "name": "libcublas-dev", "uri": "https://anaconda.org/anaconda/libcublas-dev", "description": "An implementation of BLAS (Basic Linear Algebra Subprograms) on top of the NVIDIA CUDA runtime." }, + { "name": "libcublas-static", "uri": "https://anaconda.org/anaconda/libcublas-static", "description": "An implementation of BLAS (Basic Linear Algebra Subprograms) on top of the NVIDIA CUDA runtime." }, + { "name": "libcufft", "uri": "https://anaconda.org/anaconda/libcufft", "description": "cuFFT native runtime libraries" }, + { "name": "libcufft-dev", "uri": "https://anaconda.org/anaconda/libcufft-dev", "description": "cuFFT native runtime libraries" }, + { "name": "libcufft-static", "uri": "https://anaconda.org/anaconda/libcufft-static", "description": "cuFFT native runtime libraries" }, + { "name": "libcufile", "uri": "https://anaconda.org/anaconda/libcufile", "description": "Library for NVIDIA GPUDirect Storage" }, + { "name": "libcufile-dev", "uri": "https://anaconda.org/anaconda/libcufile-dev", "description": "Library for NVIDIA GPUDirect Storage" }, + { "name": "libcufile-static", "uri": "https://anaconda.org/anaconda/libcufile-static", "description": "Library for NVIDIA GPUDirect Storage" }, + { "name": "libcurand", "uri": "https://anaconda.org/anaconda/libcurand", "description": "cuRAND native runtime libraries" }, + { "name": "libcurand-dev", "uri": "https://anaconda.org/anaconda/libcurand-dev", "description": "cuRAND native runtime libraries" }, + { "name": "libcurand-static", "uri": "https://anaconda.org/anaconda/libcurand-static", "description": "cuRAND native runtime libraries" }, + { "name": "libcurl", "uri": "https://anaconda.org/anaconda/libcurl", "description": "tool and library for transferring data with URL syntax" }, + { "name": "libcurl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libcurl-amzn2-aarch64", "description": "(CDT) A library for getting files from web servers" }, + { "name": "libcurl-static", "uri": "https://anaconda.org/anaconda/libcurl-static", "description": "tool and library for transferring data with URL syntax" }, + { "name": "libcusolver", "uri": "https://anaconda.org/anaconda/libcusolver", "description": "CUDA Linear Solver Library" }, + { "name": "libcusolver-dev", "uri": "https://anaconda.org/anaconda/libcusolver-dev", "description": "CUDA Linear Solver Library" }, + { "name": "libcusolver-static", "uri": "https://anaconda.org/anaconda/libcusolver-static", "description": "CUDA Linear Solver Library" }, + { "name": "libcusparse", "uri": "https://anaconda.org/anaconda/libcusparse", "description": "CUDA Sparse Matrix Library" }, + { "name": "libcusparse-dev", "uri": "https://anaconda.org/anaconda/libcusparse-dev", "description": "CUDA Sparse Matrix Library" }, + { "name": "libcusparse-static", "uri": "https://anaconda.org/anaconda/libcusparse-static", "description": "CUDA Sparse Matrix Library" }, + { "name": "libcxxabi", "uri": "https://anaconda.org/anaconda/libcxxabi", "description": "LLVM C++ standard library" }, + { "name": "libdap4", "uri": "https://anaconda.org/anaconda/libdap4", "description": "A C++ SDK which contains an implementation of both DAP2 and DAP4." }, + { "name": "libdate", "uri": "https://anaconda.org/anaconda/libdate", "description": "A date and time library based on the C++11/14/17 header" }, + { "name": "libdb", "uri": "https://anaconda.org/anaconda/libdb", "description": "The Berkeley DB embedded database system." }, + { "name": "libdb-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libdb-amzn2-aarch64", "description": "(CDT) The Berkeley DB database library for C" }, + { "name": "libdeflate", "uri": "https://anaconda.org/anaconda/libdeflate", "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression." }, + { "name": "libdrm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libdrm-amzn2-aarch64", "description": "(CDT) Direct Rendering Manager runtime library" }, + { "name": "libdrm-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libdrm-cos7-ppc64le", "description": "(CDT) Direct Rendering Manager runtime library" }, + { "name": "libdrm-cos7-s390x", "uri": "https://anaconda.org/anaconda/libdrm-cos7-s390x", "description": "(CDT) Direct Rendering Manager runtime library" }, + { "name": "libdrm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libdrm-devel-amzn2-aarch64", "description": "(CDT) Direct Rendering Manager development package" }, + { "name": "libdrm-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libdrm-devel-cos6-i686", "description": "(CDT) Direct Rendering Manager development package" }, + { "name": "libdrm-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libdrm-devel-cos7-ppc64le", "description": "(CDT) Direct Rendering Manager development package" }, + { "name": "libedit", "uri": "https://anaconda.org/anaconda/libedit", "description": "Editline Library (libedit)" }, + { "name": "libev", "uri": "https://anaconda.org/anaconda/libev", "description": "A full-featured and high-performance event loop that is loosely modeled after libevent, but without its limitations and bugs." }, + { "name": "libev-libevent", "uri": "https://anaconda.org/anaconda/libev-libevent", "description": "A full-featured and high-performance event loop that is loosely modeled after libevent, but without its limitations and bugs." }, + { "name": "libev-static", "uri": "https://anaconda.org/anaconda/libev-static", "description": "A full-featured and high-performance event loop that is loosely modeled after libevent, but without its limitations and bugs." }, + { "name": "libffi", "uri": "https://anaconda.org/anaconda/libffi", "description": "A Portable Foreign Function Interface Library" }, + { "name": "libffi-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libffi-amzn2-aarch64", "description": "(CDT) A portable foreign function interface library" }, + { "name": "libgcc-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libgcc-amzn2-aarch64", "description": "(CDT) GCC version 7 shared support library" }, + { "name": "libgcc-devel_linux-64", "uri": "https://anaconda.org/anaconda/libgcc-devel_linux-64", "description": "The GNU C development libraries and object files" }, + { "name": "libgcc-devel_linux-aarch64", "uri": "https://anaconda.org/anaconda/libgcc-devel_linux-aarch64", "description": "The GNU C development libraries and object files" }, + { "name": "libgcc-devel_linux-ppc64le", "uri": "https://anaconda.org/anaconda/libgcc-devel_linux-ppc64le", "description": "The GNU C development libraries and object files" }, + { "name": "libgcc-devel_linux-s390x", "uri": "https://anaconda.org/anaconda/libgcc-devel_linux-s390x", "description": "The GNU C development libraries and object files" }, + { "name": "libgcc-ng", "uri": "https://anaconda.org/anaconda/libgcc-ng", "description": "The GCC low-level runtime library" }, + { "name": "libgcj-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libgcj-cos6-x86_64", "description": "(CDT) Java runtime library for gcc" }, + { "name": "libgcrypt", "uri": "https://anaconda.org/anaconda/libgcrypt", "description": "a general purpose cryptographic library originally based on code from GnuPG." }, + { "name": "libgcrypt-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libgcrypt-amzn2-aarch64", "description": "(CDT) A general-purpose cryptography library" }, + { "name": "libgcrypt-cos6-i686", "uri": "https://anaconda.org/anaconda/libgcrypt-cos6-i686", "description": "(CDT) A general-purpose cryptography library" }, + { "name": "libgcrypt-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libgcrypt-cos6-x86_64", "description": "(CDT) A general-purpose cryptography library" }, + { "name": "libgcrypt-cos7-s390x", "uri": "https://anaconda.org/anaconda/libgcrypt-cos7-s390x", "description": "(CDT) A general-purpose cryptography library" }, + { "name": "libgd", "uri": "https://anaconda.org/anaconda/libgd", "description": "Library for the dynamic creation of images." }, + { "name": "libgdal", "uri": "https://anaconda.org/anaconda/libgdal", "description": "The Geospatial Data Abstraction Library (GDAL)" }, + { "name": "libgfortran-devel_osx-64", "uri": "https://anaconda.org/anaconda/libgfortran-devel_osx-64", "description": "Fortran compiler and libraries from the GNU Compiler Collection" }, + { "name": "libgfortran-devel_osx-arm64", "uri": "https://anaconda.org/anaconda/libgfortran-devel_osx-arm64", "description": "Fortran compiler and libraries from the GNU Compiler Collection" }, + { "name": "libgfortran-ng", "uri": "https://anaconda.org/anaconda/libgfortran-ng", "description": "The GNU Fortran Runtime Library" }, + { "name": "libgfortran4", "uri": "https://anaconda.org/anaconda/libgfortran4", "description": "The GNU Fortran Runtime Library" }, + { "name": "libgfortran5", "uri": "https://anaconda.org/anaconda/libgfortran5", "description": "Fortran compiler and libraries from the GNU Compiler Collection" }, + { "name": "libgit2", "uri": "https://anaconda.org/anaconda/libgit2", "description": "libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language which supports C bindings." }, + { "name": "libglib", "uri": "https://anaconda.org/anaconda/libglib", "description": "Provides core application building blocks for libraries and applications written in C." }, + { "name": "libglu", "uri": "https://anaconda.org/anaconda/libglu", "description": "Mesa OpenGL utility library (GLU)" }, + { "name": "libglvnd-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-amzn2-aarch64", "description": "(CDT) The GL Vendor-Neutral Dispatch library" }, + { "name": "libglvnd-core-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-core-devel-amzn2-aarch64", "description": "(CDT) Core development files for libglvnd" }, + { "name": "libglvnd-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libglvnd-cos7-ppc64le", "description": "(CDT) The GL Vendor-Neutral Dispatch library" }, + { "name": "libglvnd-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-devel-amzn2-aarch64", "description": "(CDT) Development files for libglvnd" }, + { "name": "libglvnd-egl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-egl-amzn2-aarch64", "description": "(CDT) EGL support for libglvnd" }, + { "name": "libglvnd-gles-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-gles-amzn2-aarch64", "description": "(CDT) GLES support for libglvnd" }, + { "name": "libglvnd-glx-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-glx-amzn2-aarch64", "description": "(CDT) GLX support for libglvnd" }, + { "name": "libglvnd-glx-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libglvnd-glx-cos7-ppc64le", "description": "(CDT) GLX support for libglvnd" }, + { "name": "libglvnd-opengl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libglvnd-opengl-amzn2-aarch64", "description": "(CDT) OpenGL support for libglvnd" }, + { "name": "libgomp", "uri": "https://anaconda.org/anaconda/libgomp", "description": "The GCC OpenMP implementation." }, + { "name": "libgomp-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libgomp-amzn2-aarch64", "description": "(CDT) GCC OpenMP v4.5 shared support library" }, + { "name": "libgpg-error", "uri": "https://anaconda.org/anaconda/libgpg-error", "description": "a small library that originally defined common error values for all GnuPG components" }, + { "name": "libgpg-error-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libgpg-error-amzn2-aarch64", "description": "(CDT) Library for error values used by GnuPG components" }, + { "name": "libgpg-error-cos6-i686", "uri": "https://anaconda.org/anaconda/libgpg-error-cos6-i686", "description": "(CDT) Library for error values used by GnuPG components" }, + { "name": "libgpg-error-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libgpg-error-cos6-x86_64", "description": "(CDT) Library for error values used by GnuPG components" }, + { "name": "libgpuarray", "uri": "https://anaconda.org/anaconda/libgpuarray", "description": "Library to manipulate arrays on GPU" }, + { "name": "libgrpc", "uri": "https://anaconda.org/anaconda/libgrpc", "description": "gRPC - A high-performance, open-source universal RPC framework" }, + { "name": "libgsasl", "uri": "https://anaconda.org/anaconda/libgsasl", "description": "Implementation of the Simple Authentication and Security Layer framework" }, + { "name": "libgsf", "uri": "https://anaconda.org/anaconda/libgsf", "description": "The G Structured File Library" }, + { "name": "libhdfs3", "uri": "https://anaconda.org/anaconda/libhdfs3", "description": "A Native C/C++ HDFS Client" }, + { "name": "libice-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libice-amzn2-aarch64", "description": "(CDT) X.Org X11 ICE runtime library" }, + { "name": "libice-cos6-i686", "uri": "https://anaconda.org/anaconda/libice-cos6-i686", "description": "(CDT) X.Org X11 ICE runtime library" }, + { "name": "libice-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libice-cos6-x86_64", "description": "(CDT) X.Org X11 ICE runtime library" }, + { "name": "libice-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libice-cos7-ppc64le", "description": "(CDT) X.Org X11 ICE runtime library" }, + { "name": "libice-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libice-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 ICE development package" }, + { "name": "libice-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libice-devel-cos6-i686", "description": "(CDT) X.Org X11 ICE development package" }, + { "name": "libice-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libice-devel-cos6-x86_64", "description": "(CDT) X.Org X11 ICE development package" }, + { "name": "libice-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libice-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 ICE development package" }, + { "name": "libice-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libice-devel-cos7-s390x", "description": "(CDT) X.Org X11 ICE development package" }, + { "name": "libiconv", "uri": "https://anaconda.org/anaconda/libiconv", "description": "Provides iconv for systems which don't have one (or that cannot convert from/to Unicode.)" }, + { "name": "libidl-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libidl-cos6-x86_64", "description": "(CDT) Library for parsing IDL (Interface Definition Language)" }, + { "name": "libidl-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libidl-devel-cos6-x86_64", "description": "(CDT) Development libraries and header files for libIDL" }, + { "name": "libidn11", "uri": "https://anaconda.org/anaconda/libidn11", "description": "Library for internationalized domain name support" }, + { "name": "libidn2", "uri": "https://anaconda.org/anaconda/libidn2", "description": "Library for internationalized domain names (IDNA2008) support" }, + { "name": "libjpeg-turbo", "uri": "https://anaconda.org/anaconda/libjpeg-turbo", "description": "IJG JPEG compliant runtime library with SIMD and other optimizations" }, + { "name": "libjpeg-turbo-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libjpeg-turbo-amzn2-aarch64", "description": "(CDT) A MMX/SSE2 accelerated library for manipulating JPEG image files" }, + { "name": "libjpeg-turbo-cos6-i686", "uri": "https://anaconda.org/anaconda/libjpeg-turbo-cos6-i686", "description": "(CDT) A MMX/SSE2 accelerated library for manipulating JPEG image files" }, + { "name": "libjpeg-turbo-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libjpeg-turbo-cos6-x86_64", "description": "(CDT) A MMX/SSE2 accelerated library for manipulating JPEG image files" }, + { "name": "libjpeg-turbo-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libjpeg-turbo-cos7-ppc64le", "description": "(CDT) A MMX/SSE2 accelerated library for manipulating JPEG image files" }, + { "name": "libkadm5-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libkadm5-amzn2-aarch64", "description": "(CDT) Kerberos 5 Administrative libraries" }, + { "name": "libkml", "uri": "https://anaconda.org/anaconda/libkml", "description": "Reference implementation of OGC KML 2.2" }, + { "name": "liblapack", "uri": "https://anaconda.org/anaconda/liblapack", "description": "Linear Algebra PACKage" }, + { "name": "liblapacke", "uri": "https://anaconda.org/anaconda/liblapacke", "description": "Linear Algebra PACKage" }, + { "name": "liblief", "uri": "https://anaconda.org/anaconda/liblief", "description": "A cross platform library to parse, modify and abstract ELF, PE and MachO formats." }, + { "name": "libllvm10", "uri": "https://anaconda.org/anaconda/libllvm10", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm11", "uri": "https://anaconda.org/anaconda/libllvm11", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm12", "uri": "https://anaconda.org/anaconda/libllvm12", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm14", "uri": "https://anaconda.org/anaconda/libllvm14", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm15", "uri": "https://anaconda.org/anaconda/libllvm15", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm17", "uri": "https://anaconda.org/anaconda/libllvm17", "description": "Development headers and libraries for LLVM" }, + { "name": "libllvm9", "uri": "https://anaconda.org/anaconda/libllvm9", "description": "Development headers and libraries for LLVM" }, + { "name": "libmagic", "uri": "https://anaconda.org/anaconda/libmagic", "description": "Implementation of the file(1) command" }, + { "name": "libmamba", "uri": "https://anaconda.org/anaconda/libmamba", "description": "A fast drop-in alternative to conda, using libsolv for dependency resolution" }, + { "name": "libmambapy", "uri": "https://anaconda.org/anaconda/libmambapy", "description": "A fast drop-in alternative to conda, using libsolv for dependency resolution" }, + { "name": "libmicrohttpd", "uri": "https://anaconda.org/anaconda/libmicrohttpd", "description": "Light HTTP/1.1 server library" }, + { "name": "libmklml", "uri": "https://anaconda.org/anaconda/libmklml", "description": "No Summary" }, + { "name": "libml_dtypes-headers", "uri": "https://anaconda.org/anaconda/libml_dtypes-headers", "description": "A stand-alone implementation of several NumPy dtype extensions used in machine learning." }, + { "name": "libmlir", "uri": "https://anaconda.org/anaconda/libmlir", "description": "Multi-Level IR Compiler Framework" }, + { "name": "libmlir12", "uri": "https://anaconda.org/anaconda/libmlir12", "description": "Multi-Level IR Compiler Framework" }, + { "name": "libmlir14", "uri": "https://anaconda.org/anaconda/libmlir14", "description": "Multi-Level IR Compiler Framework" }, + { "name": "libmlir17", "uri": "https://anaconda.org/anaconda/libmlir17", "description": "Multi-Level IR Compiler Framework" }, + { "name": "libmount-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libmount-amzn2-aarch64", "description": "(CDT) Device mounting library" }, + { "name": "libmpdec", "uri": "https://anaconda.org/anaconda/libmpdec", "description": "A package for correctly-rounded arbitrary precision decimal floating point arithmetic" }, + { "name": "libmpdec-devel", "uri": "https://anaconda.org/anaconda/libmpdec-devel", "description": "A package for correctly-rounded arbitrary precision decimal floating point arithmetic" }, + { "name": "libmpdecxx", "uri": "https://anaconda.org/anaconda/libmpdecxx", "description": "A package for correctly-rounded arbitrary precision decimal floating point arithmetic" }, + { "name": "libmpdecxx-devel", "uri": "https://anaconda.org/anaconda/libmpdecxx-devel", "description": "A package for correctly-rounded arbitrary precision decimal floating point arithmetic" }, + { "name": "libmxnet", "uri": "https://anaconda.org/anaconda/libmxnet", "description": "MXNet is a deep learning framework designed for both efficiency and flexibility" }, + { "name": "libnetcdf", "uri": "https://anaconda.org/anaconda/libnetcdf", "description": "Libraries and data formats that support array-oriented scientific data." }, + { "name": "libnghttp2", "uri": "https://anaconda.org/anaconda/libnghttp2", "description": "This is an implementation of Hypertext Transfer Protocol version 2." }, + { "name": "libnghttp2-static", "uri": "https://anaconda.org/anaconda/libnghttp2-static", "description": "This is an implementation of Hypertext Transfer Protocol version 2." }, + { "name": "libnpp", "uri": "https://anaconda.org/anaconda/libnpp", "description": "NPP native runtime libraries" }, + { "name": "libnpp-dev", "uri": "https://anaconda.org/anaconda/libnpp-dev", "description": "NPP native runtime libraries" }, + { "name": "libnpp-static", "uri": "https://anaconda.org/anaconda/libnpp-static", "description": "NPP native runtime libraries" }, + { "name": "libnsl", "uri": "https://anaconda.org/anaconda/libnsl", "description": "Public client interface library for NIS(YP)" }, + { "name": "libnvfatbin", "uri": "https://anaconda.org/anaconda/libnvfatbin", "description": "NVIDIA compiler library for fatbin interaction" }, + { "name": "libnvfatbin-dev", "uri": "https://anaconda.org/anaconda/libnvfatbin-dev", "description": "NVIDIA compiler library for fatbin interaction" }, + { "name": "libnvfatbin-static", "uri": "https://anaconda.org/anaconda/libnvfatbin-static", "description": "NVIDIA compiler library for fatbin interaction" }, + { "name": "libnvjitlink", "uri": "https://anaconda.org/anaconda/libnvjitlink", "description": "CUDA nvJitLink library" }, + { "name": "libnvjitlink-dev", "uri": "https://anaconda.org/anaconda/libnvjitlink-dev", "description": "CUDA nvJitLink library" }, + { "name": "libnvjitlink-static", "uri": "https://anaconda.org/anaconda/libnvjitlink-static", "description": "CUDA nvJitLink library" }, + { "name": "libnvjpeg", "uri": "https://anaconda.org/anaconda/libnvjpeg", "description": "nvJPEG native runtime libraries" }, + { "name": "libnvjpeg-dev", "uri": "https://anaconda.org/anaconda/libnvjpeg-dev", "description": "nvJPEG native runtime libraries" }, + { "name": "libnvjpeg-static", "uri": "https://anaconda.org/anaconda/libnvjpeg-static", "description": "nvJPEG native runtime libraries" }, + { "name": "libogg", "uri": "https://anaconda.org/anaconda/libogg", "description": "OGG media container" }, + { "name": "libopenblas", "uri": "https://anaconda.org/anaconda/libopenblas", "description": "An Optimized BLAS library" }, + { "name": "libopenblas-static", "uri": "https://anaconda.org/anaconda/libopenblas-static", "description": "OpenBLAS static libraries." }, + { "name": "libopencv", "uri": "https://anaconda.org/anaconda/libopencv", "description": "Computer vision and machine learning software library." }, + { "name": "libopenssl-static", "uri": "https://anaconda.org/anaconda/libopenssl-static", "description": "OpenSSL is an open-source implementation of the SSL and TLS protocols" }, + { "name": "libopus", "uri": "https://anaconda.org/anaconda/libopus", "description": "Opus Interactive Audio Codec" }, + { "name": "libosqp", "uri": "https://anaconda.org/anaconda/libosqp", "description": "The Operator Splitting QP Solver." }, + { "name": "libpcap", "uri": "https://anaconda.org/anaconda/libpcap", "description": "the LIBpcap interface to various kernel packet capture mechanism" }, + { "name": "libpng-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libpng-amzn2-aarch64", "description": "(CDT) A library of functions for manipulating PNG image format files" }, + { "name": "libpng-cos6-i686", "uri": "https://anaconda.org/anaconda/libpng-cos6-i686", "description": "(CDT) A library of functions for manipulating PNG image format files" }, + { "name": "libpng-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libpng-cos6-x86_64", "description": "(CDT) A library of functions for manipulating PNG image format files" }, + { "name": "libpng-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libpng-devel-cos6-i686", "description": "(CDT) Development tools for programs to manipulate PNG image format files" }, + { "name": "libpng-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libpng-devel-cos6-x86_64", "description": "(CDT) Development tools for programs to manipulate PNG image format files" }, + { "name": "libpng-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libpng-devel-cos7-s390x", "description": "(CDT) Development tools for programs to manipulate PNG image format files" }, + { "name": "libpq", "uri": "https://anaconda.org/anaconda/libpq", "description": "The postgres runtime libraries and utilities (not the server itself)" }, + { "name": "libprotobuf", "uri": "https://anaconda.org/anaconda/libprotobuf", "description": "Protocol Buffers - Google's data interchange format. C++ Libraries and protoc, the protobuf compiler." }, + { "name": "libprotobuf-python-headers", "uri": "https://anaconda.org/anaconda/libprotobuf-python-headers", "description": "Protocol Buffers - Google's data interchange format. C++ Libraries and protoc, the protobuf compiler." }, + { "name": "libprotobuf-static", "uri": "https://anaconda.org/anaconda/libprotobuf-static", "description": "Protocol Buffers - Google's data interchange format. C++ Libraries and protoc, the protobuf compiler." }, + { "name": "libpwquality-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libpwquality-amzn2-aarch64", "description": "(CDT) A library for password generation and password quality checking" }, + { "name": "libpysal", "uri": "https://anaconda.org/anaconda/libpysal", "description": "Core components of PySAL A library of spatial analysis functions" }, + { "name": "libpython", "uri": "https://anaconda.org/anaconda/libpython", "description": "A mingw-w64 import library for python??.dll (on Windows)" }, + { "name": "libpython-static", "uri": "https://anaconda.org/anaconda/libpython-static", "description": "General purpose programming language" }, + { "name": "libqdldl", "uri": "https://anaconda.org/anaconda/libqdldl", "description": "A free LDL factorisation routine for quasi-definite linear systems." }, + { "name": "librdkafka", "uri": "https://anaconda.org/anaconda/librdkafka", "description": "The Apache Kafka C/C++ client library" }, + { "name": "librsvg", "uri": "https://anaconda.org/anaconda/librsvg", "description": "librsvg is a library to render SVG files using cairo." }, + { "name": "libselinux-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libselinux-amzn2-aarch64", "description": "(CDT) SELinux library and simple utilities" }, + { "name": "libselinux-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libselinux-cos6-x86_64", "description": "(CDT) SELinux library and simple utilities" }, + { "name": "libselinux-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libselinux-cos7-ppc64le", "description": "(CDT) SELinux library and simple utilities" }, + { "name": "libselinux-cos7-s390x", "uri": "https://anaconda.org/anaconda/libselinux-cos7-s390x", "description": "(CDT) SELinux library and simple utilities" }, + { "name": "libselinux-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libselinux-devel-amzn2-aarch64", "description": "(CDT) Header files and libraries used to build SELinux" }, + { "name": "libselinux-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libselinux-devel-cos6-x86_64", "description": "(CDT) Header files and libraries used to build SELinux" }, + { "name": "libselinux-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libselinux-devel-cos7-ppc64le", "description": "(CDT) Header files and libraries used to build SELinux" }, + { "name": "libselinux-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libselinux-devel-cos7-s390x", "description": "(CDT) Header files and libraries used to build SELinux" }, + { "name": "libsemanage-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsemanage-amzn2-aarch64", "description": "(CDT) SELinux binary policy manipulation library" }, + { "name": "libsentencepiece", "uri": "https://anaconda.org/anaconda/libsentencepiece", "description": "Unsupervised text tokenizer for Neural Network-based text generation." }, + { "name": "libsepol-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsepol-amzn2-aarch64", "description": "(CDT) SELinux binary policy manipulation library" }, + { "name": "libsepol-cos6-i686", "uri": "https://anaconda.org/anaconda/libsepol-cos6-i686", "description": "(CDT) SELinux binary policy manipulation library" }, + { "name": "libsepol-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsepol-cos6-x86_64", "description": "(CDT) SELinux binary policy manipulation library" }, + { "name": "libsepol-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libsepol-cos7-ppc64le", "description": "(CDT) SELinux binary policy manipulation library" }, + { "name": "libsepol-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsepol-devel-amzn2-aarch64", "description": "(CDT) Header files and libraries used to build policy manipulation tools" }, + { "name": "libsepol-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libsepol-devel-cos6-i686", "description": "(CDT) Header files and libraries used to build policy manipulation tools" }, + { "name": "libsepol-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsepol-devel-cos6-x86_64", "description": "(CDT) Header files and libraries used to build policy manipulation tools" }, + { "name": "libsepol-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libsepol-devel-cos7-ppc64le", "description": "(CDT) Header files and libraries used to build policy manipulation tools" }, + { "name": "libsigcxx20-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsigcxx20-amzn2-aarch64", "description": "(CDT) Typesafe signal framework for C++" }, + { "name": "libsm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsm-amzn2-aarch64", "description": "(CDT) X.Org X11 SM runtime library" }, + { "name": "libsm-cos6-i686", "uri": "https://anaconda.org/anaconda/libsm-cos6-i686", "description": "(CDT) X.Org X11 SM runtime library" }, + { "name": "libsm-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsm-cos6-x86_64", "description": "(CDT) X.Org X11 SM runtime library" }, + { "name": "libsm-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libsm-cos7-ppc64le", "description": "(CDT) X.Org X11 SM runtime library" }, + { "name": "libsm-cos7-s390x", "uri": "https://anaconda.org/anaconda/libsm-cos7-s390x", "description": "(CDT) X.Org X11 SM runtime library" }, + { "name": "libsm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libsm-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 SM development package" }, + { "name": "libsm-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libsm-devel-cos6-i686", "description": "(CDT) X.Org X11 SM development package" }, + { "name": "libsm-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsm-devel-cos6-x86_64", "description": "(CDT) X.Org X11 SM development package" }, + { "name": "libsm-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libsm-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 SM development package" }, + { "name": "libsm-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libsm-devel-cos7-s390x", "description": "(CDT) X.Org X11 SM development package" }, + { "name": "libsolv", "uri": "https://anaconda.org/anaconda/libsolv", "description": "Library for solving packages and reading repositories" }, + { "name": "libsolv-static", "uri": "https://anaconda.org/anaconda/libsolv-static", "description": "Library for solving packages and reading repositories" }, + { "name": "libsoup-cos6-i686", "uri": "https://anaconda.org/anaconda/libsoup-cos6-i686", "description": "(CDT) Soup, an HTTP library implementation" }, + { "name": "libsoup-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsoup-cos6-x86_64", "description": "(CDT) Soup, an HTTP library implementation" }, + { "name": "libsoup-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libsoup-devel-cos6-i686", "description": "(CDT) Header files for the Soup library" }, + { "name": "libsoup-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libsoup-devel-cos6-x86_64", "description": "(CDT) Header files for the Soup library" }, + { "name": "libsoup-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libsoup-devel-cos7-s390x", "description": "(CDT) Header files for the Soup library" }, + { "name": "libspatialindex", "uri": "https://anaconda.org/anaconda/libspatialindex", "description": "Extensible framework for robust spatial indexing" }, + { "name": "libspatialite", "uri": "https://anaconda.org/anaconda/libspatialite", "description": "Extend the SQLite core to support fully fledged Spatial SQL capabilities" }, + { "name": "libssh2", "uri": "https://anaconda.org/anaconda/libssh2", "description": "the SSH library" }, + { "name": "libssh2-static", "uri": "https://anaconda.org/anaconda/libssh2-static", "description": "the SSH library" }, + { "name": "libstdcxx-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libstdcxx-amzn2-aarch64", "description": "(CDT) GNU Standard C++ Library" }, + { "name": "libstdcxx-devel_linux-64", "uri": "https://anaconda.org/anaconda/libstdcxx-devel_linux-64", "description": "The GNU C++ headers and development libraries" }, + { "name": "libstdcxx-devel_linux-aarch64", "uri": "https://anaconda.org/anaconda/libstdcxx-devel_linux-aarch64", "description": "The GNU C++ headers and development libraries" }, + { "name": "libstdcxx-devel_linux-ppc64le", "uri": "https://anaconda.org/anaconda/libstdcxx-devel_linux-ppc64le", "description": "The GNU C++ headers and development libraries" }, + { "name": "libstdcxx-devel_linux-s390x", "uri": "https://anaconda.org/anaconda/libstdcxx-devel_linux-s390x", "description": "The GNU C++ headers and development libraries" }, + { "name": "libstdcxx-ng", "uri": "https://anaconda.org/anaconda/libstdcxx-ng", "description": "The GNU C++ Runtime Library" }, + { "name": "libtasn1", "uri": "https://anaconda.org/anaconda/libtasn1", "description": "Libtasn1 is the ASN.1 library used by GnuTLS, p11-kit and some other packages" }, + { "name": "libtasn1-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libtasn1-amzn2-aarch64", "description": "(CDT) The ASN.1 library used in GNUTLS" }, + { "name": "libtasn1-cos6-i686", "uri": "https://anaconda.org/anaconda/libtasn1-cos6-i686", "description": "(CDT) The ASN.1 library used in GNUTLS" }, + { "name": "libtasn1-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libtasn1-cos6-x86_64", "description": "(CDT) The ASN.1 library used in GNUTLS" }, + { "name": "libtasn1-cos7-s390x", "uri": "https://anaconda.org/anaconda/libtasn1-cos7-s390x", "description": "(CDT) The ASN.1 library used in GNUTLS" }, + { "name": "libtensorflow", "uri": "https://anaconda.org/anaconda/libtensorflow", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "libtensorflow_cc", "uri": "https://anaconda.org/anaconda/libtensorflow_cc", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "libthai-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libthai-amzn2-aarch64", "description": "(CDT) Thai language support routines" }, + { "name": "libthai-cos6-i686", "uri": "https://anaconda.org/anaconda/libthai-cos6-i686", "description": "(CDT) Thai language support routines" }, + { "name": "libthai-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libthai-cos6-x86_64", "description": "(CDT) Thai language support routines" }, + { "name": "libthai-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libthai-cos7-ppc64le", "description": "(CDT) Thai language support routines" }, + { "name": "libtheora", "uri": "https://anaconda.org/anaconda/libtheora", "description": "Theora is a free and open video compression format from the Xiph.org Foundation." }, + { "name": "libthrift", "uri": "https://anaconda.org/anaconda/libthrift", "description": "Compiler and C++ libraries and headers for the Apache Thrift RPC system" }, + { "name": "libtiff", "uri": "https://anaconda.org/anaconda/libtiff", "description": "Support for the Tag Image File Format (TIFF)." }, + { "name": "libtiff-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libtiff-amzn2-aarch64", "description": "(CDT) Library of functions for manipulating TIFF format image files" }, + { "name": "libtiff-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libtiff-cos7-ppc64le", "description": "(CDT) Library of functions for manipulating TIFF format image files" }, + { "name": "libtiff-cos7-s390x", "uri": "https://anaconda.org/anaconda/libtiff-cos7-s390x", "description": "(CDT) Library of functions for manipulating TIFF format image files" }, + { "name": "libtmglib", "uri": "https://anaconda.org/anaconda/libtmglib", "description": "Linear Algebra PACKage" }, + { "name": "libudev-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libudev-cos6-x86_64", "description": "(CDT) Dynamic library to access udev device information" }, + { "name": "libunistring", "uri": "https://anaconda.org/anaconda/libunistring", "description": "This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard." }, + { "name": "libunistring-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libunistring-amzn2-aarch64", "description": "(CDT) GNU Unicode string library" }, + { "name": "libunwind", "uri": "https://anaconda.org/anaconda/libunwind", "description": "C++ Standard Library Support" }, + { "name": "libutf8proc", "uri": "https://anaconda.org/anaconda/libutf8proc", "description": "a clean C library for processing UTF-8 Unicode data" }, + { "name": "libuuid-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libuuid-amzn2-aarch64", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-cos6-i686", "uri": "https://anaconda.org/anaconda/libuuid-cos6-i686", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libuuid-cos6-x86_64", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libuuid-cos7-ppc64le", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-cos7-s390x", "uri": "https://anaconda.org/anaconda/libuuid-cos7-s390x", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libuuid-devel-cos6-i686", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libuuid-devel-cos6-x86_64", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libuuid-devel-cos7-ppc64le", "description": "(CDT) Universally unique ID library" }, + { "name": "libuuid-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libuuid-devel-cos7-s390x", "description": "(CDT) Universally unique ID library" }, + { "name": "libuv", "uri": "https://anaconda.org/anaconda/libuv", "description": "Cross-platform asynchronous I/O" }, + { "name": "libverto-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libverto-amzn2-aarch64", "description": "(CDT) Main loop abstraction library" }, + { "name": "libverto-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libverto-devel-amzn2-aarch64", "description": "(CDT) Development files for libverto" }, + { "name": "libvorbis", "uri": "https://anaconda.org/anaconda/libvorbis", "description": "Vorbis audio format" }, + { "name": "libvpx", "uri": "https://anaconda.org/anaconda/libvpx", "description": "A high-quality, open video format for the web" }, + { "name": "libwayland-client-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libwayland-client-amzn2-aarch64", "description": "(CDT) Wayland client library" }, + { "name": "libwayland-server-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libwayland-server-amzn2-aarch64", "description": "(CDT) Wayland server library" }, + { "name": "libwebp", "uri": "https://anaconda.org/anaconda/libwebp", "description": "WebP image library" }, + { "name": "libwebp-base", "uri": "https://anaconda.org/anaconda/libwebp-base", "description": "WebP image library" }, + { "name": "libx11-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libx11-amzn2-aarch64", "description": "(CDT) Core X11 protocol client library" }, + { "name": "libx11-common-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libx11-common-amzn2-aarch64", "description": "(CDT) Common data for libX11" }, + { "name": "libx11-common-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libx11-common-cos6-x86_64", "description": "(CDT) Common data for libX11" }, + { "name": "libx11-common-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libx11-common-cos7-ppc64le", "description": "(CDT) Common data for libX11" }, + { "name": "libx11-common-cos7-s390x", "uri": "https://anaconda.org/anaconda/libx11-common-cos7-s390x", "description": "(CDT) Common data for libX11" }, + { "name": "libx11-cos6-i686", "uri": "https://anaconda.org/anaconda/libx11-cos6-i686", "description": "(CDT) Core X11 protocol client library" }, + { "name": "libx11-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libx11-cos6-x86_64", "description": "(CDT) Core X11 protocol client library" }, + { "name": "libx11-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libx11-cos7-ppc64le", "description": "(CDT) Core X11 protocol client library" }, + { "name": "libx11-cos7-s390x", "uri": "https://anaconda.org/anaconda/libx11-cos7-s390x", "description": "(CDT) Core X11 protocol client library" }, + { "name": "libx11-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libx11-devel-amzn2-aarch64", "description": "(CDT) Development files for libX11" }, + { "name": "libx11-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libx11-devel-cos6-i686", "description": "(CDT) Development files for libX11" }, + { "name": "libx11-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libx11-devel-cos6-x86_64", "description": "(CDT) Development files for libX11" }, + { "name": "libx11-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libx11-devel-cos7-ppc64le", "description": "(CDT) Development files for libX11" }, + { "name": "libx11-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libx11-devel-cos7-s390x", "description": "(CDT) Development files for libX11" }, + { "name": "libxau-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxau-amzn2-aarch64", "description": "(CDT) Sample Authorization Protocol for X" }, + { "name": "libxau-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxau-cos6-x86_64", "description": "(CDT) Sample Authorization Protocol for X" }, + { "name": "libxau-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxau-cos7-ppc64le", "description": "(CDT) Sample Authorization Protocol for X" }, + { "name": "libxau-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxau-cos7-s390x", "description": "(CDT) Sample Authorization Protocol for X" }, + { "name": "libxau-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxau-devel-amzn2-aarch64", "description": "(CDT) Development files for libXau" }, + { "name": "libxau-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxau-devel-cos6-i686", "description": "(CDT) Development files for libXau" }, + { "name": "libxau-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxau-devel-cos7-ppc64le", "description": "(CDT) Development files for libXau" }, + { "name": "libxau-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxau-devel-cos7-s390x", "description": "(CDT) Development files for libXau" }, + { "name": "libxcb-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxcb-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "libxcb-cos6-i686", "uri": "https://anaconda.org/anaconda/libxcb-cos6-i686", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "libxcb-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxcb-cos7-ppc64le", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "libxcb-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxcb-cos7-s390x", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "libxcomposite-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxcomposite-amzn2-aarch64", "description": "(CDT) X Composite Extension library" }, + { "name": "libxcomposite-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxcomposite-cos6-x86_64", "description": "(CDT) X Composite Extension library" }, + { "name": "libxcomposite-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxcomposite-cos7-s390x", "description": "(CDT) X Composite Extension library" }, + { "name": "libxcomposite-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxcomposite-devel-amzn2-aarch64", "description": "(CDT) Development files for libXcomposite" }, + { "name": "libxcomposite-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxcomposite-devel-cos6-x86_64", "description": "(CDT) Development files for libXcomposite" }, + { "name": "libxcomposite-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxcomposite-devel-cos7-s390x", "description": "(CDT) Development files for libXcomposite" }, + { "name": "libxcursor-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxcursor-amzn2-aarch64", "description": "(CDT) Cursor management library" }, + { "name": "libxcursor-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxcursor-cos7-s390x", "description": "(CDT) Cursor management library" }, + { "name": "libxcursor-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxcursor-devel-amzn2-aarch64", "description": "(CDT) Development files for libXcursor" }, + { "name": "libxcursor-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxcursor-devel-cos6-i686", "description": "(CDT) Development files for libXcursor" }, + { "name": "libxcursor-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxcursor-devel-cos7-s390x", "description": "(CDT) Development files for libXcursor" }, + { "name": "libxdamage-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxdamage-amzn2-aarch64", "description": "(CDT) X Damage extension library" }, + { "name": "libxdamage-cos6-i686", "uri": "https://anaconda.org/anaconda/libxdamage-cos6-i686", "description": "(CDT) X Damage extension library" }, + { "name": "libxdamage-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxdamage-cos6-x86_64", "description": "(CDT) X Damage extension library" }, + { "name": "libxdamage-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxdamage-cos7-ppc64le", "description": "(CDT) X Damage extension library" }, + { "name": "libxdamage-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxdamage-cos7-s390x", "description": "(CDT) X Damage extension library" }, + { "name": "libxdamage-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxdamage-devel-amzn2-aarch64", "description": "(CDT) Development files for libXdamage" }, + { "name": "libxdamage-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxdamage-devel-cos6-i686", "description": "(CDT) Development files for libXdamage" }, + { "name": "libxdamage-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxdamage-devel-cos6-x86_64", "description": "(CDT) Development files for libXdamage" }, + { "name": "libxdamage-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxdamage-devel-cos7-ppc64le", "description": "(CDT) Development files for libXdamage" }, + { "name": "libxdamage-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxdamage-devel-cos7-s390x", "description": "(CDT) Development files for libXdamage" }, + { "name": "libxext-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxext-amzn2-aarch64", "description": "(CDT) X.Org X11 libXext runtime library" }, + { "name": "libxext-cos6-i686", "uri": "https://anaconda.org/anaconda/libxext-cos6-i686", "description": "(CDT) X.Org X11 libXext runtime library" }, + { "name": "libxext-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxext-cos6-x86_64", "description": "(CDT) X.Org X11 libXext runtime library" }, + { "name": "libxext-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxext-cos7-ppc64le", "description": "(CDT) X.Org X11 libXext runtime library" }, + { "name": "libxext-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxext-cos7-s390x", "description": "(CDT) X.Org X11 libXext runtime library" }, + { "name": "libxext-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxext-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXext development package" }, + { "name": "libxext-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxext-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXext development package" }, + { "name": "libxext-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxext-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXext development package" }, + { "name": "libxext-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxext-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXext development package" }, + { "name": "libxfixes-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxfixes-amzn2-aarch64", "description": "(CDT) X Fixes library" }, + { "name": "libxfixes-cos6-i686", "uri": "https://anaconda.org/anaconda/libxfixes-cos6-i686", "description": "(CDT) X Fixes library" }, + { "name": "libxfixes-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxfixes-cos7-ppc64le", "description": "(CDT) X Fixes library" }, + { "name": "libxfixes-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxfixes-cos7-s390x", "description": "(CDT) X Fixes library" }, + { "name": "libxfixes-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxfixes-devel-amzn2-aarch64", "description": "(CDT) Development files for libXfixes" }, + { "name": "libxfixes-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxfixes-devel-cos6-i686", "description": "(CDT) Development files for libXfixes" }, + { "name": "libxfixes-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxfixes-devel-cos6-x86_64", "description": "(CDT) Development files for libXfixes" }, + { "name": "libxfixes-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxfixes-devel-cos7-ppc64le", "description": "(CDT) Development files for libXfixes" }, + { "name": "libxfixes-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxfixes-devel-cos7-s390x", "description": "(CDT) Development files for libXfixes" }, + { "name": "libxft-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxft-amzn2-aarch64", "description": "(CDT) X.Org X11 libXft runtime library" }, + { "name": "libxft-cos6-i686", "uri": "https://anaconda.org/anaconda/libxft-cos6-i686", "description": "(CDT) X.Org X11 libXft runtime library" }, + { "name": "libxft-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxft-cos6-x86_64", "description": "(CDT) X.Org X11 libXft runtime library" }, + { "name": "libxft-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxft-cos7-ppc64le", "description": "(CDT) X.Org X11 libXft runtime library" }, + { "name": "libxgboost", "uri": "https://anaconda.org/anaconda/libxgboost", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "libxi-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxi-amzn2-aarch64", "description": "(CDT) X.Org X11 libXi runtime library" }, + { "name": "libxi-cos6-i686", "uri": "https://anaconda.org/anaconda/libxi-cos6-i686", "description": "(CDT) X.Org X11 libXi runtime library" }, + { "name": "libxi-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxi-cos6-x86_64", "description": "(CDT) X.Org X11 libXi runtime library" }, + { "name": "libxi-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxi-cos7-ppc64le", "description": "(CDT) X.Org X11 libXi runtime library" }, + { "name": "libxi-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxi-cos7-s390x", "description": "(CDT) X.Org X11 libXi runtime library" }, + { "name": "libxi-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxi-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXi development package" }, + { "name": "libxi-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxi-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXi development package" }, + { "name": "libxi-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxi-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXi development package" }, + { "name": "libxi-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxi-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXi development package" }, + { "name": "libxinerama-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxinerama-amzn2-aarch64", "description": "(CDT) X.Org X11 libXinerama runtime library" }, + { "name": "libxinerama-cos6-i686", "uri": "https://anaconda.org/anaconda/libxinerama-cos6-i686", "description": "(CDT) X.Org X11 libXinerama runtime library" }, + { "name": "libxinerama-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxinerama-cos6-x86_64", "description": "(CDT) X.Org X11 libXinerama runtime library" }, + { "name": "libxinerama-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxinerama-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXinerama development package" }, + { "name": "libxinerama-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxinerama-devel-cos6-i686", "description": "(CDT) X.Org X11 libXinerama development package" }, + { "name": "libxinerama-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxinerama-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXinerama development package" }, + { "name": "libxkbcommon", "uri": "https://anaconda.org/anaconda/libxkbcommon", "description": "keymap handling library for toolkits and window systems" }, + { "name": "libxkbfile-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxkbfile-amzn2-aarch64", "description": "(CDT) X.Org X11 libxkbfile development package" }, + { "name": "libxkbfile-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxkbfile-cos6-x86_64", "description": "(CDT) X.Org X11 libxkbfile runtime library" }, + { "name": "libxkbfile-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxkbfile-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libxkbfile development package" }, + { "name": "libxkbfile-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxkbfile-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libxkbfile development package" }, + { "name": "libxml2", "uri": "https://anaconda.org/anaconda/libxml2", "description": "The XML C parser and toolkit of Gnome" }, + { "name": "libxml2-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxml2-amzn2-aarch64", "description": "(CDT) Library providing XML and HTML support" }, + { "name": "libxml2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxml2-cos6-x86_64", "description": "(CDT) Library providing XML and HTML support" }, + { "name": "libxml2-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxml2-devel-cos6-x86_64", "description": "(CDT) Libraries, includes, etc. to develop XML and HTML applications" }, + { "name": "libxmlsec1", "uri": "https://anaconda.org/anaconda/libxmlsec1", "description": "XML Security Library" }, + { "name": "libxrandr-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxrandr-amzn2-aarch64", "description": "(CDT) X.Org X11 libXrandr runtime library" }, + { "name": "libxrandr-cos6-i686", "uri": "https://anaconda.org/anaconda/libxrandr-cos6-i686", "description": "(CDT) X.Org X11 libXrandr runtime library" }, + { "name": "libxrandr-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxrandr-cos7-ppc64le", "description": "(CDT) X.Org X11 libXrandr runtime library" }, + { "name": "libxrandr-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxrandr-cos7-s390x", "description": "(CDT) X.Org X11 libXrandr runtime library" }, + { "name": "libxrandr-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxrandr-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXrandr development package" }, + { "name": "libxrandr-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxrandr-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXrandr development package" }, + { "name": "libxrandr-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxrandr-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXrandr development package" }, + { "name": "libxrandr-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxrandr-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXrandr development package" }, + { "name": "libxrender-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxrender-amzn2-aarch64", "description": "(CDT) X.Org X11 libXrender runtime library" }, + { "name": "libxrender-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxrender-cos7-ppc64le", "description": "(CDT) X.Org X11 libXrender runtime library" }, + { "name": "libxrender-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxrender-cos7-s390x", "description": "(CDT) X.Org X11 libXrender runtime library" }, + { "name": "libxrender-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxrender-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXrender development package" }, + { "name": "libxrender-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxrender-devel-cos6-i686", "description": "(CDT) X.Org X11 libXrender development package" }, + { "name": "libxrender-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxrender-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXrender development package" }, + { "name": "libxrender-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxrender-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXrender development package" }, + { "name": "libxrender-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxrender-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXrender development package" }, + { "name": "libxscrnsaver-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxscrnsaver-amzn2-aarch64", "description": "(CDT) X.Org X11 libXss runtime library" }, + { "name": "libxscrnsaver-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxscrnsaver-cos7-s390x", "description": "(CDT) X.Org X11 libXss runtime library" }, + { "name": "libxscrnsaver-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxscrnsaver-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXScrnSaver development package" }, + { "name": "libxscrnsaver-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxscrnsaver-devel-cos6-i686", "description": "(CDT) X.Org X11 libXScrnSaver development package" }, + { "name": "libxscrnsaver-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxscrnsaver-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXScrnSaver development package" }, + { "name": "libxshmfence-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxshmfence-amzn2-aarch64", "description": "(CDT) X11 shared memory fences" }, + { "name": "libxshmfence-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxshmfence-cos7-ppc64le", "description": "(CDT) X11 shared memory fences" }, + { "name": "libxshmfence-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxshmfence-devel-cos7-ppc64le", "description": "(CDT) Development files for libxshmfence" }, + { "name": "libxslt", "uri": "https://anaconda.org/anaconda/libxslt", "description": "The XSLT C library developed for the GNOME project" }, + { "name": "libxt-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxt-amzn2-aarch64", "description": "(CDT) X.Org X11 libXt runtime library" }, + { "name": "libxt-cos6-i686", "uri": "https://anaconda.org/anaconda/libxt-cos6-i686", "description": "(CDT) X.Org X11 libXt runtime library" }, + { "name": "libxt-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxt-cos6-x86_64", "description": "(CDT) X.Org X11 libXt runtime library" }, + { "name": "libxt-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxt-cos7-ppc64le", "description": "(CDT) X.Org X11 libXt runtime library" }, + { "name": "libxt-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxt-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXt development package" }, + { "name": "libxt-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxt-devel-cos6-i686", "description": "(CDT) X.Org X11 libXt development package" }, + { "name": "libxt-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxt-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXt development package" }, + { "name": "libxt-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxt-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXt runtime library" }, + { "name": "libxtst-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxtst-amzn2-aarch64", "description": "(CDT) X.Org X11 libXtst runtime library" }, + { "name": "libxtst-cos6-i686", "uri": "https://anaconda.org/anaconda/libxtst-cos6-i686", "description": "(CDT) X.Org X11 libXtst runtime library" }, + { "name": "libxtst-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxtst-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXtst development package" }, + { "name": "libxtst-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxtst-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXtst development package" }, + { "name": "libxxf86vm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxxf86vm-amzn2-aarch64", "description": "(CDT) X.Org X11 libXxf86vm runtime library" }, + { "name": "libxxf86vm-cos6-i686", "uri": "https://anaconda.org/anaconda/libxxf86vm-cos6-i686", "description": "(CDT) X.Org X11 libXxf86vm runtime library" }, + { "name": "libxxf86vm-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxxf86vm-cos6-x86_64", "description": "(CDT) X.Org X11 libXxf86vm runtime library" }, + { "name": "libxxf86vm-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxxf86vm-cos7-ppc64le", "description": "(CDT) X.Org X11 libXxf86vm runtime library" }, + { "name": "libxxf86vm-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxxf86vm-cos7-s390x", "description": "(CDT) X.Org X11 libXxf86vm runtime library" }, + { "name": "libxxf86vm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/libxxf86vm-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 libXxf86vm development package" }, + { "name": "libxxf86vm-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/libxxf86vm-devel-cos6-i686", "description": "(CDT) X.Org X11 libXxf86vm development package" }, + { "name": "libxxf86vm-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/libxxf86vm-devel-cos6-x86_64", "description": "(CDT) X.Org X11 libXxf86vm development package" }, + { "name": "libxxf86vm-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/libxxf86vm-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 libXxf86vm development package" }, + { "name": "libxxf86vm-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/libxxf86vm-devel-cos7-s390x", "description": "(CDT) X.Org X11 libXxf86vm development package" }, + { "name": "libzopfli", "uri": "https://anaconda.org/anaconda/libzopfli", "description": "A compression library programmed in C to perform very good, but slow, deflate or zlib compression." }, + { "name": "license-expression", "uri": "https://anaconda.org/anaconda/license-expression", "description": "license-expression is small utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic." }, + { "name": "lightgbm", "uri": "https://anaconda.org/anaconda/lightgbm", "description": "LightGBM is a gradient boosting framework that uses tree based learning algorithms." }, + { "name": "lightning", "uri": "https://anaconda.org/anaconda/lightning", "description": "Use Lightning Apps to build everything from production-ready, multi-cloud ML systems to simple research demos." }, + { "name": "lightning-cloud", "uri": "https://anaconda.org/anaconda/lightning-cloud", "description": "Lightning AI Command Line Interface" }, + { "name": "lightning-utilities", "uri": "https://anaconda.org/anaconda/lightning-utilities", "description": "PyTorch Lightning Sample project." }, + { "name": "lime", "uri": "https://anaconda.org/anaconda/lime", "description": "Explaining the predictions of any machine learning classifier" }, + { "name": "line_profiler", "uri": "https://anaconda.org/anaconda/line_profiler", "description": "Line-by-line profiling for Python" }, + { "name": "linkify-it-py", "uri": "https://anaconda.org/anaconda/linkify-it-py", "description": "Links recognition library with FULL unicode support." }, + { "name": "lit", "uri": "https://anaconda.org/anaconda/lit", "description": "Development headers and libraries for LLVM" }, + { "name": "lld", "uri": "https://anaconda.org/anaconda/lld", "description": "The LLVM Linker" }, + { "name": "llvm", "uri": "https://anaconda.org/anaconda/llvm", "description": "Development headers and libraries for LLVM" }, + { "name": "llvm-lto-tapi", "uri": "https://anaconda.org/anaconda/llvm-lto-tapi", "description": "No Summary" }, + { "name": "llvm-openmp", "uri": "https://anaconda.org/anaconda/llvm-openmp", "description": "The OpenMP API supports multi-platform shared-memory parallel programming in C/C++ and Fortran." }, + { "name": "llvm-private-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/llvm-private-amzn2-aarch64", "description": "(CDT) llvm engine for Mesa" }, + { "name": "llvm-spirv", "uri": "https://anaconda.org/anaconda/llvm-spirv", "description": "A tool and a library for bi-directional translation between SPIR-V and LLVM IR" }, + { "name": "llvm-tools", "uri": "https://anaconda.org/anaconda/llvm-tools", "description": "Development headers and libraries for LLVM" }, + { "name": "llvmdev", "uri": "https://anaconda.org/anaconda/llvmdev", "description": "Development headers and libraries for LLVM" }, + { "name": "llvmlite", "uri": "https://anaconda.org/anaconda/llvmlite", "description": "A lightweight LLVM python binding for writing JIT compilers." }, + { "name": "lmdb", "uri": "https://anaconda.org/anaconda/lmdb", "description": "A high-performance embedded transactional key-value store database." }, + { "name": "locket", "uri": "https://anaconda.org/anaconda/locket", "description": "File-based locks for Python for Linux and Windows" }, + { "name": "lockfile", "uri": "https://anaconda.org/anaconda/lockfile", "description": "No Summary" }, + { "name": "locustio", "uri": "https://anaconda.org/anaconda/locustio", "description": "Website load testing framework" }, + { "name": "logbook", "uri": "https://anaconda.org/anaconda/logbook", "description": "Logbook is a nice logging replacement" }, + { "name": "logical-unification", "uri": "https://anaconda.org/anaconda/logical-unification", "description": "Logical unification in Python." }, + { "name": "loguru", "uri": "https://anaconda.org/anaconda/loguru", "description": "Python logging made (stupidly) simple" }, + { "name": "loky", "uri": "https://anaconda.org/anaconda/loky", "description": "Robust and reusable Executor for joblib" }, + { "name": "ltrace_linux-64", "uri": "https://anaconda.org/anaconda/ltrace_linux-64", "description": "Ltrace is a debugging tool for recording library calls, and signals" }, + { "name": "ltrace_linux-aarch64", "uri": "https://anaconda.org/anaconda/ltrace_linux-aarch64", "description": "Ltrace is a debugging tool for recording library calls, and signals" }, + { "name": "ltrace_linux-ppc64le", "uri": "https://anaconda.org/anaconda/ltrace_linux-ppc64le", "description": "Ltrace is a debugging tool for recording library calls, and signals" }, + { "name": "ltrace_linux-s390x", "uri": "https://anaconda.org/anaconda/ltrace_linux-s390x", "description": "Ltrace is a debugging tool for recording library calls, and signals" }, + { "name": "lua", "uri": "https://anaconda.org/anaconda/lua", "description": "Lua is a powerful, fast, lightweight, embeddable scripting language" }, + { "name": "lua-resty-http", "uri": "https://anaconda.org/anaconda/lua-resty-http", "description": "Lua HTTP client cosocket driver for OpenResty / ngx_lua." }, + { "name": "luajit", "uri": "https://anaconda.org/anaconda/luajit", "description": "Just-In-Time Compiler (JIT) for the Lua programming language." }, + { "name": "luarocks", "uri": "https://anaconda.org/anaconda/luarocks", "description": "LuaRocks is the package manager for Lua modulesLuaRocks is the package manager for Lua module" }, + { "name": "luigi", "uri": "https://anaconda.org/anaconda/luigi", "description": "Workflow mgmgt + task scheduling + dependency resolution." }, + { "name": "lunarcalendar", "uri": "https://anaconda.org/anaconda/lunarcalendar", "description": "A lunar calendar converter, including a number of lunar and solar holidays, mainly from China." }, + { "name": "lxml", "uri": "https://anaconda.org/anaconda/lxml", "description": "Pythonic binding for the C libraries libxml2 and libxslt." }, + { "name": "lz4", "uri": "https://anaconda.org/anaconda/lz4", "description": "LZ4 Bindings for Python" }, + { "name": "lz4-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/lz4-amzn2-aarch64", "description": "(CDT) Extremely fast compression algorithm" }, + { "name": "lz4-c", "uri": "https://anaconda.org/anaconda/lz4-c", "description": "Extremely Fast Compression algorithm" }, + { "name": "lz4-c-static", "uri": "https://anaconda.org/anaconda/lz4-c-static", "description": "Extremely Fast Compression algorithm" }, + { "name": "m2cgen", "uri": "https://anaconda.org/anaconda/m2cgen", "description": "Code-generation for various ML models into native code." }, + { "name": "m2w64-toolchain_win-32", "uri": "https://anaconda.org/anaconda/m2w64-toolchain_win-32", "description": "A meta-package to enable the right toolchain." }, + { "name": "m2w64-toolchain_win-64", "uri": "https://anaconda.org/anaconda/m2w64-toolchain_win-64", "description": "A meta-package to enable the right toolchain." }, + { "name": "m4ri", "uri": "https://anaconda.org/anaconda/m4ri", "description": "M4RI is a library for fast arithmetic with dense matrices over F2" }, + { "name": "macfsevents", "uri": "https://anaconda.org/anaconda/macfsevents", "description": "Thread-based interface to file system observation primitives." }, + { "name": "macholib", "uri": "https://anaconda.org/anaconda/macholib", "description": "Mach-O header analysis and editing" }, + { "name": "macports-legacy-support", "uri": "https://anaconda.org/anaconda/macports-legacy-support", "description": "Installs wrapper headers to add missing functionality to legacy OSX versions." }, + { "name": "magma", "uri": "https://anaconda.org/anaconda/magma", "description": "Matrix Algebra on GPU and Multicore Architectures" }, + { "name": "makedev-cos6-x86_64", "uri": "https://anaconda.org/anaconda/makedev-cos6-x86_64", "description": "(CDT) A program used for creating device files in /dev" }, + { "name": "mako", "uri": "https://anaconda.org/anaconda/mako", "description": "A super-fast templating language that borrows the best ideas from the existing templating languages." }, + { "name": "mando", "uri": "https://anaconda.org/anaconda/mando", "description": "Create Python CLI apps with little to no effort at all!" }, + { "name": "mapclassify", "uri": "https://anaconda.org/anaconda/mapclassify", "description": "Classification schemes for choropleth maps" }, + { "name": "markdown", "uri": "https://anaconda.org/anaconda/markdown", "description": "Python implementation of Markdown." }, + { "name": "markdown-it-py", "uri": "https://anaconda.org/anaconda/markdown-it-py", "description": "Python port of markdown-it. Markdown parsing, done right!" }, + { "name": "markdownlit", "uri": "https://anaconda.org/anaconda/markdownlit", "description": "markdownlit adds a couple of lit Markdown capabilities to your Streamlit apps" }, + { "name": "markupsafe", "uri": "https://anaconda.org/anaconda/markupsafe", "description": "Safely add untrusted strings to HTML/XML markup." }, + { "name": "marshmallow", "uri": "https://anaconda.org/anaconda/marshmallow", "description": "A lightweight library for converting complex datatypes to and from native Python datatypes." }, + { "name": "marshmallow-enum", "uri": "https://anaconda.org/anaconda/marshmallow-enum", "description": "Enum handling for Marshmallow" }, + { "name": "marshmallow-oneofschema", "uri": "https://anaconda.org/anaconda/marshmallow-oneofschema", "description": "Marshmallow library extension that allows schema (de)multiplexing" }, + { "name": "marshmallow-sqlalchemy", "uri": "https://anaconda.org/anaconda/marshmallow-sqlalchemy", "description": "SQLAlchemy integration with marshmallow" }, + { "name": "mashumaro", "uri": "https://anaconda.org/anaconda/mashumaro", "description": "Fast serialization framework on top of dataclasses" }, + { "name": "matplotlib", "uri": "https://anaconda.org/anaconda/matplotlib", "description": "Publication quality figures in Python" }, + { "name": "matplotlib-base", "uri": "https://anaconda.org/anaconda/matplotlib-base", "description": "Publication quality figures in Python" }, + { "name": "matplotlib-inline", "uri": "https://anaconda.org/anaconda/matplotlib-inline", "description": "Inline Matplotlib backend for Jupyter" }, + { "name": "matrixprofile", "uri": "https://anaconda.org/anaconda/matrixprofile", "description": "An open source time series data mining library based on Matrix Profile algorithms." }, + { "name": "maturin", "uri": "https://anaconda.org/anaconda/maturin", "description": "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" }, + { "name": "maturin-gnu", "uri": "https://anaconda.org/anaconda/maturin-gnu", "description": "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" }, + { "name": "maven", "uri": "https://anaconda.org/anaconda/maven", "description": "A software project management and comprehension tool." }, + { "name": "mdit-py-plugins", "uri": "https://anaconda.org/anaconda/mdit-py-plugins", "description": "Collection of plugins for markdown-it-py" }, + { "name": "mdp", "uri": "https://anaconda.org/anaconda/mdp", "description": "No Summary" }, + { "name": "mdurl", "uri": "https://anaconda.org/anaconda/mdurl", "description": "URL utilities for markdown-it-py parser." }, + { "name": "medspacy_quickumls", "uri": "https://anaconda.org/anaconda/medspacy_quickumls", "description": "QuickUMLS is a tool for fast, unsupervised biomedical concept extraction from medical text" }, + { "name": "menuinst", "uri": "https://anaconda.org/anaconda/menuinst", "description": "cross platform install of menu items" }, + { "name": "mesa-dri-drivers-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-dri-drivers-amzn2-aarch64", "description": "(CDT) Mesa-based DRI drivers" }, + { "name": "mesa-dri-drivers-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-dri-drivers-cos6-x86_64", "description": "(CDT) Mesa-based DRI drivers" }, + { "name": "mesa-dri-drivers-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/mesa-dri-drivers-cos7-ppc64le", "description": "(CDT) Mesa-based DRI drivers" }, + { "name": "mesa-dri-drivers-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-dri-drivers-cos7-s390x", "description": "(CDT) Mesa-based DRI drivers" }, + { "name": "mesa-dri1-drivers-cos6-i686", "uri": "https://anaconda.org/anaconda/mesa-dri1-drivers-cos6-i686", "description": "(CDT) Mesa graphics libraries" }, + { "name": "mesa-dri1-drivers-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-dri1-drivers-cos6-x86_64", "description": "(CDT) Mesa graphics libraries" }, + { "name": "mesa-filesystem-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-filesystem-amzn2-aarch64", "description": "(CDT) Mesa driver filesystem" }, + { "name": "mesa-khr-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-khr-devel-amzn2-aarch64", "description": "(CDT) Mesa Khronos development headers" }, + { "name": "mesa-khr-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/mesa-khr-devel-cos7-ppc64le", "description": "(CDT) Mesa Khronos development headers" }, + { "name": "mesa-libegl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libegl-amzn2-aarch64", "description": "(CDT) Mesa libEGL runtime libraries" }, + { "name": "mesa-libegl-cos6-i686", "uri": "https://anaconda.org/anaconda/mesa-libegl-cos6-i686", "description": "(CDT) Mesa libEGL runtime libraries" }, + { "name": "mesa-libegl-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-libegl-cos6-x86_64", "description": "(CDT) Mesa libEGL runtime libraries" }, + { "name": "mesa-libegl-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-libegl-cos7-s390x", "description": "(CDT) Mesa libEGL runtime libraries" }, + { "name": "mesa-libegl-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libegl-devel-amzn2-aarch64", "description": "(CDT) Mesa libEGL development package" }, + { "name": "mesa-libegl-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/mesa-libegl-devel-cos6-i686", "description": "(CDT) Mesa libEGL development package" }, + { "name": "mesa-libegl-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-libegl-devel-cos7-s390x", "description": "(CDT) Mesa libEGL development package" }, + { "name": "mesa-libgbm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libgbm-amzn2-aarch64", "description": "(CDT) Mesa gbm library" }, + { "name": "mesa-libgbm-cos6-i686", "uri": "https://anaconda.org/anaconda/mesa-libgbm-cos6-i686", "description": "(CDT) Mesa gbm library" }, + { "name": "mesa-libgbm-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-libgbm-cos6-x86_64", "description": "(CDT) Mesa gbm library" }, + { "name": "mesa-libgbm-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-libgbm-cos7-s390x", "description": "(CDT) Mesa gbm library" }, + { "name": "mesa-libgbm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libgbm-devel-amzn2-aarch64", "description": "(CDT) Mesa gbm development package" }, + { "name": "mesa-libgbm-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-libgbm-devel-cos6-x86_64", "description": "(CDT) Mesa gbm development package" }, + { "name": "mesa-libgl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libgl-amzn2-aarch64", "description": "(CDT) Mesa libGL runtime libraries and DRI drivers" }, + { "name": "mesa-libgl-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/mesa-libgl-cos7-ppc64le", "description": "(CDT) Mesa libGL runtime libraries and DRI drivers" }, + { "name": "mesa-libgl-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-libgl-cos7-s390x", "description": "(CDT) Mesa libGL runtime libraries and DRI drivers" }, + { "name": "mesa-libgl-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libgl-devel-amzn2-aarch64", "description": "(CDT) Mesa libGL development package" }, + { "name": "mesa-libgl-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/mesa-libgl-devel-cos6-i686", "description": "(CDT) Mesa libGL development package" }, + { "name": "mesa-libgl-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/mesa-libgl-devel-cos6-x86_64", "description": "(CDT) Mesa libGL development package" }, + { "name": "mesa-libgl-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/mesa-libgl-devel-cos7-ppc64le", "description": "(CDT) Mesa libGL development package" }, + { "name": "mesa-libglapi-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/mesa-libglapi-amzn2-aarch64", "description": "(CDT) Mesa shared glapi" }, + { "name": "mesa-libglapi-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/mesa-libglapi-cos7-ppc64le", "description": "(CDT) Mesa shared glapi" }, + { "name": "mesa-libglapi-cos7-s390x", "uri": "https://anaconda.org/anaconda/mesa-libglapi-cos7-s390x", "description": "(CDT) Mesa shared glapi" }, + { "name": "meson", "uri": "https://anaconda.org/anaconda/meson", "description": "The Meson Build System" }, + { "name": "meson-python", "uri": "https://anaconda.org/anaconda/meson-python", "description": "Meson Python build backend (PEP 517)" }, + { "name": "metakernel", "uri": "https://anaconda.org/anaconda/metakernel", "description": "Metakernel for Jupyter." }, + { "name": "metis", "uri": "https://anaconda.org/anaconda/metis", "description": "METIS - Serial Graph Partitioning and Fill-reducing Matrix Ordering" }, + { "name": "mgwr", "uri": "https://anaconda.org/anaconda/mgwr", "description": "Multiscale geographically weighted regression" }, + { "name": "mingw64-gcc-toolchain", "uri": "https://anaconda.org/anaconda/mingw64-gcc-toolchain", "description": "MINGW64 GCC toolchain packages" }, + { "name": "mingw64-gcc-toolchain_win-64", "uri": "https://anaconda.org/anaconda/mingw64-gcc-toolchain_win-64", "description": "MINGW64 GCC toolchain metapackage" }, + { "name": "minikanren", "uri": "https://anaconda.org/anaconda/minikanren", "description": "An extensible, lightweight relational/logic programming DSL written in pure Python" }, + { "name": "minimal-snowplow-tracker", "uri": "https://anaconda.org/anaconda/minimal-snowplow-tracker", "description": "Snowplow event tracker for Python" }, + { "name": "minio", "uri": "https://anaconda.org/anaconda/minio", "description": "MinIO Python Library for Amazon S3 Compatible Cloud Storage for Python" }, + { "name": "minizip", "uri": "https://anaconda.org/anaconda/minizip", "description": "minizip-ng is a zip manipulation library written in C." }, + { "name": "missingno", "uri": "https://anaconda.org/anaconda/missingno", "description": "Missing data visualization module for Python." }, + { "name": "mistune", "uri": "https://anaconda.org/anaconda/mistune", "description": "A sane Markdown parser with useful plugins and renderers." }, + { "name": "mizani", "uri": "https://anaconda.org/anaconda/mizani", "description": "A scales package for python" }, + { "name": "mkl", "uri": "https://anaconda.org/anaconda/mkl", "description": "Math library for Intel and compatible processors" }, + { "name": "mkl-devel-dpcpp", "uri": "https://anaconda.org/anaconda/mkl-devel-dpcpp", "description": "Intel® oneAPI Math Kernel Library" }, + { "name": "mkl-dnn", "uri": "https://anaconda.org/anaconda/mkl-dnn", "description": "Intel(R) Math Kernel Library for Deep Neural Networks (Intel(R) MKL-DNN)" }, + { "name": "mkl-dpcpp", "uri": "https://anaconda.org/anaconda/mkl-dpcpp", "description": "Intel® oneAPI Math Kernel Library" }, + { "name": "mkl-include", "uri": "https://anaconda.org/anaconda/mkl-include", "description": "MKL headers for developing software that uses MKL" }, + { "name": "mkl-service", "uri": "https://anaconda.org/anaconda/mkl-service", "description": "Python hooks for Intel(R) Math Kernel Library runtime control settings." }, + { "name": "mkl_fft", "uri": "https://anaconda.org/anaconda/mkl_fft", "description": "NumPy-based implementation of Fast Fourier Transform using Intel (R) Math Kernel Library." }, + { "name": "mkl_random", "uri": "https://anaconda.org/anaconda/mkl_random", "description": "Intel (R) MKL-powered package for sampling from common probability distributions into NumPy arrays." }, + { "name": "mkl_umath", "uri": "https://anaconda.org/anaconda/mkl_umath", "description": "NumPy-based implementation of universal math functions using Intel(R) Math Kernel Library (Intel(R) MKL) and Intel(R) C Compiler." }, + { "name": "mklml", "uri": "https://anaconda.org/anaconda/mklml", "description": "No Summary" }, + { "name": "ml_dtypes", "uri": "https://anaconda.org/anaconda/ml_dtypes", "description": "A stand-alone implementation of several NumPy dtype extensions used in machine learning libraries" }, + { "name": "mlflow", "uri": "https://anaconda.org/anaconda/mlflow", "description": "MLflow: A Machine Learning Lifecycle Platform" }, + { "name": "mlflow-skinny", "uri": "https://anaconda.org/anaconda/mlflow-skinny", "description": "MLflow Skinny: A Lightweight Machine Learning Lifecycle Platform Client" }, + { "name": "mlir", "uri": "https://anaconda.org/anaconda/mlir", "description": "Multi-Level IR Compiler Framework" }, + { "name": "mlxtend", "uri": "https://anaconda.org/anaconda/mlxtend", "description": "Machine Learning Library Extensions" }, + { "name": "mmh3", "uri": "https://anaconda.org/anaconda/mmh3", "description": "Python wrapper for MurmurHash (MurmurHash3), a set of fast and robust hash functions." }, + { "name": "mockito", "uri": "https://anaconda.org/anaconda/mockito", "description": "Mockito is a spying framework." }, + { "name": "mockupdb", "uri": "https://anaconda.org/anaconda/mockupdb", "description": "MongoDB Wire Protocol server library" }, + { "name": "modin", "uri": "https://anaconda.org/anaconda/modin", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "modin-all", "uri": "https://anaconda.org/anaconda/modin-all", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "modin-core", "uri": "https://anaconda.org/anaconda/modin-core", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "modin-dask", "uri": "https://anaconda.org/anaconda/modin-dask", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "modin-omnisci", "uri": "https://anaconda.org/anaconda/modin-omnisci", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "modin-ray", "uri": "https://anaconda.org/anaconda/modin-ray", "description": "Speed up your Pandas workflows by changing a single line of code" }, + { "name": "mongo-tools", "uri": "https://anaconda.org/anaconda/mongo-tools", "description": "Tools for managing and monitoring MongoDB clusters" }, + { "name": "mongodb", "uri": "https://anaconda.org/anaconda/mongodb", "description": "A next-gen database that lets you do things you could never do before" }, + { "name": "mono", "uri": "https://anaconda.org/anaconda/mono", "description": "Mono is a software platform designed to allow developers to easily create cross platform applications." }, + { "name": "monotonic", "uri": "https://anaconda.org/anaconda/monotonic", "description": "An implementation of time.monotonic() for Python 2 & Python 3." }, + { "name": "more-itertools", "uri": "https://anaconda.org/anaconda/more-itertools", "description": "More routines for operating on iterables, beyond itertools" }, + { "name": "morfessor", "uri": "https://anaconda.org/anaconda/morfessor", "description": "Library for unsupervised and semi-supervised morphological segmentation" }, + { "name": "moto", "uri": "https://anaconda.org/anaconda/moto", "description": "A library that allows your python tests to easily mock out the boto library." }, + { "name": "mpg123", "uri": "https://anaconda.org/anaconda/mpg123", "description": "mpg123 - fast console MPEG Audio Player and decoder library" }, + { "name": "mpi", "uri": "https://anaconda.org/anaconda/mpi", "description": "A high performance widely portable implementation of the MPI standard." }, + { "name": "mpich", "uri": "https://anaconda.org/anaconda/mpich", "description": "A high performance widely portable implementation of the MPI standard." }, + { "name": "mpich-mpicc", "uri": "https://anaconda.org/anaconda/mpich-mpicc", "description": "A high performance widely portable implementation of the MPI standard." }, + { "name": "mpich-mpicxx", "uri": "https://anaconda.org/anaconda/mpich-mpicxx", "description": "A high performance widely portable implementation of the MPI standard." }, + { "name": "mpich-mpifort", "uri": "https://anaconda.org/anaconda/mpich-mpifort", "description": "A high performance widely portable implementation of the MPI standard." }, + { "name": "mpir", "uri": "https://anaconda.org/anaconda/mpir", "description": "Multiple Precision Integers and Rationals." }, + { "name": "mpl-scatter-density", "uri": "https://anaconda.org/anaconda/mpl-scatter-density", "description": "Matplotlib helpers to make density scatter plots" }, + { "name": "mpl_sample_data", "uri": "https://anaconda.org/anaconda/mpl_sample_data", "description": "Publication quality figures in Python" }, + { "name": "mpld3", "uri": "https://anaconda.org/anaconda/mpld3", "description": "D3 Viewer for Matplotlib." }, + { "name": "mpmath", "uri": "https://anaconda.org/anaconda/mpmath", "description": "Python library for arbitrary-precision floating-point arithmetic" }, + { "name": "msal", "uri": "https://anaconda.org/anaconda/msal", "description": "Microsoft Authentication Library (MSAL) for Python makes it easy to authenticate to Azure Active Directory" }, + { "name": "msgpack-numpy", "uri": "https://anaconda.org/anaconda/msgpack-numpy", "description": "Numpy data serialization using msgpack" }, + { "name": "msgpack-python", "uri": "https://anaconda.org/anaconda/msgpack-python", "description": "MessagePack (de)serializer" }, + { "name": "msitools", "uri": "https://anaconda.org/anaconda/msitools", "description": "msitools is a set of programs to inspect and build Windows Installer (.MSI) files" }, + { "name": "msmpi", "uri": "https://anaconda.org/anaconda/msmpi", "description": "Microsoft message-passing-interface (MS-MPI)" }, + { "name": "msrest", "uri": "https://anaconda.org/anaconda/msrest", "description": "The runtime library \"msrest\" for AutoRest generated Python clients." }, + { "name": "msvc-headers-libs", "uri": "https://anaconda.org/anaconda/msvc-headers-libs", "description": "Scripts to download MSVC headers and libraries" }, + { "name": "msys2-autoconf-wrapper", "uri": "https://anaconda.org/anaconda/msys2-autoconf-wrapper", "description": "(repack of MSYS2-packages autoconf-wrapper for MSYS)" }, + { "name": "msys2-autoconf2.13", "uri": "https://anaconda.org/anaconda/msys2-autoconf2.13", "description": "A GNU tool for automatically configuring source code (repack of MSYS2-packages autoconf2.13 for MSYS)" }, + { "name": "msys2-autoconf2.69", "uri": "https://anaconda.org/anaconda/msys2-autoconf2.69", "description": "A GNU tool for automatically configuring source code (repack of MSYS2-packages autoconf2.69 for MSYS)" }, + { "name": "msys2-autoconf2.71", "uri": "https://anaconda.org/anaconda/msys2-autoconf2.71", "description": "A GNU tool for automatically configuring source code (repack of MSYS2-packages autoconf2.71 for MSYS)" }, + { "name": "msys2-autoconf2.72", "uri": "https://anaconda.org/anaconda/msys2-autoconf2.72", "description": "A GNU tool for automatically configuring source code (repack of MSYS2-packages autoconf2.72 for MSYS)" }, + { "name": "msys2-automake-wrapper", "uri": "https://anaconda.org/anaconda/msys2-automake-wrapper", "description": "(repack of MSYS2-packages automake-wrapper for MSYS)" }, + { "name": "msys2-automake1.11", "uri": "https://anaconda.org/anaconda/msys2-automake1.11", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.11 for MSYS)" }, + { "name": "msys2-automake1.12", "uri": "https://anaconda.org/anaconda/msys2-automake1.12", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.12 for MSYS)" }, + { "name": "msys2-automake1.13", "uri": "https://anaconda.org/anaconda/msys2-automake1.13", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.13 for MSYS)" }, + { "name": "msys2-automake1.14", "uri": "https://anaconda.org/anaconda/msys2-automake1.14", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.14 for MSYS)" }, + { "name": "msys2-automake1.15", "uri": "https://anaconda.org/anaconda/msys2-automake1.15", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.15 for MSYS)" }, + { "name": "msys2-automake1.16", "uri": "https://anaconda.org/anaconda/msys2-automake1.16", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.16 for MSYS)" }, + { "name": "msys2-automake1.17", "uri": "https://anaconda.org/anaconda/msys2-automake1.17", "description": "A GNU tool for automatically creating Makefiles (repack of MSYS2-packages automake1.17 for MSYS)" }, + { "name": "msys2-autotools", "uri": "https://anaconda.org/anaconda/msys2-autotools", "description": "A meta package for the GNU autotools build system (repack of MSYS2-packages autotools for MSYS)" }, + { "name": "msys2-base", "uri": "https://anaconda.org/anaconda/msys2-base", "description": "MSYS base development packages" }, + { "name": "msys2-bash", "uri": "https://anaconda.org/anaconda/msys2-bash", "description": "The GNU Bourne Again shell (repack of MSYS2-packages bash for MSYS)" }, + { "name": "msys2-bash-completion", "uri": "https://anaconda.org/anaconda/msys2-bash-completion", "description": "Programmable completion for the bash shell (repack of MSYS2-packages bash-completion for MSYS)" }, + { "name": "msys2-bash-devel", "uri": "https://anaconda.org/anaconda/msys2-bash-devel", "description": "The GNU Bourne Again shell (repack of MSYS2-packages bash-devel for MSYS)" }, + { "name": "msys2-binutils", "uri": "https://anaconda.org/anaconda/msys2-binutils", "description": "A set of programs to assemble and manipulate binary and object files (repack of MSYS2-packages binutils for MSYS)" }, + { "name": "msys2-bison", "uri": "https://anaconda.org/anaconda/msys2-bison", "description": "The GNU general-purpose parser generator (repack of MSYS2-packages bison for MSYS)" }, + { "name": "msys2-brotli", "uri": "https://anaconda.org/anaconda/msys2-brotli", "description": "Brotli compression library (repack of MSYS2-packages brotli for MSYS)" }, + { "name": "msys2-brotli-devel", "uri": "https://anaconda.org/anaconda/msys2-brotli-devel", "description": "Brotli compression library (repack of MSYS2-packages brotli-devel for MSYS)" }, + { "name": "msys2-brotli-testdata", "uri": "https://anaconda.org/anaconda/msys2-brotli-testdata", "description": "Brotli compression library (repack of MSYS2-packages brotli-testdata for MSYS)" }, + { "name": "msys2-bzip2", "uri": "https://anaconda.org/anaconda/msys2-bzip2", "description": "A high-quality data compression program (repack of MSYS2-packages bzip2 for MSYS)" }, + { "name": "msys2-ca-certificates", "uri": "https://anaconda.org/anaconda/msys2-ca-certificates", "description": "Common CA certificates (repack of MSYS2-packages ca-certificates for MSYS)" }, + { "name": "msys2-coreutils", "uri": "https://anaconda.org/anaconda/msys2-coreutils", "description": "The basic file, shell and text manipulation utilities of the GNU operating system (repack of MSYS2-packages coreutils for MSYS)" }, + { "name": "msys2-curl", "uri": "https://anaconda.org/anaconda/msys2-curl", "description": "Multi-protocol file transfer utility (repack of MSYS2-packages curl for MSYS)" }, + { "name": "msys2-dash", "uri": "https://anaconda.org/anaconda/msys2-dash", "description": "A POSIX compliant shell that aims to be as small as possible (repack of MSYS2-packages dash for MSYS)" }, + { "name": "msys2-db", "uri": "https://anaconda.org/anaconda/msys2-db", "description": "The Berkeley DB embedded database system (repack of MSYS2-packages db for MSYS)" }, + { "name": "msys2-db-docs", "uri": "https://anaconda.org/anaconda/msys2-db-docs", "description": "The Berkeley DB embedded database system (repack of MSYS2-packages db-docs for MSYS)" }, + { "name": "msys2-diffutils", "uri": "https://anaconda.org/anaconda/msys2-diffutils", "description": "Utility programs used for creating patch files (repack of MSYS2-packages diffutils for MSYS)" }, + { "name": "msys2-expat", "uri": "https://anaconda.org/anaconda/msys2-expat", "description": "An XML parser library (repack of MSYS2-packages expat for MSYS)" }, + { "name": "msys2-fido2-tools", "uri": "https://anaconda.org/anaconda/msys2-fido2-tools", "description": "Library functionality for FIDO 2.0, including communication with a device over USB (repack of MSYS2-packages fido2-tools for MSYS)" }, + { "name": "msys2-file", "uri": "https://anaconda.org/anaconda/msys2-file", "description": "File type identification utility (repack of MSYS2-packages file for MSYS)" }, + { "name": "msys2-filesystem", "uri": "https://anaconda.org/anaconda/msys2-filesystem", "description": "Base filesystem (repack of MSYS2-packages filesystem for MSYS)" }, + { "name": "msys2-findutils", "uri": "https://anaconda.org/anaconda/msys2-findutils", "description": "GNU utilities to locate files (repack of MSYS2-packages findutils for MSYS)" }, + { "name": "msys2-flex", "uri": "https://anaconda.org/anaconda/msys2-flex", "description": "A tool for generating text-scanning programs (repack of MSYS2-packages flex for MSYS)" }, + { "name": "msys2-gawk", "uri": "https://anaconda.org/anaconda/msys2-gawk", "description": "GNU version of awk (repack of MSYS2-packages gawk for MSYS)" }, + { "name": "msys2-gcc", "uri": "https://anaconda.org/anaconda/msys2-gcc", "description": "The GNU Compiler Collection (repack of MSYS2-packages gcc for MSYS)" }, + { "name": "msys2-gcc-libs", "uri": "https://anaconda.org/anaconda/msys2-gcc-libs", "description": "The GNU Compiler Collection (repack of MSYS2-packages gcc-libs for MSYS)" }, + { "name": "msys2-gdbm", "uri": "https://anaconda.org/anaconda/msys2-gdbm", "description": "GNU database library (repack of MSYS2-packages gdbm for MSYS)" }, + { "name": "msys2-gettext", "uri": "https://anaconda.org/anaconda/msys2-gettext", "description": "GNU internationalization library (repack of MSYS2-packages gettext for MSYS)" }, + { "name": "msys2-gettext-devel", "uri": "https://anaconda.org/anaconda/msys2-gettext-devel", "description": "GNU internationalization library (repack of MSYS2-packages gettext-devel for MSYS)" }, + { "name": "msys2-git", "uri": "https://anaconda.org/anaconda/msys2-git", "description": "The fast distributed version control system (repack of MSYS2-packages git for MSYS)" }, + { "name": "msys2-gmp", "uri": "https://anaconda.org/anaconda/msys2-gmp", "description": "A free library for arbitrary precision arithmetic (repack of MSYS2-packages gmp for MSYS)" }, + { "name": "msys2-gmp-devel", "uri": "https://anaconda.org/anaconda/msys2-gmp-devel", "description": "A free library for arbitrary precision arithmetic (repack of MSYS2-packages gmp-devel for MSYS)" }, + { "name": "msys2-gperf", "uri": "https://anaconda.org/anaconda/msys2-gperf", "description": "Perfect hash function generator (repack of MSYS2-packages gperf for MSYS)" }, + { "name": "msys2-grep", "uri": "https://anaconda.org/anaconda/msys2-grep", "description": "A string search utility (repack of MSYS2-packages grep for MSYS)" }, + { "name": "msys2-gzip", "uri": "https://anaconda.org/anaconda/msys2-gzip", "description": "GNU compression utility (repack of MSYS2-packages gzip for MSYS)" }, + { "name": "msys2-heimdal", "uri": "https://anaconda.org/anaconda/msys2-heimdal", "description": "Implementation of Kerberos V5 libraries (repack of MSYS2-packages heimdal for MSYS)" }, + { "name": "msys2-heimdal-devel", "uri": "https://anaconda.org/anaconda/msys2-heimdal-devel", "description": "Implementation of Kerberos V5 libraries (repack of MSYS2-packages heimdal-devel for MSYS)" }, + { "name": "msys2-heimdal-libs", "uri": "https://anaconda.org/anaconda/msys2-heimdal-libs", "description": "Implementation of Kerberos V5 libraries (repack of MSYS2-packages heimdal-libs for MSYS)" }, + { "name": "msys2-inetutils", "uri": "https://anaconda.org/anaconda/msys2-inetutils", "description": "A collection of common network programs. (repack of MSYS2-packages inetutils for MSYS)" }, + { "name": "msys2-info", "uri": "https://anaconda.org/anaconda/msys2-info", "description": "Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file (repack of MSYS2-packages info for MSYS)" }, + { "name": "msys2-isl", "uri": "https://anaconda.org/anaconda/msys2-isl", "description": "Library for manipulating sets and relations of integer points bounded by linear constraints (repack of MSYS2-packages isl for MSYS)" }, + { "name": "msys2-isl-devel", "uri": "https://anaconda.org/anaconda/msys2-isl-devel", "description": "Library for manipulating sets and relations of integer points bounded by linear constraints (repack of MSYS2-packages isl-devel for MSYS)" }, + { "name": "msys2-jansson", "uri": "https://anaconda.org/anaconda/msys2-jansson", "description": "C library for encoding, decoding and manipulating JSON data (repack of MSYS2-packages jansson for MSYS)" }, + { "name": "msys2-jansson-devel", "uri": "https://anaconda.org/anaconda/msys2-jansson-devel", "description": "C library for encoding, decoding and manipulating JSON data (repack of MSYS2-packages jansson-devel for MSYS)" }, + { "name": "msys2-lemon", "uri": "https://anaconda.org/anaconda/msys2-lemon", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages lemon for MSYS)" }, + { "name": "msys2-less", "uri": "https://anaconda.org/anaconda/msys2-less", "description": "A terminal based program for viewing text files (repack of MSYS2-packages less for MSYS)" }, + { "name": "msys2-libasprintf", "uri": "https://anaconda.org/anaconda/msys2-libasprintf", "description": "GNU internationalization library (repack of MSYS2-packages libasprintf for MSYS)" }, + { "name": "msys2-libbz2", "uri": "https://anaconda.org/anaconda/msys2-libbz2", "description": "A high-quality data compression program (repack of MSYS2-packages libbz2 for MSYS)" }, + { "name": "msys2-libbz2-devel", "uri": "https://anaconda.org/anaconda/msys2-libbz2-devel", "description": "A high-quality data compression program (repack of MSYS2-packages libbz2-devel for MSYS)" }, + { "name": "msys2-libcares", "uri": "https://anaconda.org/anaconda/msys2-libcares", "description": "C library that performs DNS requests and name resolves asynchronously (libraries) (repack of MSYS2-packages libcares for MSYS)" }, + { "name": "msys2-libcares-devel", "uri": "https://anaconda.org/anaconda/msys2-libcares-devel", "description": "C library that performs DNS requests and name resolves asynchronously (libraries) (repack of MSYS2-packages libcares-devel for MSYS)" }, + { "name": "msys2-libcbor", "uri": "https://anaconda.org/anaconda/msys2-libcbor", "description": "A C library for parsing and generating CBOR, a general-purpose schema-less binary data format (repack of MSYS2-packages libcbor for MSYS)" }, + { "name": "msys2-libcbor-devel", "uri": "https://anaconda.org/anaconda/msys2-libcbor-devel", "description": "A C library for parsing and generating CBOR, a general-purpose schema-less binary data format (repack of MSYS2-packages libcbor-devel for MSYS)" }, + { "name": "msys2-libcurl", "uri": "https://anaconda.org/anaconda/msys2-libcurl", "description": "Multi-protocol file transfer utility (repack of MSYS2-packages libcurl for MSYS)" }, + { "name": "msys2-libcurl-devel", "uri": "https://anaconda.org/anaconda/msys2-libcurl-devel", "description": "Multi-protocol file transfer utility (repack of MSYS2-packages libcurl-devel for MSYS)" }, + { "name": "msys2-libdb", "uri": "https://anaconda.org/anaconda/msys2-libdb", "description": "The Berkeley DB embedded database system (repack of MSYS2-packages libdb for MSYS)" }, + { "name": "msys2-libdb-devel", "uri": "https://anaconda.org/anaconda/msys2-libdb-devel", "description": "The Berkeley DB embedded database system (repack of MSYS2-packages libdb-devel for MSYS)" }, + { "name": "msys2-libedit", "uri": "https://anaconda.org/anaconda/msys2-libedit", "description": "Libedit is an autotool- and libtoolized port of the NetBSD Editline library. (repack of MSYS2-packages libedit for MSYS)" }, + { "name": "msys2-libedit-devel", "uri": "https://anaconda.org/anaconda/msys2-libedit-devel", "description": "Libedit is an autotool- and libtoolized port of the NetBSD Editline library. (repack of MSYS2-packages libedit-devel for MSYS)" }, + { "name": "msys2-libevent", "uri": "https://anaconda.org/anaconda/msys2-libevent", "description": "An event notification library (repack of MSYS2-packages libevent for MSYS)" }, + { "name": "msys2-libevent-devel", "uri": "https://anaconda.org/anaconda/msys2-libevent-devel", "description": "An event notification library (repack of MSYS2-packages libevent-devel for MSYS)" }, + { "name": "msys2-libexpat", "uri": "https://anaconda.org/anaconda/msys2-libexpat", "description": "An XML parser library (repack of MSYS2-packages libexpat for MSYS)" }, + { "name": "msys2-libexpat-devel", "uri": "https://anaconda.org/anaconda/msys2-libexpat-devel", "description": "An XML parser library (repack of MSYS2-packages libexpat-devel for MSYS)" }, + { "name": "msys2-libffi", "uri": "https://anaconda.org/anaconda/msys2-libffi", "description": "Portable, high level programming interface to various calling conventions (repack of MSYS2-packages libffi for MSYS)" }, + { "name": "msys2-libffi-devel", "uri": "https://anaconda.org/anaconda/msys2-libffi-devel", "description": "Portable, high level programming interface to various calling conventions (repack of MSYS2-packages libffi-devel for MSYS)" }, + { "name": "msys2-libfido2", "uri": "https://anaconda.org/anaconda/msys2-libfido2", "description": "Library functionality for FIDO 2.0, including communication with a device over USB (repack of MSYS2-packages libfido2 for MSYS)" }, + { "name": "msys2-libfido2-devel", "uri": "https://anaconda.org/anaconda/msys2-libfido2-devel", "description": "Library functionality for FIDO 2.0, including communication with a device over USB (repack of MSYS2-packages libfido2-devel for MSYS)" }, + { "name": "msys2-libfido2-docs", "uri": "https://anaconda.org/anaconda/msys2-libfido2-docs", "description": "Library functionality for FIDO 2.0, including communication with a device over USB (repack of MSYS2-packages libfido2-docs for MSYS)" }, + { "name": "msys2-libgdbm", "uri": "https://anaconda.org/anaconda/msys2-libgdbm", "description": "GNU database library (repack of MSYS2-packages libgdbm for MSYS)" }, + { "name": "msys2-libgdbm-devel", "uri": "https://anaconda.org/anaconda/msys2-libgdbm-devel", "description": "GNU database library (repack of MSYS2-packages libgdbm-devel for MSYS)" }, + { "name": "msys2-libgettextpo", "uri": "https://anaconda.org/anaconda/msys2-libgettextpo", "description": "GNU internationalization library (repack of MSYS2-packages libgettextpo for MSYS)" }, + { "name": "msys2-libiconv", "uri": "https://anaconda.org/anaconda/msys2-libiconv", "description": "Libiconv is a conversion library (repack of MSYS2-packages libiconv for MSYS)" }, + { "name": "msys2-libiconv-devel", "uri": "https://anaconda.org/anaconda/msys2-libiconv-devel", "description": "Libiconv is a conversion library (repack of MSYS2-packages libiconv-devel for MSYS)" }, + { "name": "msys2-libidn2", "uri": "https://anaconda.org/anaconda/msys2-libidn2", "description": "Implementation of the Stringprep, Punycode and IDNA specifications (repack of MSYS2-packages libidn2 for MSYS)" }, + { "name": "msys2-libidn2-devel", "uri": "https://anaconda.org/anaconda/msys2-libidn2-devel", "description": "Implementation of the Stringprep, Punycode and IDNA specifications (repack of MSYS2-packages libidn2-devel for MSYS)" }, + { "name": "msys2-libintl", "uri": "https://anaconda.org/anaconda/msys2-libintl", "description": "GNU internationalization library (repack of MSYS2-packages libintl for MSYS)" }, + { "name": "msys2-libltdl", "uri": "https://anaconda.org/anaconda/msys2-libltdl", "description": "A generic library support script (repack of MSYS2-packages libltdl for MSYS)" }, + { "name": "msys2-liblzma", "uri": "https://anaconda.org/anaconda/msys2-liblzma", "description": "Library and command line tools for XZ and LZMA compressed files (repack of MSYS2-packages liblzma for MSYS)" }, + { "name": "msys2-liblzma-devel", "uri": "https://anaconda.org/anaconda/msys2-liblzma-devel", "description": "Library and command line tools for XZ and LZMA compressed files (repack of MSYS2-packages liblzma-devel for MSYS)" }, + { "name": "msys2-libnghttp2", "uri": "https://anaconda.org/anaconda/msys2-libnghttp2", "description": "Framing layer of HTTP/2 is implemented as a reusable C library (repack of MSYS2-packages libnghttp2 for MSYS)" }, + { "name": "msys2-libnghttp2-devel", "uri": "https://anaconda.org/anaconda/msys2-libnghttp2-devel", "description": "Framing layer of HTTP/2 is implemented as a reusable C library (repack of MSYS2-packages libnghttp2-devel for MSYS)" }, + { "name": "msys2-libopenssl", "uri": "https://anaconda.org/anaconda/msys2-libopenssl", "description": "The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (repack of MSYS2-packages libopenssl for MSYS)" }, + { "name": "msys2-libp11-kit", "uri": "https://anaconda.org/anaconda/msys2-libp11-kit", "description": "Library to work with PKCS-11 modules (repack of MSYS2-packages libp11-kit for MSYS)" }, + { "name": "msys2-libp11-kit-devel", "uri": "https://anaconda.org/anaconda/msys2-libp11-kit-devel", "description": "Library to work with PKCS-11 modules (repack of MSYS2-packages libp11-kit-devel for MSYS)" }, + { "name": "msys2-libpcre", "uri": "https://anaconda.org/anaconda/msys2-libpcre", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre for MSYS)" }, + { "name": "msys2-libpcre16", "uri": "https://anaconda.org/anaconda/msys2-libpcre16", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre16 for MSYS)" }, + { "name": "msys2-libpcre2_16", "uri": "https://anaconda.org/anaconda/msys2-libpcre2_16", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre2_16 for MSYS)" }, + { "name": "msys2-libpcre2_32", "uri": "https://anaconda.org/anaconda/msys2-libpcre2_32", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre2_32 for MSYS)" }, + { "name": "msys2-libpcre2_8", "uri": "https://anaconda.org/anaconda/msys2-libpcre2_8", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre2_8 for MSYS)" }, + { "name": "msys2-libpcre2posix", "uri": "https://anaconda.org/anaconda/msys2-libpcre2posix", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre2posix for MSYS)" }, + { "name": "msys2-libpcre32", "uri": "https://anaconda.org/anaconda/msys2-libpcre32", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcre32 for MSYS)" }, + { "name": "msys2-libpcrecpp", "uri": "https://anaconda.org/anaconda/msys2-libpcrecpp", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcrecpp for MSYS)" }, + { "name": "msys2-libpcreposix", "uri": "https://anaconda.org/anaconda/msys2-libpcreposix", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages libpcreposix for MSYS)" }, + { "name": "msys2-libpsl", "uri": "https://anaconda.org/anaconda/msys2-libpsl", "description": "Public Suffix List library (repack of MSYS2-packages libpsl for MSYS)" }, + { "name": "msys2-libpsl-devel", "uri": "https://anaconda.org/anaconda/msys2-libpsl-devel", "description": "Public Suffix List library (repack of MSYS2-packages libpsl-devel for MSYS)" }, + { "name": "msys2-libreadline", "uri": "https://anaconda.org/anaconda/msys2-libreadline", "description": "GNU readline library (repack of MSYS2-packages libreadline for MSYS)" }, + { "name": "msys2-libreadline-devel", "uri": "https://anaconda.org/anaconda/msys2-libreadline-devel", "description": "GNU readline library (repack of MSYS2-packages libreadline-devel for MSYS)" }, + { "name": "msys2-libsqlite", "uri": "https://anaconda.org/anaconda/msys2-libsqlite", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages libsqlite for MSYS)" }, + { "name": "msys2-libsqlite-devel", "uri": "https://anaconda.org/anaconda/msys2-libsqlite-devel", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages libsqlite-devel for MSYS)" }, + { "name": "msys2-libssh2", "uri": "https://anaconda.org/anaconda/msys2-libssh2", "description": "A library implementing the SSH2 protocol as defined by Internet Drafts (repack of MSYS2-packages libssh2 for MSYS)" }, + { "name": "msys2-libssh2-devel", "uri": "https://anaconda.org/anaconda/msys2-libssh2-devel", "description": "A library implementing the SSH2 protocol as defined by Internet Drafts (repack of MSYS2-packages libssh2-devel for MSYS)" }, + { "name": "msys2-libtasn1", "uri": "https://anaconda.org/anaconda/msys2-libtasn1", "description": "A library for Abstract Syntax Notation One (ASN.1) and Distinguish Encoding Rules (DER) manipulation (repack of MSYS2-packages libtasn1 for MSYS)" }, + { "name": "msys2-libtasn1-devel", "uri": "https://anaconda.org/anaconda/msys2-libtasn1-devel", "description": "A library for Abstract Syntax Notation One (ASN.1) and Distinguish Encoding Rules (DER) manipulation (repack of MSYS2-packages libtasn1-devel for MSYS)" }, + { "name": "msys2-libtool", "uri": "https://anaconda.org/anaconda/msys2-libtool", "description": "A generic library support script (repack of MSYS2-packages libtool for MSYS)" }, + { "name": "msys2-libunistring", "uri": "https://anaconda.org/anaconda/msys2-libunistring", "description": "Library for manipulating Unicode strings and C strings. (repack of MSYS2-packages libunistring for MSYS)" }, + { "name": "msys2-libunistring-devel", "uri": "https://anaconda.org/anaconda/msys2-libunistring-devel", "description": "Library for manipulating Unicode strings and C strings. (repack of MSYS2-packages libunistring-devel for MSYS)" }, + { "name": "msys2-libutil-linux", "uri": "https://anaconda.org/anaconda/msys2-libutil-linux", "description": "Miscellaneous system utilities for Linux (repack of MSYS2-packages libutil-linux for MSYS)" }, + { "name": "msys2-libutil-linux-devel", "uri": "https://anaconda.org/anaconda/msys2-libutil-linux-devel", "description": "Miscellaneous system utilities for Linux (repack of MSYS2-packages libutil-linux-devel for MSYS)" }, + { "name": "msys2-libxcrypt", "uri": "https://anaconda.org/anaconda/msys2-libxcrypt", "description": "Modern library for one-way hashing of passwords (repack of MSYS2-packages libxcrypt for MSYS)" }, + { "name": "msys2-libxcrypt-devel", "uri": "https://anaconda.org/anaconda/msys2-libxcrypt-devel", "description": "Modern library for one-way hashing of passwords (repack of MSYS2-packages libxcrypt-devel for MSYS)" }, + { "name": "msys2-libxml2", "uri": "https://anaconda.org/anaconda/msys2-libxml2", "description": "XML parsing library, version 2 (repack of MSYS2-packages libxml2 for MSYS)" }, + { "name": "msys2-libxml2-devel", "uri": "https://anaconda.org/anaconda/msys2-libxml2-devel", "description": "XML parsing library, version 2 (repack of MSYS2-packages libxml2-devel for MSYS)" }, + { "name": "msys2-libzstd", "uri": "https://anaconda.org/anaconda/msys2-libzstd", "description": "Zstandard - Fast real-time compression algorithm (repack of MSYS2-packages libzstd for MSYS)" }, + { "name": "msys2-libzstd-devel", "uri": "https://anaconda.org/anaconda/msys2-libzstd-devel", "description": "Zstandard - Fast real-time compression algorithm (repack of MSYS2-packages libzstd-devel for MSYS)" }, + { "name": "msys2-m4", "uri": "https://anaconda.org/anaconda/msys2-m4", "description": "The GNU macro processor (repack of MSYS2-packages m4 for MSYS)" }, + { "name": "msys2-make", "uri": "https://anaconda.org/anaconda/msys2-make", "description": "GNU make utility to maintain groups of programs (repack of MSYS2-packages make for MSYS)" }, + { "name": "msys2-mingw-w64-mutex", "uri": "https://anaconda.org/anaconda/msys2-mingw-w64-mutex", "description": "A mutex package to ensure environment exclusivity between MSYS2 mingw-w64 environments" }, + { "name": "msys2-mintty", "uri": "https://anaconda.org/anaconda/msys2-mintty", "description": "Terminal emulator with native Windows look and feel (repack of MSYS2-packages mintty for MSYS)" }, + { "name": "msys2-mpc", "uri": "https://anaconda.org/anaconda/msys2-mpc", "description": "Multiple precision complex arithmetic library (repack of MSYS2-packages mpc for MSYS)" }, + { "name": "msys2-mpc-devel", "uri": "https://anaconda.org/anaconda/msys2-mpc-devel", "description": "Multiple precision complex arithmetic library (repack of MSYS2-packages mpc-devel for MSYS)" }, + { "name": "msys2-mpfr", "uri": "https://anaconda.org/anaconda/msys2-mpfr", "description": "Multiple-precision floating-point library (repack of MSYS2-packages mpfr for MSYS)" }, + { "name": "msys2-mpfr-devel", "uri": "https://anaconda.org/anaconda/msys2-mpfr-devel", "description": "Multiple-precision floating-point library (repack of MSYS2-packages mpfr-devel for MSYS)" }, + { "name": "msys2-msys-mutex", "uri": "https://anaconda.org/anaconda/msys2-msys-mutex", "description": "A mutex package to ensure environment exclusivity between MSYS2 MSYS environments" }, + { "name": "msys2-msys2-launcher", "uri": "https://anaconda.org/anaconda/msys2-msys2-launcher", "description": "Helper for launching MSYS2 shells (repack of MSYS2-packages msys2-launcher for MSYS)" }, + { "name": "msys2-msys2-runtime", "uri": "https://anaconda.org/anaconda/msys2-msys2-runtime", "description": "Cygwin POSIX emulation engine (repack of MSYS2-packages msys2-runtime for MSYS)" }, + { "name": "msys2-msys2-runtime-devel", "uri": "https://anaconda.org/anaconda/msys2-msys2-runtime-devel", "description": "Cygwin POSIX emulation engine (repack of MSYS2-packages msys2-runtime-devel for MSYS)" }, + { "name": "msys2-msys2-w32api-headers", "uri": "https://anaconda.org/anaconda/msys2-msys2-w32api-headers", "description": "Win32 API headers for MSYS2 32bit toolchain (repack of MSYS2-packages msys2-w32api-headers for MSYS)" }, + { "name": "msys2-msys2-w32api-runtime", "uri": "https://anaconda.org/anaconda/msys2-msys2-w32api-runtime", "description": "Win32 API import libs for MSYS2 toolchain (repack of MSYS2-packages msys2-w32api-runtime for MSYS)" }, + { "name": "msys2-nano", "uri": "https://anaconda.org/anaconda/msys2-nano", "description": "Pico editor clone with enhancements (repack of MSYS2-packages nano for MSYS)" }, + { "name": "msys2-ncurses", "uri": "https://anaconda.org/anaconda/msys2-ncurses", "description": "System V Release 4.0 curses emulation library (repack of MSYS2-packages ncurses for MSYS)" }, + { "name": "msys2-ncurses-devel", "uri": "https://anaconda.org/anaconda/msys2-ncurses-devel", "description": "System V Release 4.0 curses emulation library (repack of MSYS2-packages ncurses-devel for MSYS)" }, + { "name": "msys2-nghttp2", "uri": "https://anaconda.org/anaconda/msys2-nghttp2", "description": "Framing layer of HTTP/2 is implemented as a reusable C library (repack of MSYS2-packages nghttp2 for MSYS)" }, + { "name": "msys2-openssh", "uri": "https://anaconda.org/anaconda/msys2-openssh", "description": "Free version of the SSH connectivity tools (repack of MSYS2-packages openssh for MSYS)" }, + { "name": "msys2-openssl", "uri": "https://anaconda.org/anaconda/msys2-openssl", "description": "The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (repack of MSYS2-packages openssl for MSYS)" }, + { "name": "msys2-openssl-devel", "uri": "https://anaconda.org/anaconda/msys2-openssl-devel", "description": "The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (repack of MSYS2-packages openssl-devel for MSYS)" }, + { "name": "msys2-openssl-docs", "uri": "https://anaconda.org/anaconda/msys2-openssl-docs", "description": "The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (repack of MSYS2-packages openssl-docs for MSYS)" }, + { "name": "msys2-p11-kit", "uri": "https://anaconda.org/anaconda/msys2-p11-kit", "description": "Library to work with PKCS-11 modules (repack of MSYS2-packages p11-kit for MSYS)" }, + { "name": "msys2-p7zip", "uri": "https://anaconda.org/anaconda/msys2-p7zip", "description": "Command-line version of the 7zip compressed file archiver (repack of MSYS2-packages p7zip for MSYS)" }, + { "name": "msys2-patch", "uri": "https://anaconda.org/anaconda/msys2-patch", "description": "A utility to apply patch files to original sources (repack of MSYS2-packages patch for MSYS)" }, + { "name": "msys2-pcre", "uri": "https://anaconda.org/anaconda/msys2-pcre", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages pcre for MSYS)" }, + { "name": "msys2-pcre-devel", "uri": "https://anaconda.org/anaconda/msys2-pcre-devel", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages pcre-devel for MSYS)" }, + { "name": "msys2-pcre2", "uri": "https://anaconda.org/anaconda/msys2-pcre2", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages pcre2 for MSYS)" }, + { "name": "msys2-pcre2-devel", "uri": "https://anaconda.org/anaconda/msys2-pcre2-devel", "description": "A library that implements Perl 5-style regular expressions (repack of MSYS2-packages pcre2-devel for MSYS)" }, + { "name": "msys2-perl", "uri": "https://anaconda.org/anaconda/msys2-perl", "description": "A highly capable, feature-rich programming language (repack of MSYS2-packages perl for MSYS)" }, + { "name": "msys2-perl-authen-sasl", "uri": "https://anaconda.org/anaconda/msys2-perl-authen-sasl", "description": "Perl/CPAN Module Authen::SASL : SASL authentication framework (repack of MSYS2-packages perl-Authen-SASL for MSYS)" }, + { "name": "msys2-perl-clone", "uri": "https://anaconda.org/anaconda/msys2-perl-clone", "description": "Recursive copy of nested objects. (repack of MSYS2-packages perl-Clone for MSYS)" }, + { "name": "msys2-perl-convert-binhex", "uri": "https://anaconda.org/anaconda/msys2-perl-convert-binhex", "description": "Perl module to extract data from Macintosh BinHex files (repack of MSYS2-packages perl-Convert-BinHex for MSYS)" }, + { "name": "msys2-perl-devel", "uri": "https://anaconda.org/anaconda/msys2-perl-devel", "description": "A highly capable, feature-rich programming language (repack of MSYS2-packages perl-devel for MSYS)" }, + { "name": "msys2-perl-doc", "uri": "https://anaconda.org/anaconda/msys2-perl-doc", "description": "A highly capable, feature-rich programming language (repack of MSYS2-packages perl-doc for MSYS)" }, + { "name": "msys2-perl-encode-locale", "uri": "https://anaconda.org/anaconda/msys2-perl-encode-locale", "description": "Determine the locale encoding (repack of MSYS2-packages perl-Encode-Locale for MSYS)" }, + { "name": "msys2-perl-error", "uri": "https://anaconda.org/anaconda/msys2-perl-error", "description": "Perl/CPAN Error module - Error/exception handling in an OO-ish way (repack of MSYS2-packages perl-Error for MSYS)" }, + { "name": "msys2-perl-file-listing", "uri": "https://anaconda.org/anaconda/msys2-perl-file-listing", "description": "parse directory listing (repack of MSYS2-packages perl-File-Listing for MSYS)" }, + { "name": "msys2-perl-html-parser", "uri": "https://anaconda.org/anaconda/msys2-perl-html-parser", "description": "Perl HTML parser class (repack of MSYS2-packages perl-HTML-Parser for MSYS)" }, + { "name": "msys2-perl-html-tagset", "uri": "https://anaconda.org/anaconda/msys2-perl-html-tagset", "description": "Data tables useful in parsing HTML (repack of MSYS2-packages perl-HTML-Tagset for MSYS)" }, + { "name": "msys2-perl-http-cookiejar", "uri": "https://anaconda.org/anaconda/msys2-perl-http-cookiejar", "description": "A minimalist HTTP user agent cookie jar (repack of MSYS2-packages perl-http-cookiejar for MSYS)" }, + { "name": "msys2-perl-http-cookies", "uri": "https://anaconda.org/anaconda/msys2-perl-http-cookies", "description": "HTTP cookie jars (repack of MSYS2-packages perl-HTTP-Cookies for MSYS)" }, + { "name": "msys2-perl-http-daemon", "uri": "https://anaconda.org/anaconda/msys2-perl-http-daemon", "description": "A simple http server class (repack of MSYS2-packages perl-HTTP-Daemon for MSYS)" }, + { "name": "msys2-perl-http-date", "uri": "https://anaconda.org/anaconda/msys2-perl-http-date", "description": "Date conversion routines (repack of MSYS2-packages perl-HTTP-Date for MSYS)" }, + { "name": "msys2-perl-http-message", "uri": "https://anaconda.org/anaconda/msys2-perl-http-message", "description": "HTTP style messages (repack of MSYS2-packages perl-HTTP-Message for MSYS)" }, + { "name": "msys2-perl-http-negotiate", "uri": "https://anaconda.org/anaconda/msys2-perl-http-negotiate", "description": "choose a variant to serve (repack of MSYS2-packages perl-HTTP-Negotiate for MSYS)" }, + { "name": "msys2-perl-io-html", "uri": "https://anaconda.org/anaconda/msys2-perl-io-html", "description": "Open an HTML file with automatic charset detection (repack of MSYS2-packages perl-IO-HTML for MSYS)" }, + { "name": "msys2-perl-io-socket-ssl", "uri": "https://anaconda.org/anaconda/msys2-perl-io-socket-ssl", "description": "Nearly transparent SSL encapsulation for IO::Socket::INET (repack of MSYS2-packages perl-IO-Socket-SSL for MSYS)" }, + { "name": "msys2-perl-io-stringy", "uri": "https://anaconda.org/anaconda/msys2-perl-io-stringy", "description": "I/O on in-core objects like strings/arrays (repack of MSYS2-packages perl-IO-Stringy for MSYS)" }, + { "name": "msys2-perl-libwww", "uri": "https://anaconda.org/anaconda/msys2-perl-libwww", "description": "The World-Wide Web library for Perl (repack of MSYS2-packages perl-libwww for MSYS)" }, + { "name": "msys2-perl-lwp-mediatypes", "uri": "https://anaconda.org/anaconda/msys2-perl-lwp-mediatypes", "description": "Guess the media type of a file or a URL (repack of MSYS2-packages perl-LWP-MediaTypes for MSYS)" }, + { "name": "msys2-perl-mailtools", "uri": "https://anaconda.org/anaconda/msys2-perl-mailtools", "description": "Various e-mail related modules (repack of MSYS2-packages perl-MailTools for MSYS)" }, + { "name": "msys2-perl-mime-tools", "uri": "https://anaconda.org/anaconda/msys2-perl-mime-tools", "description": "Parses streams to create MIME entities (repack of MSYS2-packages perl-MIME-tools for MSYS)" }, + { "name": "msys2-perl-net-http", "uri": "https://anaconda.org/anaconda/msys2-perl-net-http", "description": "Low-level HTTP connection (client) (repack of MSYS2-packages perl-Net-HTTP for MSYS)" }, + { "name": "msys2-perl-net-smtp-ssl", "uri": "https://anaconda.org/anaconda/msys2-perl-net-smtp-ssl", "description": "SSL support for Net::SMTP (repack of MSYS2-packages perl-Net-SMTP-SSL for MSYS)" }, + { "name": "msys2-perl-net-ssleay", "uri": "https://anaconda.org/anaconda/msys2-perl-net-ssleay", "description": "Perl extension for using OpenSSL (repack of MSYS2-packages perl-Net-SSLeay for MSYS)" }, + { "name": "msys2-perl-termreadkey", "uri": "https://anaconda.org/anaconda/msys2-perl-termreadkey", "description": "Provides simple control over terminal driver modes (repack of MSYS2-packages perl-TermReadKey for MSYS)" }, + { "name": "msys2-perl-timedate", "uri": "https://anaconda.org/anaconda/msys2-perl-timedate", "description": "Date formating subroutines (repack of MSYS2-packages perl-TimeDate for MSYS)" }, + { "name": "msys2-perl-try-tiny", "uri": "https://anaconda.org/anaconda/msys2-perl-try-tiny", "description": "Minimal try/catch with proper localization of $@ (repack of MSYS2-packages perl-Try-Tiny for MSYS)" }, + { "name": "msys2-perl-uri", "uri": "https://anaconda.org/anaconda/msys2-perl-uri", "description": "Uniform Resource Identifiers (absolute and relative) (repack of MSYS2-packages perl-URI for MSYS)" }, + { "name": "msys2-perl-www-robotrules", "uri": "https://anaconda.org/anaconda/msys2-perl-www-robotrules", "description": "Database of robots.txt-derived permissions (repack of MSYS2-packages perl-WWW-RobotRules for MSYS)" }, + { "name": "msys2-pkg-config", "uri": "https://anaconda.org/anaconda/msys2-pkg-config", "description": "msys2-pkgconf wrapper to align with non-MSYS2 systems" }, + { "name": "msys2-pkgconf", "uri": "https://anaconda.org/anaconda/msys2-pkgconf", "description": "pkg-config compatible utility which does not depend on glib (repack of MSYS2-packages pkgconf for MSYS)" }, + { "name": "msys2-posix", "uri": "https://anaconda.org/anaconda/msys2-posix", "description": "MSYS POSIX development packages" }, + { "name": "msys2-sed", "uri": "https://anaconda.org/anaconda/msys2-sed", "description": "GNU stream editor (repack of MSYS2-packages sed for MSYS)" }, + { "name": "msys2-sqlite", "uri": "https://anaconda.org/anaconda/msys2-sqlite", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages sqlite for MSYS)" }, + { "name": "msys2-sqlite-doc", "uri": "https://anaconda.org/anaconda/msys2-sqlite-doc", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages sqlite-doc for MSYS)" }, + { "name": "msys2-sqlite-extensions", "uri": "https://anaconda.org/anaconda/msys2-sqlite-extensions", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages sqlite-extensions for MSYS)" }, + { "name": "msys2-tar", "uri": "https://anaconda.org/anaconda/msys2-tar", "description": "Utility used to store, backup, and transport files (repack of MSYS2-packages tar for MSYS)" }, + { "name": "msys2-tcl", "uri": "https://anaconda.org/anaconda/msys2-tcl", "description": "The Tcl scripting language (repack of MSYS2-packages tcl for MSYS)" }, + { "name": "msys2-tcl-devel", "uri": "https://anaconda.org/anaconda/msys2-tcl-devel", "description": "The Tcl scripting language (repack of MSYS2-packages tcl-devel for MSYS)" }, + { "name": "msys2-tcl-doc", "uri": "https://anaconda.org/anaconda/msys2-tcl-doc", "description": "The Tcl scripting language (repack of MSYS2-packages tcl-doc for MSYS)" }, + { "name": "msys2-tcl-sqlite", "uri": "https://anaconda.org/anaconda/msys2-tcl-sqlite", "description": "A C library that implements an SQL database engine (repack of MSYS2-packages tcl-sqlite for MSYS)" }, + { "name": "msys2-texinfo", "uri": "https://anaconda.org/anaconda/msys2-texinfo", "description": "Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file (repack of MSYS2-packages texinfo for MSYS)" }, + { "name": "msys2-texinfo-tex", "uri": "https://anaconda.org/anaconda/msys2-texinfo-tex", "description": "Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file (repack of MSYS2-packages texinfo-tex for MSYS)" }, + { "name": "msys2-time", "uri": "https://anaconda.org/anaconda/msys2-time", "description": "Utility for monitoring a program's use of system resources (repack of MSYS2-packages time for MSYS)" }, + { "name": "msys2-tzcode", "uri": "https://anaconda.org/anaconda/msys2-tzcode", "description": "Sources for time zone and daylight saving time data (repack of MSYS2-packages tzcode for MSYS)" }, + { "name": "msys2-unzip", "uri": "https://anaconda.org/anaconda/msys2-unzip", "description": "Unpacks .zip archives such as those made by PKZIP (repack of MSYS2-packages unzip for MSYS)" }, + { "name": "msys2-util-linux", "uri": "https://anaconda.org/anaconda/msys2-util-linux", "description": "Miscellaneous system utilities for Linux (repack of MSYS2-packages util-linux for MSYS)" }, + { "name": "msys2-which", "uri": "https://anaconda.org/anaconda/msys2-which", "description": "A utility to show the full path of commands (repack of MSYS2-packages which for MSYS)" }, + { "name": "msys2-windows-default-manifest", "uri": "https://anaconda.org/anaconda/msys2-windows-default-manifest", "description": "Default Windows application manifest (repack of MSYS2-packages windows-default-manifest for MSYS)" }, + { "name": "msys2-xz", "uri": "https://anaconda.org/anaconda/msys2-xz", "description": "Library and command line tools for XZ and LZMA compressed files (repack of MSYS2-packages xz for MSYS)" }, + { "name": "msys2-zip", "uri": "https://anaconda.org/anaconda/msys2-zip", "description": "Creates PKZIP-compatible .zip files (repack of MSYS2-packages zip for MSYS)" }, + { "name": "msys2-zlib", "uri": "https://anaconda.org/anaconda/msys2-zlib", "description": "Compression library implementing the deflate compression method found in gzip and PKZIP (repack of MSYS2-packages zlib for MSYS)" }, + { "name": "msys2-zlib-devel", "uri": "https://anaconda.org/anaconda/msys2-zlib-devel", "description": "Compression library implementing the deflate compression method found in gzip and PKZIP (repack of MSYS2-packages zlib-devel for MSYS)" }, + { "name": "msys2-zstd", "uri": "https://anaconda.org/anaconda/msys2-zstd", "description": "Zstandard - Fast real-time compression algorithm (repack of MSYS2-packages zstd for MSYS)" }, + { "name": "multi_key_dict", "uri": "https://anaconda.org/anaconda/multi_key_dict", "description": "Multi key dictionary implementation" }, + { "name": "multidict", "uri": "https://anaconda.org/anaconda/multidict", "description": "The multidict implementation" }, + { "name": "multimethod", "uri": "https://anaconda.org/anaconda/multimethod", "description": "Multiple argument dispatching." }, + { "name": "multipart", "uri": "https://anaconda.org/anaconda/multipart", "description": "Parser for multipart/form-data.#" }, + { "name": "multipledispatch", "uri": "https://anaconda.org/anaconda/multipledispatch", "description": "Multiple dispatch in Python" }, + { "name": "multiprocess", "uri": "https://anaconda.org/anaconda/multiprocess", "description": "better multiprocessing and multithreading in python" }, + { "name": "multivolumefile", "uri": "https://anaconda.org/anaconda/multivolumefile", "description": "multi volume file wrapper library" }, + { "name": "munkres", "uri": "https://anaconda.org/anaconda/munkres", "description": "The Munkres module provides an O(n^3) implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm)." }, + { "name": "murmurhash", "uri": "https://anaconda.org/anaconda/murmurhash", "description": "Cython bindings for MurmurHash2" }, + { "name": "mxnet", "uri": "https://anaconda.org/anaconda/mxnet", "description": "MXNet metapackage for installing lib,py-MXNet Conda packages" }, + { "name": "mxnet-gpu", "uri": "https://anaconda.org/anaconda/mxnet-gpu", "description": "MXNet metapackage which pins a variant of MXNet(GPU) Conda package" }, + { "name": "mxnet-gpu_mkl", "uri": "https://anaconda.org/anaconda/mxnet-gpu_mkl", "description": "MXNet metapackage which pins a variant of MXNet Conda package" }, + { "name": "mxnet-gpu_openblas", "uri": "https://anaconda.org/anaconda/mxnet-gpu_openblas", "description": "MXNet metapackage which pins a variant of MXNet Conda package" }, + { "name": "mxnet-mkl", "uri": "https://anaconda.org/anaconda/mxnet-mkl", "description": "MXNet metapackage which pins a variant of MXNet Conda package" }, + { "name": "mxnet-openblas", "uri": "https://anaconda.org/anaconda/mxnet-openblas", "description": "MXNet metapackage which pins a variant of MXNet Conda package" }, + { "name": "mypy", "uri": "https://anaconda.org/anaconda/mypy", "description": "Optional static typing for Python" }, + { "name": "mypy-protobuf", "uri": "https://anaconda.org/anaconda/mypy-protobuf", "description": "Generate mypy stub files from protobuf specs" }, + { "name": "mypy_extensions", "uri": "https://anaconda.org/anaconda/mypy_extensions", "description": "Extensions for mypy" }, + { "name": "mypyc", "uri": "https://anaconda.org/anaconda/mypyc", "description": "Optional static typing for Python" }, + { "name": "mysql", "uri": "https://anaconda.org/anaconda/mysql", "description": "Open source relational database management system." }, + { "name": "mysql-connector-c", "uri": "https://anaconda.org/anaconda/mysql-connector-c", "description": "MySQL Connector/C, the C interface for communicating with MySQL servers." }, + { "name": "mysql-connector-python", "uri": "https://anaconda.org/anaconda/mysql-connector-python", "description": "Python driver for communicating with MySQL servers" }, + { "name": "mysqlclient", "uri": "https://anaconda.org/anaconda/mysqlclient", "description": "Python interface to MySQL" }, + { "name": "namex", "uri": "https://anaconda.org/anaconda/namex", "description": "Clean up the public namespace of your package" }, + { "name": "navigator-updater", "uri": "https://anaconda.org/anaconda/navigator-updater", "description": "Anaconda Navigator Updater" }, + { "name": "nb_conda", "uri": "https://anaconda.org/anaconda/nb_conda", "description": "Conda environment and package access extension from within Jupyter" }, + { "name": "nb_conda_kernels", "uri": "https://anaconda.org/anaconda/nb_conda_kernels", "description": "Launch Jupyter kernels for any installed conda environment" }, + { "name": "nbclassic", "uri": "https://anaconda.org/anaconda/nbclassic", "description": "Jupyter Notebook as a Jupyter Server Extension." }, + { "name": "nbclient", "uri": "https://anaconda.org/anaconda/nbclient", "description": "A client library for executing notebooks. Formally nbconvert's ExecutePreprocessor." }, + { "name": "nbconvert", "uri": "https://anaconda.org/anaconda/nbconvert", "description": "Converting Jupyter Notebooks" }, + { "name": "nbconvert-all", "uri": "https://anaconda.org/anaconda/nbconvert-all", "description": "No Summary" }, + { "name": "nbconvert-core", "uri": "https://anaconda.org/anaconda/nbconvert-core", "description": "No Summary" }, + { "name": "nbconvert-pandoc", "uri": "https://anaconda.org/anaconda/nbconvert-pandoc", "description": "No Summary" }, + { "name": "nbdime", "uri": "https://anaconda.org/anaconda/nbdime", "description": "Diff and merge of Jupyter Notebooks" }, + { "name": "nbformat", "uri": "https://anaconda.org/anaconda/nbformat", "description": "The Jupyter Notebook format" }, + { "name": "nbgrader", "uri": "https://anaconda.org/anaconda/nbgrader", "description": "A system for assigning and grading Jupyter notebooks" }, + { "name": "nbserverproxy", "uri": "https://anaconda.org/anaconda/nbserverproxy", "description": "Jupyter server extension to proxy web services" }, + { "name": "nbsmoke", "uri": "https://anaconda.org/anaconda/nbsmoke", "description": "Basic notebook checks. Do they run? Do they contain lint?" }, + { "name": "nccl", "uri": "https://anaconda.org/anaconda/nccl", "description": "Optimized primitives for collective multi-GPU communication" }, + { "name": "ncurses-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/ncurses-amzn2-aarch64", "description": "(CDT) Ncurses support utilities" }, + { "name": "ncurses-base-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/ncurses-base-amzn2-aarch64", "description": "(CDT) Descriptions of common terminals" }, + { "name": "ncurses-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/ncurses-libs-amzn2-aarch64", "description": "(CDT) Ncurses libraries" }, + { "name": "neo4j-python-driver", "uri": "https://anaconda.org/anaconda/neo4j-python-driver", "description": "Database connector for Neo4j graph database" }, + { "name": "neon", "uri": "https://anaconda.org/anaconda/neon", "description": "Nervana's Python-based Deep Learning framework" }, + { "name": "neotime", "uri": "https://anaconda.org/anaconda/neotime", "description": "Nanosecond resolution temporal types" }, + { "name": "nest-asyncio", "uri": "https://anaconda.org/anaconda/nest-asyncio", "description": "Patch asyncio to allow nested event loops" }, + { "name": "netcdf4", "uri": "https://anaconda.org/anaconda/netcdf4", "description": "netcdf4-python is a Python interface to the netCDF C library." }, + { "name": "netifaces", "uri": "https://anaconda.org/anaconda/netifaces", "description": "Portable network interface information." }, + { "name": "nettle", "uri": "https://anaconda.org/anaconda/nettle", "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context" }, + { "name": "nettle-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/nettle-amzn2-aarch64", "description": "(CDT) A low-level cryptographic library" }, + { "name": "networkx", "uri": "https://anaconda.org/anaconda/networkx", "description": "Python package for creating and manipulating complex networks" }, + { "name": "neuralprophet", "uri": "https://anaconda.org/anaconda/neuralprophet", "description": "NeuralProphet is an easy to learn framework for interpretable time series forecasting" }, + { "name": "nginx", "uri": "https://anaconda.org/anaconda/nginx", "description": "Nginx is an HTTP and reverse proxy server" }, + { "name": "ninja", "uri": "https://anaconda.org/anaconda/ninja", "description": "A small build system with a focus on speed" }, + { "name": "ninja-base", "uri": "https://anaconda.org/anaconda/ninja-base", "description": "A small build system with a focus on speed" }, + { "name": "nitro", "uri": "https://anaconda.org/anaconda/nitro", "description": "A GIT Mirror of Nitro NITF project" }, + { "name": "nlohmann_json", "uri": "https://anaconda.org/anaconda/nlohmann_json", "description": "JSON for Modern C++" }, + { "name": "nlopt", "uri": "https://anaconda.org/anaconda/nlopt", "description": "nonlinear optimization library" }, + { "name": "nltk", "uri": "https://anaconda.org/anaconda/nltk", "description": "Natural Language Toolkit" }, + { "name": "nodeenv", "uri": "https://anaconda.org/anaconda/nodeenv", "description": "Node.js virtual environment builder" }, + { "name": "nodejs", "uri": "https://anaconda.org/anaconda/nodejs", "description": "Node.js is an open-source, cross-platform JavaScript runtime environment." }, + { "name": "nose-exclude", "uri": "https://anaconda.org/anaconda/nose-exclude", "description": "Exclude specific directories from nosetests runs." }, + { "name": "nose-parameterized", "uri": "https://anaconda.org/anaconda/nose-parameterized", "description": "Parameterized testing with any Python test framework" }, + { "name": "nose2", "uri": "https://anaconda.org/anaconda/nose2", "description": "nose2 is the next generation of nicer testing for Python" }, + { "name": "notebook", "uri": "https://anaconda.org/anaconda/notebook", "description": "A web-based notebook environment for interactive computing" }, + { "name": "notebook-shim", "uri": "https://anaconda.org/anaconda/notebook-shim", "description": "A shim layer for notebook traits and config" }, + { "name": "nsight-compute", "uri": "https://anaconda.org/anaconda/nsight-compute", "description": "NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications" }, + { "name": "nspr-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/nspr-cos7-ppc64le", "description": "(CDT) Netscape Portable Runtime" }, + { "name": "nspr-cos7-s390x", "uri": "https://anaconda.org/anaconda/nspr-cos7-s390x", "description": "(CDT) Netscape Portable Runtime" }, + { "name": "nss-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/nss-cos7-ppc64le", "description": "(CDT) Network Security Services" }, + { "name": "nss-cos7-s390x", "uri": "https://anaconda.org/anaconda/nss-cos7-s390x", "description": "(CDT) Network Security Services" }, + { "name": "nss-softokn-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/nss-softokn-cos7-ppc64le", "description": "(CDT) Network Security Services Softoken Module" }, + { "name": "nss-softokn-cos7-s390x", "uri": "https://anaconda.org/anaconda/nss-softokn-cos7-s390x", "description": "(CDT) Network Security Services Softoken Module" }, + { "name": "nss-softokn-freebl-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/nss-softokn-freebl-cos7-ppc64le", "description": "(CDT) Freebl library for the Network Security Services" }, + { "name": "nss-softokn-freebl-cos7-s390x", "uri": "https://anaconda.org/anaconda/nss-softokn-freebl-cos7-s390x", "description": "(CDT) Freebl library for the Network Security Services" }, + { "name": "nss-util-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/nss-util-cos7-ppc64le", "description": "(CDT) Network Security Services Utilities Library" }, + { "name": "nss-util-cos7-s390x", "uri": "https://anaconda.org/anaconda/nss-util-cos7-s390x", "description": "(CDT) Network Security Services Utilities Library" }, + { "name": "nsync", "uri": "https://anaconda.org/anaconda/nsync", "description": "nsync is a C library that exports various synchronization primitives, such as mutexes" }, + { "name": "ntlm-auth", "uri": "https://anaconda.org/anaconda/ntlm-auth", "description": "Calculates NTLM Authentication codes" }, + { "name": "numactl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/numactl-amzn2-aarch64", "description": "(CDT) The numactl" }, + { "name": "numactl-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/numactl-devel-amzn2-aarch64", "description": "(CDT) The numactl developer" }, + { "name": "numba", "uri": "https://anaconda.org/anaconda/numba", "description": "NumPy aware dynamic Python compiler using LLVM" }, + { "name": "numba-cuda", "uri": "https://anaconda.org/anaconda/numba-cuda", "description": "CUDA target for Numba" }, + { "name": "numba-dppy", "uri": "https://anaconda.org/anaconda/numba-dppy", "description": "Numba extension for Intel CPU and GPU backend" }, + { "name": "numcodecs", "uri": "https://anaconda.org/anaconda/numcodecs", "description": "A Python package providing buffer compression and transformation codecs for use in data storage and communication applications." }, + { "name": "numexpr", "uri": "https://anaconda.org/anaconda/numexpr", "description": "Fast numerical expression evaluator for NumPy" }, + { "name": "numpy", "uri": "https://anaconda.org/anaconda/numpy", "description": "Array processing for numbers, strings, records, and objects." }, + { "name": "numpy-base", "uri": "https://anaconda.org/anaconda/numpy-base", "description": "Array processing for numbers, strings, records, and objects." }, + { "name": "numpy-devel", "uri": "https://anaconda.org/anaconda/numpy-devel", "description": "Array processing for numbers, strings, records, and objects." }, + { "name": "numpydoc", "uri": "https://anaconda.org/anaconda/numpydoc", "description": "Sphinx extension to support docstrings in Numpy format" }, + { "name": "nvcc_linux-64", "uri": "https://anaconda.org/anaconda/nvcc_linux-64", "description": "A meta-package to enable the right nvcc." }, + { "name": "nvcc_win-64", "uri": "https://anaconda.org/anaconda/nvcc_win-64", "description": "A meta-package to enable the right nvcc." }, + { "name": "nvidia-gds", "uri": "https://anaconda.org/anaconda/nvidia-gds", "description": "GPU Direct Storage meta-package" }, + { "name": "nvidia-ml", "uri": "https://anaconda.org/anaconda/nvidia-ml", "description": "Provides a Python interface to GPU management and monitoring functions." }, + { "name": "nvidia-ml-py", "uri": "https://anaconda.org/anaconda/nvidia-ml-py", "description": "Python Bindings for the NVIDIA Management Library" }, + { "name": "oauthenticator", "uri": "https://anaconda.org/anaconda/oauthenticator", "description": "OAuth + JupyterHub Authenticator = OAuthenticator" }, + { "name": "oauthlib", "uri": "https://anaconda.org/anaconda/oauthlib", "description": "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" }, + { "name": "objconv", "uri": "https://anaconda.org/anaconda/objconv", "description": "Object file converter" }, + { "name": "ocl-icd", "uri": "https://anaconda.org/anaconda/ocl-icd", "description": "An OpenCL ICD Loader under an open-source license" }, + { "name": "odo", "uri": "https://anaconda.org/anaconda/odo", "description": "Shapeshifting for your data" }, + { "name": "olefile", "uri": "https://anaconda.org/anaconda/olefile", "description": "parse, read and write Microsoft OLE2 files" }, + { "name": "omniscidb", "uri": "https://anaconda.org/anaconda/omniscidb", "description": "The OmniSci database" }, + { "name": "omniscidb-common", "uri": "https://anaconda.org/anaconda/omniscidb-common", "description": "The OmniSci / HeavyDB database common files." }, + { "name": "omniscidbe", "uri": "https://anaconda.org/anaconda/omniscidbe", "description": "The OmniSci / HeavyDB database" }, + { "name": "oneccl-devel", "uri": "https://anaconda.org/anaconda/oneccl-devel", "description": "Intel® oneAPI Collective Communications Library 2021.3.0 for Linux*" }, + { "name": "oniguruma", "uri": "https://anaconda.org/anaconda/oniguruma", "description": "A regular expression library." }, + { "name": "onnx", "uri": "https://anaconda.org/anaconda/onnx", "description": "Open Neural Network Exchange library" }, + { "name": "onnxconverter-common", "uri": "https://anaconda.org/anaconda/onnxconverter-common", "description": "Common utilities for ONNX converters" }, + { "name": "onnxmltools", "uri": "https://anaconda.org/anaconda/onnxmltools", "description": "ONNXMLTools enables conversion of models to ONNX" }, + { "name": "onnxruntime", "uri": "https://anaconda.org/anaconda/onnxruntime", "description": "cross-platform, high performance ML inferencing and training accelerator" }, + { "name": "onnxruntime-novec", "uri": "https://anaconda.org/anaconda/onnxruntime-novec", "description": "cross-platform, high performance ML inferencing and training accelerator" }, + { "name": "openai", "uri": "https://anaconda.org/anaconda/openai", "description": "Python client library for the OpenAI API" }, + { "name": "openapi-pydantic", "uri": "https://anaconda.org/anaconda/openapi-pydantic", "description": "Pydantic OpenAPI schema implementation" }, + { "name": "openapi-schema-pydantic", "uri": "https://anaconda.org/anaconda/openapi-schema-pydantic", "description": "OpenAPI (v3) specification schema as pydantic class" }, + { "name": "openapi-schema-validator", "uri": "https://anaconda.org/anaconda/openapi-schema-validator", "description": "OpenAPI schema validation for Python" }, + { "name": "openapi-spec-validator", "uri": "https://anaconda.org/anaconda/openapi-spec-validator", "description": "OpenAPI 2.0 (aka Swagger) and OpenAPI 3 spec validator" }, + { "name": "openblas-devel", "uri": "https://anaconda.org/anaconda/openblas-devel", "description": "OpenBLAS headers and libraries for developing software that used OpenBLAS." }, + { "name": "opencensus", "uri": "https://anaconda.org/anaconda/opencensus", "description": "OpenCensus - A stats collection and distributed tracing framework" }, + { "name": "opencensus-context", "uri": "https://anaconda.org/anaconda/opencensus-context", "description": "The OpenCensus Runtime Context." }, + { "name": "opencensus-proto", "uri": "https://anaconda.org/anaconda/opencensus-proto", "description": "OpenCensus Proto - Language Independent Interface Types For OpenCensus" }, + { "name": "opencv", "uri": "https://anaconda.org/anaconda/opencv", "description": "Computer vision and machine learning software library." }, + { "name": "opencv-suite", "uri": "https://anaconda.org/anaconda/opencv-suite", "description": "Computer vision and machine learning software library." }, + { "name": "openh264", "uri": "https://anaconda.org/anaconda/openh264", "description": "OpenH264 is a codec library which supports H.264 encoding and decoding" }, + { "name": "openhmd", "uri": "https://anaconda.org/anaconda/openhmd", "description": "Free and Open Source API and drivers for immersive technology" }, + { "name": "openjpeg", "uri": "https://anaconda.org/anaconda/openjpeg", "description": "An open-source JPEG 2000 codec written in C." }, + { "name": "openldap", "uri": "https://anaconda.org/anaconda/openldap", "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." }, + { "name": "openml", "uri": "https://anaconda.org/anaconda/openml", "description": "Python API for OpenML" }, + { "name": "openmpi-mpicc", "uri": "https://anaconda.org/anaconda/openmpi-mpicc", "description": "An open source Message Passing Interface implementation." }, + { "name": "openmpi-mpicxx", "uri": "https://anaconda.org/anaconda/openmpi-mpicxx", "description": "An open source Message Passing Interface implementation." }, + { "name": "openmpi-mpifort", "uri": "https://anaconda.org/anaconda/openmpi-mpifort", "description": "An open source Message Passing Interface implementation." }, + { "name": "openpyxl", "uri": "https://anaconda.org/anaconda/openpyxl", "description": "A Python library to read/write Excel 2010 xlsx/xlsm files" }, + { "name": "openresty", "uri": "https://anaconda.org/anaconda/openresty", "description": "No Summary" }, + { "name": "openssl", "uri": "https://anaconda.org/anaconda/openssl", "description": "OpenSSL is an open-source implementation of the SSL and TLS protocols" }, + { "name": "openssl-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/openssl-devel-amzn2-aarch64", "description": "(CDT) Files for development of applications which will use OpenSSL" }, + { "name": "openssl-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/openssl-libs-amzn2-aarch64", "description": "(CDT) A general purpose cryptography library with TLS implementation" }, + { "name": "opentelemetry-api", "uri": "https://anaconda.org/anaconda/opentelemetry-api", "description": "OpenTelemetry Python / API" }, + { "name": "opentelemetry-distro", "uri": "https://anaconda.org/anaconda/opentelemetry-distro", "description": "OpenTelemetry Python Distro" }, + { "name": "opentelemetry-exporter-otlp", "uri": "https://anaconda.org/anaconda/opentelemetry-exporter-otlp", "description": "OpenTelemetry Collector Exporters" }, + { "name": "opentelemetry-exporter-otlp-proto-common", "uri": "https://anaconda.org/anaconda/opentelemetry-exporter-otlp-proto-common", "description": "OpenTelemetry Protobuf encoding" }, + { "name": "opentelemetry-exporter-otlp-proto-grpc", "uri": "https://anaconda.org/anaconda/opentelemetry-exporter-otlp-proto-grpc", "description": "OpenTelemetry Python / Protobuf over gRPC Exporter" }, + { "name": "opentelemetry-exporter-otlp-proto-http", "uri": "https://anaconda.org/anaconda/opentelemetry-exporter-otlp-proto-http", "description": "OpenTelemetry Collector Protobuf over HTTP Exporter" }, + { "name": "opentelemetry-instrumentation", "uri": "https://anaconda.org/anaconda/opentelemetry-instrumentation", "description": "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python" }, + { "name": "opentelemetry-instrumentation-system-metrics", "uri": "https://anaconda.org/anaconda/opentelemetry-instrumentation-system-metrics", "description": "OpenTelemetry Python Instrumentation for System Metrics" }, + { "name": "opentelemetry-opentracing-shim", "uri": "https://anaconda.org/anaconda/opentelemetry-opentracing-shim", "description": "OpenTelemetry Python | OpenTracing Shim" }, + { "name": "opentelemetry-propagator-b3", "uri": "https://anaconda.org/anaconda/opentelemetry-propagator-b3", "description": "OpenTelemetry B3 Propagator" }, + { "name": "opentelemetry-propagator-jaeger", "uri": "https://anaconda.org/anaconda/opentelemetry-propagator-jaeger", "description": "OpenTelemetry Python | Jaeger Propagator" }, + { "name": "opentelemetry-proto", "uri": "https://anaconda.org/anaconda/opentelemetry-proto", "description": "OpenTelemetry Python / Proto" }, + { "name": "opentelemetry-sdk", "uri": "https://anaconda.org/anaconda/opentelemetry-sdk", "description": "OpenTelemetry Python / SDK" }, + { "name": "opentelemetry-semantic-conventions", "uri": "https://anaconda.org/anaconda/opentelemetry-semantic-conventions", "description": "OpenTelemetry Python | Semantic Conventions" }, + { "name": "opentracing", "uri": "https://anaconda.org/anaconda/opentracing", "description": "OpenTracing API for Python." }, + { "name": "opentracing_instrumentation", "uri": "https://anaconda.org/anaconda/opentracing_instrumentation", "description": "Tracing Instrumentation using OpenTracing API (http://opentracing.io)" }, + { "name": "opentsne", "uri": "https://anaconda.org/anaconda/opentsne", "description": "Extensible, parallel implementations of t-SNE" }, + { "name": "opt_einsum", "uri": "https://anaconda.org/anaconda/opt_einsum", "description": "Optimizing einsum functions in NumPy, Tensorflow, Dask, and more with contraction order optimization." }, + { "name": "optax", "uri": "https://anaconda.org/anaconda/optax", "description": "A gradient processing and optimisation library in JAX." }, + { "name": "optimum", "uri": "https://anaconda.org/anaconda/optimum", "description": "🤗 Optimum is an extension of 🤗 Transformers and Diffusers, providing a set of\noptimization tools enabling maximum efficiency to train and run models on targeted hardware,\nwhile keeping things easy to use." }, + { "name": "optional-lite", "uri": "https://anaconda.org/anaconda/optional-lite", "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library" }, + { "name": "optree", "uri": "https://anaconda.org/anaconda/optree", "description": "Optimized PyTree Utilities" }, + { "name": "oracledb", "uri": "https://anaconda.org/anaconda/oracledb", "description": "Python interface to Oracle Database" }, + { "name": "orange-canvas-core", "uri": "https://anaconda.org/anaconda/orange-canvas-core", "description": "Core component of Orange Canvas" }, + { "name": "orange-widget-base", "uri": "https://anaconda.org/anaconda/orange-widget-base", "description": "Base Widget for Orange Canvas" }, + { "name": "orange3", "uri": "https://anaconda.org/anaconda/orange3", "description": "component-based data mining framework" }, + { "name": "orbit2-cos6-i686", "uri": "https://anaconda.org/anaconda/orbit2-cos6-i686", "description": "(CDT) A high-performance CORBA Object Request Broker" }, + { "name": "orbit2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/orbit2-cos6-x86_64", "description": "(CDT) A high-performance CORBA Object Request Broker" }, + { "name": "orbit2-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/orbit2-cos7-ppc64le", "description": "(CDT) A high-performance CORBA Object Request Broker" }, + { "name": "orbit2-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/orbit2-devel-cos6-x86_64", "description": "(CDT) Development libraries, header files and utilities for ORBit" }, + { "name": "orc", "uri": "https://anaconda.org/anaconda/orc", "description": "C++ libraries for Apache ORC" }, + { "name": "ordered-set", "uri": "https://anaconda.org/anaconda/ordered-set", "description": "A MutableSet that remembers its order, so that every entry has an index." }, + { "name": "orderedmultidict", "uri": "https://anaconda.org/anaconda/orderedmultidict", "description": "Ordered Multivalue Dictionary - omdict." }, + { "name": "orjson", "uri": "https://anaconda.org/anaconda/orjson", "description": "orjson is a fast, correct JSON library for Python." }, + { "name": "oscrypto", "uri": "https://anaconda.org/anaconda/oscrypto", "description": "Compiler-free Python crypto library backed by the OS, supporting CPython and PyPy" }, + { "name": "osqp", "uri": "https://anaconda.org/anaconda/osqp", "description": "Python interface for OSQP, the Operator Splitting QP Solver" }, + { "name": "outcome", "uri": "https://anaconda.org/anaconda/outcome", "description": "Capture the outcome of Python function calls." }, + { "name": "overrides", "uri": "https://anaconda.org/anaconda/overrides", "description": "A decorator to automatically detect mismatch when overriding a method" }, + { "name": "owslib", "uri": "https://anaconda.org/anaconda/owslib", "description": "OGC Web Service utility library" }, + { "name": "p11-kit-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/p11-kit-amzn2-aarch64", "description": "(CDT) Library for loading and sharing PKCS#11 modules" }, + { "name": "p11-kit-cos6-i686", "uri": "https://anaconda.org/anaconda/p11-kit-cos6-i686", "description": "(CDT) Library for loading and sharing PKCS#11 modules" }, + { "name": "p11-kit-cos6-x86_64", "uri": "https://anaconda.org/anaconda/p11-kit-cos6-x86_64", "description": "(CDT) Library for loading and sharing PKCS#11 modules" }, + { "name": "p11-kit-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/p11-kit-cos7-ppc64le", "description": "(CDT) Library for loading and sharing PKCS#11 modules" }, + { "name": "p11-kit-cos7-s390x", "uri": "https://anaconda.org/anaconda/p11-kit-cos7-s390x", "description": "(CDT) Library for loading and sharing PKCS#11 modules" }, + { "name": "p11-kit-trust-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/p11-kit-trust-amzn2-aarch64", "description": "(CDT) System trust module from p11-kit" }, + { "name": "p11-kit-trust-cos6-i686", "uri": "https://anaconda.org/anaconda/p11-kit-trust-cos6-i686", "description": "(CDT) System trust module from p11-kit" }, + { "name": "p11-kit-trust-cos6-x86_64", "uri": "https://anaconda.org/anaconda/p11-kit-trust-cos6-x86_64", "description": "(CDT) System trust module from p11-kit" }, + { "name": "p11-kit-trust-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/p11-kit-trust-cos7-ppc64le", "description": "(CDT) System trust module from p11-kit" }, + { "name": "p11-kit-trust-cos7-s390x", "uri": "https://anaconda.org/anaconda/p11-kit-trust-cos7-s390x", "description": "(CDT) System trust module from p11-kit" }, + { "name": "p7zip", "uri": "https://anaconda.org/anaconda/p7zip", "description": "p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip." }, + { "name": "packaging", "uri": "https://anaconda.org/anaconda/packaging", "description": "Core utilities for Python packages" }, + { "name": "palettable", "uri": "https://anaconda.org/anaconda/palettable", "description": "Color palettes for Python." }, + { "name": "pam-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pam-amzn2-aarch64", "description": "(CDT) An extensible library which provides authentication for applications" }, + { "name": "pam-cos6-i686", "uri": "https://anaconda.org/anaconda/pam-cos6-i686", "description": "(CDT) An extensible library which provides authentication for applications" }, + { "name": "pam-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pam-cos6-x86_64", "description": "(CDT) An extensible library which provides authentication for applications" }, + { "name": "pam-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/pam-devel-cos6-i686", "description": "(CDT) Files needed for developing PAM-aware applications and modules for PAM" }, + { "name": "pam-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pam-devel-cos6-x86_64", "description": "(CDT) Files needed for developing PAM-aware applications and modules for PAM" }, + { "name": "pamela", "uri": "https://anaconda.org/anaconda/pamela", "description": "PAM interface using ctypes" }, + { "name": "pandarallel", "uri": "https://anaconda.org/anaconda/pandarallel", "description": "An easy to use library to speed up computation (by parallelizing on multi CPUs) with pandas." }, + { "name": "pandas", "uri": "https://anaconda.org/anaconda/pandas", "description": "High-performance, easy-to-use data structures and data analysis tools." }, + { "name": "pandas-profiling", "uri": "https://anaconda.org/anaconda/pandas-profiling", "description": "Generate profile report for pandas DataFrame" }, + { "name": "pandas-stubs", "uri": "https://anaconda.org/anaconda/pandas-stubs", "description": "Collection of Pandas stub files" }, + { "name": "pandasql", "uri": "https://anaconda.org/anaconda/pandasql", "description": "No Summary" }, + { "name": "pandera-core", "uri": "https://anaconda.org/anaconda/pandera-core", "description": "The open source framework for precision data testing" }, + { "name": "pandoc", "uri": "https://anaconda.org/anaconda/pandoc", "description": "Universal markup converter (repackaged binaries)" }, + { "name": "panel", "uri": "https://anaconda.org/anaconda/panel", "description": "The powerful data exploration & web app framework for Python" }, + { "name": "pango", "uri": "https://anaconda.org/anaconda/pango", "description": "Text layout and rendering engine." }, + { "name": "pango-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pango-amzn2-aarch64", "description": "(CDT) System for layout and rendering of internationalized text" }, + { "name": "pango-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pango-cos6-x86_64", "description": "(CDT) System for layout and rendering of internationalized text" }, + { "name": "pango-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/pango-cos7-ppc64le", "description": "(CDT) System for layout and rendering of internationalized text" }, + { "name": "pango-cos7-s390x", "uri": "https://anaconda.org/anaconda/pango-cos7-s390x", "description": "(CDT) System for layout and rendering of internationalized text" }, + { "name": "pango-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pango-devel-amzn2-aarch64", "description": "(CDT) Development files for pango" }, + { "name": "pango-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/pango-devel-cos7-ppc64le", "description": "(CDT) Development files for pango" }, + { "name": "pango-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/pango-devel-cos7-s390x", "description": "(CDT) Development files for pango" }, + { "name": "pangomm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pangomm-amzn2-aarch64", "description": "(CDT) C++ interface for Pango" }, + { "name": "pangomm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pangomm-devel-amzn2-aarch64", "description": "(CDT) Headers for developing programs that will use pangomm" }, + { "name": "param", "uri": "https://anaconda.org/anaconda/param", "description": "Param: Make your Python code clearer and more reliable by declaring Parameters" }, + { "name": "parameterized", "uri": "https://anaconda.org/anaconda/parameterized", "description": "Parameterized testing with any Python test framework" }, + { "name": "paramiko", "uri": "https://anaconda.org/anaconda/paramiko", "description": "SSH2 protocol library" }, + { "name": "parquet-cpp", "uri": "https://anaconda.org/anaconda/parquet-cpp", "description": "C++ libraries for the Apache Parquet file format" }, + { "name": "parse", "uri": "https://anaconda.org/anaconda/parse", "description": "parse() is the opposite of format()" }, + { "name": "parse_type", "uri": "https://anaconda.org/anaconda/parse_type", "description": "Simplifies to build parse types based on the parse module" }, + { "name": "parsedatetime", "uri": "https://anaconda.org/anaconda/parsedatetime", "description": "Parse human-readable date/time text." }, + { "name": "parsel", "uri": "https://anaconda.org/anaconda/parsel", "description": "library to extract data from HTML and XML using XPath and CSS selectors" }, + { "name": "parso", "uri": "https://anaconda.org/anaconda/parso", "description": "A Python Parser" }, + { "name": "partd", "uri": "https://anaconda.org/anaconda/partd", "description": "Appendable key-value storage" }, + { "name": "pastel", "uri": "https://anaconda.org/anaconda/pastel", "description": "Bring colors to your terminal" }, + { "name": "patch-ng", "uri": "https://anaconda.org/anaconda/patch-ng", "description": "Library to parse and apply unified diffs" }, + { "name": "path", "uri": "https://anaconda.org/anaconda/path", "description": "A module wrapper for os.path" }, + { "name": "pathable", "uri": "https://anaconda.org/anaconda/pathable", "description": "Object-oriented paths" }, + { "name": "pathlib2", "uri": "https://anaconda.org/anaconda/pathlib2", "description": "Fork of pathlib aiming to support the full stdlib Python API" }, + { "name": "pathos", "uri": "https://anaconda.org/anaconda/pathos", "description": "parallel graph management and execution in heterogeneous computing" }, + { "name": "pathspec", "uri": "https://anaconda.org/anaconda/pathspec", "description": "Utility library for gitignore style pattern matching of file paths." }, + { "name": "pathtools", "uri": "https://anaconda.org/anaconda/pathtools", "description": "Path utilities for Python." }, + { "name": "pathy", "uri": "https://anaconda.org/anaconda/pathy", "description": "A Path interface for local and cloud bucket storage" }, + { "name": "patsy", "uri": "https://anaconda.org/anaconda/patsy", "description": "Describing statistical models in Python using symbolic formulas" }, + { "name": "pbkdf2", "uri": "https://anaconda.org/anaconda/pbkdf2", "description": "No Summary" }, + { "name": "pciutils-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pciutils-amzn2-aarch64", "description": "(CDT) PCI bus related utilities" }, + { "name": "pciutils-cos7-s390x", "uri": "https://anaconda.org/anaconda/pciutils-cos7-s390x", "description": "(CDT) PCI bus related utilities" }, + { "name": "pciutils-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pciutils-devel-amzn2-aarch64", "description": "(CDT) Linux PCI development library" }, + { "name": "pciutils-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/pciutils-devel-cos6-i686", "description": "(CDT) Linux PCI development library" }, + { "name": "pciutils-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/pciutils-devel-cos7-s390x", "description": "(CDT) Linux PCI development library" }, + { "name": "pciutils-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pciutils-libs-amzn2-aarch64", "description": "(CDT) Linux PCI library" }, + { "name": "pciutils-libs-cos7-s390x", "uri": "https://anaconda.org/anaconda/pciutils-libs-cos7-s390x", "description": "(CDT) Linux PCI library" }, + { "name": "pcre-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pcre-amzn2-aarch64", "description": "(CDT) Perl-compatible regular expression library" }, + { "name": "pcre2", "uri": "https://anaconda.org/anaconda/pcre2", "description": "Regular expression pattern matching using Perl 5 syntax and semantics." }, + { "name": "pdf2image", "uri": "https://anaconda.org/anaconda/pdf2image", "description": "A python module that wraps pdftoppm and pdftocairo to convert PDF to a PIL Image object" }, + { "name": "pdfium-binaries", "uri": "https://anaconda.org/anaconda/pdfium-binaries", "description": "pre-compiled binaries of the PDFium library" }, + { "name": "pdm", "uri": "https://anaconda.org/anaconda/pdm", "description": "Python Development Master" }, + { "name": "pdm-backend", "uri": "https://anaconda.org/anaconda/pdm-backend", "description": "The build backend used by PDM that supports latest packaging standards." }, + { "name": "pdm-pep517", "uri": "https://anaconda.org/anaconda/pdm-pep517", "description": "A PEP 517 backend for PDM that supports PEP 621 metadata" }, + { "name": "pdoc3", "uri": "https://anaconda.org/anaconda/pdoc3", "description": "Auto-generate API documentation for Python projects." }, + { "name": "pefile", "uri": "https://anaconda.org/anaconda/pefile", "description": "pefile is a Python module to read and work with PE (Portable Executable) files" }, + { "name": "pegen", "uri": "https://anaconda.org/anaconda/pegen", "description": "CPython's PEG parser generator" }, + { "name": "pendulum", "uri": "https://anaconda.org/anaconda/pendulum", "description": "Python datetimes made easy" }, + { "name": "pep517", "uri": "https://anaconda.org/anaconda/pep517", "description": "Wrappers to build Python packages using PEP 517 hooks" }, + { "name": "pep8-naming", "uri": "https://anaconda.org/anaconda/pep8-naming", "description": "Plug-in for flake 8 to check the PEP-8 naming conventions" }, + { "name": "percy", "uri": "https://anaconda.org/anaconda/percy", "description": "Helper tool for recipes on aggregate." }, + { "name": "perf", "uri": "https://anaconda.org/anaconda/perf", "description": "Python module to generate and modify perf" }, + { "name": "performance", "uri": "https://anaconda.org/anaconda/performance", "description": "Python benchmark suite" }, + { "name": "perl-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-amzn2-aarch64", "description": "(CDT) Practical Extraction and Report Language" }, + { "name": "perl-carp", "uri": "https://anaconda.org/anaconda/perl-carp", "description": "alternative warn and die for modules" }, + { "name": "perl-carp-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-carp-amzn2-aarch64", "description": "(CDT) Alternative warn and die for modules" }, + { "name": "perl-constant-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-constant-amzn2-aarch64", "description": "(CDT) Perl pragma to declare constants" }, + { "name": "perl-exporter-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-exporter-amzn2-aarch64", "description": "(CDT) Implements default import method for modules" }, + { "name": "perl-exporter-lite", "uri": "https://anaconda.org/anaconda/perl-exporter-lite", "description": "lightweight exporting of functions and variables" }, + { "name": "perl-extutils-makemaker", "uri": "https://anaconda.org/anaconda/perl-extutils-makemaker", "description": "Create a module Makefile" }, + { "name": "perl-file-which", "uri": "https://anaconda.org/anaconda/perl-file-which", "description": "Perl implementation of the which utility as an API" }, + { "name": "perl-getopt-tabular", "uri": "https://anaconda.org/anaconda/perl-getopt-tabular", "description": "table-driven argument parsing for Perl 5" }, + { "name": "perl-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-libs-amzn2-aarch64", "description": "(CDT) The libraries for the perl runtime" }, + { "name": "perl-regexp-common", "uri": "https://anaconda.org/anaconda/perl-regexp-common", "description": "Provide commonly requested regular expressions" }, + { "name": "perl-xml-parser", "uri": "https://anaconda.org/anaconda/perl-xml-parser", "description": "A perl module for parsing XML documents" }, + { "name": "perl-xml-parser-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/perl-xml-parser-amzn2-aarch64", "description": "(CDT) Perl module for parsing XML documents" }, + { "name": "persistent", "uri": "https://anaconda.org/anaconda/persistent", "description": "Translucent persistent objects" }, + { "name": "pg8000", "uri": "https://anaconda.org/anaconda/pg8000", "description": "PostgreSQL interface library" }, + { "name": "phik", "uri": "https://anaconda.org/anaconda/phik", "description": "Phi_K correlation analyzer library" }, + { "name": "phonenumbers", "uri": "https://anaconda.org/anaconda/phonenumbers", "description": "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers." }, + { "name": "picklable-itertools", "uri": "https://anaconda.org/anaconda/picklable-itertools", "description": "No Summary" }, + { "name": "pickle5", "uri": "https://anaconda.org/anaconda/pickle5", "description": "Experimental backport of the pickle 5 protocol (PEP 574)" }, + { "name": "pillow", "uri": "https://anaconda.org/anaconda/pillow", "description": "Pillow is the friendly PIL fork by Alex Clark and Contributors" }, + { "name": "pims", "uri": "https://anaconda.org/anaconda/pims", "description": "Python Image Sequence. Load video and sequential images in many formats with a simple, consistent interface." }, + { "name": "pip", "uri": "https://anaconda.org/anaconda/pip", "description": "PyPA recommended tool for installing Python packages" }, + { "name": "pipenv", "uri": "https://anaconda.org/anaconda/pipenv", "description": "Python Development Workflow for Humans." }, + { "name": "pivottablejs", "uri": "https://anaconda.org/anaconda/pivottablejs", "description": "No Summary" }, + { "name": "pivottablejs-airgap", "uri": "https://anaconda.org/anaconda/pivottablejs-airgap", "description": "PivotTable.js integration for Jupyter/IPython Notebook" }, + { "name": "pixman-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pixman-amzn2-aarch64", "description": "(CDT) Pixel manipulation library" }, + { "name": "pixman-cos6-i686", "uri": "https://anaconda.org/anaconda/pixman-cos6-i686", "description": "(CDT) Pixel manipulation library" }, + { "name": "pixman-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pixman-cos6-x86_64", "description": "(CDT) Pixel manipulation library" }, + { "name": "pixman-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/pixman-cos7-ppc64le", "description": "(CDT) Pixel manipulation library" }, + { "name": "pixman-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/pixman-devel-cos6-i686", "description": "(CDT) Pixel manipulation library development package" }, + { "name": "pkce", "uri": "https://anaconda.org/anaconda/pkce", "description": "PKCE Python generator." }, + { "name": "pkgconfig", "uri": "https://anaconda.org/anaconda/pkgconfig", "description": "A Python interface to the pkg-config command line tool" }, + { "name": "pkgconfig-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/pkgconfig-amzn2-aarch64", "description": "(CDT) A tool for determining compilation options" }, + { "name": "pkginfo", "uri": "https://anaconda.org/anaconda/pkginfo", "description": "Query metadatdata from sdists / bdists / installed packages." }, + { "name": "pkgutil-resolve-name", "uri": "https://anaconda.org/anaconda/pkgutil-resolve-name", "description": "Backport of Python 3.9's pkgutil.resolve_name; resolves a name to an object." }, + { "name": "plaster", "uri": "https://anaconda.org/anaconda/plaster", "description": "A loader interface around multiple config file formats." }, + { "name": "plaster_pastedeploy", "uri": "https://anaconda.org/anaconda/plaster_pastedeploy", "description": "A loader implementing the PasteDeploy syntax to be used by plaster." }, + { "name": "platformdirs", "uri": "https://anaconda.org/anaconda/platformdirs", "description": "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." }, + { "name": "plotly", "uri": "https://anaconda.org/anaconda/plotly", "description": "An interactive JavaScript-based visualization library for Python" }, + { "name": "plotly-resampler", "uri": "https://anaconda.org/anaconda/plotly-resampler", "description": "Visualizing large time series with plotly" }, + { "name": "plotnine", "uri": "https://anaconda.org/anaconda/plotnine", "description": "A grammar of graphics for python" }, + { "name": "pluggy", "uri": "https://anaconda.org/anaconda/pluggy", "description": "Plugin registration and hook calling for Python" }, + { "name": "ply", "uri": "https://anaconda.org/anaconda/ply", "description": "Python Lex-Yacc" }, + { "name": "plyvel", "uri": "https://anaconda.org/anaconda/plyvel", "description": "Plyvel, a fast and feature-rich Python interface to LevelDB" }, + { "name": "pmdarima", "uri": "https://anaconda.org/anaconda/pmdarima", "description": "Pmdarima (originally pyramid-arima, for the anagram of 'py' + 'arima') is a statistical library designed to fill the void in Python's time series analysis capabilities." }, + { "name": "poetry", "uri": "https://anaconda.org/anaconda/poetry", "description": "Python dependency management and packaging made easy" }, + { "name": "poetry-core", "uri": "https://anaconda.org/anaconda/poetry-core", "description": "Poetry PEP 517 Build Backend" }, + { "name": "poetry-dynamic-versioning", "uri": "https://anaconda.org/anaconda/poetry-dynamic-versioning", "description": "Plugin for Poetry to enable dynamic versioning based on VCS tags" }, + { "name": "poetry-plugin-export", "uri": "https://anaconda.org/anaconda/poetry-plugin-export", "description": "Poetry plugin to export the dependencies to various formats" }, + { "name": "pointpats", "uri": "https://anaconda.org/anaconda/pointpats", "description": "Statistical analysis of planar point patterns." }, + { "name": "polly", "uri": "https://anaconda.org/anaconda/polly", "description": "LLVM Framework for High-Level Loop and Data-Locality Optimizations" }, + { "name": "pomegranate", "uri": "https://anaconda.org/anaconda/pomegranate", "description": "Pomegranate is a graphical models library for Python, implemented in Cython for speed." }, + { "name": "pooch", "uri": "https://anaconda.org/anaconda/pooch", "description": "A friend to fetch your data files" }, + { "name": "poppler", "uri": "https://anaconda.org/anaconda/poppler", "description": "The Poppler PDF manipulation library." }, + { "name": "poppler-cpp", "uri": "https://anaconda.org/anaconda/poppler-cpp", "description": "The Poppler PDF manipulation library." }, + { "name": "poppler-data", "uri": "https://anaconda.org/anaconda/poppler-data", "description": "Encoding data for the Poppler PDF manipulation library." }, + { "name": "poppler-qt", "uri": "https://anaconda.org/anaconda/poppler-qt", "description": "The Poppler PDF manipulation library." }, + { "name": "popt", "uri": "https://anaconda.org/anaconda/popt", "description": "Popt is a C library for parsing command line parameters." }, + { "name": "portalocker", "uri": "https://anaconda.org/anaconda/portalocker", "description": "Portalocker is a library to provide an easy API to file locking." }, + { "name": "portend", "uri": "https://anaconda.org/anaconda/portend", "description": "TCP port monitoring utilities" }, + { "name": "portpicker", "uri": "https://anaconda.org/anaconda/portpicker", "description": "A library to choose unique available network ports." }, + { "name": "postgresql", "uri": "https://anaconda.org/anaconda/postgresql", "description": "PostgreSQL is a powerful, open source object-relational database system." }, + { "name": "powerlaw", "uri": "https://anaconda.org/anaconda/powerlaw", "description": "Toolbox for testing if a probability distribution fits a power law" }, + { "name": "powershell_shortcut", "uri": "https://anaconda.org/anaconda/powershell_shortcut", "description": "Powershell shortcut creator for Windows (using menuinst)" }, + { "name": "powershell_shortcut_miniconda", "uri": "https://anaconda.org/anaconda/powershell_shortcut_miniconda", "description": "Powershell shortcut creator for Windows (using menuinst)" }, + { "name": "pox", "uri": "https://anaconda.org/anaconda/pox", "description": "utilities for filesystem exploration and automated builds" }, + { "name": "poyo", "uri": "https://anaconda.org/anaconda/poyo", "description": "A lightweight YAML Parser for Python" }, + { "name": "ppft", "uri": "https://anaconda.org/anaconda/ppft", "description": "distributed and parallel python" }, + { "name": "pre-commit", "uri": "https://anaconda.org/anaconda/pre-commit", "description": "A framework for managing and maintaining multi-language pre-commit hooks." }, + { "name": "pre_commit", "uri": "https://anaconda.org/anaconda/pre_commit", "description": "A framework for managing and maintaining multi-language pre-commit hooks." }, + { "name": "preshed", "uri": "https://anaconda.org/anaconda/preshed", "description": "Cython Hash Table for Pre-Hashed Keys" }, + { "name": "pretend", "uri": "https://anaconda.org/anaconda/pretend", "description": "A library for stubbing in Python" }, + { "name": "prettytable", "uri": "https://anaconda.org/anaconda/prettytable", "description": "Display tabular data in a visually appealing ASCII table format" }, + { "name": "prince", "uri": "https://anaconda.org/anaconda/prince", "description": "Multivariate exploratory data analysis in Python — PCA, CA, MCA, MFA, FAMD, GPA" }, + { "name": "priority", "uri": "https://anaconda.org/anaconda/priority", "description": "A pure-Python implementation of the HTTP/2 priority tree" }, + { "name": "prison", "uri": "https://anaconda.org/anaconda/prison", "description": "Python rison encoder/decoder" }, + { "name": "progress", "uri": "https://anaconda.org/anaconda/progress", "description": "Easy progress reporting for Python" }, + { "name": "progressbar2", "uri": "https://anaconda.org/anaconda/progressbar2", "description": "A Python Progressbar library to provide visual (yet text based) progress to long running operations." }, + { "name": "proj", "uri": "https://anaconda.org/anaconda/proj", "description": "Cartographic Projections and Coordinate Transformations Library" }, + { "name": "prometheus_client", "uri": "https://anaconda.org/anaconda/prometheus_client", "description": "Python client for the Prometheus monitoring system" }, + { "name": "prometheus_flask_exporter", "uri": "https://anaconda.org/anaconda/prometheus_flask_exporter", "description": "Prometheus metrics exporter for Flask" }, + { "name": "promise", "uri": "https://anaconda.org/anaconda/promise", "description": "Ultra-performant Promise implementation in Python" }, + { "name": "prompt-toolkit", "uri": "https://anaconda.org/anaconda/prompt-toolkit", "description": "Library for building powerful interactive command lines in Python" }, + { "name": "prompt_toolkit", "uri": "https://anaconda.org/anaconda/prompt_toolkit", "description": "Library for building powerful interactive command lines in Python" }, + { "name": "propcache", "uri": "https://anaconda.org/anaconda/propcache", "description": "Accelerated property cache" }, + { "name": "prophet", "uri": "https://anaconda.org/anaconda/prophet", "description": "Automatic Forecasting Procedure" }, + { "name": "protego", "uri": "https://anaconda.org/anaconda/protego", "description": "A pure-Python robots.txt parser with support for modern conventions" }, + { "name": "proto-plus", "uri": "https://anaconda.org/anaconda/proto-plus", "description": "Beautiful, Pythonic protocol buffers." }, + { "name": "protobuf", "uri": "https://anaconda.org/anaconda/protobuf", "description": "Protocol Buffers - Google's data interchange format." }, + { "name": "pscript", "uri": "https://anaconda.org/anaconda/pscript", "description": "library for transpiling Python code to JavaScript." }, + { "name": "psqlodbc", "uri": "https://anaconda.org/anaconda/psqlodbc", "description": "psqlODBC is the official PostgreSQL ODBC Driver" }, + { "name": "psutil", "uri": "https://anaconda.org/anaconda/psutil", "description": "A cross-platform process and system utilities module for Python" }, + { "name": "psycopg2", "uri": "https://anaconda.org/anaconda/psycopg2", "description": "PostgreSQL database adapter for Python" }, + { "name": "ptscotch", "uri": "https://anaconda.org/anaconda/ptscotch", "description": "PT-SCOTCH: (Parallel) Static Mapping, Graph, Mesh and Hypergraph Partitioning, and Parallel and Sequential Sparse Matrix Ordering Package" }, + { "name": "pugixml", "uri": "https://anaconda.org/anaconda/pugixml", "description": "Light-weight, simple and fast XML parser for C++ with XPath support" }, + { "name": "pulseaudio-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pulseaudio-libs-cos6-x86_64", "description": "(CDT) Libraries for PulseAudio clients" }, + { "name": "pulseaudio-libs-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pulseaudio-libs-devel-cos6-x86_64", "description": "(CDT) Headers and libraries for PulseAudio client development" }, + { "name": "pulseaudio-libs-glib2-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pulseaudio-libs-glib2-cos6-x86_64", "description": "(CDT) GLIB 2.x bindings for PulseAudio clients" }, + { "name": "pulseaudio-libs-zeroconf-cos6-x86_64", "uri": "https://anaconda.org/anaconda/pulseaudio-libs-zeroconf-cos6-x86_64", "description": "(CDT) Zeroconf support for PulseAudio clients" }, + { "name": "pure_eval", "uri": "https://anaconda.org/anaconda/pure_eval", "description": "Safely evaluate AST nodes without side effects" }, + { "name": "py-boost", "uri": "https://anaconda.org/anaconda/py-boost", "description": "Free peer-reviewed portable C++ source libraries." }, + { "name": "py-cpuinfo", "uri": "https://anaconda.org/anaconda/py-cpuinfo", "description": "A module for getting CPU info with Python 2 & 3" }, + { "name": "py-lief", "uri": "https://anaconda.org/anaconda/py-lief", "description": "A cross platform library to parse, modify and abstract ELF, PE and MachO formats." }, + { "name": "py-mxnet", "uri": "https://anaconda.org/anaconda/py-mxnet", "description": "MXNet is a deep learning framework designed for both efficiency and flexibility" }, + { "name": "py-opencv", "uri": "https://anaconda.org/anaconda/py-opencv", "description": "Computer vision and machine learning software library." }, + { "name": "py-partiql-parser", "uri": "https://anaconda.org/anaconda/py-partiql-parser", "description": "Pure Python PartiQL Parser" }, + { "name": "py-spy", "uri": "https://anaconda.org/anaconda/py-spy", "description": "Sampling profiler for Python programs" }, + { "name": "py-xgboost", "uri": "https://anaconda.org/anaconda/py-xgboost", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "py-xgboost-cpu", "uri": "https://anaconda.org/anaconda/py-xgboost-cpu", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "py-xgboost-gpu", "uri": "https://anaconda.org/anaconda/py-xgboost-gpu", "description": "No Summary" }, + { "name": "py4j", "uri": "https://anaconda.org/anaconda/py4j", "description": "Enables Python programs to dynamically access arbitrary Java objects" }, + { "name": "py7zr", "uri": "https://anaconda.org/anaconda/py7zr", "description": "Pure python 7-zip library" }, + { "name": "pyamg", "uri": "https://anaconda.org/anaconda/pyamg", "description": "Algebraic Multigrid Solvers in Python" }, + { "name": "pyaml", "uri": "https://anaconda.org/anaconda/pyaml", "description": "PyYAML-based module to produce pretty and readable YAML-serialized data" }, + { "name": "pyarrow", "uri": "https://anaconda.org/anaconda/pyarrow", "description": "Python libraries for Apache Arrow" }, + { "name": "pyasn1", "uri": "https://anaconda.org/anaconda/pyasn1", "description": "ASN.1 types and codecs" }, + { "name": "pybcj", "uri": "https://anaconda.org/anaconda/pybcj", "description": "bcj filter library" }, + { "name": "pybind11", "uri": "https://anaconda.org/anaconda/pybind11", "description": "Seamless operability between C++11 and Python" }, + { "name": "pybind11-abi", "uri": "https://anaconda.org/anaconda/pybind11-abi", "description": "Seamless operability between C++11 and Python" }, + { "name": "pybind11-global", "uri": "https://anaconda.org/anaconda/pybind11-global", "description": "Seamless operability between C++11 and Python" }, + { "name": "pycares", "uri": "https://anaconda.org/anaconda/pycares", "description": "Python interface for c-ares" }, + { "name": "pyclipper", "uri": "https://anaconda.org/anaconda/pyclipper", "description": "Cython wrapper for the C++ translation of the Angus Johnson's Clipper library (ver. 6.4.2)" }, + { "name": "pycodestyle", "uri": "https://anaconda.org/anaconda/pycodestyle", "description": "Python style guide checker" }, + { "name": "pycosat", "uri": "https://anaconda.org/anaconda/pycosat", "description": "Bindings to picosat (a SAT solver)" }, + { "name": "pycryptodome", "uri": "https://anaconda.org/anaconda/pycryptodome", "description": "Cryptographic library for Python" }, + { "name": "pycryptodomex", "uri": "https://anaconda.org/anaconda/pycryptodomex", "description": "Cryptographic library for Python" }, + { "name": "pycryptosat", "uri": "https://anaconda.org/anaconda/pycryptosat", "description": "An advanced SAT Solver https://www.msoos.org" }, + { "name": "pyct", "uri": "https://anaconda.org/anaconda/pyct", "description": "python package common tasks for users (e.g. copy examples, fetch data, ...)" }, + { "name": "pyct-core", "uri": "https://anaconda.org/anaconda/pyct-core", "description": "Common tasks for package building (e.g. bundle examples)" }, + { "name": "pycurl", "uri": "https://anaconda.org/anaconda/pycurl", "description": "A Python Interface To The cURL library" }, + { "name": "pydantic", "uri": "https://anaconda.org/anaconda/pydantic", "description": "Data validation and settings management using python type hinting" }, + { "name": "pydantic-core", "uri": "https://anaconda.org/anaconda/pydantic-core", "description": "Core validation logic for pydantic written in rust" }, + { "name": "pydantic-settings", "uri": "https://anaconda.org/anaconda/pydantic-settings", "description": "Settings management using Pydantic" }, + { "name": "pydata-google-auth", "uri": "https://anaconda.org/anaconda/pydata-google-auth", "description": "Helpers for authenticating to Google APIs from Python." }, + { "name": "pydeck", "uri": "https://anaconda.org/anaconda/pydeck", "description": "Widget for deck.gl maps" }, + { "name": "pydispatcher", "uri": "https://anaconda.org/anaconda/pydispatcher", "description": "No Summary" }, + { "name": "pydocstyle", "uri": "https://anaconda.org/anaconda/pydocstyle", "description": "Python docstring style checker (formerly pep257)" }, + { "name": "pydot", "uri": "https://anaconda.org/anaconda/pydot", "description": "Python interface to Graphviz's Dot" }, + { "name": "pydruid", "uri": "https://anaconda.org/anaconda/pydruid", "description": "A Python connector for Druid" }, + { "name": "pyee", "uri": "https://anaconda.org/anaconda/pyee", "description": "A port of node.js's EventEmitter to python." }, + { "name": "pyemd", "uri": "https://anaconda.org/anaconda/pyemd", "description": "A Python wrapper for the Earth Mover's Distance." }, + { "name": "pyepsg", "uri": "https://anaconda.org/anaconda/pyepsg", "description": "Easy access to the EPSG database via http://epsg.io/" }, + { "name": "pyerfa", "uri": "https://anaconda.org/anaconda/pyerfa", "description": "Python bindings for ERFA routines" }, + { "name": "pyface", "uri": "https://anaconda.org/anaconda/pyface", "description": "Traits-capable windowing framework" }, + { "name": "pyfakefs", "uri": "https://anaconda.org/anaconda/pyfakefs", "description": "A fake file system that mocks the Python file system modules." }, + { "name": "pyfastner", "uri": "https://anaconda.org/anaconda/pyfastner", "description": "A fast implementation of dictionary based named entity recognition." }, + { "name": "pyflakes", "uri": "https://anaconda.org/anaconda/pyflakes", "description": "Pyflakes analyzes programs and detects various errors." }, + { "name": "pygithub", "uri": "https://anaconda.org/anaconda/pygithub", "description": "Python library implementing the GitHub API v3" }, + { "name": "pygments", "uri": "https://anaconda.org/anaconda/pygments", "description": "Pygments is a generic syntax highlighter suitable for use in code hosting, forums, wikis or other applications that need to prettify source code." }, + { "name": "pygpu", "uri": "https://anaconda.org/anaconda/pygpu", "description": "Library to manipulate arrays on GPU" }, + { "name": "pygraphviz", "uri": "https://anaconda.org/anaconda/pygraphviz", "description": "Python interface to Graphviz" }, + { "name": "pyhamcrest", "uri": "https://anaconda.org/anaconda/pyhamcrest", "description": "Hamcrest framework for matcher objects" }, + { "name": "pyicu", "uri": "https://anaconda.org/anaconda/pyicu", "description": "Welcome to PyICU, a Python extension wrapping the ICU C++ libraries." }, + { "name": "pyinotify", "uri": "https://anaconda.org/anaconda/pyinotify", "description": "Monitoring filesystems events with inotify on Linux." }, + { "name": "pyinstaller", "uri": "https://anaconda.org/anaconda/pyinstaller", "description": "PyInstaller bundles a Python application and all its dependencies into a single package." }, + { "name": "pyinstaller-hooks-contrib", "uri": "https://anaconda.org/anaconda/pyinstaller-hooks-contrib", "description": "Community maintained hooks for PyInstaller" }, + { "name": "pyjks", "uri": "https://anaconda.org/anaconda/pyjks", "description": "Pure-Python Java Keystore (JKS) library" }, + { "name": "pyjsparser", "uri": "https://anaconda.org/anaconda/pyjsparser", "description": "Fast javascript parser (based on esprima.js)" }, + { "name": "pyjwt", "uri": "https://anaconda.org/anaconda/pyjwt", "description": "JSON Web Token implementation in Python" }, + { "name": "pykdtree", "uri": "https://anaconda.org/anaconda/pykdtree", "description": "Fast kd-tree implementation with OpenMP-enabled queries" }, + { "name": "pykerberos", "uri": "https://anaconda.org/anaconda/pykerberos", "description": "high-level interface to Kerberos" }, + { "name": "pykrb5", "uri": "https://anaconda.org/anaconda/pykrb5", "description": "Kerberos API bindings for Python" }, + { "name": "pylev", "uri": "https://anaconda.org/anaconda/pylev", "description": "A pure Python Levenshtein implementation that's not freaking GPL'd." }, + { "name": "pylint", "uri": "https://anaconda.org/anaconda/pylint", "description": "python code static checker" }, + { "name": "pylint-venv", "uri": "https://anaconda.org/anaconda/pylint-venv", "description": "pylint-venv provides a Pylint init-hook to use the same Pylint installation with different virtual environments." }, + { "name": "pyls-black", "uri": "https://anaconda.org/anaconda/pyls-black", "description": "Black plugin for the Python Language Server" }, + { "name": "pyls-spyder", "uri": "https://anaconda.org/anaconda/pyls-spyder", "description": "Spyder extensions for the python-lsp-server" }, + { "name": "pymc", "uri": "https://anaconda.org/anaconda/pymc", "description": "PyMC: Bayesian Stochastic Modelling in Python" }, + { "name": "pymc-experimental", "uri": "https://anaconda.org/anaconda/pymc-experimental", "description": "The next batch of cool PyMC features" }, + { "name": "pymc3", "uri": "https://anaconda.org/anaconda/pymc3", "description": "Probabilistic Programming in Python" }, + { "name": "pymdown-extensions", "uri": "https://anaconda.org/anaconda/pymdown-extensions", "description": "Extension pack for Python Markdown." }, + { "name": "pymeeus", "uri": "https://anaconda.org/anaconda/pymeeus", "description": "Python implementation of Jean Meeus astronomical routines" }, + { "name": "pymongo", "uri": "https://anaconda.org/anaconda/pymongo", "description": "Python driver for MongoDB http://www.mongodb.org" }, + { "name": "pymorphy3", "uri": "https://anaconda.org/anaconda/pymorphy3", "description": "Morphological analyzer (POS tagger + inflection engine) for Ukrainian and Russian languages." }, + { "name": "pymorphy3-dicts-ru", "uri": "https://anaconda.org/anaconda/pymorphy3-dicts-ru", "description": "Russian dictionaries for pymorphy3" }, + { "name": "pymorphy3-dicts-uk", "uri": "https://anaconda.org/anaconda/pymorphy3-dicts-uk", "description": "Ukrainian dictionaries for pymorphy3" }, + { "name": "pympler", "uri": "https://anaconda.org/anaconda/pympler", "description": "Development tool to measure, monitor and analyze the memory behavior of Python objects in a running Python application." }, + { "name": "pymysql", "uri": "https://anaconda.org/anaconda/pymysql", "description": "Pure Python MySQL Driver" }, + { "name": "pynacl", "uri": "https://anaconda.org/anaconda/pynacl", "description": "PyNaCl is a Python binding to the Networking and Cryptography library, a crypto library with the stated goal of improving usability, security and speed." }, + { "name": "pynndescent", "uri": "https://anaconda.org/anaconda/pynndescent", "description": "Simple fast approximate nearest neighbor search" }, + { "name": "pyo3-pack", "uri": "https://anaconda.org/anaconda/pyo3-pack", "description": "No Summary" }, + { "name": "pyobjc-core", "uri": "https://anaconda.org/anaconda/pyobjc-core", "description": "Python<->ObjC Interoperability Module" }, + { "name": "pyobjc-framework-cocoa", "uri": "https://anaconda.org/anaconda/pyobjc-framework-cocoa", "description": "Wrappers for the Cocoa frameworks on Mac OS X" }, + { "name": "pyobjc-framework-coreservices", "uri": "https://anaconda.org/anaconda/pyobjc-framework-coreservices", "description": "Wrappers for the “CoreServices” framework on macOS." }, + { "name": "pyobjc-framework-fsevents", "uri": "https://anaconda.org/anaconda/pyobjc-framework-fsevents", "description": "Wrappers for the framework FSEvents on macOS" }, + { "name": "pyod", "uri": "https://anaconda.org/anaconda/pyod", "description": "A Python Toolkit for Scalable Outlier Detection (Anomaly Detection)" }, + { "name": "pyodbc", "uri": "https://anaconda.org/anaconda/pyodbc", "description": "DB API Module for ODBC" }, + { "name": "pyomniscidb", "uri": "https://anaconda.org/anaconda/pyomniscidb", "description": "A python DB API 2 compatible client for OmniSci (formerly MapD)." }, + { "name": "pyomniscidbe", "uri": "https://anaconda.org/anaconda/pyomniscidbe", "description": "The OmniSci / HeavyDB database" }, + { "name": "pyopengl", "uri": "https://anaconda.org/anaconda/pyopengl", "description": "No Summary" }, + { "name": "pyopenssl", "uri": "https://anaconda.org/anaconda/pyopenssl", "description": "Python wrapper module around the OpenSSL library" }, + { "name": "pyparsing", "uri": "https://anaconda.org/anaconda/pyparsing", "description": "Create and execute simple grammars" }, + { "name": "pypdf", "uri": "https://anaconda.org/anaconda/pypdf", "description": "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" }, + { "name": "pypdf-with-crypto", "uri": "https://anaconda.org/anaconda/pypdf-with-crypto", "description": "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" }, + { "name": "pypdf-with-full", "uri": "https://anaconda.org/anaconda/pypdf-with-full", "description": "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" }, + { "name": "pypdf-with-image", "uri": "https://anaconda.org/anaconda/pypdf-with-image", "description": "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" }, + { "name": "pypdf2", "uri": "https://anaconda.org/anaconda/pypdf2", "description": "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" }, + { "name": "pyperf", "uri": "https://anaconda.org/anaconda/pyperf", "description": "Toolkit to run Python benchmarks" }, + { "name": "pyperformance", "uri": "https://anaconda.org/anaconda/pyperformance", "description": "Python benchmark suite" }, + { "name": "pyphen", "uri": "https://anaconda.org/anaconda/pyphen", "description": "Pure Python module to hyphenate text" }, + { "name": "pypng", "uri": "https://anaconda.org/anaconda/pypng", "description": "Pure Python PNG image encoder and decoder" }, + { "name": "pyppmd", "uri": "https://anaconda.org/anaconda/pyppmd", "description": "PPMd compression/decompression library" }, + { "name": "pyprof2calltree", "uri": "https://anaconda.org/anaconda/pyprof2calltree", "description": "Help visualize profiling data from cProfile with qcachegrind" }, + { "name": "pyproj", "uri": "https://anaconda.org/anaconda/pyproj", "description": "Python interface to PROJ library" }, + { "name": "pyproject-metadata", "uri": "https://anaconda.org/anaconda/pyproject-metadata", "description": "PEP 621 metadata parsing" }, + { "name": "pyproject_hooks", "uri": "https://anaconda.org/anaconda/pyproject_hooks", "description": "Wrappers to call pyproject.toml-based build backend hooks." }, + { "name": "pyqt", "uri": "https://anaconda.org/anaconda/pyqt", "description": "Python bindings for the Qt cross platform application toolkit" }, + { "name": "pyqt-builder", "uri": "https://anaconda.org/anaconda/pyqt-builder", "description": "The PEP 517 compliant PyQt build system" }, + { "name": "pyqt5-sip", "uri": "https://anaconda.org/anaconda/pyqt5-sip", "description": "Python bindings for the Qt cross platform application toolkit" }, + { "name": "pyqtchart", "uri": "https://anaconda.org/anaconda/pyqtchart", "description": "Python bindings for the Qt cross platform application toolkit" }, + { "name": "pyqtgraph", "uri": "https://anaconda.org/anaconda/pyqtgraph", "description": "Scientific Graphics and GUI Library for Python" }, + { "name": "pyqtwebengine", "uri": "https://anaconda.org/anaconda/pyqtwebengine", "description": "Python bindings for the Qt cross platform application toolkit" }, + { "name": "pyquery", "uri": "https://anaconda.org/anaconda/pyquery", "description": "A jquery-like library for python" }, + { "name": "pyreadline3", "uri": "https://anaconda.org/anaconda/pyreadline3", "description": "A python implementation of GNU readline." }, + { "name": "pyrsistent", "uri": "https://anaconda.org/anaconda/pyrsistent", "description": "Persistent/Functional/Immutable data structures" }, + { "name": "pyrush", "uri": "https://anaconda.org/anaconda/pyrush", "description": "A fast implementation of RuSH (Rule-based sentence Segmenter using Hashing)." }, + { "name": "pysbd", "uri": "https://anaconda.org/anaconda/pysbd", "description": "Rule-based sentence boundary detection" }, + { "name": "pyserial", "uri": "https://anaconda.org/anaconda/pyserial", "description": "Python serial port access library" }, + { "name": "pysftp", "uri": "https://anaconda.org/anaconda/pysftp", "description": "A friendly face on SFTP" }, + { "name": "pyshp", "uri": "https://anaconda.org/anaconda/pyshp", "description": "Pure Python read/write support for ESRI Shapefile format" }, + { "name": "pysimstring", "uri": "https://anaconda.org/anaconda/pysimstring", "description": "Python Simstring bindings for Linux, OS X and Windows" }, + { "name": "pysmbclient", "uri": "https://anaconda.org/anaconda/pysmbclient", "description": "A convenient smbclient wrapper" }, + { "name": "pysmi", "uri": "https://anaconda.org/anaconda/pysmi", "description": "SNMP SMI/MIB Parser" }, + { "name": "pysnmp", "uri": "https://anaconda.org/anaconda/pysnmp", "description": "SNMP library for Python" }, + { "name": "pysocks", "uri": "https://anaconda.org/anaconda/pysocks", "description": "A Python SOCKS client module. See https://github.com/Anorov/PySocks for more information." }, + { "name": "pyspark", "uri": "https://anaconda.org/anaconda/pyspark", "description": "Apache Spark Python API" }, + { "name": "pyspnego", "uri": "https://anaconda.org/anaconda/pyspnego", "description": "Windows Negotiate Authentication Client and Server" }, + { "name": "pytables", "uri": "https://anaconda.org/anaconda/pytables", "description": "Brings together Python, HDF5 and NumPy to easily handle large amounts of data." }, + { "name": "pyte", "uri": "https://anaconda.org/anaconda/pyte", "description": "Simple VTXXX-compatible linux terminal emulator" }, + { "name": "pytensor", "uri": "https://anaconda.org/anaconda/pytensor", "description": "An optimizing compiler for evaluating mathematical expressions." }, + { "name": "pytesseract", "uri": "https://anaconda.org/anaconda/pytesseract", "description": "Python-tesseract is an optical character recognition (OCR) tool for python." }, + { "name": "pytest", "uri": "https://anaconda.org/anaconda/pytest", "description": "Simple and powerful testing with Python." }, + { "name": "pytest-arraydiff", "uri": "https://anaconda.org/anaconda/pytest-arraydiff", "description": "pytest plugin to help with comparing array output from tests" }, + { "name": "pytest-astropy", "uri": "https://anaconda.org/anaconda/pytest-astropy", "description": "Meta-package containing dependencies for testing Astropy" }, + { "name": "pytest-astropy-header", "uri": "https://anaconda.org/anaconda/pytest-astropy-header", "description": "Pytest plugin to add diagnostic information to the header of the test output" }, + { "name": "pytest-asyncio", "uri": "https://anaconda.org/anaconda/pytest-asyncio", "description": "Pytest support for asyncio" }, + { "name": "pytest-azurepipelines", "uri": "https://anaconda.org/anaconda/pytest-azurepipelines", "description": "Plugin for pytest that makes it simple to work with Azure Pipelines" }, + { "name": "pytest-base-url", "uri": "https://anaconda.org/anaconda/pytest-base-url", "description": "pytest plugin for URL based testing" }, + { "name": "pytest-bdd", "uri": "https://anaconda.org/anaconda/pytest-bdd", "description": "BDD for pytest" }, + { "name": "pytest-benchmark", "uri": "https://anaconda.org/anaconda/pytest-benchmark", "description": "A py.test fixture for benchmarking code" }, + { "name": "pytest-cache", "uri": "https://anaconda.org/anaconda/pytest-cache", "description": "No Summary" }, + { "name": "pytest-codspeed", "uri": "https://anaconda.org/anaconda/pytest-codspeed", "description": "Pytest plugin to create CodSpeed benchmarks" }, + { "name": "pytest-console-scripts", "uri": "https://anaconda.org/anaconda/pytest-console-scripts", "description": "Pytest plugin for testing console scripts" }, + { "name": "pytest-cov", "uri": "https://anaconda.org/anaconda/pytest-cov", "description": "Pytest plugin for measuring coverage" }, + { "name": "pytest-csv", "uri": "https://anaconda.org/anaconda/pytest-csv", "description": "CSV output for pytest." }, + { "name": "pytest-dependency", "uri": "https://anaconda.org/anaconda/pytest-dependency", "description": "Manage dependencies of tests" }, + { "name": "pytest-describe", "uri": "https://anaconda.org/anaconda/pytest-describe", "description": "Describe-style plugin for py.test" }, + { "name": "pytest-doctestplus", "uri": "https://anaconda.org/anaconda/pytest-doctestplus", "description": "Pytest plugin with advanced doctest features." }, + { "name": "pytest-filter-subpackage", "uri": "https://anaconda.org/anaconda/pytest-filter-subpackage", "description": "Pytest plugin for filtering based on sub-packages" }, + { "name": "pytest-flake8", "uri": "https://anaconda.org/anaconda/pytest-flake8", "description": "pytest plugin to check FLAKE8 requirements" }, + { "name": "pytest-flakefinder", "uri": "https://anaconda.org/anaconda/pytest-flakefinder", "description": "Runs tests multiple times to expose flakiness." }, + { "name": "pytest-flakes", "uri": "https://anaconda.org/anaconda/pytest-flakes", "description": "pytest plugin to check source code with pyflakes" }, + { "name": "pytest-forked", "uri": "https://anaconda.org/anaconda/pytest-forked", "description": "run tests in isolated forked subprocesses" }, + { "name": "pytest-grpc", "uri": "https://anaconda.org/anaconda/pytest-grpc", "description": "Write test for gRPC with pytest" }, + { "name": "pytest-html", "uri": "https://anaconda.org/anaconda/pytest-html", "description": "pytest plugin for generating HTML reports" }, + { "name": "pytest-httpserver", "uri": "https://anaconda.org/anaconda/pytest-httpserver", "description": "pytest-httpserver is a httpserver for pytest" }, + { "name": "pytest-json", "uri": "https://anaconda.org/anaconda/pytest-json", "description": "Generate JSON test reports" }, + { "name": "pytest-jupyter", "uri": "https://anaconda.org/anaconda/pytest-jupyter", "description": "Pytest plugin that provides a set of fixtures and markers for testing Jupyter notebooks and\nJupyter kernel sessions using the Pytest framework. This package allows developers to run\ntests on Jupyter notebooks as if they were regular Python modules." }, + { "name": "pytest-jupyter-client", "uri": "https://anaconda.org/anaconda/pytest-jupyter-client", "description": "Pytest plugin that provides a set of fixtures and markers for testing Jupyter notebooks and\nJupyter kernel sessions using the Pytest framework. This package allows developers to run\ntests on Jupyter notebooks as if they were regular Python modules." }, + { "name": "pytest-jupyter-server", "uri": "https://anaconda.org/anaconda/pytest-jupyter-server", "description": "Pytest plugin that provides a set of fixtures and markers for testing Jupyter notebooks and\nJupyter kernel sessions using the Pytest framework. This package allows developers to run\ntests on Jupyter notebooks as if they were regular Python modules." }, + { "name": "pytest-localserver", "uri": "https://anaconda.org/anaconda/pytest-localserver", "description": "pytest-localserver is a plugin for the pytest testing framework which enables you to test server connections locally." }, + { "name": "pytest-metadata", "uri": "https://anaconda.org/anaconda/pytest-metadata", "description": "pytest plugin for test session metadata" }, + { "name": "pytest-mock", "uri": "https://anaconda.org/anaconda/pytest-mock", "description": "Thin-wrapper around the mock package for easier use with py.test" }, + { "name": "pytest-mpi", "uri": "https://anaconda.org/anaconda/pytest-mpi", "description": "Pytest plugin for working with MPI" }, + { "name": "pytest-openfiles", "uri": "https://anaconda.org/anaconda/pytest-openfiles", "description": "Pytest plugin for detecting inadvertent open file handles" }, + { "name": "pytest-ordering", "uri": "https://anaconda.org/anaconda/pytest-ordering", "description": "pytest plugin to run your tests in a specific order" }, + { "name": "pytest-pep8", "uri": "https://anaconda.org/anaconda/pytest-pep8", "description": "No Summary" }, + { "name": "pytest-qt", "uri": "https://anaconda.org/anaconda/pytest-qt", "description": "pytest support for PyQt and PySide applications" }, + { "name": "pytest-randomly", "uri": "https://anaconda.org/anaconda/pytest-randomly", "description": "Pytest plugin to randomly order tests and control random.seed" }, + { "name": "pytest-remotedata", "uri": "https://anaconda.org/anaconda/pytest-remotedata", "description": "Pytest plugin for controlling remote data access" }, + { "name": "pytest-replay", "uri": "https://anaconda.org/anaconda/pytest-replay", "description": "Saves shell scripts that allow re-execute previous pytest runs to reproduce crashes or flaky tests" }, + { "name": "pytest-rerunfailures", "uri": "https://anaconda.org/anaconda/pytest-rerunfailures", "description": "pytest plugin to re-run tests to eliminate flaky failures" }, + { "name": "pytest-runner", "uri": "https://anaconda.org/anaconda/pytest-runner", "description": "Invoke py.test as distutils command with dependency resolution." }, + { "name": "pytest-selenium", "uri": "https://anaconda.org/anaconda/pytest-selenium", "description": "pytest-selenium is a plugin for py.test that provides support for running Selenium based tests." }, + { "name": "pytest-shard", "uri": "https://anaconda.org/anaconda/pytest-shard", "description": "Shards tests based on a hash of their test name." }, + { "name": "pytest-socket", "uri": "https://anaconda.org/anaconda/pytest-socket", "description": "Pytest Plugin to disable socket calls during tests" }, + { "name": "pytest-subprocess", "uri": "https://anaconda.org/anaconda/pytest-subprocess", "description": "A plugin to fake subprocess for pytest" }, + { "name": "pytest-subtests", "uri": "https://anaconda.org/anaconda/pytest-subtests", "description": "unittest subTest() support and subtests fixture" }, + { "name": "pytest-sugar", "uri": "https://anaconda.org/anaconda/pytest-sugar", "description": "Pytest plugin that adds a progress bar and other visual enhancements" }, + { "name": "pytest-timeout", "uri": "https://anaconda.org/anaconda/pytest-timeout", "description": "This is a plugin which will terminate tests after a certain timeout." }, + { "name": "pytest-tornado", "uri": "https://anaconda.org/anaconda/pytest-tornado", "description": "A py.test plugin providing fixtures and markers to simplify testing of\nasynchronous tornado applications." }, + { "name": "pytest-tornasync", "uri": "https://anaconda.org/anaconda/pytest-tornasync", "description": "py.test plugin for testing Python 3.5+ Tornado code" }, + { "name": "pytest-trio", "uri": "https://anaconda.org/anaconda/pytest-trio", "description": "This is a pytest plugin to help you test projects that use Trio, a friendly library for concurrency and async I/O in Python" }, + { "name": "pytest-variables", "uri": "https://anaconda.org/anaconda/pytest-variables", "description": "pytest plugin for providing variables to tests/fixtures" }, + { "name": "pytest-xdist", "uri": "https://anaconda.org/anaconda/pytest-xdist", "description": "py.test xdist plugin for distributed testing and loop-on-failing modes" }, + { "name": "python", "uri": "https://anaconda.org/anaconda/python", "description": "General purpose programming language" }, + { "name": "python-bidi", "uri": "https://anaconda.org/anaconda/python-bidi", "description": "Pure python implementation of the BiDi layout algorithm" }, + { "name": "python-blosc", "uri": "https://anaconda.org/anaconda/python-blosc", "description": "A Python wrapper for the extremely fast Blosc compression library" }, + { "name": "python-build", "uri": "https://anaconda.org/anaconda/python-build", "description": "A simple, correct PEP517 package builder" }, + { "name": "python-chromedriver-binary", "uri": "https://anaconda.org/anaconda/python-chromedriver-binary", "description": "WebDriver for Chrome (binary)" }, + { "name": "python-clang", "uri": "https://anaconda.org/anaconda/python-clang", "description": "Development headers and libraries for Clang" }, + { "name": "python-crfsuite", "uri": "https://anaconda.org/anaconda/python-crfsuite", "description": "Python binding for CRFsuite" }, + { "name": "python-daemon", "uri": "https://anaconda.org/anaconda/python-daemon", "description": "Library to implement a well-behaved Unix daemon process." }, + { "name": "python-dateutil", "uri": "https://anaconda.org/anaconda/python-dateutil", "description": "Extensions to the standard Python datetime module" }, + { "name": "python-debian", "uri": "https://anaconda.org/anaconda/python-debian", "description": "Debian package related modules" }, + { "name": "python-dotenv", "uri": "https://anaconda.org/anaconda/python-dotenv", "description": "Get and set values in your .env file in local and production servers like Heroku does." }, + { "name": "python-editor", "uri": "https://anaconda.org/anaconda/python-editor", "description": "Programmatically open an editor, capture the result." }, + { "name": "python-engineio", "uri": "https://anaconda.org/anaconda/python-engineio", "description": "Engine.IO server" }, + { "name": "python-fastjsonschema", "uri": "https://anaconda.org/anaconda/python-fastjsonschema", "description": "Fastest Python implementation of JSON schema" }, + { "name": "python-flatbuffers", "uri": "https://anaconda.org/anaconda/python-flatbuffers", "description": "The FlatBuffers serialization format for Python" }, + { "name": "python-gil", "uri": "https://anaconda.org/anaconda/python-gil", "description": "General purpose programming language" }, + { "name": "python-graphviz", "uri": "https://anaconda.org/anaconda/python-graphviz", "description": "Simple Python interface for Graphviz" }, + { "name": "python-gssapi", "uri": "https://anaconda.org/anaconda/python-gssapi", "description": "A Python interface to RFC 2743/2744 (plus common extensions)" }, + { "name": "python-hdfs", "uri": "https://anaconda.org/anaconda/python-hdfs", "description": "HdfsCLI: API and command line interface for HDFS." }, + { "name": "python-installer", "uri": "https://anaconda.org/anaconda/python-installer", "description": "A library for installing Python wheels." }, + { "name": "python-isal", "uri": "https://anaconda.org/anaconda/python-isal", "description": "Faster zlib and gzip compatible compression and decompression by providing python bindings for the isa-l library." }, + { "name": "python-javapackages-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/python-javapackages-cos7-ppc64le", "description": "(CDT) Module for handling various files for Java packaging" }, + { "name": "python-javapackages-cos7-s390x", "uri": "https://anaconda.org/anaconda/python-javapackages-cos7-s390x", "description": "(CDT) Module for handling various files for Java packaging" }, + { "name": "python-jenkins", "uri": "https://anaconda.org/anaconda/python-jenkins", "description": "Python Jenkins is a python wrapper for the Jenkins REST API" }, + { "name": "python-jose", "uri": "https://anaconda.org/anaconda/python-jose", "description": "JOSE implementation in Python" }, + { "name": "python-json-logger", "uri": "https://anaconda.org/anaconda/python-json-logger", "description": "JSON Formatter for Python Logging" }, + { "name": "python-jsonrpc-server", "uri": "https://anaconda.org/anaconda/python-jsonrpc-server", "description": "A Python 2.7 and 3.4+ server implementation of the JSON RPC 2.0 protocol." }, + { "name": "python-kaleido", "uri": "https://anaconda.org/anaconda/python-kaleido", "description": "Fast static image export for web-based visualization libraries" }, + { "name": "python-kubernetes", "uri": "https://anaconda.org/anaconda/python-kubernetes", "description": "The official Kubernetes python client." }, + { "name": "python-language-server", "uri": "https://anaconda.org/anaconda/python-language-server", "description": "An implementation of the Language Server Protocol for Python" }, + { "name": "python-levenshtein", "uri": "https://anaconda.org/anaconda/python-levenshtein", "description": "Python extension for computing string edit distances and similarities." }, + { "name": "python-libarchive-c", "uri": "https://anaconda.org/anaconda/python-libarchive-c", "description": "Python interface to libarchive" }, + { "name": "python-lmdb", "uri": "https://anaconda.org/anaconda/python-lmdb", "description": "Universal Python binding for the LMDB 'Lightning' Database" }, + { "name": "python-louvain", "uri": "https://anaconda.org/anaconda/python-louvain", "description": "Louvain Community Detection" }, + { "name": "python-lsp-black", "uri": "https://anaconda.org/anaconda/python-lsp-black", "description": "Black plugin for the Python LSP Server" }, + { "name": "python-lsp-jsonrpc", "uri": "https://anaconda.org/anaconda/python-lsp-jsonrpc", "description": "A Python server implementation of the JSON RPC 2.0 protocol." }, + { "name": "python-lsp-server", "uri": "https://anaconda.org/anaconda/python-lsp-server", "description": "An implementation of the Language Server Protocol for Python" }, + { "name": "python-memcached", "uri": "https://anaconda.org/anaconda/python-memcached", "description": "Pure python memcached client" }, + { "name": "python-multipart", "uri": "https://anaconda.org/anaconda/python-multipart", "description": "A streaming multipart parser for Python." }, + { "name": "python-nvd3", "uri": "https://anaconda.org/anaconda/python-nvd3", "description": "Python NVD3 - Chart Library for d3.js" }, + { "name": "python-oauth2", "uri": "https://anaconda.org/anaconda/python-oauth2", "description": "OAuth 2.0 provider written in python" }, + { "name": "python-openid", "uri": "https://anaconda.org/anaconda/python-openid", "description": "OpenID support for servers and consumers." }, + { "name": "python-pptx", "uri": "https://anaconda.org/anaconda/python-pptx", "description": "Generate and manipulate Open XML PowerPoint (.pptx) files" }, + { "name": "python-rapidjson", "uri": "https://anaconda.org/anaconda/python-rapidjson", "description": "Python wrapper around rapidjson" }, + { "name": "python-regr-testsuite", "uri": "https://anaconda.org/anaconda/python-regr-testsuite", "description": "General purpose programming language" }, + { "name": "python-slugify", "uri": "https://anaconda.org/anaconda/python-slugify", "description": "A Python Slugify application that handles Unicode" }, + { "name": "python-snappy", "uri": "https://anaconda.org/anaconda/python-snappy", "description": "Python library for the snappy compression library from Google" }, + { "name": "python-socketio", "uri": "https://anaconda.org/anaconda/python-socketio", "description": "Socket.IO server" }, + { "name": "python-tblib", "uri": "https://anaconda.org/anaconda/python-tblib", "description": "Serialization library for Exceptions and Tracebacks." }, + { "name": "python-tzdata", "uri": "https://anaconda.org/anaconda/python-tzdata", "description": "Provider of IANA time zone data" }, + { "name": "python-utils", "uri": "https://anaconda.org/anaconda/python-utils", "description": "Python Utils is a collection of small Python functions and classes which make common patterns shorter and easier." }, + { "name": "python-xxhash", "uri": "https://anaconda.org/anaconda/python-xxhash", "description": "Python binding for xxHash" }, + { "name": "python-zstd", "uri": "https://anaconda.org/anaconda/python-zstd", "description": "ZSTD Bindings for Python" }, + { "name": "python.app", "uri": "https://anaconda.org/anaconda/python.app", "description": "Proxy on macOS letting Python libraries hook into the GUI event loop" }, + { "name": "python3-openid", "uri": "https://anaconda.org/anaconda/python3-openid", "description": "OpenID support for modern servers and consumers." }, + { "name": "python3-saml", "uri": "https://anaconda.org/anaconda/python3-saml", "description": "Onelogin Python Toolkit. Add SAML support to your Python software using this library" }, + { "name": "python_abi", "uri": "https://anaconda.org/anaconda/python_abi", "description": "Metapackage to select python implementation" }, + { "name": "python_http_client", "uri": "https://anaconda.org/anaconda/python_http_client", "description": "SendGrid's Python HTTP Client for calling APIs" }, + { "name": "pythonanywhere", "uri": "https://anaconda.org/anaconda/pythonanywhere", "description": "PythonAnywhere helper tools for users" }, + { "name": "pythonnet", "uri": "https://anaconda.org/anaconda/pythonnet", "description": ".Net and Mono integration for Python" }, + { "name": "pythran", "uri": "https://anaconda.org/anaconda/pythran", "description": "a claimless python to c++ converter" }, + { "name": "pytimeparse", "uri": "https://anaconda.org/anaconda/pytimeparse", "description": "A small Python library to parse various kinds of time expressions" }, + { "name": "pytoml", "uri": "https://anaconda.org/anaconda/pytoml", "description": "A TOML-0.4.0 parser/writer for Python." }, + { "name": "pytoolconfig", "uri": "https://anaconda.org/anaconda/pytoolconfig", "description": "Python tool configuration" }, + { "name": "pytorch", "uri": "https://anaconda.org/anaconda/pytorch", "description": "PyTorch is an optimized tensor library for deep learning using GPUs and CPUs." }, + { "name": "pytorch-cpu", "uri": "https://anaconda.org/anaconda/pytorch-cpu", "description": "PyTorch is an optimized tensor library for deep learning using GPUs and CPUs." }, + { "name": "pytorch-gpu", "uri": "https://anaconda.org/anaconda/pytorch-gpu", "description": "PyTorch is an optimized tensor library for deep learning using GPUs and CPUs." }, + { "name": "pytorch-lightning", "uri": "https://anaconda.org/anaconda/pytorch-lightning", "description": "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate." }, + { "name": "pyts", "uri": "https://anaconda.org/anaconda/pyts", "description": "A Python package for time series classification" }, + { "name": "pytz", "uri": "https://anaconda.org/anaconda/pytz", "description": "World timezone definitions, modern and historical." }, + { "name": "pytzdata", "uri": "https://anaconda.org/anaconda/pytzdata", "description": "Official timezone database for Python" }, + { "name": "pyuca", "uri": "https://anaconda.org/anaconda/pyuca", "description": "a Python implementation of the Unicode Collation Algorithm" }, + { "name": "pyutilib", "uri": "https://anaconda.org/anaconda/pyutilib", "description": "PyUtilib: A collection of Python utilities" }, + { "name": "pyviz_comms", "uri": "https://anaconda.org/anaconda/pyviz_comms", "description": "Bidirectional notebook communication for HoloViz libraries" }, + { "name": "pywavelets", "uri": "https://anaconda.org/anaconda/pywavelets", "description": "Discrete Wavelet Transforms in Python" }, + { "name": "pywin32", "uri": "https://anaconda.org/anaconda/pywin32", "description": "No Summary" }, + { "name": "pywin32-ctypes", "uri": "https://anaconda.org/anaconda/pywin32-ctypes", "description": "A limited subset of pywin32 re-implemented using ctypes (or cffi)" }, + { "name": "pywinpty", "uri": "https://anaconda.org/anaconda/pywinpty", "description": "Pseudoterminals for Windows in Python" }, + { "name": "pywinrm", "uri": "https://anaconda.org/anaconda/pywinrm", "description": "Python library for Windows Remote Management (WinRM)" }, + { "name": "pyxdg", "uri": "https://anaconda.org/anaconda/pyxdg", "description": "PyXDG contains implementations of freedesktop.org standards in python." }, + { "name": "pyyaml", "uri": "https://anaconda.org/anaconda/pyyaml", "description": "YAML parser and emitter for Python" }, + { "name": "pyzmq", "uri": "https://anaconda.org/anaconda/pyzmq", "description": "Python bindings for zeromq" }, + { "name": "pyzstd", "uri": "https://anaconda.org/anaconda/pyzstd", "description": "Python bindings to Zstandard (zstd) compression library" }, + { "name": "qasync", "uri": "https://anaconda.org/anaconda/qasync", "description": "Implementation of the PEP 3156 Event-Loop with Qt." }, + { "name": "qbs", "uri": "https://anaconda.org/anaconda/qbs", "description": "Qbs (pronounced Cubes) is a cross-platform build tool" }, + { "name": "qdarkstyle", "uri": "https://anaconda.org/anaconda/qdarkstyle", "description": "A dark stylesheet for Qt applications (Qt4, Qt5, PySide, PyQt4, PyQt5, QtPy, PyQtGraph)." }, + { "name": "qdldl-python", "uri": "https://anaconda.org/anaconda/qdldl-python", "description": "Python interface to the QDLDL free LDL factorization routine for quasi-definite linear systems" }, + { "name": "qds-sdk", "uri": "https://anaconda.org/anaconda/qds-sdk", "description": "Python SDK for coding to the Qubole Data Service API" }, + { "name": "qgrid", "uri": "https://anaconda.org/anaconda/qgrid", "description": "Pandas DataFrame viewer for Jupyter Notebook" }, + { "name": "qhull", "uri": "https://anaconda.org/anaconda/qhull", "description": "Qhull computes the convex hull" }, + { "name": "qpd", "uri": "https://anaconda.org/anaconda/qpd", "description": "Query Pandas Using SQL" }, + { "name": "qrcode", "uri": "https://anaconda.org/anaconda/qrcode", "description": "QR Code image generator" }, + { "name": "qrencode-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/qrencode-libs-amzn2-aarch64", "description": "(CDT) QR Code encoding library - Shared libraries" }, + { "name": "qstylizer", "uri": "https://anaconda.org/anaconda/qstylizer", "description": "Qt stylesheet generation utility for PyQt/PySide" }, + { "name": "qt-main", "uri": "https://anaconda.org/anaconda/qt-main", "description": "Qt is a cross-platform application and UI framework." }, + { "name": "qt-webengine", "uri": "https://anaconda.org/anaconda/qt-webengine", "description": "Qt is a cross-platform application and UI framework." }, + { "name": "qt5compat", "uri": "https://anaconda.org/anaconda/qt5compat", "description": "Cross-platform application and UI framework (5compat libraries)." }, + { "name": "qtawesome", "uri": "https://anaconda.org/anaconda/qtawesome", "description": "Iconic fonts in PyQt and PySide applications" }, + { "name": "qtbase", "uri": "https://anaconda.org/anaconda/qtbase", "description": "Cross-platform application and UI framework (base libraries)." }, + { "name": "qtconsole", "uri": "https://anaconda.org/anaconda/qtconsole", "description": "Jupyter Qt console" }, + { "name": "qtdeclarative", "uri": "https://anaconda.org/anaconda/qtdeclarative", "description": "Cross-platform application and UI framework (declarative libraries)." }, + { "name": "qtimageformats", "uri": "https://anaconda.org/anaconda/qtimageformats", "description": "Cross-platform application and UI framework (imageformats libraries)." }, + { "name": "qtpy", "uri": "https://anaconda.org/anaconda/qtpy", "description": "Abtraction layer for PyQt5/PyQt6/PySide2/PySide6" }, + { "name": "qtshadertools", "uri": "https://anaconda.org/anaconda/qtshadertools", "description": "Cross-platform application and UI framework (shadertools libraries)." }, + { "name": "qtsvg", "uri": "https://anaconda.org/anaconda/qtsvg", "description": "Cross-platform application and UI framework (svg libraries)." }, + { "name": "qttools", "uri": "https://anaconda.org/anaconda/qttools", "description": "Cross-platform application and UI framework (tools libraries)." }, + { "name": "qttranslations", "uri": "https://anaconda.org/anaconda/qttranslations", "description": "Cross-platform application and UI framework (translations libraries)." }, + { "name": "qtwebchannel", "uri": "https://anaconda.org/anaconda/qtwebchannel", "description": "Cross-platform application and UI framework (webchannel libraries)." }, + { "name": "qtwebkit", "uri": "https://anaconda.org/anaconda/qtwebkit", "description": "WebKit is one of the major engine to render webpages and execute JavaScript code" }, + { "name": "qtwebsockets", "uri": "https://anaconda.org/anaconda/qtwebsockets", "description": "Cross-platform application and UI framework (websockets libraries)." }, + { "name": "quandl", "uri": "https://anaconda.org/anaconda/quandl", "description": "Source for financial, economic, and alternative datasets." }, + { "name": "quantecon", "uri": "https://anaconda.org/anaconda/quantecon", "description": "QuantEcon is a package to support all forms of quantitative economic modelling." }, + { "name": "querystring_parser", "uri": "https://anaconda.org/anaconda/querystring_parser", "description": "QueryString parser for Python/Django that correctly handles nested dictionaries" }, + { "name": "queuelib", "uri": "https://anaconda.org/anaconda/queuelib", "description": "Collection of persistent (disk-based) queues" }, + { "name": "quicksectx", "uri": "https://anaconda.org/anaconda/quicksectx", "description": "fast, simple interval intersection" }, + { "name": "quilt3", "uri": "https://anaconda.org/anaconda/quilt3", "description": "Quilt: where data comes together" }, + { "name": "quiver_engine", "uri": "https://anaconda.org/anaconda/quiver_engine", "description": "Interactive per-layer visualization for convents in keras" }, + { "name": "r-archive", "uri": "https://anaconda.org/anaconda/r-archive", "description": "Bindings to 'libarchive' the Multi-format archive and compression library. Offers R connections and direct extraction for many archive formats including 'tar', 'ZIP', '7-zip', 'RAR', 'CAB' and compression formats including 'gzip', 'bzip2', 'compress', 'lzma' and 'xz'." }, + { "name": "r-xgboost", "uri": "https://anaconda.org/anaconda/r-xgboost", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "r-xgboost-cpu", "uri": "https://anaconda.org/anaconda/r-xgboost-cpu", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "radon", "uri": "https://anaconda.org/anaconda/radon", "description": "Code Metrics in Python" }, + { "name": "rapidfuzz", "uri": "https://anaconda.org/anaconda/rapidfuzz", "description": "rapid fuzzy string matching" }, + { "name": "rapidjson", "uri": "https://anaconda.org/anaconda/rapidjson", "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API" }, + { "name": "rasterio", "uri": "https://anaconda.org/anaconda/rasterio", "description": "Rasterio reads and writes geospatial raster datasets" }, + { "name": "rasterstats", "uri": "https://anaconda.org/anaconda/rasterstats", "description": "Summarize geospatial raster datasets based on vector geometries" }, + { "name": "ray-air", "uri": "https://anaconda.org/anaconda/ray-air", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-client", "uri": "https://anaconda.org/anaconda/ray-client", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-core", "uri": "https://anaconda.org/anaconda/ray-core", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-dashboard", "uri": "https://anaconda.org/anaconda/ray-dashboard", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-data", "uri": "https://anaconda.org/anaconda/ray-data", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-debug", "uri": "https://anaconda.org/anaconda/ray-debug", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-default", "uri": "https://anaconda.org/anaconda/ray-default", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-observability", "uri": "https://anaconda.org/anaconda/ray-observability", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-rllib", "uri": "https://anaconda.org/anaconda/ray-rllib", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-serve", "uri": "https://anaconda.org/anaconda/ray-serve", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-serve-grpc", "uri": "https://anaconda.org/anaconda/ray-serve-grpc", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-train", "uri": "https://anaconda.org/anaconda/ray-train", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "ray-tune", "uri": "https://anaconda.org/anaconda/ray-tune", "description": "Ray is a fast and simple framework for building and running distributed applications." }, + { "name": "re-assert", "uri": "https://anaconda.org/anaconda/re-assert", "description": "show where your regex match assertion failed!" }, + { "name": "re2", "uri": "https://anaconda.org/anaconda/re2", "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression\nengines like those used in PCRE, Perl, and Python. It is a C++ library." }, + { "name": "readchar", "uri": "https://anaconda.org/anaconda/readchar", "description": "Python library to read characters and key strokes." }, + { "name": "readline-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/readline-amzn2-aarch64", "description": "(CDT) A library for editing typed command lines" }, + { "name": "readme_renderer", "uri": "https://anaconda.org/anaconda/readme_renderer", "description": "readme_renderer is a library for rendering readme descriptions for Warehouse" }, + { "name": "recommonmark", "uri": "https://anaconda.org/anaconda/recommonmark", "description": "A docutils-compatibility bridge to CommonMark" }, + { "name": "redis-py", "uri": "https://anaconda.org/anaconda/redis-py", "description": "Python client for Redis key-value store" }, + { "name": "referencing", "uri": "https://anaconda.org/anaconda/referencing", "description": "JSON Referencing + Python" }, + { "name": "regex", "uri": "https://anaconda.org/anaconda/regex", "description": "Alternative regular expression module, to replace re" }, + { "name": "reportlab", "uri": "https://anaconda.org/anaconda/reportlab", "description": "The Reportlab Toolkit" }, + { "name": "repoze.lru", "uri": "https://anaconda.org/anaconda/repoze.lru", "description": "A tiny LRU cache implementation and decorator" }, + { "name": "reproc", "uri": "https://anaconda.org/anaconda/reproc", "description": "reproc (Redirected Process) is a cross-platform C/C++ library that simplifies starting, stopping and communicating with external programs." }, + { "name": "reproc-cpp", "uri": "https://anaconda.org/anaconda/reproc-cpp", "description": "reproc (Redirected Process) is a cross-platform C/C++ library that simplifies starting, stopping and communicating with external programs." }, + { "name": "reproc-cpp-static", "uri": "https://anaconda.org/anaconda/reproc-cpp-static", "description": "reproc (Redirected Process) is a cross-platform C/C++ library that simplifies starting, stopping and communicating with external programs." }, + { "name": "reproc-static", "uri": "https://anaconda.org/anaconda/reproc-static", "description": "reproc (Redirected Process) is a cross-platform C/C++ library that simplifies starting, stopping and communicating with external programs." }, + { "name": "requests", "uri": "https://anaconda.org/anaconda/requests", "description": "Requests is an elegant and simple HTTP library for Python, built with ♥." }, + { "name": "requests-cache", "uri": "https://anaconda.org/anaconda/requests-cache", "description": "A transparent persistent cache for the requests library" }, + { "name": "requests-futures", "uri": "https://anaconda.org/anaconda/requests-futures", "description": "Asynchronous Python HTTP for Humans" }, + { "name": "requests-mock", "uri": "https://anaconda.org/anaconda/requests-mock", "description": "requests-mock provides a building block to stub out the HTTP requests portions of your testing code." }, + { "name": "requests-oauthlib", "uri": "https://anaconda.org/anaconda/requests-oauthlib", "description": "OAuthlib authentication support for Requests." }, + { "name": "requests-toolbelt", "uri": "https://anaconda.org/anaconda/requests-toolbelt", "description": "A toolbelt of useful classes and functions to be used with python-requests" }, + { "name": "requests-wsgi-adapter", "uri": "https://anaconda.org/anaconda/requests-wsgi-adapter", "description": "WSGI Transport Adapter for Requests" }, + { "name": "requests_download", "uri": "https://anaconda.org/anaconda/requests_download", "description": "Download files using requests and save them to a target path" }, + { "name": "requests_ntlm", "uri": "https://anaconda.org/anaconda/requests_ntlm", "description": "NTLM authentication support for Requests." }, + { "name": "resolvelib", "uri": "https://anaconda.org/anaconda/resolvelib", "description": "Simple, fast, extensible JSON encoder/decoder for Python" }, + { "name": "responses", "uri": "https://anaconda.org/anaconda/responses", "description": "A utility library for mocking out the `requests` Python library." }, + { "name": "retrying", "uri": "https://anaconda.org/anaconda/retrying", "description": "Simplify the task of adding retry behavior to just about anything." }, + { "name": "rfc3339-validator", "uri": "https://anaconda.org/anaconda/rfc3339-validator", "description": "A pure python RFC3339 validator" }, + { "name": "rfc3986", "uri": "https://anaconda.org/anaconda/rfc3986", "description": "Validating URI References per RFC 3986" }, + { "name": "rfc3986-validator", "uri": "https://anaconda.org/anaconda/rfc3986-validator", "description": "Pure python rfc3986 validator" }, + { "name": "rich", "uri": "https://anaconda.org/anaconda/rich", "description": "Rich is a Python library for rich text and beautiful formatting in the terminal." }, + { "name": "rioxarray", "uri": "https://anaconda.org/anaconda/rioxarray", "description": "rasterio xarray extension." }, + { "name": "ripgrep", "uri": "https://anaconda.org/anaconda/ripgrep", "description": "ripgrep recursively searches directories for a regex pattern while respecting your gitignore" }, + { "name": "rise", "uri": "https://anaconda.org/anaconda/rise", "description": "RISE: Live Reveal.js Jupyter/IPython Slideshow Extension" }, + { "name": "robotframework", "uri": "https://anaconda.org/anaconda/robotframework", "description": "Generic automation framework for acceptance testing and robotic process automation (RPA)" }, + { "name": "rope", "uri": "https://anaconda.org/anaconda/rope", "description": "A python refactoring library" }, + { "name": "routes", "uri": "https://anaconda.org/anaconda/routes", "description": "Routing Recognition and Generation Tools" }, + { "name": "rpds-py", "uri": "https://anaconda.org/anaconda/rpds-py", "description": "Python bindings to Rust's persistent data structures (rpds)" }, + { "name": "rsa", "uri": "https://anaconda.org/anaconda/rsa", "description": "Pure-Python RSA implementation" }, + { "name": "rstudio", "uri": "https://anaconda.org/anaconda/rstudio", "description": "A set of integrated tools designed to help you be more productive with R" }, + { "name": "rsync", "uri": "https://anaconda.org/anaconda/rsync", "description": "Tool for fast incremental file transfer" }, + { "name": "rtree", "uri": "https://anaconda.org/anaconda/rtree", "description": "R-Tree spatial index for Python GIS" }, + { "name": "ruamel", "uri": "https://anaconda.org/anaconda/ruamel", "description": "A package to ensure the `ruamel` namespace is available." }, + { "name": "ruamel.yaml", "uri": "https://anaconda.org/anaconda/ruamel.yaml", "description": "A YAML package for Python. It is a derivative of Kirill Simonov's PyYAML 3.11 which supports YAML1.1" }, + { "name": "ruamel.yaml.clib", "uri": "https://anaconda.org/anaconda/ruamel.yaml.clib", "description": "C version of reader, parser and emitter for ruamel.yaml derived from libyaml" }, + { "name": "ruamel.yaml.jinja2", "uri": "https://anaconda.org/anaconda/ruamel.yaml.jinja2", "description": "jinja2 pre and post-processor to update YAML" }, + { "name": "ruamel_yaml", "uri": "https://anaconda.org/anaconda/ruamel_yaml", "description": "A patched copy of ruamel.yaml." }, + { "name": "ruby", "uri": "https://anaconda.org/anaconda/ruby", "description": "A dynamic, open source programming language with a focus on simplicity and productivity." }, + { "name": "ruby-cos6-x86_64", "uri": "https://anaconda.org/anaconda/ruby-cos6-x86_64", "description": "(CDT) An interpreter of object-oriented scripting language" }, + { "name": "ruby-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/ruby-cos7-ppc64le", "description": "(CDT) An interpreter of object-oriented scripting language" }, + { "name": "ruby-libs-cos6-x86_64", "uri": "https://anaconda.org/anaconda/ruby-libs-cos6-x86_64", "description": "(CDT) Libraries necessary to run Ruby" }, + { "name": "ruby-libs-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/ruby-libs-cos7-ppc64le", "description": "(CDT) Libraries necessary to run Ruby" }, + { "name": "rubygem-json-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/rubygem-json-cos7-ppc64le", "description": "(CDT) This is a JSON implementation as a Ruby extension in C" }, + { "name": "ruff", "uri": "https://anaconda.org/anaconda/ruff", "description": "An extremely fast Python linter, written in Rust." }, + { "name": "rust", "uri": "https://anaconda.org/anaconda/rust", "description": "Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety." }, + { "name": "rust-gnu", "uri": "https://anaconda.org/anaconda/rust-gnu", "description": "Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety." }, + { "name": "rust-gnu_win-32", "uri": "https://anaconda.org/anaconda/rust-gnu_win-32", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust-gnu_win-64", "uri": "https://anaconda.org/anaconda/rust-gnu_win-64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust-nightly", "uri": "https://anaconda.org/anaconda/rust-nightly", "description": "Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.\nThis package provides the compiler (rustc) and the documentation utilities rustdoc." }, + { "name": "rust-nightly_linux-64", "uri": "https://anaconda.org/anaconda/rust-nightly_linux-64", "description": "A safe systems programming language" }, + { "name": "rust-nightly_osx-64", "uri": "https://anaconda.org/anaconda/rust-nightly_osx-64", "description": "A safe systems programming language" }, + { "name": "rust_linux-64", "uri": "https://anaconda.org/anaconda/rust_linux-64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_linux-aarch64", "uri": "https://anaconda.org/anaconda/rust_linux-aarch64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_linux-ppc64le", "uri": "https://anaconda.org/anaconda/rust_linux-ppc64le", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_linux-s390x", "uri": "https://anaconda.org/anaconda/rust_linux-s390x", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_osx-64", "uri": "https://anaconda.org/anaconda/rust_osx-64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_osx-arm64", "uri": "https://anaconda.org/anaconda/rust_osx-arm64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_win-32", "uri": "https://anaconda.org/anaconda/rust_win-32", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "rust_win-64", "uri": "https://anaconda.org/anaconda/rust_win-64", "description": "A safe systems programming language (conda activation scripts)" }, + { "name": "s2n", "uri": "https://anaconda.org/anaconda/s2n", "description": "an implementation of the TLS/SSL protocols" }, + { "name": "s2n-static", "uri": "https://anaconda.org/anaconda/s2n-static", "description": "an implementation of the TLS/SSL protocols" }, + { "name": "s3fs", "uri": "https://anaconda.org/anaconda/s3fs", "description": "Convenient Filesystem interface over S3" }, + { "name": "s3transfer", "uri": "https://anaconda.org/anaconda/s3transfer", "description": "An Amazon S3 Transfer Manager for Python" }, + { "name": "sacrebleu", "uri": "https://anaconda.org/anaconda/sacrebleu", "description": "Reference BLEU implementation that auto-downloads test sets and reports a version string to facilitate cross-lab comparisons" }, + { "name": "sacremoses", "uri": "https://anaconda.org/anaconda/sacremoses", "description": "SacreMoses" }, + { "name": "safeint", "uri": "https://anaconda.org/anaconda/safeint", "description": "SafeInt is a class library for C++ that manages integer overflows." }, + { "name": "safetensors", "uri": "https://anaconda.org/anaconda/safetensors", "description": "Fast and Safe Tensor serialization" }, + { "name": "salib", "uri": "https://anaconda.org/anaconda/salib", "description": "Sensitivity Analysis Library" }, + { "name": "salt", "uri": "https://anaconda.org/anaconda/salt", "description": "Software to automate the management and configuration of any infrastructure or application at scale" }, + { "name": "sarif_om", "uri": "https://anaconda.org/anaconda/sarif_om", "description": "Classes implementing the SARIF 2.1.0 object model." }, + { "name": "sas_kernel", "uri": "https://anaconda.org/anaconda/sas_kernel", "description": "A Jupyter kernel for SAS" }, + { "name": "saspy", "uri": "https://anaconda.org/anaconda/saspy", "description": "A Python interface module to the SAS System" }, + { "name": "scandir", "uri": "https://anaconda.org/anaconda/scandir", "description": "scandir, a better directory iterator and faster os.walk()" }, + { "name": "scapy", "uri": "https://anaconda.org/anaconda/scapy", "description": "Scapy: interactive packet manipulation tool" }, + { "name": "schema", "uri": "https://anaconda.org/anaconda/schema", "description": "Schema validation just got Pythonic" }, + { "name": "schemdraw", "uri": "https://anaconda.org/anaconda/schemdraw", "description": "Electrical circuit schematic drawing" }, + { "name": "scikit-build", "uri": "https://anaconda.org/anaconda/scikit-build", "description": "Improved build system generator for CPython C extensions." }, + { "name": "scikit-build-core", "uri": "https://anaconda.org/anaconda/scikit-build-core", "description": "Build backend for CMake based projects" }, + { "name": "scikit-image", "uri": "https://anaconda.org/anaconda/scikit-image", "description": "Image processing in Python." }, + { "name": "scikit-learn", "uri": "https://anaconda.org/anaconda/scikit-learn", "description": "A set of python modules for machine learning and data mining" }, + { "name": "scikit-learn-intelex", "uri": "https://anaconda.org/anaconda/scikit-learn-intelex", "description": "Intel(R) Extension for Scikit-learn is a seamless way to speed up your Scikit-learn application." }, + { "name": "scikit-plot", "uri": "https://anaconda.org/anaconda/scikit-plot", "description": "An intuitive library to add plotting functionality to scikit-learn objects." }, + { "name": "scikit-rf", "uri": "https://anaconda.org/anaconda/scikit-rf", "description": "Object Oriented Microwave Engineering." }, + { "name": "scipy", "uri": "https://anaconda.org/anaconda/scipy", "description": "Scientific Library for Python" }, + { "name": "scons", "uri": "https://anaconda.org/anaconda/scons", "description": "Open Source next-generation build tool." }, + { "name": "scotch", "uri": "https://anaconda.org/anaconda/scotch", "description": "SCOTCH: Static Mapping, Graph, Mesh and Hypergraph Partitioning, and Parallel and Sequential Sparse Matrix Ordering Package" }, + { "name": "scp", "uri": "https://anaconda.org/anaconda/scp", "description": "Pure python scp module for paramiko" }, + { "name": "scramp", "uri": "https://anaconda.org/anaconda/scramp", "description": "A pure-Python implementation of the SCRAM authentication protocol" }, + { "name": "scrapy", "uri": "https://anaconda.org/anaconda/scrapy", "description": "A high-level Python Screen Scraping framework" }, + { "name": "scs", "uri": "https://anaconda.org/anaconda/scs", "description": "Python interface for SCS, which solves convex cone problems" }, + { "name": "seaborn", "uri": "https://anaconda.org/anaconda/seaborn", "description": "Statistical data visualization" }, + { "name": "secretstorage", "uri": "https://anaconda.org/anaconda/secretstorage", "description": "Provides a way for securely storing passwords and other secrets." }, + { "name": "sed", "uri": "https://anaconda.org/anaconda/sed", "description": "sed (stream editor) is a non-interactive command-line text editor." }, + { "name": "sed-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/sed-amzn2-aarch64", "description": "(CDT) A GNU stream text editor" }, + { "name": "segregation", "uri": "https://anaconda.org/anaconda/segregation", "description": "Segregation Measures Framework in PySAL" }, + { "name": "selectors2", "uri": "https://anaconda.org/anaconda/selectors2", "description": "Back-ported, durable, and portable selectors" }, + { "name": "selenium", "uri": "https://anaconda.org/anaconda/selenium", "description": "Python bindings for the Selenium WebDriver for automating web browser interaction." }, + { "name": "semver", "uri": "https://anaconda.org/anaconda/semver", "description": "Python package to work with Semantic Versioning" }, + { "name": "send2trash", "uri": "https://anaconda.org/anaconda/send2trash", "description": "Python library to natively send files to Trash (or Recycle bin) on all platforms." }, + { "name": "sendgrid", "uri": "https://anaconda.org/anaconda/sendgrid", "description": "SendGrid library for Python" }, + { "name": "sentencepiece", "uri": "https://anaconda.org/anaconda/sentencepiece", "description": "Unsupervised text tokenizer for Neural Network-based text generation." }, + { "name": "sentencepiece-python", "uri": "https://anaconda.org/anaconda/sentencepiece-python", "description": "Unsupervised text tokenizer for Neural Network-based text generation." }, + { "name": "sentencepiece-spm", "uri": "https://anaconda.org/anaconda/sentencepiece-spm", "description": "Unsupervised text tokenizer for Neural Network-based text generation." }, + { "name": "sentry-sdk", "uri": "https://anaconda.org/anaconda/sentry-sdk", "description": "The new Python SDK for Sentry.io" }, + { "name": "serf", "uri": "https://anaconda.org/anaconda/serf", "description": "High performance C-based HTTP client library" }, + { "name": "serverfiles", "uri": "https://anaconda.org/anaconda/serverfiles", "description": "An utility that accesses files on a HTTP server and stores them locally for reuse" }, + { "name": "setproctitle", "uri": "https://anaconda.org/anaconda/setproctitle", "description": "A library to allow customization of the process title." }, + { "name": "setup-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/setup-amzn2-aarch64", "description": "(CDT) A set of system configuration and setup files" }, + { "name": "setuptools", "uri": "https://anaconda.org/anaconda/setuptools", "description": "Download, build, install, upgrade, and uninstall Python packages" }, + { "name": "setuptools-git", "uri": "https://anaconda.org/anaconda/setuptools-git", "description": "Setuptools revision control system plugin for Git" }, + { "name": "setuptools-git-versioning", "uri": "https://anaconda.org/anaconda/setuptools-git-versioning", "description": "Use git repo data for building a version number according PEP-440" }, + { "name": "setuptools-rust", "uri": "https://anaconda.org/anaconda/setuptools-rust", "description": "Setuptools rust extension plugin" }, + { "name": "setuptools-scm", "uri": "https://anaconda.org/anaconda/setuptools-scm", "description": "The blessed package to manage your versions by scm tags" }, + { "name": "setuptools-scm-git-archive", "uri": "https://anaconda.org/anaconda/setuptools-scm-git-archive", "description": "setuptools_scm plugin for git archives" }, + { "name": "setuptools_scm", "uri": "https://anaconda.org/anaconda/setuptools_scm", "description": "The blessed package to manage your versions by scm tags" }, + { "name": "setuptools_scm_git_archive", "uri": "https://anaconda.org/anaconda/setuptools_scm_git_archive", "description": "setuptools_scm plugin for git archives" }, + { "name": "sgmllib3k", "uri": "https://anaconda.org/anaconda/sgmllib3k", "description": "Py3k port of sgmllib." }, + { "name": "sh", "uri": "https://anaconda.org/anaconda/sh", "description": "Python subprocess interface" }, + { "name": "shadow-utils-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/shadow-utils-amzn2-aarch64", "description": "(CDT) Utilities for managing accounts and shadow password files" }, + { "name": "shap", "uri": "https://anaconda.org/anaconda/shap", "description": "A unified approach to explain the output of any machine learning model." }, + { "name": "shapely", "uri": "https://anaconda.org/anaconda/shapely", "description": "Python package for manipulation and analysis of geometric objects in the Cartesian plane" }, + { "name": "shared-mime-info-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/shared-mime-info-amzn2-aarch64", "description": "(CDT) Shared MIME information database" }, + { "name": "shellcheck", "uri": "https://anaconda.org/anaconda/shellcheck", "description": "ShellCheck, a static analysis tool for shell scripts" }, + { "name": "shellingham", "uri": "https://anaconda.org/anaconda/shellingham", "description": "Tool to Detect Surrounding Shell" }, + { "name": "simdjson", "uri": "https://anaconda.org/anaconda/simdjson", "description": "Parsing gigabytes of JSON per second" }, + { "name": "simdjson-static", "uri": "https://anaconda.org/anaconda/simdjson-static", "description": "Parsing gigabytes of JSON per second" }, + { "name": "simpervisor", "uri": "https://anaconda.org/anaconda/simpervisor", "description": "Simple async process supervisor" }, + { "name": "simple-salesforce", "uri": "https://anaconda.org/anaconda/simple-salesforce", "description": "Simple Salesforce is a basic Salesforce.com REST API client. The goal is to provide a very low-level interface to the API, returning an ordered dictionary of the API JSON response." }, + { "name": "simplejson", "uri": "https://anaconda.org/anaconda/simplejson", "description": "Simple, fast, extensible JSON encoder/decoder for Python" }, + { "name": "sip", "uri": "https://anaconda.org/anaconda/sip", "description": "A Python bindings generator for C/C++ libraries" }, + { "name": "skl2onnx", "uri": "https://anaconda.org/anaconda/skl2onnx", "description": "Convert scikit-learn models to ONNX" }, + { "name": "sklearn-pandas", "uri": "https://anaconda.org/anaconda/sklearn-pandas", "description": "Pandas integration with sklearn" }, + { "name": "slack-sdk", "uri": "https://anaconda.org/anaconda/slack-sdk", "description": "The Slack API Platform SDK for Python" }, + { "name": "slack_sdk", "uri": "https://anaconda.org/anaconda/slack_sdk", "description": "The Slack API Platform SDK for Python" }, + { "name": "slackclient", "uri": "https://anaconda.org/anaconda/slackclient", "description": "Python client for Slack.com" }, + { "name": "sleef", "uri": "https://anaconda.org/anaconda/sleef", "description": "SIMD library for evaluating elementary functions" }, + { "name": "slicer", "uri": "https://anaconda.org/anaconda/slicer", "description": "Unified slicing for all Python data structures." }, + { "name": "slicerator", "uri": "https://anaconda.org/anaconda/slicerator", "description": "A lazy-loading, fancy-sliceable iterable." }, + { "name": "smart_open", "uri": "https://anaconda.org/anaconda/smart_open", "description": "Python library for efficient streaming of large files" }, + { "name": "smartypants", "uri": "https://anaconda.org/anaconda/smartypants", "description": "Python with the SmartyPants" }, + { "name": "smmap", "uri": "https://anaconda.org/anaconda/smmap", "description": "A pure git implementation of a sliding window memory map manager." }, + { "name": "snakebite-py3", "uri": "https://anaconda.org/anaconda/snakebite-py3", "description": "Pure Python HDFS client" }, + { "name": "snakeviz", "uri": "https://anaconda.org/anaconda/snakeviz", "description": "Web-based viewer for Python profiler output" }, + { "name": "snappy", "uri": "https://anaconda.org/anaconda/snappy", "description": "A fast compressor/decompressor" }, + { "name": "sniffio", "uri": "https://anaconda.org/anaconda/sniffio", "description": "Sniff out which async library your code is running under" }, + { "name": "snowflake-connector-python", "uri": "https://anaconda.org/anaconda/snowflake-connector-python", "description": "Snowflake Connector for Python" }, + { "name": "snowflake-ml-python", "uri": "https://anaconda.org/anaconda/snowflake-ml-python", "description": "Snowflake machine learning library." }, + { "name": "snowflake-snowpark-python", "uri": "https://anaconda.org/anaconda/snowflake-snowpark-python", "description": "Snowflake Snowpark Python API" }, + { "name": "soappy", "uri": "https://anaconda.org/anaconda/soappy", "description": "Simple to use SOAP library for Python" }, + { "name": "sortedcontainers", "uri": "https://anaconda.org/anaconda/sortedcontainers", "description": "Python Sorted Container Types: SortedList, SortedDict, and SortedSet" }, + { "name": "soupsieve", "uri": "https://anaconda.org/anaconda/soupsieve", "description": "A modern CSS selector implementation for BeautifulSoup" }, + { "name": "spacy", "uri": "https://anaconda.org/anaconda/spacy", "description": "Industrial-strength Natural Language Processing (NLP) in Python" }, + { "name": "spacy-alignments", "uri": "https://anaconda.org/anaconda/spacy-alignments", "description": "Align tokenizations for spaCy + transformers" }, + { "name": "spacy-legacy", "uri": "https://anaconda.org/anaconda/spacy-legacy", "description": "Legacy functions and architectures for backwards compatibility" }, + { "name": "spacy-loggers", "uri": "https://anaconda.org/anaconda/spacy-loggers", "description": "Alternate loggers for spaCy pipeline training" }, + { "name": "spacy-model-ca_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-ca_core_news_lg", "description": "Catalan pipeline optimized for CPU." }, + { "name": "spacy-model-ca_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-ca_core_news_md", "description": "Catalan pipeline optimized for CPU." }, + { "name": "spacy-model-ca_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-ca_core_news_sm", "description": "Catalan pipeline optimized for CPU." }, + { "name": "spacy-model-ca_core_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-ca_core_news_trf", "description": "Catalan transformer pipeline (projecte-aina/roberta-base-ca-v2)." }, + { "name": "spacy-model-da_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-da_core_news_lg", "description": "Danish pipeline optimized for CPU." }, + { "name": "spacy-model-da_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-da_core_news_md", "description": "Danish pipeline optimized for CPU." }, + { "name": "spacy-model-da_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-da_core_news_sm", "description": "Danish pipeline optimized for CPU." }, + { "name": "spacy-model-da_core_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-da_core_news_trf", "description": "Danish transformer pipeline (Maltehb/danish-bert-botxo)." }, + { "name": "spacy-model-de_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-de_core_news_lg", "description": "German pipeline optimized for CPU." }, + { "name": "spacy-model-de_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-de_core_news_md", "description": "German pipeline optimized for CPU." }, + { "name": "spacy-model-de_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-de_core_news_sm", "description": "German pipeline optimized for CPU." }, + { "name": "spacy-model-de_dep_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-de_dep_news_trf", "description": "German transformer pipeline (bert-base-german-cased)." }, + { "name": "spacy-model-el_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-el_core_news_lg", "description": "Greek pipeline optimized for CPU." }, + { "name": "spacy-model-el_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-el_core_news_md", "description": "Greek pipeline optimized for CPU." }, + { "name": "spacy-model-el_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-el_core_news_sm", "description": "Greek pipeline optimized for CPU." }, + { "name": "spacy-model-en_core_web_lg", "uri": "https://anaconda.org/anaconda/spacy-model-en_core_web_lg", "description": "English pipeline optimized for CPU." }, + { "name": "spacy-model-en_core_web_md", "uri": "https://anaconda.org/anaconda/spacy-model-en_core_web_md", "description": "English pipeline optimized for CPU." }, + { "name": "spacy-model-en_core_web_sm", "uri": "https://anaconda.org/anaconda/spacy-model-en_core_web_sm", "description": "English pipeline optimized for CPU." }, + { "name": "spacy-model-en_core_web_trf", "uri": "https://anaconda.org/anaconda/spacy-model-en_core_web_trf", "description": "English transformer pipeline (roberta-base)." }, + { "name": "spacy-model-es_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-es_core_news_lg", "description": "Spanish pipeline optimized for CPU." }, + { "name": "spacy-model-es_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-es_core_news_md", "description": "Spanish pipeline optimized for CPU." }, + { "name": "spacy-model-es_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-es_core_news_sm", "description": "Spanish pipeline optimized for CPU." }, + { "name": "spacy-model-es_dep_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-es_dep_news_trf", "description": "Spanish transformer pipeline (dccuchile/bert-base-spanish-wwm-cased)." }, + { "name": "spacy-model-fi_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-fi_core_news_lg", "description": "Finnish pipeline optimized for CPU." }, + { "name": "spacy-model-fi_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-fi_core_news_md", "description": "Finnish pipeline optimized for CPU." }, + { "name": "spacy-model-fi_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-fi_core_news_sm", "description": "Finnish pipeline optimized for CPU." }, + { "name": "spacy-model-fr_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-fr_core_news_lg", "description": "French pipeline optimized for CPU." }, + { "name": "spacy-model-fr_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-fr_core_news_md", "description": "French pipeline optimized for CPU." }, + { "name": "spacy-model-fr_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-fr_core_news_sm", "description": "French pipeline optimized for CPU." }, + { "name": "spacy-model-fr_dep_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-fr_dep_news_trf", "description": "French transformer pipeline (camembert-base)." }, + { "name": "spacy-model-hr_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-hr_core_news_lg", "description": "Croatian pipeline optimized for CPU." }, + { "name": "spacy-model-hr_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-hr_core_news_md", "description": "Croatian pipeline optimized for CPU." }, + { "name": "spacy-model-hr_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-hr_core_news_sm", "description": "Croatian pipeline optimized for CPU." }, + { "name": "spacy-model-it_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-it_core_news_lg", "description": "Italian pipeline optimized for CPU." }, + { "name": "spacy-model-it_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-it_core_news_md", "description": "Italian pipeline optimized for CPU." }, + { "name": "spacy-model-it_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-it_core_news_sm", "description": "Italian pipeline optimized for CPU." }, + { "name": "spacy-model-ja_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-ja_core_news_lg", "description": "Japanese pipeline optimized for CPU." }, + { "name": "spacy-model-ja_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-ja_core_news_md", "description": "Japanese pipeline optimized for CPU." }, + { "name": "spacy-model-ja_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-ja_core_news_sm", "description": "Japanese pipeline optimized for CPU." }, + { "name": "spacy-model-ja_core_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-ja_core_news_trf", "description": "Japanese transformer pipeline (cl-tohoku/bert-base-japanese-char-v2)." }, + { "name": "spacy-model-ko_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-ko_core_news_lg", "description": "Korean pipeline optimized for CPU." }, + { "name": "spacy-model-ko_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-ko_core_news_md", "description": "Korean pipeline optimized for CPU." }, + { "name": "spacy-model-ko_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-ko_core_news_sm", "description": "Korean pipeline optimized for CPU." }, + { "name": "spacy-model-lt_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-lt_core_news_lg", "description": "Lithuanian pipeline optimized for CPU." }, + { "name": "spacy-model-lt_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-lt_core_news_md", "description": "Lithuanian pipeline optimized for CPU." }, + { "name": "spacy-model-lt_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-lt_core_news_sm", "description": "Lithuanian pipeline optimized for CPU." }, + { "name": "spacy-model-mk_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-mk_core_news_lg", "description": "Macedonian pipeline optimized for CPU." }, + { "name": "spacy-model-mk_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-mk_core_news_md", "description": "Macedonian pipeline optimized for CPU." }, + { "name": "spacy-model-mk_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-mk_core_news_sm", "description": "Macedonian pipeline optimized for CPU." }, + { "name": "spacy-model-nb_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-nb_core_news_lg", "description": "Norwegian (Bokmål) pipeline optimized for CPU." }, + { "name": "spacy-model-nb_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-nb_core_news_md", "description": "Norwegian (Bokmål) pipeline optimized for CPU." }, + { "name": "spacy-model-nb_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-nb_core_news_sm", "description": "Norwegian (Bokmål) pipeline optimized for CPU." }, + { "name": "spacy-model-nl_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-nl_core_news_lg", "description": "Dutch pipeline optimized for CPU." }, + { "name": "spacy-model-nl_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-nl_core_news_md", "description": "Dutch pipeline optimized for CPU." }, + { "name": "spacy-model-nl_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-nl_core_news_sm", "description": "Dutch pipeline optimized for CPU." }, + { "name": "spacy-model-pl_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-pl_core_news_lg", "description": "Polish pipeline optimized for CPU." }, + { "name": "spacy-model-pl_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-pl_core_news_md", "description": "Polish pipeline optimized for CPU." }, + { "name": "spacy-model-pl_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-pl_core_news_sm", "description": "Polish pipeline optimized for CPU." }, + { "name": "spacy-model-pt_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-pt_core_news_lg", "description": "Portuguese pipeline optimized for CPU." }, + { "name": "spacy-model-pt_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-pt_core_news_md", "description": "Portuguese pipeline optimized for CPU." }, + { "name": "spacy-model-pt_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-pt_core_news_sm", "description": "Portuguese pipeline optimized for CPU." }, + { "name": "spacy-model-ro_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-ro_core_news_lg", "description": "Romanian pipeline optimized for CPU." }, + { "name": "spacy-model-ro_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-ro_core_news_md", "description": "Romanian pipeline optimized for CPU." }, + { "name": "spacy-model-ro_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-ro_core_news_sm", "description": "Romanian pipeline optimized for CPU." }, + { "name": "spacy-model-ru_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-ru_core_news_lg", "description": "Russian pipeline optimized for CPU." }, + { "name": "spacy-model-ru_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-ru_core_news_md", "description": "Russian pipeline optimized for CPU." }, + { "name": "spacy-model-ru_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-ru_core_news_sm", "description": "Russian pipeline optimized for CPU." }, + { "name": "spacy-model-sl_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-sl_core_news_lg", "description": "Slovenian pipeline optimized for CPU." }, + { "name": "spacy-model-sl_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-sl_core_news_md", "description": "Slovenian pipeline optimized for CPU." }, + { "name": "spacy-model-sl_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-sl_core_news_sm", "description": "Slovenian pipeline optimized for CPU." }, + { "name": "spacy-model-sv_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-sv_core_news_lg", "description": "Swedish pipeline optimized for CPU." }, + { "name": "spacy-model-sv_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-sv_core_news_md", "description": "Swedish pipeline optimized for CPU." }, + { "name": "spacy-model-sv_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-sv_core_news_sm", "description": "Swedish pipeline optimized for CPU." }, + { "name": "spacy-model-uk_core_news_lg", "uri": "https://anaconda.org/anaconda/spacy-model-uk_core_news_lg", "description": "Ukrainian pipeline optimized for CPU." }, + { "name": "spacy-model-uk_core_news_md", "uri": "https://anaconda.org/anaconda/spacy-model-uk_core_news_md", "description": "Ukrainian pipeline optimized for CPU." }, + { "name": "spacy-model-uk_core_news_sm", "uri": "https://anaconda.org/anaconda/spacy-model-uk_core_news_sm", "description": "Ukrainian pipeline optimized for CPU." }, + { "name": "spacy-model-uk_core_news_trf", "uri": "https://anaconda.org/anaconda/spacy-model-uk_core_news_trf", "description": "Ukrainian transformer pipeline (ukr-models/xlm-roberta-base-uk)." }, + { "name": "spacy-model-xx_ent_wiki_sm", "uri": "https://anaconda.org/anaconda/spacy-model-xx_ent_wiki_sm", "description": "Multi-language pipeline optimized for CPU." }, + { "name": "spacy-model-xx_sent_ud_sm", "uri": "https://anaconda.org/anaconda/spacy-model-xx_sent_ud_sm", "description": "Multi-language pipeline optimized for CPU." }, + { "name": "spacy-model-zh_core_web_lg", "uri": "https://anaconda.org/anaconda/spacy-model-zh_core_web_lg", "description": "Chinese pipeline optimized for CPU." }, + { "name": "spacy-model-zh_core_web_md", "uri": "https://anaconda.org/anaconda/spacy-model-zh_core_web_md", "description": "Chinese pipeline optimized for CPU." }, + { "name": "spacy-model-zh_core_web_sm", "uri": "https://anaconda.org/anaconda/spacy-model-zh_core_web_sm", "description": "Chinese pipeline optimized for CPU." }, + { "name": "spacy-model-zh_core_web_trf", "uri": "https://anaconda.org/anaconda/spacy-model-zh_core_web_trf", "description": "Chinese transformer pipeline (bert-base-chinese)." }, + { "name": "spacy-pkuseg", "uri": "https://anaconda.org/anaconda/spacy-pkuseg", "description": "PKUSeg Chinese word segmentation toolkit for spaCy" }, + { "name": "spacy-transformers", "uri": "https://anaconda.org/anaconda/spacy-transformers", "description": "Use pretrained transformers like BERT, XLNet and GPT-2 in spaCy" }, + { "name": "spaghetti", "uri": "https://anaconda.org/anaconda/spaghetti", "description": "SPAtial GrapHs: nETworks, Topology, & Inference" }, + { "name": "spark-nlp", "uri": "https://anaconda.org/anaconda/spark-nlp", "description": "John Snow Labs Spark NLP is a natural language processing library built on top of Apache Spark ML" }, + { "name": "sparkmagic", "uri": "https://anaconda.org/anaconda/sparkmagic", "description": "Jupyter magics and kernels for working with remote Spark clusters" }, + { "name": "spatialpandas", "uri": "https://anaconda.org/anaconda/spatialpandas", "description": "Pandas extension arrays for spatial/geometric operations" }, + { "name": "spdlog", "uri": "https://anaconda.org/anaconda/spdlog", "description": "Super fast C++ logging library." }, + { "name": "spdlog-fmt-embed", "uri": "https://anaconda.org/anaconda/spdlog-fmt-embed", "description": "Super fast C++ logging library." }, + { "name": "spglm", "uri": "https://anaconda.org/anaconda/spglm", "description": "Sparse generalized linear models" }, + { "name": "sphinx", "uri": "https://anaconda.org/anaconda/sphinx", "description": "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation" }, + { "name": "sphinx-design", "uri": "https://anaconda.org/anaconda/sphinx-design", "description": "A sphinx extension for designing beautiful, screen-size responsive web components" }, + { "name": "sphinx-rtd-theme", "uri": "https://anaconda.org/anaconda/sphinx-rtd-theme", "description": "Sphinx theme for readthedocs.org" }, + { "name": "sphinx-sitemap", "uri": "https://anaconda.org/anaconda/sphinx-sitemap", "description": "Sitemap generator for Sphinx" }, + { "name": "sphinx_rtd_theme", "uri": "https://anaconda.org/anaconda/sphinx_rtd_theme", "description": "Sphinx theme for readthedocs.org" }, + { "name": "sphinxcontrib", "uri": "https://anaconda.org/anaconda/sphinxcontrib", "description": "Python namespace for sphinxcontrib" }, + { "name": "sphinxcontrib-applehelp", "uri": "https://anaconda.org/anaconda/sphinxcontrib-applehelp", "description": "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" }, + { "name": "sphinxcontrib-devhelp", "uri": "https://anaconda.org/anaconda/sphinxcontrib-devhelp", "description": "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document" }, + { "name": "sphinxcontrib-htmlhelp", "uri": "https://anaconda.org/anaconda/sphinxcontrib-htmlhelp", "description": "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files." }, + { "name": "sphinxcontrib-images", "uri": "https://anaconda.org/anaconda/sphinxcontrib-images", "description": "Sphinx extension for thumbnails" }, + { "name": "sphinxcontrib-jquery", "uri": "https://anaconda.org/anaconda/sphinxcontrib-jquery", "description": "A sphinx extension to include jQuery on newer sphinx releases" }, + { "name": "sphinxcontrib-jsmath", "uri": "https://anaconda.org/anaconda/sphinxcontrib-jsmath", "description": "A sphinx extension which renders display math in HTML via JavaScript" }, + { "name": "sphinxcontrib-qthelp", "uri": "https://anaconda.org/anaconda/sphinxcontrib-qthelp", "description": "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document" }, + { "name": "sphinxcontrib-serializinghtml", "uri": "https://anaconda.org/anaconda/sphinxcontrib-serializinghtml", "description": "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." }, + { "name": "sphinxcontrib-websupport", "uri": "https://anaconda.org/anaconda/sphinxcontrib-websupport", "description": "Sphinx API for Web Apps" }, + { "name": "sphinxcontrib-youtube", "uri": "https://anaconda.org/anaconda/sphinxcontrib-youtube", "description": "Sphinx \"youtube\" extension" }, + { "name": "spin", "uri": "https://anaconda.org/anaconda/spin", "description": "Developer tool for scientific Python libraries" }, + { "name": "spint", "uri": "https://anaconda.org/anaconda/spint", "description": "Efficient calibration of spatial interaction models in Python" }, + { "name": "spirv-tools", "uri": "https://anaconda.org/anaconda/spirv-tools", "description": "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules." }, + { "name": "splot", "uri": "https://anaconda.org/anaconda/splot", "description": "Lightweight plotting and mapping to facilitate spatial analysis with PySAL" }, + { "name": "splunk-opentelemetry", "uri": "https://anaconda.org/anaconda/splunk-opentelemetry", "description": "The Splunk distribution of OpenTelemetry Python Instrumentation provides a Python agent that automatically instruments your Python application to capture and report distributed traces to SignalFx APM." }, + { "name": "spreg", "uri": "https://anaconda.org/anaconda/spreg", "description": "PySAL Spatial Econometrics Package" }, + { "name": "spvcm", "uri": "https://anaconda.org/anaconda/spvcm", "description": "Gibbs sampling for spatially-correlated variance-components" }, + { "name": "spyder", "uri": "https://anaconda.org/anaconda/spyder", "description": "The Scientific Python Development Environment" }, + { "name": "spyder-kernels", "uri": "https://anaconda.org/anaconda/spyder-kernels", "description": "Jupyter kernels for Spyder's console" }, + { "name": "spyder_parso_requirement", "uri": "https://anaconda.org/anaconda/spyder_parso_requirement", "description": "Ancillary package to ensure the Spyder parso requirement is in current_repodata.json" }, + { "name": "sqlalchemy", "uri": "https://anaconda.org/anaconda/sqlalchemy", "description": "Database Abstraction Library." }, + { "name": "sqlalchemy-jsonfield", "uri": "https://anaconda.org/anaconda/sqlalchemy-jsonfield", "description": "SQLALchemy JSONField implementation for storing dicts at SQL independently\nfrom JSON type support." }, + { "name": "sqlalchemy-utils", "uri": "https://anaconda.org/anaconda/sqlalchemy-utils", "description": "Various utility functions for SQLAlchemy" }, + { "name": "sqlglot", "uri": "https://anaconda.org/anaconda/sqlglot", "description": "An easily customizable SQL parser and transpiler" }, + { "name": "sqlite", "uri": "https://anaconda.org/anaconda/sqlite", "description": "Implements a self-contained, zero-configuration, SQL database engine" }, + { "name": "sqlparse", "uri": "https://anaconda.org/anaconda/sqlparse", "description": "A non-validating SQL parser module for Python." }, + { "name": "squarify", "uri": "https://anaconda.org/anaconda/squarify", "description": "Pure Python implementation of the squarify treemap layout algorithm." }, + { "name": "srsly", "uri": "https://anaconda.org/anaconda/srsly", "description": "Modern high-performance serialization utilities for Python" }, + { "name": "sshpubkeys", "uri": "https://anaconda.org/anaconda/sshpubkeys", "description": "SSH public key parser" }, + { "name": "sshtunnel", "uri": "https://anaconda.org/anaconda/sshtunnel", "description": "Pure Python SSH tunnels" }, + { "name": "st-annotated-text", "uri": "https://anaconda.org/anaconda/st-annotated-text", "description": "A simple component to display annotated text in Streamlit apps." }, + { "name": "stack_data", "uri": "https://anaconda.org/anaconda/stack_data", "description": "Extract data from python stack frames and tracebacks for informative displays" }, + { "name": "starkbank-ecdsa", "uri": "https://anaconda.org/anaconda/starkbank-ecdsa", "description": "A lightweight and fast pure python ECDSA library" }, + { "name": "starlette", "uri": "https://anaconda.org/anaconda/starlette", "description": "The little ASGI framework that shines" }, + { "name": "starlette-full", "uri": "https://anaconda.org/anaconda/starlette-full", "description": "The little ASGI framework that shines" }, + { "name": "starsessions", "uri": "https://anaconda.org/anaconda/starsessions", "description": "Pluggable session support for Starlette." }, + { "name": "statistics", "uri": "https://anaconda.org/anaconda/statistics", "description": "A Python 2.* port of 3.4 Statistics Module" }, + { "name": "statsd", "uri": "https://anaconda.org/anaconda/statsd", "description": "A Python client for statsd" }, + { "name": "statsmodels", "uri": "https://anaconda.org/anaconda/statsmodels", "description": "Statistical computations and models for use with SciPy" }, + { "name": "stdlib-list", "uri": "https://anaconda.org/anaconda/stdlib-list", "description": "A list of standard libraries for Python 2.6 through 3.12." }, + { "name": "stone", "uri": "https://anaconda.org/anaconda/stone", "description": "Stone is an interface description language (IDL) for APIs." }, + { "name": "strace_linux-64", "uri": "https://anaconda.org/anaconda/strace_linux-64", "description": "Strace is a linux diagnostic, and debugging utility with cli" }, + { "name": "strace_linux-aarch64", "uri": "https://anaconda.org/anaconda/strace_linux-aarch64", "description": "Strace is a linux diagnostic, and debugging utility with cli" }, + { "name": "strace_linux-ppc64le", "uri": "https://anaconda.org/anaconda/strace_linux-ppc64le", "description": "Strace is a linux diagnostic, and debugging utility with cli" }, + { "name": "strace_linux-s390x", "uri": "https://anaconda.org/anaconda/strace_linux-s390x", "description": "Strace is a linux diagnostic, and debugging utility with cli" }, + { "name": "streamlit", "uri": "https://anaconda.org/anaconda/streamlit", "description": "The fastest way to build data apps in Python" }, + { "name": "streamlit-camera-input-live", "uri": "https://anaconda.org/anaconda/streamlit-camera-input-live", "description": "Alternative version of st.camera_input which returns the webcam images live, without any button press needed" }, + { "name": "streamlit-card", "uri": "https://anaconda.org/anaconda/streamlit-card", "description": "A streamlit component, to make UI cards" }, + { "name": "streamlit-chat", "uri": "https://anaconda.org/anaconda/streamlit-chat", "description": "A streamlit component, to make chatbots" }, + { "name": "streamlit-embedcode", "uri": "https://anaconda.org/anaconda/streamlit-embedcode", "description": "Streamlit component for embedded code snippets" }, + { "name": "streamlit-extras", "uri": "https://anaconda.org/anaconda/streamlit-extras", "description": "A library to discover, try, install and share Streamlit extras" }, + { "name": "streamlit-faker", "uri": "https://anaconda.org/anaconda/streamlit-faker", "description": "streamlit-faker is a library to very easily fake Streamlit commands" }, + { "name": "streamlit-image-coordinates", "uri": "https://anaconda.org/anaconda/streamlit-image-coordinates", "description": "Streamlit component that displays an image and returns the coordinates when you click on it" }, + { "name": "streamlit-keyup", "uri": "https://anaconda.org/anaconda/streamlit-keyup", "description": "Text input that renders on keyup" }, + { "name": "streamlit-toggle-switch", "uri": "https://anaconda.org/anaconda/streamlit-toggle-switch", "description": "Creates a customizable toggle" }, + { "name": "streamlit-vertical-slider", "uri": "https://anaconda.org/anaconda/streamlit-vertical-slider", "description": "Creates a customizable vertical slider" }, + { "name": "streamz", "uri": "https://anaconda.org/anaconda/streamz", "description": "Manage streaming data, optionally with Dask and Pandas" }, + { "name": "strict-rfc3339", "uri": "https://anaconda.org/anaconda/strict-rfc3339", "description": "Strict, simple, lightweight RFC3339 functions" }, + { "name": "stumpy", "uri": "https://anaconda.org/anaconda/stumpy", "description": "A powerful and scalable library that can be used for a variety of time series data mining tasks." }, + { "name": "subprocess32", "uri": "https://anaconda.org/anaconda/subprocess32", "description": "A backport of the subprocess module from Python 3.2/3.3 for use on 2.x" }, + { "name": "sudachidict-core", "uri": "https://anaconda.org/anaconda/sudachidict-core", "description": "Sudachi Dictionary for SudachiPy - Core Edition" }, + { "name": "sudachipy", "uri": "https://anaconda.org/anaconda/sudachipy", "description": "Python version of Sudachi, the Japanese Morphological Analyzer" }, + { "name": "suitesparse", "uri": "https://anaconda.org/anaconda/suitesparse", "description": "A suite of sparse matrix algorithms" }, + { "name": "superqt", "uri": "https://anaconda.org/anaconda/superqt", "description": "Missing widgets and components for PyQt/PySide" }, + { "name": "supervisor", "uri": "https://anaconda.org/anaconda/supervisor", "description": "A Process Control System" }, + { "name": "swagger-ui-bundle", "uri": "https://anaconda.org/anaconda/swagger-ui-bundle", "description": "swagger_ui_bundle - swagger-ui files in a pip package" }, + { "name": "sybil", "uri": "https://anaconda.org/anaconda/sybil", "description": "Automated testing for the examples in your documentation." }, + { "name": "sympy", "uri": "https://anaconda.org/anaconda/sympy", "description": "Python library for symbolic mathematics" }, + { "name": "sysroot-cos7-aarch64", "uri": "https://anaconda.org/anaconda/sysroot-cos7-aarch64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/sysroot-cos7-ppc64le", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot-cos7-s390x", "uri": "https://anaconda.org/anaconda/sysroot-cos7-s390x", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot-cos7-x86_64", "uri": "https://anaconda.org/anaconda/sysroot-cos7-x86_64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot_linux-64", "uri": "https://anaconda.org/anaconda/sysroot_linux-64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot_linux-aarch64", "uri": "https://anaconda.org/anaconda/sysroot_linux-aarch64", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot_linux-ppc64le", "uri": "https://anaconda.org/anaconda/sysroot_linux-ppc64le", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "sysroot_linux-s390x", "uri": "https://anaconda.org/anaconda/sysroot_linux-s390x", "description": "(CDT) The GNU libc libraries and header files for the Linux kernel for use by glibc" }, + { "name": "system-release-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/system-release-amzn2-aarch64", "description": "(CDT) Amazon Linux release files" }, + { "name": "systemd-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/systemd-amzn2-aarch64", "description": "(CDT) A System and Service Manager" }, + { "name": "systemd-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/systemd-cos7-ppc64le", "description": "(CDT) A System and Service Manager" }, + { "name": "systemd-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/systemd-libs-amzn2-aarch64", "description": "(CDT) systemd libraries" }, + { "name": "systemd-libs-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/systemd-libs-cos7-ppc64le", "description": "(CDT) systemd libraries" }, + { "name": "tables", "uri": "https://anaconda.org/anaconda/tables", "description": "Brings together Python, HDF5 and NumPy to easily handle large amounts of data." }, + { "name": "tabpy-server", "uri": "https://anaconda.org/anaconda/tabpy-server", "description": "No Summary" }, + { "name": "tabula-py", "uri": "https://anaconda.org/anaconda/tabula-py", "description": "Simple wrapper of tabula-java: extract table from PDF into pandas DataFrame" }, + { "name": "tabulate", "uri": "https://anaconda.org/anaconda/tabulate", "description": "Pretty-print tabular data in Python, a library and a command-line utility." }, + { "name": "tangled-up-in-unicode", "uri": "https://anaconda.org/anaconda/tangled-up-in-unicode", "description": "Access to the Unicode Character Database (UCD)" }, + { "name": "tapi", "uri": "https://anaconda.org/anaconda/tapi", "description": "TAPI is a Text-based Application Programming Interface" }, + { "name": "tbats", "uri": "https://anaconda.org/anaconda/tbats", "description": "BATS and TBATS for time series forecasting" }, + { "name": "tbb", "uri": "https://anaconda.org/anaconda/tbb", "description": "High level abstract threading library" }, + { "name": "tbb-devel", "uri": "https://anaconda.org/anaconda/tbb-devel", "description": "High level abstract threading library" }, + { "name": "tbb4py", "uri": "https://anaconda.org/anaconda/tbb4py", "description": "TBB module for Python" }, + { "name": "tempora", "uri": "https://anaconda.org/anaconda/tempora", "description": "Objects and routines pertaining to date and time (tempora)" }, + { "name": "tenacity", "uri": "https://anaconda.org/anaconda/tenacity", "description": "Retry a flaky function whenever an exception occurs until it works" }, + { "name": "tensorboard", "uri": "https://anaconda.org/anaconda/tensorboard", "description": "TensorFlow's Visualization Toolkit" }, + { "name": "tensorboard-data-server", "uri": "https://anaconda.org/anaconda/tensorboard-data-server", "description": "Data server for TensorBoard" }, + { "name": "tensorboardx", "uri": "https://anaconda.org/anaconda/tensorboardx", "description": "tensorboard for pytorch" }, + { "name": "tensorflow", "uri": "https://anaconda.org/anaconda/tensorflow", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "tensorflow-base", "uri": "https://anaconda.org/anaconda/tensorflow-base", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "tensorflow-cpu", "uri": "https://anaconda.org/anaconda/tensorflow-cpu", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "tensorflow-datasets", "uri": "https://anaconda.org/anaconda/tensorflow-datasets", "description": "tensorflow/datasets is a library of datasets ready to use with TensorFlow." }, + { "name": "tensorflow-eigen", "uri": "https://anaconda.org/anaconda/tensorflow-eigen", "description": "Metapackage for selecting a TensorFlow variant." }, + { "name": "tensorflow-estimator", "uri": "https://anaconda.org/anaconda/tensorflow-estimator", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "tensorflow-gpu", "uri": "https://anaconda.org/anaconda/tensorflow-gpu", "description": "TensorFlow is an end-to-end open source platform for machine learning." }, + { "name": "tensorflow-gpu-base", "uri": "https://anaconda.org/anaconda/tensorflow-gpu-base", "description": "TensorFlow is a machine learning library, base GPU package, tensorflow only." }, + { "name": "tensorflow-hub", "uri": "https://anaconda.org/anaconda/tensorflow-hub", "description": "A library for transfer learning by reusing parts of TensorFlow models." }, + { "name": "tensorflow-metadata", "uri": "https://anaconda.org/anaconda/tensorflow-metadata", "description": "Library and standards for schema and statistics." }, + { "name": "tensorflow-mkl", "uri": "https://anaconda.org/anaconda/tensorflow-mkl", "description": "Metapackage for selecting a TensorFlow variant." }, + { "name": "tensorflow-probability", "uri": "https://anaconda.org/anaconda/tensorflow-probability", "description": "TensorFlow Probability is a library for probabilistic reasoning and statistical analysis in TensorFlow" }, + { "name": "termcolor", "uri": "https://anaconda.org/anaconda/termcolor", "description": "ANSII Color formatting for output in terminal." }, + { "name": "termcolor-cpp", "uri": "https://anaconda.org/anaconda/termcolor-cpp", "description": "Header-only C++ library for printing colored messages to the terminal." }, + { "name": "terminado", "uri": "https://anaconda.org/anaconda/terminado", "description": "Terminals served by tornado websockets" }, + { "name": "tesseract", "uri": "https://anaconda.org/anaconda/tesseract", "description": "An optical character recognition (OCR) engine" }, + { "name": "testfixtures", "uri": "https://anaconda.org/anaconda/testfixtures", "description": "A collection of helpers and mock objects for unit tests and doc tests." }, + { "name": "testpath", "uri": "https://anaconda.org/anaconda/testpath", "description": "Testpath is a collection of utilities for Python code working with files and commands." }, + { "name": "testscenarios", "uri": "https://anaconda.org/anaconda/testscenarios", "description": "Summary of the package" }, + { "name": "testtools", "uri": "https://anaconda.org/anaconda/testtools", "description": "Extensions to the Python standard library unit testing framework" }, + { "name": "texinfo", "uri": "https://anaconda.org/anaconda/texinfo", "description": "The GNU Documentation System." }, + { "name": "texlive-core", "uri": "https://anaconda.org/anaconda/texlive-core", "description": "An easy way to get up and running with the TeX document production system." }, + { "name": "textblob", "uri": "https://anaconda.org/anaconda/textblob", "description": "Simple, Pythonic text processing. Sentiment analysis, part-of-speech tagging, noun phrase parsing, and more." }, + { "name": "textdistance", "uri": "https://anaconda.org/anaconda/textdistance", "description": "TextDistance – python library for comparing distance between two or more sequences by many algorithms." }, + { "name": "texttable", "uri": "https://anaconda.org/anaconda/texttable", "description": "Python module for creating simple ASCII tables" }, + { "name": "the_silver_searcher", "uri": "https://anaconda.org/anaconda/the_silver_searcher", "description": "A code searching tool similar to ack, with a focus on speed." }, + { "name": "theano", "uri": "https://anaconda.org/anaconda/theano", "description": "Optimizing compiler for evaluating mathematical expressions on CPUs and GPUs." }, + { "name": "theano-pymc", "uri": "https://anaconda.org/anaconda/theano-pymc", "description": "An optimizing compiler for evaluating mathematical expressions. Theano-PyMC is a fork of the Theano library maintained by the PyMC developers." }, + { "name": "thefuzz", "uri": "https://anaconda.org/anaconda/thefuzz", "description": "Fuzzy string matching library." }, + { "name": "thinc", "uri": "https://anaconda.org/anaconda/thinc", "description": "A refreshing functional take on deep learning, compatible with your favorite libraries." }, + { "name": "threadloop", "uri": "https://anaconda.org/anaconda/threadloop", "description": "Tornado IOLoop Backed Concurrent Futures" }, + { "name": "threadpoolctl", "uri": "https://anaconda.org/anaconda/threadpoolctl", "description": "Python helpers to control the threadpools of native libraries" }, + { "name": "three-merge", "uri": "https://anaconda.org/anaconda/three-merge", "description": "Simple Python library to perform a 3-way merge between strings" }, + { "name": "thrift", "uri": "https://anaconda.org/anaconda/thrift", "description": "Python bindings for the Apache Thrift RPC system" }, + { "name": "thrift-compiler", "uri": "https://anaconda.org/anaconda/thrift-compiler", "description": "Compiler and C++ libraries and headers for the Apache Thrift RPC system" }, + { "name": "thrift-cpp", "uri": "https://anaconda.org/anaconda/thrift-cpp", "description": "Compiler and C++ libraries and headers for the Apache Thrift RPC system" }, + { "name": "thrift_sasl", "uri": "https://anaconda.org/anaconda/thrift_sasl", "description": "Thrift SASL module that implements TSaslClientTransport" }, + { "name": "thriftpy2", "uri": "https://anaconda.org/anaconda/thriftpy2", "description": "Pure python implementation of Apache Thrift." }, + { "name": "tifffile", "uri": "https://anaconda.org/anaconda/tifffile", "description": "Read and write image data from and to TIFF files." }, + { "name": "tiledb", "uri": "https://anaconda.org/anaconda/tiledb", "description": "TileDB sparse and dense multi-dimensional array data management" }, + { "name": "time-machine", "uri": "https://anaconda.org/anaconda/time-machine", "description": "Travel through time in your tests." }, + { "name": "tini", "uri": "https://anaconda.org/anaconda/tini", "description": "A tiny but valid `init` for containers" }, + { "name": "tinycss", "uri": "https://anaconda.org/anaconda/tinycss", "description": "Tinycss is a complete yet simple CSS parser for Python." }, + { "name": "tinycss2", "uri": "https://anaconda.org/anaconda/tinycss2", "description": "Low-level CSS parser for Python" }, + { "name": "tk", "uri": "https://anaconda.org/anaconda/tk", "description": "A dynamic programming language with GUI support. Bundles Tcl and Tk." }, + { "name": "tktable", "uri": "https://anaconda.org/anaconda/tktable", "description": "Tktable is a 2D editable table widget" }, + { "name": "tldextract", "uri": "https://anaconda.org/anaconda/tldextract", "description": "Accurately separate the TLD from the registered domain andsubdomains of a URL, using the Public Suffix List." }, + { "name": "tmux", "uri": "https://anaconda.org/anaconda/tmux", "description": "A terminal multiplexer." }, + { "name": "tobler", "uri": "https://anaconda.org/anaconda/tobler", "description": "Tobler is a python package for areal interpolation, dasymetric mapping, and change of support." }, + { "name": "tokenizers", "uri": "https://anaconda.org/anaconda/tokenizers", "description": "Fast State-of-the-Art Tokenizers optimized for Research and Production" }, + { "name": "toml", "uri": "https://anaconda.org/anaconda/toml", "description": "Python lib for TOML." }, + { "name": "tomli", "uri": "https://anaconda.org/anaconda/tomli", "description": "A simple TOML parser" }, + { "name": "tomli-w", "uri": "https://anaconda.org/anaconda/tomli-w", "description": "A lil' TOML writer" }, + { "name": "tomlkit", "uri": "https://anaconda.org/anaconda/tomlkit", "description": "Style preserving TOML library" }, + { "name": "toolchain", "uri": "https://anaconda.org/anaconda/toolchain", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_c_linux-64", "uri": "https://anaconda.org/anaconda/toolchain_c_linux-64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_c_linux-aarch64", "uri": "https://anaconda.org/anaconda/toolchain_c_linux-aarch64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_c_linux-ppc64le", "uri": "https://anaconda.org/anaconda/toolchain_c_linux-ppc64le", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_cxx_linux-64", "uri": "https://anaconda.org/anaconda/toolchain_cxx_linux-64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_cxx_linux-aarch64", "uri": "https://anaconda.org/anaconda/toolchain_cxx_linux-aarch64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_cxx_linux-ppc64le", "uri": "https://anaconda.org/anaconda/toolchain_cxx_linux-ppc64le", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_fort_linux-64", "uri": "https://anaconda.org/anaconda/toolchain_fort_linux-64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_fort_linux-aarch64", "uri": "https://anaconda.org/anaconda/toolchain_fort_linux-aarch64", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolchain_fort_linux-ppc64le", "uri": "https://anaconda.org/anaconda/toolchain_fort_linux-ppc64le", "description": "A meta-package to enable the right toolchain." }, + { "name": "toolz", "uri": "https://anaconda.org/anaconda/toolz", "description": "List processing tools and functional utilities" }, + { "name": "torch-lr-finder", "uri": "https://anaconda.org/anaconda/torch-lr-finder", "description": "Pytorch implementation of the learning rate range test" }, + { "name": "torchmetrics", "uri": "https://anaconda.org/anaconda/torchmetrics", "description": "Collection of PyTorch native metrics for easy evaluating machine learning models" }, + { "name": "torchtriton", "uri": "https://anaconda.org/anaconda/torchtriton", "description": "Development repository for the Triton language and compiler" }, + { "name": "torchvision", "uri": "https://anaconda.org/anaconda/torchvision", "description": "Image and video datasets and models for torch deep learning" }, + { "name": "tornado", "uri": "https://anaconda.org/anaconda/tornado", "description": "A Python web framework and asynchronous networking library, originally developed at FriendFeed." }, + { "name": "tornado-json", "uri": "https://anaconda.org/anaconda/tornado-json", "description": "A simple JSON API framework based on Tornado" }, + { "name": "tqdm", "uri": "https://anaconda.org/anaconda/tqdm", "description": "A Fast, Extensible Progress Meter" }, + { "name": "trace-updater", "uri": "https://anaconda.org/anaconda/trace-updater", "description": "Dash component which allows updating a dcc.Graph its traces." }, + { "name": "traceback2", "uri": "https://anaconda.org/anaconda/traceback2", "description": "Backports of the traceback module" }, + { "name": "trafaret", "uri": "https://anaconda.org/anaconda/trafaret", "description": "Ultimate transformation library that supports validation, contexts and aiohttp" }, + { "name": "traitlets", "uri": "https://anaconda.org/anaconda/traitlets", "description": "Configuration system for Python applications" }, + { "name": "traits", "uri": "https://anaconda.org/anaconda/traits", "description": "traits - explicitly typed attributes for Python" }, + { "name": "traittypes", "uri": "https://anaconda.org/anaconda/traittypes", "description": "Trait types for NumPy, SciPy and friends" }, + { "name": "tranquilizer", "uri": "https://anaconda.org/anaconda/tranquilizer", "description": "Put your Python functions to REST" }, + { "name": "transaction", "uri": "https://anaconda.org/anaconda/transaction", "description": "Transaction management for Python" }, + { "name": "transformers", "uri": "https://anaconda.org/anaconda/transformers", "description": "State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" }, + { "name": "treeinterpreter", "uri": "https://anaconda.org/anaconda/treeinterpreter", "description": "Package for interpreting scikit-learn's decision tree and random forest predictions." }, + { "name": "treelib", "uri": "https://anaconda.org/anaconda/treelib", "description": "A Python 2/3 implementation of tree structure." }, + { "name": "triad", "uri": "https://anaconda.org/anaconda/triad", "description": "A collection of python utility functions for Fugue projects" }, + { "name": "trio", "uri": "https://anaconda.org/anaconda/trio", "description": "Trio – a friendly Python library for async concurrency and I/O" }, + { "name": "trio-websocket", "uri": "https://anaconda.org/anaconda/trio-websocket", "description": "WebSocket library for Trio" }, + { "name": "trousers-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/trousers-amzn2-aarch64", "description": "(CDT) TCG's Software Stack v1.2" }, + { "name": "trousers-cos7-s390x", "uri": "https://anaconda.org/anaconda/trousers-cos7-s390x", "description": "(CDT) TCG's Software Stack v1.2" }, + { "name": "trove-classifiers", "uri": "https://anaconda.org/anaconda/trove-classifiers", "description": "Canonical source for classifiers on PyPI (pypi.org)." }, + { "name": "trustme", "uri": "https://anaconda.org/anaconda/trustme", "description": "#1 quality TLS certs while you wait, for the discerning tester" }, + { "name": "truststore", "uri": "https://anaconda.org/anaconda/truststore", "description": "Verify certificates using native system trust stores" }, + { "name": "tsfresh", "uri": "https://anaconda.org/anaconda/tsfresh", "description": "Automatic extraction of relevant features from time series" }, + { "name": "twine", "uri": "https://anaconda.org/anaconda/twine", "description": "Collection of utilities for interacting with PyPI" }, + { "name": "twisted", "uri": "https://anaconda.org/anaconda/twisted", "description": "An event-based framework for internet applications, written in Python" }, + { "name": "twisted-iocpsupport", "uri": "https://anaconda.org/anaconda/twisted-iocpsupport", "description": "An extension for use in the twisted I/O Completion Ports reactor." }, + { "name": "twofish", "uri": "https://anaconda.org/anaconda/twofish", "description": "Bindings for the Twofish implementation by Niels Ferguson" }, + { "name": "twython", "uri": "https://anaconda.org/anaconda/twython", "description": "Actively maintained, pure Python wrapper for the Twitter API. Supports both normal and streaming Twitter APIs" }, + { "name": "typed-ast", "uri": "https://anaconda.org/anaconda/typed-ast", "description": "a fork of Python 2 and 3 ast modules with type comment support" }, + { "name": "typeguard", "uri": "https://anaconda.org/anaconda/typeguard", "description": "Runtime type checker for Python" }, + { "name": "typer", "uri": "https://anaconda.org/anaconda/typer", "description": "A library for building CLI applications" }, + { "name": "types-futures", "uri": "https://anaconda.org/anaconda/types-futures", "description": "Typing stubs for futures" }, + { "name": "types-jsonschema", "uri": "https://anaconda.org/anaconda/types-jsonschema", "description": "Typing stubs for jsonschema" }, + { "name": "types-protobuf", "uri": "https://anaconda.org/anaconda/types-protobuf", "description": "Typing stubs for protobuf" }, + { "name": "types-psutil", "uri": "https://anaconda.org/anaconda/types-psutil", "description": "Typing stubs for psutil" }, + { "name": "types-pytz", "uri": "https://anaconda.org/anaconda/types-pytz", "description": "Typing stubs for pytz" }, + { "name": "types-pyyaml", "uri": "https://anaconda.org/anaconda/types-pyyaml", "description": "Typing stubs for PyYAML" }, + { "name": "types-requests", "uri": "https://anaconda.org/anaconda/types-requests", "description": "Typing stubs for requests" }, + { "name": "types-setuptools", "uri": "https://anaconda.org/anaconda/types-setuptools", "description": "Typing stubs for setuptools" }, + { "name": "types-toml", "uri": "https://anaconda.org/anaconda/types-toml", "description": "Typing stubs for toml" }, + { "name": "types-urllib3", "uri": "https://anaconda.org/anaconda/types-urllib3", "description": "Typing stubs for urllib3" }, + { "name": "typing", "uri": "https://anaconda.org/anaconda/typing", "description": "Type Hints for Python - backport for Python<3.5" }, + { "name": "typing-extensions", "uri": "https://anaconda.org/anaconda/typing-extensions", "description": "Backported and Experimental Type Hints for Python" }, + { "name": "typing_extensions", "uri": "https://anaconda.org/anaconda/typing_extensions", "description": "Backported and Experimental Type Hints for Python" }, + { "name": "typing_inspect", "uri": "https://anaconda.org/anaconda/typing_inspect", "description": "Runtime inspection utilities for Python typing module" }, + { "name": "typogrify", "uri": "https://anaconda.org/anaconda/typogrify", "description": "Filters to enhance web typography, including support for Django & Jinja templates" }, + { "name": "tzdata", "uri": "https://anaconda.org/anaconda/tzdata", "description": "The Time Zone Database (called tz, tzdb or zoneinfo)" }, + { "name": "tzdata-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/tzdata-amzn2-aarch64", "description": "(CDT) Timezone data" }, + { "name": "tzdata-java-cos7-s390x", "uri": "https://anaconda.org/anaconda/tzdata-java-cos7-s390x", "description": "(CDT) Timezone data for Java" }, + { "name": "tzlocal", "uri": "https://anaconda.org/anaconda/tzlocal", "description": "tzinfo object for the local timezone" }, + { "name": "uc-micro-py", "uri": "https://anaconda.org/anaconda/uc-micro-py", "description": "Micro subset of unicode data files for linkify-it-py projects." }, + { "name": "ucrt", "uri": "https://anaconda.org/anaconda/ucrt", "description": "Redistributable files for Windows SDK. This is only needed Windows <10" }, + { "name": "ucrt64-binutils", "uri": "https://anaconda.org/anaconda/ucrt64-binutils", "description": "A set of programs to assemble and manipulate binary and object files (mingw-w64) (repack of MINGW-packages binutils for UCRT64)" }, + { "name": "ucrt64-bzip2", "uri": "https://anaconda.org/anaconda/ucrt64-bzip2", "description": "A high-quality data compression program (mingw-w64) (repack of MINGW-packages bzip2 for UCRT64)" }, + { "name": "ucrt64-crt-git", "uri": "https://anaconda.org/anaconda/ucrt64-crt-git", "description": "MinGW-w64 CRT for Windows (mingw-w64) (repack of MINGW-packages crt-git for UCRT64)" }, + { "name": "ucrt64-expat", "uri": "https://anaconda.org/anaconda/ucrt64-expat", "description": "An XML parser library (mingw-w64) (repack of MINGW-packages expat for UCRT64)" }, + { "name": "ucrt64-gcc", "uri": "https://anaconda.org/anaconda/ucrt64-gcc", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc for UCRT64)" }, + { "name": "ucrt64-gcc-ada", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-ada", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-ada for UCRT64)" }, + { "name": "ucrt64-gcc-fortran", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-fortran", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-fortran for UCRT64)" }, + { "name": "ucrt64-gcc-libgfortran", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-libgfortran", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-libgfortran for UCRT64)" }, + { "name": "ucrt64-gcc-libs", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-libs", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-libs for UCRT64)" }, + { "name": "ucrt64-gcc-lto-dump", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-lto-dump", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-lto-dump for UCRT64)" }, + { "name": "ucrt64-gcc-objc", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-objc", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-objc for UCRT64)" }, + { "name": "ucrt64-gcc-rust", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-rust", "description": "GCC for the MinGW-w64 (repack of MINGW-packages gcc-rust for UCRT64)" }, + { "name": "ucrt64-gcc-toolchain", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-toolchain", "description": "UCRT64 GCC toolchain packages" }, + { "name": "ucrt64-gcc-toolchain_win-64", "uri": "https://anaconda.org/anaconda/ucrt64-gcc-toolchain_win-64", "description": "UCRT64 GCC toolchain metapackage" }, + { "name": "ucrt64-gettext-runtime", "uri": "https://anaconda.org/anaconda/ucrt64-gettext-runtime", "description": "GNU internationalization library (mingw-w64) (repack of MINGW-packages gettext-runtime for UCRT64)" }, + { "name": "ucrt64-gettext-tools", "uri": "https://anaconda.org/anaconda/ucrt64-gettext-tools", "description": "GNU internationalization library (mingw-w64) (repack of MINGW-packages gettext-tools for UCRT64)" }, + { "name": "ucrt64-gmp", "uri": "https://anaconda.org/anaconda/ucrt64-gmp", "description": "A free library for arbitrary precision arithmetic (mingw-w64) (repack of MINGW-packages gmp for UCRT64)" }, + { "name": "ucrt64-headers-git", "uri": "https://anaconda.org/anaconda/ucrt64-headers-git", "description": "MinGW-w64 headers for Windows (mingw-w64) (repack of MINGW-packages headers-git for UCRT64)" }, + { "name": "ucrt64-iconv", "uri": "https://anaconda.org/anaconda/ucrt64-iconv", "description": "Character encoding conversion library and utility (mingw-w64) (repack of MINGW-packages iconv for UCRT64)" }, + { "name": "ucrt64-isl", "uri": "https://anaconda.org/anaconda/ucrt64-isl", "description": "Library for manipulating sets and relations of integer points bounded by linear constraints (mingw-w64) (repack of MINGW-packages isl for UCRT64)" }, + { "name": "ucrt64-libcxx", "uri": "https://anaconda.org/anaconda/ucrt64-libcxx", "description": "(repack of MINGW-packages libc++ for UCRT64)" }, + { "name": "ucrt64-libgccjit", "uri": "https://anaconda.org/anaconda/ucrt64-libgccjit", "description": "GCC for the MinGW-w64 (repack of MINGW-packages libgccjit for UCRT64)" }, + { "name": "ucrt64-libiconv", "uri": "https://anaconda.org/anaconda/ucrt64-libiconv", "description": "Character encoding conversion library and utility (mingw-w64) (repack of MINGW-packages libiconv for UCRT64)" }, + { "name": "ucrt64-libidn2", "uri": "https://anaconda.org/anaconda/ucrt64-libidn2", "description": "Implementation of the Stringprep, Punycode and IDNA specifications (mingw-w64) (repack of MINGW-packages libidn2 for UCRT64)" }, + { "name": "ucrt64-libmangle-git", "uri": "https://anaconda.org/anaconda/ucrt64-libmangle-git", "description": "MinGW-w64 libmangle (mingw-w64) (repack of MINGW-packages libmangle-git for UCRT64)" }, + { "name": "ucrt64-libunistring", "uri": "https://anaconda.org/anaconda/ucrt64-libunistring", "description": "Library for manipulating Unicode strings and C strings. (mingw-w64) (repack of MINGW-packages libunistring for UCRT64)" }, + { "name": "ucrt64-libunwind", "uri": "https://anaconda.org/anaconda/ucrt64-libunwind", "description": "(repack of MINGW-packages libunwind for UCRT64)" }, + { "name": "ucrt64-libwinpthread-git", "uri": "https://anaconda.org/anaconda/ucrt64-libwinpthread-git", "description": "MinGW-w64 winpthreads library (mingw-w64) (repack of MINGW-packages libwinpthread-git for UCRT64)" }, + { "name": "ucrt64-make", "uri": "https://anaconda.org/anaconda/ucrt64-make", "description": "GNU make utility to maintain groups of programs (mingw-w64) (repack of MINGW-packages make for UCRT64)" }, + { "name": "ucrt64-minizip", "uri": "https://anaconda.org/anaconda/ucrt64-minizip", "description": "(repack of MINGW-packages minizip for UCRT64)" }, + { "name": "ucrt64-mpc", "uri": "https://anaconda.org/anaconda/ucrt64-mpc", "description": "Multiple precision complex arithmetic library (mingw-w64) (repack of MINGW-packages mpc for UCRT64)" }, + { "name": "ucrt64-mpfr", "uri": "https://anaconda.org/anaconda/ucrt64-mpfr", "description": "Multiple-precision floating-point library (mingw-w64) (repack of MINGW-packages mpfr for UCRT64)" }, + { "name": "ucrt64-openblas", "uri": "https://anaconda.org/anaconda/ucrt64-openblas", "description": "An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64) (repack of MINGW-packages openblas for UCRT64)" }, + { "name": "ucrt64-openblas64", "uri": "https://anaconda.org/anaconda/ucrt64-openblas64", "description": "An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64) (repack of MINGW-packages openblas64 for UCRT64)" }, + { "name": "ucrt64-pkg-config", "uri": "https://anaconda.org/anaconda/ucrt64-pkg-config", "description": "A system for managing library compile/link flags (mingw-w64) (repack of MINGW-packages pkg-config for UCRT64)" }, + { "name": "ucrt64-tools-git", "uri": "https://anaconda.org/anaconda/ucrt64-tools-git", "description": "MinGW-w64 tools (mingw-w64) (repack of MINGW-packages tools-git for UCRT64)" }, + { "name": "ucrt64-windows-default-manifest", "uri": "https://anaconda.org/anaconda/ucrt64-windows-default-manifest", "description": "Default Windows application manifest (mingw-w64) (repack of MINGW-packages windows-default-manifest for UCRT64)" }, + { "name": "ucrt64-winpthreads-git", "uri": "https://anaconda.org/anaconda/ucrt64-winpthreads-git", "description": "MinGW-w64 winpthreads library (mingw-w64) (repack of MINGW-packages winpthreads-git for UCRT64)" }, + { "name": "ucrt64-xz", "uri": "https://anaconda.org/anaconda/ucrt64-xz", "description": "Library and command line tools for XZ and LZMA compressed files (mingw-w64) (repack of MINGW-packages xz for UCRT64)" }, + { "name": "ucrt64-zlib", "uri": "https://anaconda.org/anaconda/ucrt64-zlib", "description": "(repack of MINGW-packages zlib for UCRT64)" }, + { "name": "ucrt64-zstd", "uri": "https://anaconda.org/anaconda/ucrt64-zstd", "description": "Zstandard - Fast real-time compression algorithm (mingw-w64) (repack of MINGW-packages zstd for UCRT64)" }, + { "name": "udev-cos6-x86_64", "uri": "https://anaconda.org/anaconda/udev-cos6-x86_64", "description": "(CDT) A userspace implementation of devfs" }, + { "name": "ujson", "uri": "https://anaconda.org/anaconda/ujson", "description": "Ultra fast JSON decoder and encoder written in C with Python bindings" }, + { "name": "ukkonen", "uri": "https://anaconda.org/anaconda/ukkonen", "description": "Implementation of bounded Levenshtein distance (Ukkonen)." }, + { "name": "umap-learn", "uri": "https://anaconda.org/anaconda/umap-learn", "description": "Uniform Manifold Approximation and Projection" }, + { "name": "unearth", "uri": "https://anaconda.org/anaconda/unearth", "description": "A utility to fetch and download python packages" }, + { "name": "unicodedata2", "uri": "https://anaconda.org/anaconda/unicodedata2", "description": "unicodedata backport/updates to python 3 and python 2." }, + { "name": "unidecode", "uri": "https://anaconda.org/anaconda/unidecode", "description": "ASCII transliterations of Unicode text" }, + { "name": "unittest-xml-reporting", "uri": "https://anaconda.org/anaconda/unittest-xml-reporting", "description": "unittest-based test runner with Ant/JUnit like XML reporting." }, + { "name": "unqlite", "uri": "https://anaconda.org/anaconda/unqlite", "description": "Fast Python bindings for the UnQLite embedded NoSQL database." }, + { "name": "unyt", "uri": "https://anaconda.org/anaconda/unyt", "description": "Handle, manipulate, and convert data with units in Python" }, + { "name": "unzip", "uri": "https://anaconda.org/anaconda/unzip", "description": "simple program for unzipping files" }, + { "name": "uriparser", "uri": "https://anaconda.org/anaconda/uriparser", "description": "RFC 3986 compliant URI parsing and handling library written in C89" }, + { "name": "url-normalize", "uri": "https://anaconda.org/anaconda/url-normalize", "description": "URL normalization for Python" }, + { "name": "urllib3", "uri": "https://anaconda.org/anaconda/urllib3", "description": "HTTP library with thread-safe connection pooling, file post, and more." }, + { "name": "urwid", "uri": "https://anaconda.org/anaconda/urwid", "description": "A full-featured console (xterm et al.) user interface library" }, + { "name": "ustr-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/ustr-amzn2-aarch64", "description": "(CDT) String library, very low memory overhead, simple to import" }, + { "name": "utf8proc", "uri": "https://anaconda.org/anaconda/utf8proc", "description": "utf8proc is a small C library that provides Unicode utility functions" }, + { "name": "utfcpp", "uri": "https://anaconda.org/anaconda/utfcpp", "description": "A simple, portable and lightweight generic library for handling UTF-8 encoded strings." }, + { "name": "util-linux-ng-cos6-x86_64", "uri": "https://anaconda.org/anaconda/util-linux-ng-cos6-x86_64", "description": "(CDT) A collection of basic system utilities" }, + { "name": "uvicorn", "uri": "https://anaconda.org/anaconda/uvicorn", "description": "The lightning-fast ASGI server." }, + { "name": "uvicorn-standard", "uri": "https://anaconda.org/anaconda/uvicorn-standard", "description": "The lightning-fast ASGI server." }, + { "name": "uvloop", "uri": "https://anaconda.org/anaconda/uvloop", "description": "Ultra fast implementation of asyncio event loop on top of libuv." }, + { "name": "uwsgi", "uri": "https://anaconda.org/anaconda/uwsgi", "description": "The uWSGI project aims at developing a full stack for building hosting services" }, + { "name": "validators", "uri": "https://anaconda.org/anaconda/validators", "description": "Python Data Validation for Humans" }, + { "name": "vc", "uri": "https://anaconda.org/anaconda/vc", "description": "A meta-package to impose mutual exclusivity among software built with different VS versions" }, + { "name": "vcrpy", "uri": "https://anaconda.org/anaconda/vcrpy", "description": "Automatically mock your HTTP interactions to simplify and speed up testing" }, + { "name": "vega_datasets", "uri": "https://anaconda.org/anaconda/vega_datasets", "description": "A Python package for offline access to Vega datasets" }, + { "name": "verboselogs", "uri": "https://anaconda.org/anaconda/verboselogs", "description": "Verbose logging level for Python's logging module." }, + { "name": "versioneer", "uri": "https://anaconda.org/anaconda/versioneer", "description": "Easy VCS-based management of project version strings" }, + { "name": "vertica-python", "uri": "https://anaconda.org/anaconda/vertica-python", "description": "A native Python client for the Vertica database." }, + { "name": "vine", "uri": "https://anaconda.org/anaconda/vine", "description": "Python promises" }, + { "name": "virtualenv", "uri": "https://anaconda.org/anaconda/virtualenv", "description": "Virtual Python Environment builder" }, + { "name": "virtualenv-clone", "uri": "https://anaconda.org/anaconda/virtualenv-clone", "description": "script to clone virtualenvs." }, + { "name": "visions", "uri": "https://anaconda.org/anaconda/visions", "description": "Type System for Data Analysis in Python" }, + { "name": "voila", "uri": "https://anaconda.org/anaconda/voila", "description": "Rendering of live Jupyter notebooks with interactive widgets" }, + { "name": "vs2015_runtime", "uri": "https://anaconda.org/anaconda/vs2015_runtime", "description": "MSVC runtimes associated with cl.exe version 19.40.33813 (VS 2022 update 10)" }, + { "name": "vs2017_win-32", "uri": "https://anaconda.org/anaconda/vs2017_win-32", "description": "Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9)" }, + { "name": "vs2017_win-64", "uri": "https://anaconda.org/anaconda/vs2017_win-64", "description": "Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9)" }, + { "name": "vs2019_win-32", "uri": "https://anaconda.org/anaconda/vs2019_win-32", "description": "Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 5)" }, + { "name": "vs2019_win-64", "uri": "https://anaconda.org/anaconda/vs2019_win-64", "description": "Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11)" }, + { "name": "vs2022_win-64", "uri": "https://anaconda.org/anaconda/vs2022_win-64", "description": "Activation and version verification of MSVC 14.40 (VS 2022 compiler, update 10)" }, + { "name": "vswhere", "uri": "https://anaconda.org/anaconda/vswhere", "description": "CLI tool to locate Visual Studio 2017 and newer installations" }, + { "name": "vtk", "uri": "https://anaconda.org/anaconda/vtk", "description": "The Visualization Toolkit (VTK) is an open-source, freely available software system for 3D computer graphics, modeling, image processing, volume rendering, scientific visualization, and information visualization." }, + { "name": "vyper-config", "uri": "https://anaconda.org/anaconda/vyper-config", "description": "Python configuration with (more) fangs" }, + { "name": "w3lib", "uri": "https://anaconda.org/anaconda/w3lib", "description": "Library of web-related functions" }, + { "name": "waf", "uri": "https://anaconda.org/anaconda/waf", "description": "A build automation tool." }, + { "name": "waitress", "uri": "https://anaconda.org/anaconda/waitress", "description": "Production-quality pure-Python WSGI server" }, + { "name": "wasabi", "uri": "https://anaconda.org/anaconda/wasabi", "description": "A lightweight console printing and formatting toolkit" }, + { "name": "wasmtime", "uri": "https://anaconda.org/anaconda/wasmtime", "description": "A WebAssembly runtime powered by Wasmtime" }, + { "name": "watchdog", "uri": "https://anaconda.org/anaconda/watchdog", "description": "Filesystem events monitoring" }, + { "name": "watchfiles", "uri": "https://anaconda.org/anaconda/watchfiles", "description": "Simple, modern and high performance file watching and code reload in python." }, + { "name": "weasel", "uri": "https://anaconda.org/anaconda/weasel", "description": "A small and easy workflow system" }, + { "name": "webencodings", "uri": "https://anaconda.org/anaconda/webencodings", "description": "Character encoding aliases for legacy web content" }, + { "name": "webkitgtk-cos6-i686", "uri": "https://anaconda.org/anaconda/webkitgtk-cos6-i686", "description": "(CDT) GTK+ Web content engine library" }, + { "name": "webkitgtk-cos6-x86_64", "uri": "https://anaconda.org/anaconda/webkitgtk-cos6-x86_64", "description": "(CDT) GTK+ Web content engine library" }, + { "name": "webkitgtk-devel-cos6-i686", "uri": "https://anaconda.org/anaconda/webkitgtk-devel-cos6-i686", "description": "(CDT) Development files for webkitgtk" }, + { "name": "webkitgtk-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/webkitgtk-devel-cos6-x86_64", "description": "(CDT) Development files for webkitgtk" }, + { "name": "webkitgtk3-cos7-s390x", "uri": "https://anaconda.org/anaconda/webkitgtk3-cos7-s390x", "description": "(CDT) GTK+ Web content engine library" }, + { "name": "webkitgtk3-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/webkitgtk3-devel-cos7-s390x", "description": "(CDT) Development files for webkitgtk3" }, + { "name": "websocket-client", "uri": "https://anaconda.org/anaconda/websocket-client", "description": "WebSocket client for Python" }, + { "name": "websockets", "uri": "https://anaconda.org/anaconda/websockets", "description": "A library for developing WebSocket servers and clients in Python." }, + { "name": "webtest", "uri": "https://anaconda.org/anaconda/webtest", "description": "helper to test WSGI applications" }, + { "name": "werkzeug", "uri": "https://anaconda.org/anaconda/werkzeug", "description": "The comprehensive WSGI web application library." }, + { "name": "wget", "uri": "https://anaconda.org/anaconda/wget", "description": "No Summary" }, + { "name": "whatthepatch", "uri": "https://anaconda.org/anaconda/whatthepatch", "description": "What The Patch!? is a library for both parsing and applying patch files" }, + { "name": "wheel", "uri": "https://anaconda.org/anaconda/wheel", "description": "A built-package format for Python." }, + { "name": "whichcraft", "uri": "https://anaconda.org/anaconda/whichcraft", "description": "This package provides cross-platform cross-python shutil.which functionality." }, + { "name": "whylabs-client", "uri": "https://anaconda.org/anaconda/whylabs-client", "description": "Public Python client for WhyLabs API" }, + { "name": "whylogs-sketching", "uri": "https://anaconda.org/anaconda/whylogs-sketching", "description": "WhyLabs's fork of the Apache Datasketches library" }, + { "name": "widgetsnbextension", "uri": "https://anaconda.org/anaconda/widgetsnbextension", "description": "Interactive Widgets for Jupyter" }, + { "name": "win32_setctime", "uri": "https://anaconda.org/anaconda/win32_setctime", "description": "A small Python utility to set file creation time on Windows" }, + { "name": "win_inet_pton", "uri": "https://anaconda.org/anaconda/win_inet_pton", "description": "Native inet_pton and inet_ntop implementation for Python on Windows (with ctypes)." }, + { "name": "winpty", "uri": "https://anaconda.org/anaconda/winpty", "description": "Winpty provides an interface similar to a Unix pty-master for communicating\nwith Windows console programs." }, + { "name": "winreg", "uri": "https://anaconda.org/anaconda/winreg", "description": "Convenient high-level C++ wrapper around the Windows Registry API" }, + { "name": "winsdk", "uri": "https://anaconda.org/anaconda/winsdk", "description": "Scripts to download Windows SDK headers" }, + { "name": "woodwork", "uri": "https://anaconda.org/anaconda/woodwork", "description": "Woodwork is a Python library that provides robust methods for managing and communicating data typing information." }, + { "name": "word2vec", "uri": "https://anaconda.org/anaconda/word2vec", "description": "Python interface to Google word2vec" }, + { "name": "wordcloud", "uri": "https://anaconda.org/anaconda/wordcloud", "description": "A little word cloud generator in Python" }, + { "name": "workerpool", "uri": "https://anaconda.org/anaconda/workerpool", "description": "No Summary" }, + { "name": "wrapt", "uri": "https://anaconda.org/anaconda/wrapt", "description": "Module for decorators, wrappers and monkey patching" }, + { "name": "ws4py", "uri": "https://anaconda.org/anaconda/ws4py", "description": "WebSocket client and server library for Python 2, 3, and PyPy" }, + { "name": "wsgiproxy2", "uri": "https://anaconda.org/anaconda/wsgiproxy2", "description": "A WSGI Proxy with various http client backends" }, + { "name": "wsgiref", "uri": "https://anaconda.org/anaconda/wsgiref", "description": "WSGI (PEP 333) Reference Library" }, + { "name": "wsproto", "uri": "https://anaconda.org/anaconda/wsproto", "description": "Pure Python, pure state-machine WebSocket implementation." }, + { "name": "wstools", "uri": "https://anaconda.org/anaconda/wstools", "description": "WSDL parsing services package for Web Services for Python" }, + { "name": "wurlitzer", "uri": "https://anaconda.org/anaconda/wurlitzer", "description": "Capture C-level stdout/stderr in Python" }, + { "name": "x264", "uri": "https://anaconda.org/anaconda/x264", "description": "A free software library for encoding video streams into the H.264/MPEG-4 AVC format." }, + { "name": "xar", "uri": "https://anaconda.org/anaconda/xar", "description": "eXtensible ARchiver" }, + { "name": "xarray", "uri": "https://anaconda.org/anaconda/xarray", "description": "N-D labeled arrays and datasets in Python." }, + { "name": "xarray-einstats", "uri": "https://anaconda.org/anaconda/xarray-einstats", "description": "Stats, linear algebra and einops for xarray." }, + { "name": "xattr", "uri": "https://anaconda.org/anaconda/xattr", "description": "Python wrapper for extended filesystem attributes" }, + { "name": "xcb-proto", "uri": "https://anaconda.org/anaconda/xcb-proto", "description": "Provides the XML-XCB protocol descriptions that libxcb uses to generate the majority of its code and API" }, + { "name": "xcb-util-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-cursor", "uri": "https://anaconda.org/anaconda/xcb-util-cursor", "description": "port of Xlib libXcursor functions" }, + { "name": "xcb-util-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-devel-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-devel-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-image-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-image-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-image-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-image-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-image-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-image-devel-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-image-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-image-devel-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-keysyms-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-keysyms-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-keysyms-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-keysyms-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-keysyms-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-keysyms-devel-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-keysyms-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-keysyms-devel-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-renderutil-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-renderutil-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-renderutil-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-renderutil-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-renderutil-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-renderutil-devel-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-renderutil-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-renderutil-devel-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-wm-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-wm-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-wm-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-wm-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-wm-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xcb-util-wm-devel-amzn2-aarch64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xcb-util-wm-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xcb-util-wm-devel-cos6-x86_64", "description": "(CDT) A C binding to the X11 protocol" }, + { "name": "xerces-c", "uri": "https://anaconda.org/anaconda/xerces-c", "description": "Xerces-C++ is a validating XML parser written in a portable subset of C++." }, + { "name": "xgboost", "uri": "https://anaconda.org/anaconda/xgboost", "description": "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library, for\nPython, R, Java, Scala, C++ and more. Runs on single machine, Hadoop, Spark, Flink\nand DataFlow" }, + { "name": "xlsxwriter", "uri": "https://anaconda.org/anaconda/xlsxwriter", "description": "A Python module for creating Excel XLSX files" }, + { "name": "xlwings", "uri": "https://anaconda.org/anaconda/xlwings", "description": "Interact with Excel from Python and vice versa" }, + { "name": "xmlsec", "uri": "https://anaconda.org/anaconda/xmlsec", "description": "Python bindings for the XML Security Library (XMLSec)." }, + { "name": "xmltodict", "uri": "https://anaconda.org/anaconda/xmltodict", "description": "Makes working with XML feel like you are working with JSON" }, + { "name": "xorg-util-macros", "uri": "https://anaconda.org/anaconda/xorg-util-macros", "description": "Development utility macros for X.org software." }, + { "name": "xorg-x11-proto-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xorg-x11-proto-devel-amzn2-aarch64", "description": "(CDT) X.Org X11 Protocol headers" }, + { "name": "xorg-x11-proto-devel-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xorg-x11-proto-devel-cos6-x86_64", "description": "(CDT) X.Org X11 Protocol headers" }, + { "name": "xorg-x11-proto-devel-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/xorg-x11-proto-devel-cos7-ppc64le", "description": "(CDT) X.Org X11 Protocol headers" }, + { "name": "xorg-x11-proto-devel-cos7-s390x", "uri": "https://anaconda.org/anaconda/xorg-x11-proto-devel-cos7-s390x", "description": "(CDT) X.Org X11 Protocol headers" }, + { "name": "xorg-x11-server-common-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xorg-x11-server-common-cos6-x86_64", "description": "(CDT) Xorg server common files" }, + { "name": "xorg-x11-server-common-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/xorg-x11-server-common-cos7-ppc64le", "description": "(CDT) Xorg server common files" }, + { "name": "xorg-x11-server-utils-cos7-s390x", "uri": "https://anaconda.org/anaconda/xorg-x11-server-utils-cos7-s390x", "description": "(CDT) X.Org X11 X server utilities" }, + { "name": "xorg-x11-server-xvfb-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xorg-x11-server-xvfb-cos6-x86_64", "description": "(CDT) A X Windows System virtual framebuffer X server." }, + { "name": "xorg-x11-server-xvfb-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/xorg-x11-server-xvfb-cos7-ppc64le", "description": "(CDT) A X Windows System virtual framebuffer X server." }, + { "name": "xorg-x11-util-macros-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xorg-x11-util-macros-amzn2-aarch64", "description": "(CDT) X.Org X11 Autotools macros" }, + { "name": "xorg-x11-util-macros-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xorg-x11-util-macros-cos6-x86_64", "description": "(CDT) X.Org X11 Autotools macros" }, + { "name": "xorg-x11-util-macros-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/xorg-x11-util-macros-cos7-ppc64le", "description": "(CDT) X.Org X11 Autotools macros" }, + { "name": "xorg-x11-util-macros-cos7-s390x", "uri": "https://anaconda.org/anaconda/xorg-x11-util-macros-cos7-s390x", "description": "(CDT) X.Org X11 Autotools macros" }, + { "name": "xorg-x11-xauth-cos6-x86_64", "uri": "https://anaconda.org/anaconda/xorg-x11-xauth-cos6-x86_64", "description": "(CDT) X.Org X11 X authority utilities" }, + { "name": "xorg-x11-xauth-cos7-ppc64le", "uri": "https://anaconda.org/anaconda/xorg-x11-xauth-cos7-ppc64le", "description": "(CDT) X.Org X11 X authority utilities" }, + { "name": "xorg-x11-xauth-cos7-s390x", "uri": "https://anaconda.org/anaconda/xorg-x11-xauth-cos7-s390x", "description": "(CDT) X.Org X11 X authority utilities" }, + { "name": "xorg-xproto", "uri": "https://anaconda.org/anaconda/xorg-xproto", "description": "Core X Windows C prototypes." }, + { "name": "xsimd", "uri": "https://anaconda.org/anaconda/xsimd", "description": "C++ Wrappers for SIMD Intrinsices" }, + { "name": "xxhash", "uri": "https://anaconda.org/anaconda/xxhash", "description": "Extremely fast hash algorithm" }, + { "name": "xyzservices", "uri": "https://anaconda.org/anaconda/xyzservices", "description": "Source of XYZ tiles providers" }, + { "name": "xz", "uri": "https://anaconda.org/anaconda/xz", "description": "Data compression software with high compression ratio" }, + { "name": "xz-libs-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/xz-libs-amzn2-aarch64", "description": "(CDT) Libraries for decoding LZMA compression" }, + { "name": "xz-static", "uri": "https://anaconda.org/anaconda/xz-static", "description": "Data compression software with high compression ratio" }, + { "name": "y-py", "uri": "https://anaconda.org/anaconda/y-py", "description": "Python bindings for the Rust port of Yjs" }, + { "name": "yacs", "uri": "https://anaconda.org/anaconda/yacs", "description": "YACS -- Yet Another Configuration System" }, + { "name": "yajl", "uri": "https://anaconda.org/anaconda/yajl", "description": "Yet Another JSON Library" }, + { "name": "yaml-cpp", "uri": "https://anaconda.org/anaconda/yaml-cpp", "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." }, + { "name": "yaml-cpp-static", "uri": "https://anaconda.org/anaconda/yaml-cpp-static", "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." }, + { "name": "yapf", "uri": "https://anaconda.org/anaconda/yapf", "description": "A formatter for Python code" }, + { "name": "yarl", "uri": "https://anaconda.org/anaconda/yarl", "description": "Yet another URL library" }, + { "name": "yarn", "uri": "https://anaconda.org/anaconda/yarn", "description": "Fast, reliable, and secure dependency management." }, + { "name": "yasm", "uri": "https://anaconda.org/anaconda/yasm", "description": "Yasm is a complete rewrite of the NASM assembler under the \"new\" BSD License." }, + { "name": "ydata-profiling", "uri": "https://anaconda.org/anaconda/ydata-profiling", "description": "Generate profile report for pandas DataFrame" }, + { "name": "yellowbrick", "uri": "https://anaconda.org/anaconda/yellowbrick", "description": "A suite of visual analysis and diagnostic tools for machine learning." }, + { "name": "ypy-websocket", "uri": "https://anaconda.org/anaconda/ypy-websocket", "description": "WebSocket connector for Ypy" }, + { "name": "yq", "uri": "https://anaconda.org/anaconda/yq", "description": "Command-line YAML/XML processor - jq wrapper for YAML/XML documents" }, + { "name": "yt", "uri": "https://anaconda.org/anaconda/yt", "description": "Analysis and visualization toolkit for volumetric data" }, + { "name": "zarr", "uri": "https://anaconda.org/anaconda/zarr", "description": "An implementation of chunked, compressed, N-dimensional arrays for Python." }, + { "name": "zc.lockfile", "uri": "https://anaconda.org/anaconda/zc.lockfile", "description": "Basic inter-process locks" }, + { "name": "zeep", "uri": "https://anaconda.org/anaconda/zeep", "description": "A fast and modern Python SOAP client" }, + { "name": "zeromq", "uri": "https://anaconda.org/anaconda/zeromq", "description": "A high-performance asynchronous messaging library." }, + { "name": "zeromq-static", "uri": "https://anaconda.org/anaconda/zeromq-static", "description": "A high-performance asynchronous messaging library." }, + { "name": "zfp", "uri": "https://anaconda.org/anaconda/zfp", "description": "Library for compressed numerical arrays that support high throughput read and write random access" }, + { "name": "zfpy", "uri": "https://anaconda.org/anaconda/zfpy", "description": "Library for compressed numerical arrays that support high throughput read and write random access" }, + { "name": "zict", "uri": "https://anaconda.org/anaconda/zict", "description": "Composable Dictionary Classes" }, + { "name": "zip", "uri": "https://anaconda.org/anaconda/zip", "description": "simple program for unzipping files" }, + { "name": "zip-cos6-x86_64", "uri": "https://anaconda.org/anaconda/zip-cos6-x86_64", "description": "(CDT) A file compression and packaging utility compatible with PKZIP" }, + { "name": "zip-cos7-s390x", "uri": "https://anaconda.org/anaconda/zip-cos7-s390x", "description": "(CDT) A file compression and packaging utility compatible with PKZIP" }, + { "name": "zipfile-deflate64", "uri": "https://anaconda.org/anaconda/zipfile-deflate64", "description": "Extract Deflate64 ZIP archives with Python's zipfile API." }, + { "name": "zipfile36", "uri": "https://anaconda.org/anaconda/zipfile36", "description": "Backport of zipfile from Python 3.6" }, + { "name": "zipp", "uri": "https://anaconda.org/anaconda/zipp", "description": "A pathlib-compatible Zipfile object wrapper" }, + { "name": "zlib", "uri": "https://anaconda.org/anaconda/zlib", "description": "Massively spiffy yet delicately unobtrusive compression library" }, + { "name": "zlib-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/zlib-amzn2-aarch64", "description": "(CDT) The compression and decompression library" }, + { "name": "zlib-devel-amzn2-aarch64", "uri": "https://anaconda.org/anaconda/zlib-devel-amzn2-aarch64", "description": "(CDT) Header files and libraries for Zlib development" }, + { "name": "zlib-ng", "uri": "https://anaconda.org/anaconda/zlib-ng", "description": "zlib data compression library for the next generation systems" }, + { "name": "zope", "uri": "https://anaconda.org/anaconda/zope", "description": "No Summary" }, + { "name": "zope.component", "uri": "https://anaconda.org/anaconda/zope.component", "description": "Zope Component Architecture" }, + { "name": "zope.event", "uri": "https://anaconda.org/anaconda/zope.event", "description": "Event publishing / dispatch, used by Zope Component Architecture" }, + { "name": "zope.interface", "uri": "https://anaconda.org/anaconda/zope.interface", "description": "Interfaces for Python" }, + { "name": "zstandard", "uri": "https://anaconda.org/anaconda/zstandard", "description": "Zstandard bindings for Python" }, + { "name": "zstd", "uri": "https://anaconda.org/anaconda/zstd", "description": "Zstandard - Fast real-time compression algorithm" }, + { "name": "zstd-static", "uri": "https://anaconda.org/anaconda/zstd-static", "description": "Zstandard - Fast real-time compression algorithm" } +] diff --git a/src/api.ts b/src/api.ts index cc3fbb2..be7821c 100644 --- a/src/api.ts +++ b/src/api.ts @@ -597,7 +597,7 @@ export interface PackageManager { * @param packages - The packages to install. * @returns A promise that resolves when the installation is complete. */ - install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise; + install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise; /** * Uninstalls packages from the specified Python environment. @@ -605,7 +605,7 @@ export interface PackageManager { * @param packages - The packages to uninstall, which can be an array of packages or strings. * @returns A promise that resolves when the uninstall is complete. */ - uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise; + uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise; /** * Refreshes the package list for the specified Python environment. @@ -621,17 +621,6 @@ export interface PackageManager { */ getPackages(environment: PythonEnvironment): Promise; - /** - * Get a list of installable items for a Python project. - * - * @param environment The Python environment for which to get installable items. - * - * Note: An environment can be used by multiple projects, so the installable items returned. - * should be for the environment. If you want to do it for a particular project, then you should - * ask user to select a project, and filter the installable items based on the project. - */ - getInstallable?(environment: PythonEnvironment): Promise; - /** * Event that is fired when packages change. */ @@ -751,45 +740,6 @@ export interface PackageInstallOptions { upgrade?: boolean; } -export interface Installable { - /** - * The display name of the package, requirements, pyproject.toml or any other project file. - */ - readonly displayName: string; - - /** - * Arguments passed to the package manager to install the package. - * - * @example - * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. - * ['--pre', 'debugpy'] for `pip install --pre debugpy`. - * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. - */ - readonly args: string[]; - - /** - * Installable group name, this will be used to group installable items in the UI. - * - * @example - * `Requirements` for any requirements file. - * `Packages` for any package. - */ - readonly group?: string; - - /** - * Description about the installable item. This can also be path to the requirements, - * version of the package, or any other project file path. - */ - readonly description?: string; - - /** - * External Uri to the package on pypi or docs. - * @example - * https://pypi.org/project/debugpy/ for `debugpy`. - */ - readonly uri?: Uri; -} - export interface PythonProcess { /** * The process ID of the Python process. diff --git a/src/common/localize.ts b/src/common/localize.ts index 16c7313..fcda9e5 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -22,8 +22,8 @@ export namespace Interpreter { export namespace PackageManagement { export const selectPackagesToInstall = l10n.t('Select packages to install'); export const enterPackageNames = l10n.t('Enter package names'); - export const commonPackages = l10n.t('Search common packages'); - export const commonPackagesDescription = l10n.t('Search and Install common packages'); + export const commonPackages = l10n.t('Search common `PyPI` packages'); + export const commonPackagesDescription = l10n.t('Search and Install common `PyPI` packages'); export const workspaceDependencies = l10n.t('Install workspace dependencies'); export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); diff --git a/src/common/pickers/packages.ts b/src/common/pickers/packages.ts index 478cea0..8010224 100644 --- a/src/common/pickers/packages.ts +++ b/src/common/pickers/packages.ts @@ -1,13 +1,5 @@ -import * as path from 'path'; -import * as fs from 'fs-extra'; -import { Uri, ThemeIcon, QuickPickItem, QuickPickItemKind, QuickPickItemButtonEvent, QuickInputButtons } from 'vscode'; -import { Installable, PythonEnvironment, Package } from '../../api'; -import { InternalPackageManager } from '../../internal.api'; -import { EXTENSION_ROOT_DIR } from '../constants'; -import { launchBrowser } from '../env.apis'; -import { Common, PackageManagement, Pickers } from '../localize'; -import { traceWarn } from '../logging'; -import { showQuickPick, showInputBoxWithButtons, showTextDocument, showQuickPickWithButtons } from '../window.apis'; +import { Common, Pickers } from '../localize'; +import { showQuickPick } from '../window.apis'; export async function pickPackageOptions(): Promise { const items = [ @@ -23,366 +15,8 @@ export async function pickPackageOptions(): Promise { const selected = await showQuickPick(items, { placeHolder: Pickers.Packages.selectOption, ignoreFocusOut: true, + matchOnDescription: false, + matchOnDetail: false, }); return selected?.label; } - -export async function enterPackageManually(filler?: string): Promise { - const input = await showInputBoxWithButtons({ - placeHolder: PackageManagement.enterPackagesPlaceHolder, - value: filler, - ignoreFocusOut: true, - showBackButton: true, - }); - return input?.split(' '); -} - -async function getCommonPackages(): Promise { - const pipData = path.join(EXTENSION_ROOT_DIR, 'files', 'common_packages.txt'); - const data = await fs.readFile(pipData, { encoding: 'utf-8' }); - const packages = data.split(/\r?\n/).filter((l) => l.trim().length > 0); - - return packages.map((p) => { - return { - displayName: p, - args: [p], - uri: Uri.parse(`https://pypi.org/project/${p}`), - }; - }); -} - -export const OPEN_BROWSER_BUTTON = { - iconPath: new ThemeIcon('globe'), - tooltip: Common.openInBrowser, -}; - -export const OPEN_EDITOR_BUTTON = { - iconPath: new ThemeIcon('go-to-file'), - tooltip: Common.openInEditor, -}; - -export const EDIT_ARGUMENTS_BUTTON = { - iconPath: new ThemeIcon('pencil'), - tooltip: PackageManagement.editArguments, -}; - -function handleItemButton(uri?: Uri) { - if (uri) { - if (uri.scheme.toLowerCase().startsWith('http')) { - launchBrowser(uri); - } else { - showTextDocument(uri); - } - } -} - -interface PackageQuickPickItem extends QuickPickItem { - uri?: Uri; - args?: string[]; -} - -function getDetail(i: Installable): string | undefined { - if (i.args && i.args.length > 0) { - if (i.args.length === 1 && i.args[0] === i.displayName) { - return undefined; - } - return i.args.join(' '); - } - return undefined; -} - -function installableToQuickPickItem(i: Installable): PackageQuickPickItem { - const detail = i.description ? getDetail(i) : undefined; - const description = i.description ? i.description : getDetail(i); - const buttons = i.uri - ? i.uri.scheme.startsWith('http') - ? [OPEN_BROWSER_BUTTON] - : [OPEN_EDITOR_BUTTON] - : undefined; - return { - label: i.displayName, - detail, - description, - buttons, - uri: i.uri, - args: i.args, - }; -} - -async function getPackageType(): Promise { - const items: QuickPickItem[] = [ - { - label: PackageManagement.workspaceDependencies, - description: PackageManagement.workspaceDependenciesDescription, - alwaysShow: true, - iconPath: new ThemeIcon('folder'), - }, - { - label: PackageManagement.commonPackages, - description: PackageManagement.commonPackagesDescription, - alwaysShow: true, - iconPath: new ThemeIcon('search'), - }, - ]; - const selected = (await showQuickPickWithButtons(items, { - placeHolder: PackageManagement.selectPackagesToInstall, - showBackButton: true, - ignoreFocusOut: true, - })) as QuickPickItem; - - return selected?.label; -} - -function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { - const groups = new Map(); - const workspaceInstallable: Installable[] = []; - - items.forEach((i) => { - if (i.group) { - let group = groups.get(i.group); - if (!group) { - group = []; - groups.set(i.group, group); - } - group.push(i); - } else { - workspaceInstallable.push(i); - } - }); - - const result: PackageQuickPickItem[] = []; - groups.forEach((group, key) => { - result.push({ - label: key, - kind: QuickPickItemKind.Separator, - }); - result.push(...group.map(installableToQuickPickItem)); - }); - - if (workspaceInstallable.length > 0) { - result.push({ - label: PackageManagement.workspaceDependencies, - kind: QuickPickItemKind.Separator, - }); - result.push(...workspaceInstallable.map(installableToQuickPickItem)); - } - - return result; -} - -async function getInstallables(packageManager: InternalPackageManager, environment: PythonEnvironment) { - const installable = await packageManager?.getInstallable(environment); - if (installable && installable.length === 0) { - traceWarn(`No installable packages found for ${packageManager.id}: ${environment.environmentPath.fsPath}`); - } - return installable; -} - -async function getWorkspacePackages( - installable: Installable[] | undefined, - preSelected?: PackageQuickPickItem[] | undefined, -): Promise { - const items: PackageQuickPickItem[] = []; - - if (installable && installable.length > 0) { - items.push(...getGroupedItems(installable)); - } else { - const common = await getCommonPackages(); - items.push( - { - label: PackageManagement.commonPackages, - kind: QuickPickItemKind.Separator, - }, - ...common.map(installableToQuickPickItem), - ); - } - - let preSelectedItems = items - .filter((i) => i.kind !== QuickPickItemKind.Separator) - .filter((i) => - preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), - ); - let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; - try { - selected = await showQuickPickWithButtons( - items, - { - placeHolder: PackageManagement.selectPackagesToInstall, - ignoreFocusOut: true, - canPickMany: true, - showBackButton: true, - buttons: [EDIT_ARGUMENTS_BUTTON], - selected: preSelectedItems, - }, - undefined, - (e: QuickPickItemButtonEvent) => { - handleItemButton(e.item.uri); - }, - ); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } catch (ex: any) { - if (ex === QuickInputButtons.Back) { - throw ex; - } else if (ex.button === EDIT_ARGUMENTS_BUTTON && ex.item) { - const parts: PackageQuickPickItem[] = Array.isArray(ex.item) ? ex.item : [ex.item]; - selected = [ - { - label: PackageManagement.enterPackageNames, - alwaysShow: true, - }, - ...parts, - ]; - } - } - - if (selected && Array.isArray(selected)) { - if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { - const filler = selected - .filter((s) => s.label !== PackageManagement.enterPackageNames) - .flatMap((s) => s.args ?? []) - .join(' '); - try { - const result = await enterPackageManually(filler); - return result; - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return getWorkspacePackages(installable, selected); - } - return undefined; - } - } else { - return selected.flatMap((s) => s.args ?? []); - } - } -} - -async function getCommonPackagesToInstall( - preSelected?: PackageQuickPickItem[] | undefined, -): Promise { - const common = await getCommonPackages(); - - const items: PackageQuickPickItem[] = common.map(installableToQuickPickItem); - const preSelectedItems = items - .filter((i) => i.kind !== QuickPickItemKind.Separator) - .filter((i) => - preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), - ); - - let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; - try { - selected = await showQuickPickWithButtons( - items, - { - placeHolder: PackageManagement.selectPackagesToInstall, - ignoreFocusOut: true, - canPickMany: true, - showBackButton: true, - buttons: [EDIT_ARGUMENTS_BUTTON], - selected: preSelectedItems, - }, - undefined, - (e: QuickPickItemButtonEvent) => { - handleItemButton(e.item.uri); - }, - ); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } catch (ex: any) { - if (ex === QuickInputButtons.Back) { - throw ex; - } else if (ex.button === EDIT_ARGUMENTS_BUTTON && ex.item) { - const parts: PackageQuickPickItem[] = Array.isArray(ex.item) ? ex.item : [ex.item]; - selected = [ - { - label: PackageManagement.enterPackageNames, - alwaysShow: true, - }, - ...parts, - ]; - } - } - - if (selected && Array.isArray(selected)) { - if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { - const filler = selected - .filter((s) => s.label !== PackageManagement.enterPackageNames) - .map((s) => s.label) - .join(' '); - try { - const result = await enterPackageManually(filler); - return result; - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return getCommonPackagesToInstall(selected); - } - return undefined; - } - } else { - return selected.map((s) => s.label); - } - } -} - -export async function getPackagesToInstallFromPackageManager( - packageManager: InternalPackageManager, - environment: PythonEnvironment, - cachedInstallables?: Installable[], -): Promise { - let installable: Installable[] = cachedInstallables ?? []; - if (installable.length === 0 && packageManager.supportsGetInstallable) { - installable = await getInstallables(packageManager, environment); - } - const packageType = installable.length > 0 ? await getPackageType() : PackageManagement.commonPackages; - - if (packageType === PackageManagement.workspaceDependencies) { - try { - const result = await getWorkspacePackages(installable); - return result; - } catch (ex) { - if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstallFromPackageManager(packageManager, environment, installable); - } - if (ex === QuickInputButtons.Back) { - throw ex; - } - return undefined; - } - } - - if (packageType === PackageManagement.commonPackages) { - try { - const result = await getCommonPackagesToInstall(); - return result; - } catch (ex) { - if (packageManager.supportsGetInstallable && ex === QuickInputButtons.Back) { - return getPackagesToInstallFromPackageManager(packageManager, environment, installable); - } - if (ex === QuickInputButtons.Back) { - throw ex; - } - return undefined; - } - } - - return undefined; -} - -export async function getPackagesToInstallFromInstallable(installable: Installable[]): Promise { - if (installable.length === 0) { - return undefined; - } - return getWorkspacePackages(installable); -} - -export async function getPackagesToUninstall(packages: Package[]): Promise { - const items = packages.map((p) => ({ - label: p.name, - description: p.version, - p: p, - })); - const selected = await showQuickPick(items, { - placeHolder: PackageManagement.selectPackagesToUninstall, - ignoreFocusOut: true, - canPickMany: true, - }); - return Array.isArray(selected) ? selected?.map((s) => s.p) : undefined; -} diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 6ddf324..2dff42c 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -34,11 +34,7 @@ import { import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; -import { - pickPackageOptions, - getPackagesToInstallFromPackageManager, - getPackagesToUninstall, -} from '../common/pickers/packages'; +import { pickPackageOptions } from '../common/pickers/packages'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { TerminalManager } from './terminal/terminalManager'; import { runInTerminal } from './terminal/runInTerminal'; @@ -174,37 +170,20 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir export async function handlePackagesCommand( packageManager: InternalPackageManager, environment: PythonEnvironment, - packages?: string[], ): Promise { const action = await pickPackageOptions(); - if (action === Common.install) { - if (!packages || packages.length === 0) { - try { - packages = await getPackagesToInstallFromPackageManager(packageManager, environment); - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return handlePackagesCommand(packageManager, environment, packages); - } - throw ex; - } + try { + if (action === Common.install) { + await packageManager.install(environment); + } else if (action === Common.uninstall) { + await packageManager.uninstall(environment); } - if (packages && packages.length > 0) { - return packageManager.install(environment, packages, { upgrade: false }); - } - } - - if (action === Common.uninstall) { - if (!packages || packages.length === 0) { - const allPackages = await packageManager.getPackages(environment); - if (allPackages && allPackages.length > 0) { - packages = (await getPackagesToUninstall(allPackages))?.map((p) => p.name); - } - - if (packages && packages.length > 0) { - return packageManager.uninstall(environment, packages); - } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return handlePackagesCommand(packageManager, environment); } + throw ex; } } diff --git a/src/internal.api.ts b/src/internal.api.ts index 839773b..59165bd 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -23,7 +23,6 @@ import { PythonProjectCreator, ResolveEnvironmentContext, PackageInstallOptions, - Installable, EnvironmentGroupInfo, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; @@ -208,10 +207,10 @@ export class InternalPackageManager implements PackageManager { return this.manager.log; } - install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { + install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { return this.manager.install(environment, packages, options); } - uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise { + uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { return this.manager.uninstall(environment, packages); } refresh(environment: PythonEnvironment): Promise { @@ -221,14 +220,6 @@ export class InternalPackageManager implements PackageManager { return this.manager.getPackages(environment); } - public get supportsGetInstallable(): boolean { - return this.manager.getInstallable !== undefined; - } - - getInstallable(environment: PythonEnvironment): Promise { - return this.manager.getInstallable ? this.manager.getInstallable(environment) : Promise.resolve([]); - } - onDidChangePackages(handler: (e: DidChangePackagesEventArgs) => void): Disposable { return this.manager.onDidChangePackages ? this.manager.onDidChangePackages(handler) : new Disposable(() => {}); } diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index f1c5d8c..d4c5a73 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -2,7 +2,6 @@ import { Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation import { DidChangePackagesEventArgs, IconPath, - Installable, Package, PackageChangeKind, PackageInstallOptions, @@ -12,8 +11,9 @@ import { } from '../../api'; import { installPackages, refreshPackages, uninstallPackages } from './utils'; import { Disposable } from 'vscode-jsonrpc'; -import { getProjectInstallable } from './venvUtils'; import { VenvManager } from './venvManager'; +import { getWorkspacePackagesToInstall } from './pipUtils'; +import { getPackagesToUninstall } from '../common/utils'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -49,7 +49,19 @@ export class PipPackageManager implements PackageManager, Disposable { readonly tooltip?: string | MarkdownString; readonly iconPath?: IconPath; - async install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { + async install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { + let selected: string[] = packages ?? []; + + if (selected.length === 0) { + const projects = this.venv.getProjectsByEnvironment(environment); + selected = (await getWorkspacePackagesToInstall(this.api, projects)) ?? []; + } + + if (selected.length === 0) { + return; + } + + const installOptions = options ?? { upgrade: false }; await window.withProgress( { location: ProgressLocation.Notification, @@ -59,7 +71,7 @@ export class PipPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, packages, options, this.api, this, token); + const after = await installPackages(environment, selected, installOptions, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment, manager: this, changes }); @@ -76,7 +88,20 @@ export class PipPackageManager implements PackageManager, Disposable { ); } - async uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise { + async uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { + let selected: Package[] | string[] = packages ?? []; + if (selected.length === 0) { + const installed = await this.getPackages(environment); + if (!installed) { + return; + } + selected = (await getPackagesToUninstall(installed)) ?? []; + } + + if (selected.length === 0) { + return; + } + await window.withProgress( { location: ProgressLocation.Notification, @@ -86,7 +111,7 @@ export class PipPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, this.api, this, packages, token); + const after = await uninstallPackages(environment, this.api, this, selected, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); @@ -120,10 +145,7 @@ export class PipPackageManager implements PackageManager, Disposable { } return this.packages.get(environment.envId.id); } - async getInstallable(environment: PythonEnvironment): Promise { - const projects = this.venv.getProjectsByEnvironment(environment); - return getProjectInstallable(this.api, projects); - } + dispose(): void { this._onDidChangePackages.dispose(); this.packages.clear(); diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts new file mode 100644 index 0000000..12674ca --- /dev/null +++ b/src/managers/builtin/pipUtils.ts @@ -0,0 +1,182 @@ +import * as fse from 'fs-extra'; +import * as path from 'path'; +import * as tomljs from '@iarna/toml'; +import { LogOutputChannel, ProgressLocation, QuickInputButtons, Uri } from 'vscode'; +import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; +import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; +import { PythonEnvironmentApi, PythonProject } from '../../api'; +import { findFiles } from '../../common/workspace.apis'; +import { EXTENSION_ROOT_DIR } from '../../common/constants'; +import { Installable, selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; + +async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { + try { + const content = await fse.readFile(fsPath, 'utf-8'); + return tomljs.parse(content); + } catch (err) { + log?.error('Failed to parse `pyproject.toml`:', err); + } + return {}; +} + +function isPipInstallableToml(toml: tomljs.JsonMap): boolean { + return toml['build-system'] !== undefined && toml.project !== undefined; +} + +function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] { + const extras: Installable[] = []; + + if (isPipInstallableToml(toml)) { + const name = path.basename(tomlPath.fsPath); + extras.push({ + name, + displayName: name, + description: VenvManagerStrings.installEditable, + group: 'TOML', + args: ['-e', path.dirname(tomlPath.fsPath)], + uri: tomlPath, + }); + } + + if (toml.project && (toml.project as tomljs.JsonMap)['optional-dependencies']) { + const deps = (toml.project as tomljs.JsonMap)['optional-dependencies']; + for (const key of Object.keys(deps)) { + extras.push({ + name: key, + displayName: key, + group: 'TOML', + args: ['-e', `.[${key}]`], + uri: tomlPath, + }); + } + } + return extras; +} + +async function getCommonPackages(): Promise { + try { + const pipData = path.join(EXTENSION_ROOT_DIR, 'files', 'common_pip_packages.json'); + const data = await fse.readFile(pipData, { encoding: 'utf-8' }); + const packages = JSON.parse(data) as { name: string; uri: string }[]; + + return packages.map((p) => { + return { + name: p.name, + displayName: p.name, + uri: Uri.parse(p.uri), + }; + }); + } catch { + return []; + } +} + +async function selectWorkspaceOrCommon( + installable: Installable[], + common: Installable[], +): Promise { + if (installable.length > 0) { + const selected = await showQuickPickWithButtons( + [ + { + label: PackageManagement.workspaceDependencies, + description: PackageManagement.workspaceDependenciesDescription, + }, + { + label: PackageManagement.commonPackages, + description: PackageManagement.commonPackagesDescription, + }, + ], + { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }, + ); + if (selected && !Array.isArray(selected)) { + try { + if (selected.label === PackageManagement.workspaceDependencies) { + return await selectFromInstallableToInstall(installable); + } else if (selected.label === PackageManagement.commonPackages) { + return await selectFromCommonPackagesToInstall(common); + } + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + return selectWorkspaceOrCommon(installable, common); + } + } + } + return undefined; + } + + if (common.length === 0) { + return selectFromCommonPackagesToInstall(common); + } + + return undefined; +} + +export async function getWorkspacePackagesToInstall( + api: PythonEnvironmentApi, + project?: PythonProject[], +): Promise { + const installable = (await getProjectInstallable(api, project)) ?? []; + const common = await getCommonPackages(); + return selectWorkspaceOrCommon(installable, common); +} + +export async function getProjectInstallable( + api: PythonEnvironmentApi, + projects?: PythonProject[], +): Promise { + if (!projects) { + return []; + } + const exclude = '**/{.venv*,.git,.nox,.tox,.conda,site-packages,__pypackages__}/**'; + const installable: Installable[] = []; + await withProgress( + { + location: ProgressLocation.Window, + title: VenvManagerStrings.searchingDependencies, + }, + async (_progress, token) => { + const results: Uri[] = ( + await Promise.all([ + findFiles('**/*requirements*.txt', exclude, undefined, token), + findFiles('**/requirements/*.txt', exclude, undefined, token), + findFiles('**/pyproject.toml', exclude, undefined, token), + ]) + ).flat(); + + const fsPaths = projects.map((p) => p.uri.fsPath); + const filtered = results + .filter((uri) => { + const p = api.getPythonProject(uri)?.uri.fsPath; + return p && fsPaths.includes(p); + }) + .sort(); + + await Promise.all( + filtered.map(async (uri) => { + if (uri.fsPath.endsWith('.toml')) { + const toml = await tomlParse(uri.fsPath); + installable.push(...getTomlInstallable(toml, uri)); + } else { + const name = path.basename(uri.fsPath); + installable.push({ + name, + uri, + displayName: name, + group: 'Requirements', + args: ['-r', uri.fsPath], + }); + } + }), + ); + }, + ); + return installable; +} diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 68f5bb2..5ab4883 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -1,15 +1,12 @@ import { l10n, LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; import { EnvironmentManager, - Installable, PythonCommandRunConfiguration, PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo, - PythonProject, TerminalShellType, } from '../../api'; -import * as tomljs from '@iarna/toml'; import * as path from 'path'; import * as os from 'os'; import * as fsapi from 'fs-extra'; @@ -23,7 +20,7 @@ import { } from '../common/nativePythonFinder'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; -import { findFiles, getConfiguration } from '../../common/workspace.apis'; +import { getConfiguration } from '../../common/workspace.apis'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { showQuickPick, @@ -33,9 +30,9 @@ import { showOpenDialog, } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; -import { getPackagesToInstallFromInstallable } from '../../common/pickers/packages'; import { Common, VenvManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; +import { getWorkspacePackagesToInstall } from './pipUtils'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -310,16 +307,7 @@ export async function createPythonVenv( os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); const project = api.getPythonProject(venvRoot); - const installable = await getProjectInstallable(api, project ? [project] : undefined); - - let packages: string[] = []; - if (installable && installable.length > 0) { - const packagesToInstall = await getPackagesToInstallFromInstallable(installable); - if (!packagesToInstall) { - return; - } - packages = packagesToInstall; - } + const packages = await getWorkspacePackagesToInstall(api, project ? [project] : undefined); return await withProgress( { @@ -352,7 +340,7 @@ export async function createPythonVenv( const resolved = await nativeFinder.resolve(pythonPath); const env = api.createPythonEnvironmentItem(getPythonInfo(resolved), manager); - if (packages?.length > 0) { + if (packages && packages?.length > 0) { await api.installPackages(env, packages, { upgrade: false }); } return env; @@ -399,97 +387,6 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC return false; } -function tomlParse(content: string, log?: LogOutputChannel): tomljs.JsonMap { - try { - return tomljs.parse(content); - } catch (err) { - log?.error('Failed to parse `pyproject.toml`:', err); - } - return {}; -} - -function isPipInstallableToml(toml: tomljs.JsonMap): boolean { - return toml['build-system'] !== undefined && toml.project !== undefined; -} - -function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] { - const extras: Installable[] = []; - - if (isPipInstallableToml(toml)) { - extras.push({ - displayName: path.basename(tomlPath.fsPath), - description: VenvManagerStrings.installEditable, - group: 'TOML', - args: ['-e', path.dirname(tomlPath.fsPath)], - uri: tomlPath, - }); - } - - if (toml.project && (toml.project as tomljs.JsonMap)['optional-dependencies']) { - const deps = (toml.project as tomljs.JsonMap)['optional-dependencies']; - for (const key of Object.keys(deps)) { - extras.push({ - displayName: key, - group: 'TOML', - args: ['-e', `.[${key}]`], - uri: tomlPath, - }); - } - } - return extras; -} - -export async function getProjectInstallable( - api: PythonEnvironmentApi, - projects?: PythonProject[], -): Promise { - if (!projects) { - return []; - } - const exclude = '**/{.venv*,.git,.nox,.tox,.conda,site-packages,__pypackages__}/**'; - const installable: Installable[] = []; - await withProgress( - { - location: ProgressLocation.Window, - title: VenvManagerStrings.searchingDependencies, - }, - async (_progress, token) => { - const results: Uri[] = ( - await Promise.all([ - findFiles('**/*requirements*.txt', exclude, undefined, token), - findFiles('**/requirements/*.txt', exclude, undefined, token), - findFiles('**/pyproject.toml', exclude, undefined, token), - ]) - ).flat(); - - const fsPaths = projects.map((p) => p.uri.fsPath); - const filtered = results - .filter((uri) => { - const p = api.getPythonProject(uri)?.uri.fsPath; - return p && fsPaths.includes(p); - }) - .sort(); - - await Promise.all( - filtered.map(async (uri) => { - if (uri.fsPath.endsWith('.toml')) { - const toml = tomlParse(await fsapi.readFile(uri.fsPath, 'utf-8')); - installable.push(...getTomlInstallable(toml, uri)); - } else { - installable.push({ - uri, - displayName: path.basename(uri.fsPath), - group: 'Requirements', - args: ['-r', uri.fsPath], - }); - } - }), - ); - }, - ); - return installable; -} - export async function resolveVenvPythonEnvironmentPath( fsPath: string, nativeFinder: NativePythonFinder, diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts new file mode 100644 index 0000000..7173209 --- /dev/null +++ b/src/managers/common/pickers.ts @@ -0,0 +1,265 @@ +import { QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; +import { Common, PackageManagement } from '../../common/localize'; +import { launchBrowser } from '../../common/env.apis'; +import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from '../../common/window.apis'; + +const OPEN_BROWSER_BUTTON = { + iconPath: new ThemeIcon('globe'), + tooltip: Common.openInBrowser, +}; + +const OPEN_EDITOR_BUTTON = { + iconPath: new ThemeIcon('go-to-file'), + tooltip: Common.openInEditor, +}; + +const EDIT_ARGUMENTS_BUTTON = { + iconPath: new ThemeIcon('pencil'), + tooltip: PackageManagement.editArguments, +}; + +export interface Installable { + /** + * The name of the package, requirements, lock files, or step name. + */ + readonly name: string; + + /** + * The name of the package, requirements, pyproject.toml or any other project file, etc. + */ + readonly displayName: string; + + /** + * Arguments passed to the package manager to install the package. + * + * @example + * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. + * ['--pre', 'debugpy'] for `pip install --pre debugpy`. + * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. + */ + readonly args?: string[]; + + /** + * Installable group name, this will be used to group installable items in the UI. + * + * @example + * `Requirements` for any requirements file. + * `Packages` for any package. + */ + readonly group?: string; + + /** + * Description about the installable item. This can also be path to the requirements, + * version of the package, or any other project file path. + */ + readonly description?: string; + + /** + * External Uri to the package on pypi or docs. + * @example + * https://pypi.org/project/debugpy/ for `debugpy`. + */ + readonly uri?: Uri; +} + +function handleItemButton(uri?: Uri) { + if (uri) { + if (uri.scheme.toLowerCase().startsWith('http')) { + launchBrowser(uri); + } else { + showTextDocument(uri); + } + } +} + +interface PackageQuickPickItem extends QuickPickItem { + id: string; + uri?: Uri; + args?: string[]; +} + +function getDetail(i: Installable): string | undefined { + if (i.args && i.args.length > 0) { + if (i.args.length === 1 && i.args[0] === i.name) { + return undefined; + } + return i.args.join(' '); + } + return undefined; +} + +function installableToQuickPickItem(i: Installable): PackageQuickPickItem { + const detail = i.description ? getDetail(i) : undefined; + const description = i.description ? i.description : getDetail(i); + const buttons = i.uri + ? i.uri.scheme.startsWith('http') + ? [OPEN_BROWSER_BUTTON] + : [OPEN_EDITOR_BUTTON] + : undefined; + return { + label: i.displayName, + detail, + description, + buttons, + uri: i.uri, + args: i.args, + id: i.name, + }; +} + +async function enterPackageManually(filler?: string): Promise { + const input = await showInputBoxWithButtons({ + placeHolder: PackageManagement.enterPackagesPlaceHolder, + value: filler, + ignoreFocusOut: true, + showBackButton: true, + }); + return input?.split(' '); +} + +export async function selectFromCommonPackagesToInstall( + common: Installable[], + preSelected?: PackageQuickPickItem[] | undefined, +): Promise { + const items: PackageQuickPickItem[] = common.map(installableToQuickPickItem); + const preSelectedItems = items + .filter((i) => i.kind !== QuickPickItemKind.Separator) + .filter((i) => + preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), + ); + + let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; + try { + selected = await showQuickPickWithButtons( + items, + { + placeHolder: PackageManagement.selectPackagesToInstall, + ignoreFocusOut: true, + canPickMany: true, + showBackButton: true, + buttons: [EDIT_ARGUMENTS_BUTTON], + selected: preSelectedItems, + }, + undefined, + (e: QuickPickItemButtonEvent) => { + handleItemButton(e.item.uri); + }, + ); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + throw ex; + } else if (ex.button === EDIT_ARGUMENTS_BUTTON && ex.item) { + const parts: PackageQuickPickItem[] = Array.isArray(ex.item) ? ex.item : [ex.item]; + selected = [ + { + id: PackageManagement.enterPackageNames, + label: PackageManagement.enterPackageNames, + alwaysShow: true, + }, + ...parts, + ]; + } + } + + if (selected && Array.isArray(selected)) { + if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { + const filler = selected + .filter((s) => s.label !== PackageManagement.enterPackageNames) + .map((s) => s.id) + .join(' '); + try { + const result = await enterPackageManually(filler); + return result; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return selectFromCommonPackagesToInstall(common, selected); + } + return undefined; + } + } else { + return selected.map((s) => s.id); + } + } +} + +function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { + const groups = new Map(); + const workspaceInstallable: Installable[] = []; + + items.forEach((i) => { + if (i.group) { + let group = groups.get(i.group); + if (!group) { + group = []; + groups.set(i.group, group); + } + group.push(i); + } else { + workspaceInstallable.push(i); + } + }); + + const result: PackageQuickPickItem[] = []; + groups.forEach((group, key) => { + result.push({ + id: key, + label: key, + kind: QuickPickItemKind.Separator, + }); + result.push(...group.map(installableToQuickPickItem)); + }); + + if (workspaceInstallable.length > 0) { + result.push({ + id: PackageManagement.workspaceDependencies, + label: PackageManagement.workspaceDependencies, + kind: QuickPickItemKind.Separator, + }); + result.push(...workspaceInstallable.map(installableToQuickPickItem)); + } + + return result; +} + +export async function selectFromInstallableToInstall( + installable: Installable[], + preSelected?: PackageQuickPickItem[], +): Promise { + const items: PackageQuickPickItem[] = []; + + if (installable && installable.length > 0) { + items.push(...getGroupedItems(installable)); + } else { + return undefined; + } + + let preSelectedItems = items + .filter((i) => i.kind !== QuickPickItemKind.Separator) + .filter((i) => + preSelected?.find((s) => s.id === i.id && s.description === i.description && s.detail === i.detail), + ); + const selected = await showQuickPickWithButtons( + items, + { + placeHolder: PackageManagement.selectPackagesToInstall, + ignoreFocusOut: true, + canPickMany: true, + showBackButton: true, + selected: preSelectedItems, + }, + undefined, + (e: QuickPickItemButtonEvent) => { + handleItemButton(e.item.uri); + }, + ); + + if (selected) { + if (Array.isArray(selected)) { + return selected.flatMap((s) => s.args ?? []); + } else { + return selected.args ?? []; + } + } + return undefined; +} diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 5bc9981..500ce19 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,5 +1,7 @@ import * as os from 'os'; -import { PythonEnvironment } from '../../api'; +import { Package, PythonEnvironment } from '../../api'; +import { showQuickPick } from '../../common/window.apis'; +import { PackageManagement } from '../../common/localize'; export function isWindows(): boolean { return process.platform === 'win32'; @@ -86,3 +88,17 @@ export function getLatest(collection: PythonEnvironment[]): PythonEnvironment | } return latest; } + +export async function getPackagesToUninstall(packages: Package[]): Promise { + const items = packages.map((p) => ({ + label: p.name, + description: p.version, + p, + })); + const selected = await showQuickPick(items, { + placeHolder: PackageManagement.selectPackagesToUninstall, + ignoreFocusOut: true, + canPickMany: true, + }); + return Array.isArray(selected) ? selected?.map((s) => s.p) : undefined; +} diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index ca48987..fe77508 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -17,10 +17,11 @@ import { PythonEnvironment, PythonEnvironmentApi, } from '../../api'; -import { installPackages, refreshPackages, uninstallPackages } from './condaUtils'; +import { getCommonCondaPackagesToInstall, installPackages, refreshPackages, uninstallPackages } from './condaUtils'; import { withProgress } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; import { CondaStrings } from '../../common/localize'; +import { getPackagesToUninstall } from '../common/utils'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -51,7 +52,18 @@ export class CondaPackageManager implements PackageManager, Disposable { tooltip?: string | MarkdownString; iconPath?: IconPath; - async install(environment: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { + async install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { + let selected: string[] = packages ?? []; + + if (selected.length === 0) { + selected = (await getCommonCondaPackagesToInstall()) ?? []; + } + + if (selected.length === 0) { + return; + } + + const installOptions = options ?? { upgrade: false }; await withProgress( { location: ProgressLocation.Notification, @@ -61,7 +73,7 @@ export class CondaPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, packages, options, this.api, this, token); + const after = await installPackages(environment, selected, installOptions, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); @@ -79,7 +91,20 @@ export class CondaPackageManager implements PackageManager, Disposable { ); } - async uninstall(environment: PythonEnvironment, packages: Package[] | string[]): Promise { + async uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { + let selected: Package[] | string[] = packages ?? []; + if (selected.length === 0) { + const installed = await this.getPackages(environment); + if (!installed) { + return; + } + selected = (await getPackagesToUninstall(installed)) ?? []; + } + + if (selected.length === 0) { + return; + } + await withProgress( { location: ProgressLocation.Notification, @@ -89,7 +114,7 @@ export class CondaPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, packages, this.api, this, token); + const after = await uninstallPackages(environment, selected, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index bc2bc23..d62a405 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -11,9 +11,9 @@ import { } from '../../api'; import * as path from 'path'; import * as os from 'os'; -import * as fsapi from 'fs-extra'; +import * as fse from 'fs-extra'; import { CancellationError, CancellationToken, l10n, LogOutputChannel, ProgressLocation, Uri } from 'vscode'; -import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; import { isNativeEnvInfo, @@ -30,6 +30,7 @@ import { pickProject } from '../../common/pickers/projects'; import { CondaStrings } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; import { showInputBox, showQuickPick, withProgress } from '../../common/window.apis'; +import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -193,10 +194,10 @@ async function getPrefixes(): Promise { } async function getVersion(root: string): Promise { - const files = await fsapi.readdir(path.join(root, 'conda-meta')); + const files = await fse.readdir(path.join(root, 'conda-meta')); for (let file of files) { if (file.startsWith('python-3') && file.endsWith('.json')) { - const content = fsapi.readJsonSync(path.join(root, 'conda-meta', file)); + const content = fse.readJsonSync(path.join(root, 'conda-meta', file)); return content['version'] as string; } } @@ -467,7 +468,7 @@ async function createNamedCondaEnvironment( const prefixes = await getPrefixes(); let envPath = ''; for (let prefix of prefixes) { - if (await fsapi.pathExists(path.join(prefix, envName))) { + if (await fse.pathExists(path.join(prefix, envName))) { envPath = path.join(prefix, envName); break; } @@ -518,7 +519,7 @@ async function createPrefixCondaEnvironment( } let name = `./.conda`; - if (await fsapi.pathExists(path.join(fsPath, '.conda'))) { + if (await fse.pathExists(path.join(fsPath, '.conda'))) { log.warn(`Environment "${path.join(fsPath, '.conda')}" already exists`); const newName = await showInputBox({ prompt: l10n.t('Environment "{0}" already exists. Enter a different name', name), @@ -679,3 +680,31 @@ export async function uninstallPackages( return refreshPackages(environment, api, manager); } + +async function getCommonPackages(): Promise { + try { + const pipData = path.join(EXTENSION_ROOT_DIR, 'files', 'conda_packages.json'); + const data = await fse.readFile(pipData, { encoding: 'utf-8' }); + const packages = JSON.parse(data) as { name: string; description: string; uri: string }[]; + + return packages.map((p) => { + return { + name: p.name, + displayName: p.name, + uri: Uri.parse(p.uri), + description: p.description, + }; + }); + } catch { + return []; + } +} + +export async function getCommonCondaPackagesToInstall(): Promise { + const common = await getCommonPackages(); + if (common.length === 0) { + return undefined; + } + const selected = await selectFromCommonPackagesToInstall(common); + return selected; +} From 580759cb17bd4452ebe3fc80bc0d04a7502b1579 Mon Sep 17 00:00:00 2001 From: Rob Woods <134370543+robwoods-cam@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:02:26 +0000 Subject: [PATCH 047/328] added note of ms-python.python pre-release requirement (#111) added note of pre-release version of ms-python.python requirement to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a51eac2..dc99dae 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ The Python Environments and Package Manager extension for VS Code helps you mana > Note: This extension is in preview and its APIs and features are subject to change as the project continues to evolve. +> Important: This extension currently requires the pre-release version of the Python extension (ms-python.python) to operate (version 2024.23.2025010901 or later). + ## Features From 50666cb7bb3ea0755b085c77d6cd9ddbfeb724f4 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 10 Jan 2025 14:54:41 -0800 Subject: [PATCH 048/328] Better handling for venv activations (#108) Closes https://github.com/microsoft/vscode-python-environments/issues/106 Closes https://github.com/microsoft/vscode-python-environments/issues/107 Closes https://github.com/microsoft/vscode-python-environments/issues/50 --- src/managers/builtin/venvUtils.ts | 60 +++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 5ab4883..ec5174f 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -19,7 +19,7 @@ import { NativePythonFinder, } from '../common/nativePythonFinder'; import { getWorkspacePersistentState } from '../../common/persistentState'; -import { shortVersion, sortEnvironments } from '../common/utils'; +import { isWindows, shortVersion, sortEnvironments } from '../common/utils'; import { getConfiguration } from '../../common/workspace.apis'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { @@ -110,7 +110,7 @@ function getName(binPath: string): string { return path.basename(dir1); } -function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { +async function getPythonInfo(env: NativeEnvInfo): Promise { if (env.executable && env.version && env.prefix) { const venvName = env.name ?? getName(env.executable); const sv = shortVersion(env.version); @@ -119,18 +119,50 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { const binDir = path.dirname(env.executable); const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + + // Commands for bash shellActivation.set(TerminalShellType.bash, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); + shellDeactivation.set(TerminalShellType.bash, [{ executable: 'deactivate' }]); + + // Commands for csh + shellActivation.set(TerminalShellType.cshell, [ + { executable: 'source', args: [path.join(binDir, 'activate')] }, + ]); + shellDeactivation.set(TerminalShellType.cshell, [{ executable: 'deactivate' }]); + + // Commands for zsh + shellActivation.set(TerminalShellType.zsh, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); + shellDeactivation.set(TerminalShellType.zsh, [{ executable: 'deactivate' }]); + + // Commands for powershell shellActivation.set(TerminalShellType.powershell, [ { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, ]); - shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); - shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); - - const shellDeactivation = new Map(); - shellDeactivation.set(TerminalShellType.bash, [{ executable: 'deactivate' }]); shellDeactivation.set(TerminalShellType.powershell, [{ executable: 'deactivate' }]); + + // Commands for command prompt + shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); shellDeactivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'deactivate.bat') }]); - shellActivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); + + // Commands for fish + if (await fsapi.pathExists(path.join(binDir, 'activate.fish'))) { + shellActivation.set(TerminalShellType.fish, [ + { executable: 'source', args: [path.join(binDir, 'activate.fish')] }, + ]); + shellDeactivation.set(TerminalShellType.fish, [{ executable: 'deactivate' }]); + } + + // Commands for unknown cases + if (isWindows()) { + shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); + shellDeactivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); + } else { + shellActivation.set(TerminalShellType.unknown, [ + { executable: 'source', args: [path.join(binDir, 'activate')] }, + ]); + shellDeactivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); + } return { name: name, @@ -173,16 +205,16 @@ export async function findVirtualEnvironments( .map((e) => e as NativeEnvInfo) .filter((e) => e.kind === NativePythonEnvironmentKind.venv); - envs.forEach((e) => { + for (const e of envs) { if (!(e.prefix && e.executable && e.version)) { log.warn(`Invalid conda environment: ${JSON.stringify(e)}`); - return; + continue; } - const env = api.createPythonEnvironmentItem(getPythonInfo(e), manager); + const env = api.createPythonEnvironmentItem(await getPythonInfo(e), manager); collection.push(env); log.info(`Found venv environment: ${env.name}`); - }); + } return collection; } @@ -339,7 +371,7 @@ export async function createPythonVenv( } const resolved = await nativeFinder.resolve(pythonPath); - const env = api.createPythonEnvironmentItem(getPythonInfo(resolved), manager); + const env = api.createPythonEnvironmentItem(await getPythonInfo(resolved), manager); if (packages && packages?.length > 0) { await api.installPackages(env, packages, { upgrade: false }); } @@ -397,7 +429,7 @@ export async function resolveVenvPythonEnvironmentPath( const resolved = await nativeFinder.resolve(fsPath); if (resolved.kind === NativePythonEnvironmentKind.venv) { - const envInfo = getPythonInfo(resolved); + const envInfo = await getPythonInfo(resolved); return api.createPythonEnvironmentItem(envInfo, manager); } From bcae097731b15fccdc2835f7884c0e308506950b Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 14 Jan 2025 13:22:22 -0800 Subject: [PATCH 049/328] Ensure `pwsh` (powershell Core) use the right activation script (#112) For https://github.com/microsoft/vscode-python-environments/issues/109 --- src/managers/builtin/venvUtils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index ec5174f..f3a3140 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -139,7 +139,11 @@ async function getPythonInfo(env: NativeEnvInfo): Promise shellActivation.set(TerminalShellType.powershell, [ { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, ]); + shellActivation.set(TerminalShellType.powershellCore, [ + { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, + ]); shellDeactivation.set(TerminalShellType.powershell, [{ executable: 'deactivate' }]); + shellDeactivation.set(TerminalShellType.powershellCore, [{ executable: 'deactivate' }]); // Commands for command prompt shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); From c529baaa325bfc6db72c6a24cca6ddb0eb5f37b9 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 14 Jan 2025 13:22:43 -0800 Subject: [PATCH 050/328] Quote `conda env remove` arguments when using full path (#113) Closes https://github.com/microsoft/vscode-python-environments/issues/103 --- src/managers/conda/condaUtils.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index d62a405..15011d1 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -31,6 +31,7 @@ import { CondaStrings } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; import { showInputBox, showQuickPick, withProgress } from '../../common/window.apis'; import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers'; +import { quoteArgs } from '../../features/execution/execUtils'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -585,7 +586,7 @@ async function createPrefixCondaEnvironment( } export async function deleteCondaEnvironment(environment: PythonEnvironment, log: LogOutputChannel): Promise { - let args = ['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]; + let args = quoteArgs(['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]); return await withProgress( { location: ProgressLocation.Notification, From 820f160a93af500e534e1fa8cd05658b1ab0d6be Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 14 Jan 2025 13:47:12 -0800 Subject: [PATCH 051/328] Fix missing common list when no installables are available (#114) --- src/managers/builtin/pipUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 12674ca..9a4fa94 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -112,7 +112,7 @@ async function selectWorkspaceOrCommon( return undefined; } - if (common.length === 0) { + if (common.length > 0) { return selectFromCommonPackagesToInstall(common); } From 86ae682a2bffa1204ab578ff307a49ed9c70a71d Mon Sep 17 00:00:00 2001 From: Abdelrahman AL MAROUK <72821992+almarouk@users.noreply.github.com> Date: Mon, 20 Jan 2025 18:00:42 +0100 Subject: [PATCH 052/328] Untildify conda path from settings (#122) Support using tilded (~) path for `condaPath` setting. --- src/managers/conda/condaUtils.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 15011d1..0e44d0d 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -25,7 +25,7 @@ import { import { getConfiguration } from '../../common/workspace.apis'; import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; import which from 'which'; -import { shortVersion, sortEnvironments } from '../common/utils'; +import { shortVersion, sortEnvironments, untildify } from '../common/utils'; import { pickProject } from '../../common/pickers/projects'; import { CondaStrings } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; @@ -54,7 +54,8 @@ async function setConda(conda: string): Promise { export function getCondaPathSetting(): string | undefined { const config = getConfiguration('python'); - return config.get('condaPath'); + const value = config.get('condaPath'); + return (value && typeof value === 'string') ? untildify(value) : value; } export async function getCondaForWorkspace(fsPath: string): Promise { @@ -113,20 +114,19 @@ async function findConda(): Promise { } export async function getConda(): Promise { - const config = getConfiguration('python'); - const conda = config.get('condaPath'); + const conda = getCondaPathSetting(); if (conda) { return conda; } if (condaPath) { - return condaPath; + return untildify(condaPath); } const state = await getWorkspacePersistentState(); condaPath = await state.get(CONDA_PATH_KEY); if (condaPath) { - return condaPath; + return untildify(condaPath); } const paths = await findConda(); From 9b9f648c422d68fd3f6786464ba55b67f012cfff Mon Sep 17 00:00:00 2001 From: Logan Ramos Date: Tue, 21 Jan 2025 07:24:00 -0700 Subject: [PATCH 053/328] Fix telemetry properties (#123) @karthiknadig Joh made a nice eslint rule for this which may make be useful to adopt to avoid these cases https://github.com/microsoft/vscode-copilot/blob/main/.eslintplugin/no-bad-gdpr-comment.ts --- src/common/telemetry/constants.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index 53128ea..fca616a 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -1,31 +1,31 @@ export enum EventNames { - EXTENSION_ACTIVATION_DURATION = 'EXTENSION.ACTIVATION_DURATION', - EXTENSION_MANAGER_REGISTRATION_DURATION = 'EXTENSION.MANAGER_REGISTRATION_DURATION', + EXTENSION_ACTIVATION_DURATION = "EXTENSION.ACTIVATION_DURATION", + EXTENSION_MANAGER_REGISTRATION_DURATION = "EXTENSION.MANAGER_REGISTRATION_DURATION", - ENVIRONMENT_MANAGER_REGISTERED = 'ENVIRONMENT_MANAGER.REGISTERED', - PACKAGE_MANAGER_REGISTERED = 'PACKAGE_MANAGER.REGISTERED', + ENVIRONMENT_MANAGER_REGISTERED = "ENVIRONMENT_MANAGER.REGISTERED", + PACKAGE_MANAGER_REGISTERED = "PACKAGE_MANAGER.REGISTERED", - VENV_USING_UV = 'VENV.USING_UV', + VENV_USING_UV = "VENV.USING_UV", } // Map all events to their properties export interface IEventNamePropertyMapping { /* __GDPR__ "extension_activation_duration": { - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.EXTENSION_ACTIVATION_DURATION]: never | undefined; /* __GDPR__ "extension_manager_registration_duration": { - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.EXTENSION_MANAGER_REGISTRATION_DURATION]: never | undefined; /* __GDPR__ "environment_manager_registered": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.ENVIRONMENT_MANAGER_REGISTERED]: { @@ -34,7 +34,7 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "package_manager_registered": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.PACKAGE_MANAGER_REGISTERED]: { From 6fe8265047b433610a0b1583c45b8f47b345c48a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 21 Jan 2025 07:33:57 -0800 Subject: [PATCH 054/328] Adds uninstall button on packages (#120) Closes https://github.com/microsoft/vscode-python-environments/issues/59 --- package.json | 20 ++++++++++++++++++++ package.nls.json | 4 ++-- src/extension.ts | 4 ++++ src/features/envCommands.ts | 13 +++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5c73335..03f3ad0 100644 --- a/package.json +++ b/package.json @@ -209,6 +209,12 @@ "title": "%python-envs.terminal.deactivate.title%", "category": "Python Envs", "icon": "$(circle-slash)" + }, + { + "command": "python-envs.uninstallPackage", + "title": "%python-envs.uninstallPackage.title%", + "category": "Python Envs", + "icon": "$(trash)" } ], "menus": { @@ -272,6 +278,10 @@ { "command": "python-envs.terminal.deactivate", "when": "pythonTerminalActivation" + }, + { + "command": "python-envs.uninstallPackage", + "when": "false" } ], "view/item/context": [ @@ -309,6 +319,11 @@ "group": "inline", "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" }, + { + "command": "python-envs.uninstallPackage", + "group": "inline", + "when": "view == env-managers && viewItem == python-package" + }, { "command": "python-envs.packages", "group": "inline", @@ -336,6 +351,11 @@ "command": "python-envs.createTerminal", "group": "inline", "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" + }, + { + "command": "python-envs.uninstallPackage", + "group": "inline", + "when": "view == python-projects && viewItem == python-package" } ], "view/title": [ diff --git a/package.nls.json b/package.nls.json index d51e29e..5e1fdb1 100644 --- a/package.nls.json +++ b/package.nls.json @@ -6,7 +6,6 @@ "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", - "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", "python-envs.addPythonProject.title": "Add Python Project", @@ -26,5 +25,6 @@ "python-envs.createTerminal.title": "Create Python Terminal", "python-envs.runAsTask.title": "Run as Task", "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", - "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal" + "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", + "python-envs.uninstallPackage.title": "Uninstall Package" } diff --git a/src/extension.ts b/src/extension.ts index c23ea9d..f70ca4b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -21,6 +21,7 @@ import { refreshPackagesCommand, createAnyEnvironmentCommand, runInDedicatedTerminalCommand, + handlePackageUninstall, } from './features/envCommands'; import { registerCondaFeatures } from './managers/conda/main'; import { registerSystemPythonFeatures } from './managers/builtin/main'; @@ -133,6 +134,9 @@ export async function activate(context: ExtensionContext): Promise { + await handlePackageUninstall(context, envManagers); + }), commands.registerCommand('python-envs.set', async (item) => { await setEnvironmentCommand(item, envManagers, projectManager); }), diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 2dff42c..b6a7060 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -30,6 +30,8 @@ import { ProjectPackageRootTreeItem, GlobalProjectItem, EnvTreeItemKind, + PackageTreeItem, + ProjectPackage, } from './views/treeViewItems'; import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; @@ -187,6 +189,17 @@ export async function handlePackagesCommand( } } +export async function handlePackageUninstall(context: unknown, em: EnvironmentManagers) { + if (context instanceof PackageTreeItem || context instanceof ProjectPackage) { + const moduleName = context.pkg.name; + const environment = context.parent.environment; + const packageManager = em.getPackageManager(environment); + await packageManager?.uninstall(environment, [moduleName]); + return; + } + traceError(`Invalid context for uninstall command: ${typeof context}`); +} + export async function setEnvironmentCommand( context: unknown, em: EnvironmentManagers, From bf6047c3f9ae62b18e04dd66cbbde6ca417ada88 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 21 Jan 2025 08:06:39 -0800 Subject: [PATCH 055/328] Add support for auto-activation (#119) --- examples/sample1/src/api.ts | 6 +- src/api.ts | 6 +- src/extension.ts | 7 +- src/features/pythonApi.ts | 4 +- src/features/terminal/terminalManager.ts | 171 ++++++++--------------- src/features/terminal/utils.ts | 14 ++ 6 files changed, 84 insertions(+), 124 deletions(-) create mode 100644 src/features/terminal/utils.ts diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index be7821c..76b2284 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -1000,9 +1000,9 @@ export interface PythonProjectModifyApi { */ export interface PythonProjectApi extends PythonProjectCreationApi, PythonProjectGetterApi, PythonProjectModifyApi {} -export interface PythonTerminalOptions extends TerminalOptions { +export interface PythonTerminalCreateOptions extends TerminalOptions { /** - * Whether to show the terminal. + * Whether to disable activation on create. */ disableActivation?: boolean; } @@ -1016,7 +1016,7 @@ export interface PythonTerminalCreateApi { * * Note: Non-activatable environments have no effect on the terminal. */ - createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; + createTerminal(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; } /** diff --git a/src/api.ts b/src/api.ts index be7821c..76b2284 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1000,9 +1000,9 @@ export interface PythonProjectModifyApi { */ export interface PythonProjectApi extends PythonProjectCreationApi, PythonProjectGetterApi, PythonProjectModifyApi {} -export interface PythonTerminalOptions extends TerminalOptions { +export interface PythonTerminalCreateOptions extends TerminalOptions { /** - * Whether to show the terminal. + * Whether to disable activation on create. */ disableActivation?: boolean; } @@ -1016,7 +1016,7 @@ export interface PythonTerminalCreateApi { * * Note: Non-activatable environments have no effect on the terminal. */ - createTerminal(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; + createTerminal(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; } /** diff --git a/src/extension.ts b/src/extension.ts index f70ca4b..142da28 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -71,9 +71,6 @@ export async function activate(context: ExtensionContext): Promise { + async createTerminal(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise { return this.terminalManager.create(environment, options); } async runInTerminal(environment: PythonEnvironment, options: PythonTerminalExecutionOptions): Promise { diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index ece342d..da16015 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -8,12 +8,11 @@ import { Terminal, TerminalShellExecutionEndEvent, TerminalShellExecutionStartEvent, - TerminalShellIntegrationChangeEvent, Uri, + TerminalOptions, } from 'vscode'; import { createTerminal, - onDidChangeTerminalShellIntegration, onDidCloseTerminal, onDidEndTerminalShellExecution, onDidOpenTerminal, @@ -21,17 +20,14 @@ import { terminals, withProgress, } from '../../common/window.apis'; -import { PythonEnvironment, PythonProject, PythonTerminalOptions } from '../../api'; +import { PythonEnvironment, PythonProject, PythonTerminalCreateOptions } from '../../api'; import { getActivationCommand, getDeactivationCommand, isActivatableEnvironment } from '../common/activation'; -import { showErrorMessage } from '../../common/errors/utils'; import { quoteArgs } from '../execution/execUtils'; import { createDeferred } from '../../common/utils/deferred'; import { traceError, traceVerbose } from '../../common/logging'; import { getConfiguration } from '../../common/workspace.apis'; -import { EnvironmentManagers } from '../../internal.api'; - -const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds -const SHELL_INTEGRATION_POLL_INTERVAL = 100; // 0.1 seconds +import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; +import { waitForShellIntegration } from './utils'; export interface TerminalActivation { isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean; @@ -40,7 +36,7 @@ export interface TerminalActivation { } export interface TerminalCreation { - create(environment: PythonEnvironment, options: PythonTerminalOptions): Promise; + create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; } export interface TerminalGetters { @@ -62,7 +58,7 @@ export interface TerminalEnvironment { } export interface TerminalInit { - initialize(projects: PythonProject[], em: EnvironmentManagers): Promise; + initialize(): Promise; } export interface TerminalManager @@ -78,6 +74,7 @@ export class TerminalManagerImpl implements TerminalManager { private activatedTerminals = new Map(); private activatingTerminals = new Map>(); private deactivatingTerminals = new Map>(); + private skipActivationOnOpen = new Set(); private onTerminalOpenedEmitter = new EventEmitter(); private onTerminalOpened = this.onTerminalOpenedEmitter.event; @@ -85,16 +82,13 @@ export class TerminalManagerImpl implements TerminalManager { private onTerminalClosedEmitter = new EventEmitter(); private onTerminalClosed = this.onTerminalClosedEmitter.event; - private onTerminalShellIntegrationChangedEmitter = new EventEmitter(); - private onTerminalShellIntegrationChanged = this.onTerminalShellIntegrationChangedEmitter.event; - private onTerminalShellExecutionStartEmitter = new EventEmitter(); private onTerminalShellExecutionStart = this.onTerminalShellExecutionStartEmitter.event; private onTerminalShellExecutionEndEmitter = new EventEmitter(); private onTerminalShellExecutionEnd = this.onTerminalShellExecutionEndEmitter.event; - constructor() { + constructor(private readonly projectManager: PythonProjectManager, private readonly em: EnvironmentManagers) { this.disposables.push( onDidOpenTerminal((t: Terminal) => { this.onTerminalOpenedEmitter.fire(t); @@ -102,9 +96,6 @@ export class TerminalManagerImpl implements TerminalManager { onDidCloseTerminal((t: Terminal) => { this.onTerminalClosedEmitter.fire(t); }), - onDidChangeTerminalShellIntegration((e: TerminalShellIntegrationChangeEvent) => { - this.onTerminalShellIntegrationChangedEmitter.fire(e); - }), onDidStartTerminalShellExecution((e: TerminalShellExecutionStartEvent) => { this.onTerminalShellExecutionStartEmitter.fire(e); }), @@ -113,9 +104,20 @@ export class TerminalManagerImpl implements TerminalManager { }), this.onTerminalOpenedEmitter, this.onTerminalClosedEmitter, - this.onTerminalShellIntegrationChangedEmitter, this.onTerminalShellExecutionStartEmitter, this.onTerminalShellExecutionEndEmitter, + this.onTerminalOpened(async (t) => { + if (this.skipActivationOnOpen.has(t) || (t.creationOptions as TerminalOptions)?.hideFromUser) { + return; + } + await this.autoActivateOnTerminalOpen(t); + }), + this.onTerminalClosed((t) => { + this.activatedTerminals.delete(t); + this.activatingTerminals.delete(t); + this.deactivatingTerminals.delete(t); + this.skipActivationOnOpen.delete(t); + }), ); } @@ -212,75 +214,36 @@ export class TerminalManagerImpl implements TerminalManager { } } - private async activateEnvironmentOnCreation(terminal: Terminal, environment: PythonEnvironment): Promise { - const deferred = createDeferred(); - const disposables: Disposable[] = []; - let disposeTimer: Disposable | undefined; - let activated = false; - this.activatingTerminals.set(terminal, deferred.promise); + private async getActivationEnvironment(): Promise { + const projects = this.projectManager.getProjects(); + const uri = projects.length === 0 ? undefined : projects[0].uri; + const manager = this.em.getEnvironmentManager(uri); + const env = await manager?.get(uri); + return env; + } - try { - disposables.push( - new Disposable(() => { - this.activatingTerminals.delete(terminal); - }), - this.onTerminalOpened(async (t: Terminal) => { - if (t === terminal) { - if (terminal.shellIntegration) { - // Shell integration is available when the terminal is opened. - activated = true; - await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); - deferred.resolve(); - } else { - let seconds = 0; - const timer = setInterval(() => { - seconds += SHELL_INTEGRATION_POLL_INTERVAL; - if (terminal.shellIntegration || activated) { - disposeTimer?.dispose(); - return; - } - - if (seconds >= SHELL_INTEGRATION_TIMEOUT) { - disposeTimer?.dispose(); - activated = true; - this.activateLegacy(terminal, environment); - deferred.resolve(); - } - }, 100); - - disposeTimer = new Disposable(() => { - clearInterval(timer); - disposeTimer = undefined; - }); - } - } - }), - this.onTerminalShellIntegrationChanged(async (e: TerminalShellIntegrationChangeEvent) => { - if (terminal === e.terminal && !activated) { - disposeTimer?.dispose(); - activated = true; - await this.activateUsingShellIntegration(e.shellIntegration, terminal, environment); - deferred.resolve(); - } - }), - this.onTerminalClosed((t) => { - if (terminal === t && !deferred.completed) { - deferred.reject(new Error('Terminal closed before activation')); - } - }), - new Disposable(() => { - disposeTimer?.dispose(); - }), + private async autoActivateOnTerminalOpen(terminal: Terminal, environment?: PythonEnvironment): Promise { + const config = getConfiguration('python'); + if (!config.get('terminal.activateEnvironment', false)) { + return; + } + + const env = environment ?? (await this.getActivationEnvironment()); + if (env && isActivatableEnvironment(env)) { + await withProgress( + { + location: ProgressLocation.Window, + title: `Activating environment: ${env.displayName}`, + }, + async () => { + await waitForShellIntegration(terminal); + await this.activate(terminal, env); + }, ); - await deferred.promise; - } catch (ex) { - traceError('Failed to activate environment:\r\n', ex); - } finally { - disposables.forEach((d) => d.dispose()); } } - public async create(environment: PythonEnvironment, options: PythonTerminalOptions): Promise { + public async create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise { // const name = options.name ?? `Python: ${environment.displayName}`; const newTerminal = createTerminal({ name: options.name, @@ -296,25 +259,17 @@ export class TerminalManagerImpl implements TerminalManager { location: options.location, isTransient: options.isTransient, }); - const activatable = !options.disableActivation && isActivatableEnvironment(environment); - if (activatable) { - try { - await withProgress( - { - location: ProgressLocation.Window, - title: `Activating ${environment.displayName}`, - }, - async () => { - await this.activateEnvironmentOnCreation(newTerminal, environment); - }, - ); - } catch (e) { - traceError('Failed to activate environment:\r\n', e); - showErrorMessage(`Failed to activate ${environment.displayName}`); - } + if (options.disableActivation) { + this.skipActivationOnOpen.add(newTerminal); + return newTerminal; } + // We add it to skip activation on open to prevent double activation. + // We can activate it ourselves since we are creating it. + this.skipActivationOnOpen.add(newTerminal); + await this.autoActivateOnTerminalOpen(newTerminal, environment); + return newTerminal; } @@ -462,25 +417,15 @@ export class TerminalManagerImpl implements TerminalManager { } } - public async initialize(projects: PythonProject[], em: EnvironmentManagers): Promise { + public async initialize(): Promise { const config = getConfiguration('python'); if (config.get('terminal.activateEnvInCurrentTerminal', false)) { await Promise.all( terminals().map(async (t) => { - if (projects.length === 0) { - const manager = em.getEnvironmentManager(undefined); - const env = await manager?.get(undefined); - if (env) { - return this.activate(t, env); - } - } else if (projects.length === 1) { - const manager = em.getEnvironmentManager(projects[0].uri); - const env = await manager?.get(projects[0].uri); - if (env) { - return this.activate(t, env); - } - } else { - // TODO: handle multi project case + this.skipActivationOnOpen.add(t); + const env = await this.getActivationEnvironment(); + if (env && isActivatableEnvironment(env)) { + await this.activate(t, env); } }), ); diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts new file mode 100644 index 0000000..3b66337 --- /dev/null +++ b/src/features/terminal/utils.ts @@ -0,0 +1,14 @@ +import { Terminal } from 'vscode'; +import { sleep } from '../../common/utils/asyncUtils'; + +const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds +const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds + +export async function waitForShellIntegration(terminal: Terminal): Promise { + let timeout = 0; + while (!terminal.shellIntegration && timeout < SHELL_INTEGRATION_TIMEOUT) { + await sleep(SHELL_INTEGRATION_POLL_INTERVAL); + timeout += SHELL_INTEGRATION_POLL_INTERVAL; + } + return terminal.shellIntegration !== undefined; +} From 176dd9acd4649cc0fb05f6f981f82756e9dedd4a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 21 Jan 2025 08:13:04 -0800 Subject: [PATCH 056/328] Add Extension dependency diagrams (#118) --- README.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/README.md b/README.md index dc99dae..814b6da 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,70 @@ See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/s To consume these APIs you can look at the example here: https://github.com/microsoft/vscode-python-environments/blob/main/src/examples/README.md + +## Extension Dependency + +This section provides an overview of how the Python extension interacts with the Python Environments extension and other tool-specific extensions. The Python Environments extension allows users to create, manage, and remove Python environments and packages. It also provides an API that other extensions can use to support environment management or consume it for running Python tools or projects. + +Tools that may rely on these APIs in their own extensions include: +- **Debuggers** (e.g., `debugpy`) +- **Linters** (e.g., Pylint, Flake8, Mypy) +- **Formatters** (e.g., Black, autopep8) +- **Language Server extensions** (e.g., Pylance, Jedi) +- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) + +### API Dependency +The relationship between these extensions can be represented as follows: + +```mermaid +graph TD + subgraph Language Features + B[Python Extension] + E[Pylance] + end + + subgraph Code Execution + A[Python Environments] <-. Optional .-> B + C["Linters, Formatters, Debugger"] + E -. Optional .-> B + A --> C + A <--> P + + subgraph Environment Extensions + P["Pixi, Pyenv, etc"] + end + end +``` + +Users who do not need to execute code or work in **Virtual Workspaces** can use the Python extension to access language features like hover, completion, and go-to definition. However, executing code (e.g., running a debugger, linter, or formatter), creating/modifying environments, or managing packages requires the Python Environments extension to enable these functionalities. + +### Trust Relationship Between Python and Python Environments Extensions + +VS Code supports trust management, allowing extensions to function in either **trusted** or **untrusted** scenarios. Code execution and tools that can modify the user’s environment are typically unavailable in untrusted scenarios. + +The relationship is illustrated below: + +```mermaid +graph TD + + subgraph Handles Untrusted Code + B[Python Extension] + E[Pylance] -. Optional .-> B + end + + subgraph Only Trusted Code + A[Python Environments] <-. Optional .-> B + C["Linters, Formatters, Debugger"] + A --> C + A <--> P + subgraph Environment Extensions + P["Pixi, Pyenv, etc"] + end + end +``` + +In **trusted mode**, the Python Environments extension supports tasks like managing environments, installing/removing packages, and running tools. In **untrusted mode**, functionality is limited to language features, ensuring a secure and restricted environment. + ## Contributing This project welcomes contributions and suggestions. Most contributions require you to agree to a From 7229ca435161386023dbb47ff06528b68521dfab Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:01:38 -0600 Subject: [PATCH 057/328] Replacing mermaid code with images (#129) --- README.md | 39 ++--------------------------- images/extension_relationships.png | Bin 0 -> 38253 bytes images/trust_relationships.png | Bin 0 -> 39068 bytes 3 files changed, 2 insertions(+), 37 deletions(-) create mode 100644 images/extension_relationships.png create mode 100644 images/trust_relationships.png diff --git a/README.md b/README.md index 814b6da..eb45c06 100644 --- a/README.md +++ b/README.md @@ -69,25 +69,7 @@ Tools that may rely on these APIs in their own extensions include: ### API Dependency The relationship between these extensions can be represented as follows: -```mermaid -graph TD - subgraph Language Features - B[Python Extension] - E[Pylance] - end - - subgraph Code Execution - A[Python Environments] <-. Optional .-> B - C["Linters, Formatters, Debugger"] - E -. Optional .-> B - A --> C - A <--> P - - subgraph Environment Extensions - P["Pixi, Pyenv, etc"] - end - end -``` + Users who do not need to execute code or work in **Virtual Workspaces** can use the Python extension to access language features like hover, completion, and go-to definition. However, executing code (e.g., running a debugger, linter, or formatter), creating/modifying environments, or managing packages requires the Python Environments extension to enable these functionalities. @@ -97,24 +79,7 @@ VS Code supports trust management, allowing extensions to function in either **t The relationship is illustrated below: -```mermaid -graph TD - - subgraph Handles Untrusted Code - B[Python Extension] - E[Pylance] -. Optional .-> B - end - - subgraph Only Trusted Code - A[Python Environments] <-. Optional .-> B - C["Linters, Formatters, Debugger"] - A --> C - A <--> P - subgraph Environment Extensions - P["Pixi, Pyenv, etc"] - end - end -``` + In **trusted mode**, the Python Environments extension supports tasks like managing environments, installing/removing packages, and running tools. In **untrusted mode**, functionality is limited to language features, ensuring a secure and restricted environment. diff --git a/images/extension_relationships.png b/images/extension_relationships.png new file mode 100644 index 0000000000000000000000000000000000000000..f90ea732410d1871dfbacdcd31aeed31988c2874 GIT binary patch literal 38253 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%0D_F$3l5#NmWLqGRPFQU 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 Q8S-usLCI&CPv3m{U&R{-=>Px# literal 0 HcmV?d00001 diff --git a/images/trust_relationships.png b/images/trust_relationships.png new file mode 100644 index 0000000000000000000000000000000000000000..3c98b7e484936a389d758678c2ed6826fb645a00 GIT binary patch literal 39068 zcmdpeWmHyO*DfZa2m;b6Eh*g~N~h9|v`BY@igZagsFX-aORGqiba!`moq6-T?-<{A z&i9>h&X4ow++#eC3j1Dr?X~8*<~8TM<_>rvCw~7f!CfRIr2CQ*A__=IH(w$lT?@H$ z8-6l8zM%wvT(eUUe}SfFjDkrGS!p?OITIxjVMSnr|4*krI%~DB7WQQI`O5e2kVG&lul}J z8NPb@ZoIrzMR19L#i~?6$C1<3@6PxfQd^_l;`PIRhf@@X$db#8tX$qx-`{L+{kG4a zvr%?gbXv#AVE$FD(5z?DN&3qN-;3br=u#HStLGX1lc#w(JwI<{-lZwyG2J#%%Yt_%9mr~$SfH%#^5#8OoybzHy8={tAL z@bKJaZ3v%$b4_Yya zqf}wPOgG!qmH9Hw@<-*#)O2^a<+#{)k5fTROw8c%)UVoA?`<6RTmDk;rSg+zEiK`x zm*3cO2BHeCL?`*4H z#d7S9-yHL}AA0J~K_^!4+p?78Gi5d`l1<%dS@=(0U4Qqkj_|pBd)?)Q_+WnO)Z!r{ zE|V6!_D!u?_YmcrGn6|+7FvjqWjY=tRZsT)JFnHi-FVF#p*^H5!9DYYW4{ z{$N^jGGD9>c3As2<%^rQFXY_at6BD7f@8*GKdiW2c8H?sqK$@Gg$_1#TPAAg<5*^~ zQoL%pnQPS=f5gEVnj`Z%$8LRpOUU~Cbb8qu&*nvl8*9!)_KHhb_|cClRilAi`Ro^;*<)g2)HF4> zciQ@oS8_0vz9|h{&99kldZd)FJ@HTg$)M>VOFA}&n|to|&tV?Y=f3tCx^FeK+aa#C)q*Z- zC##?;H_b{X(qGw%Uihj8)V#dD7w0s8(wkH+ z%kOa#{A;|1abm)Q$6=+QsSDV;M=zLEXp~*P49q^5U>{pGUyEx!GKA3S`V;3Z zN-b@Vo?Jc_mhcNMB%8S{1Rr0l_ph>bCZ9G9F>04v zi5EJoUVbksN;eQ^?!6`aMl=XVrq}c0tj>7%9U;d`W7OlI9}e_Axuh+d^AS{puY1yw z^YaDSO?$klq&XiD5}K?@J$rUt=(5@m?lQgLxVURO^|RZYtyNM)grwllACa@OT89v~Y$)H~J?&zpw@z5_i-lNb=^+_@x`s_l-o%ipb$t)gr z2_~AZL@LbLFLs{iYRt<=QVUqynY9h-7Ch4Yg7tFq@|-V@ zXBv%RQk`y_A;0U>DDqoM7h)KOpW5387n)@X`o+7f^MruWMyzYs5HvOfsUp7dkY1%3 zk271n81rdDIIYmx_h`9f_v7_)ia$*>4@gsgetu4aC+I#RfWGJGSmx|fBc-OsU3c#I zhr#jG@gbk%TH5RG_e$A2@734z0K1|AhYGzeN#V;c%FHG2V%u^$R^`OSsZq-&G@%Qb zb0p7Mjon$CYq0~fC#=e%2it&s+qyVSx2?uTD0Nh^n|iZ^Yo7SwGc zW^Xf-t9}W9=zIV4eKABckcCP1ZSG|jlrYe1- z%;{K>1*eJCb}rU<@g$O_E2DzxM{Mwh9jgnYE!U$*SrQTwQ>BA%3`|VSP_xWV4?OnP z`C{N32@%w>%(@0AdsL_-{4ERt(eYh+#yW0td#^9D{QV6-fBlN5udl!9W?NoX_I?ga z`AuP=jk9x~VZCqsP2>XOj)di?$BGffCYK98-=!IQglK8!yr{IdIXm~_(A?DZ^0A%y z!?V(##aAn zrVg%#j)>t)UdD%?eX{A567u7v9M%OK6{*^DS`nnbP^kU zD`mBw;u{)@qlpzMvrXuKIy+-7&o{|%nW?Exi)Z)=h>7dxTJCW> zZIHUV^UFHSI&Nr*9B$;H+`DITu%;{mb~dQ{8R3o-IOyX~Zoz&m{mpOeH_i@T3p&}? zRxdKdblK&7QRRs3xUTUG9$fG=x4_1MNYFh(UU0eL;+%fC+9h<^uOt|8O1`8SIM0Tt z%64IaUsK7`LH?xQz?!SU;e$yP_~MHQ#@YE|T>tmBcEPT-(&llv?ftj!Z|xF3U%q?4 zrX9>VASh_I=Fokp)C@&fI7h9lJq$JiS(U@46%ak1r{J{hHzx>iV}B#@ zA12+CO&qu}Rd*R7C*d@^mJ}uyqO&km$OhB=-FE>e2?HNrw8oXAH(6)zQy>mwvp>eB zV!FgN05@w}TXwMgv*X=(vBp1t{usNC!bSlz2`MebPW2dwjn&N$g};JBMR-yB@KTd5 zVI;@3p(en&*P~@T9;c3Ey0z)+jLP5ejM`#YHJwzBce{3zcpXyclv`QsU#s@oRsML` zI9Sft*?D~D?uj=c7x~d6RWXZzMm~iC zU}e5F`gcRd6B`?wFb6{;u>(TabYeHgC#ey0P*Z#H`I)IN+Ik?sOO+ET88tPhVrqSR^+A#p zaOswVorMnXni^u5;UWKUM&EB*t)q)xT~@myi@vXDp`k8AmHS>m*f23{5^LPh6$TG@PBspC?LXh8_GWgFd7doCqFxd_z{l?Z(%F=! z8NRo6Y?|<>^ZZnvjFYpIoo=x`zOJymOSIm1BVKMOy*auKM^iKLw6^ZC+PM| zBqYSc#fwe=j{$*!zhLbV2A9ZXHN8F_3nT&)({`nhT1f%#P}Eo{Uu)ytA?{CU=4g46 zmK|i-!~?_jIQ6rA)vtx4+D68yCJP#KItuwNJvrwwDN&?%%?5I#jCFIk_#Djm@@90(;oI8#D?1vCVhEZFS@V=oG%`e@HD$@EZu9{VL~s z$;kHA92|DjnO}_|x@_iZ=x9XTQi+`2YGvlL6wLA};&;QAboS>-iX@MBBlGg|?x5F2TXq))OPybIrqs}lhm&-7vt(W`f-7HH zr3URTUdk2=T^uj6E_Pi8MJno;TUY=Y{nOL)9*d^a_WVS)xK^yJjFX#ZKEtr(i}}c& zY{FpDj`LzNPNS%(2&EsN>z+KYw`l!_yW8`z^~1#`JimVB$a3(LD5)fiudmyI&HPll z*Ks7FeTw?CrzgU7|4otg^vwy^92T=dOOAfNs>G=9G;n5fEB#Ll;^1+p$!9n#Y=@2B z{IODz97ccnvfEhF7a-7nlR;v~p^MO}x^-th(#9?a0vfYTw?i@3iY_)gMqB3oZ^}Pm zL4l+##_GNg)7TGBpFFfA|fWXeY|ML?Y#Blv8luQ$bI8>HDeW<8olRE z0I0_ciP4DomYm!&GA^#!=N>MPm*8x@{-paZM{CsMmRb+L0i>}x z*}K&kdY&M3$uAGl1q(~zhYv}tIsU0!1vl;!R@zPf78Sg7&(F4MU5)2=`9(q4K|xMF ztO-=P+)`8_U+eKV)q=PM+|#ICQDdV6{sh~snq$e)>y9;1fI3f^m03_FoPEacWly| zsV$RI{r1C$n>wBqt_kOnFP$*a7P&poWHJv-H^wTy7Z>YYUI-mcUZO>O{P zbe~+gV0_>g)~hO%dV13zlU^5MLY!KRx_DRNPO{WL)XFm3$*Ixdl(t+>En?BXCYJB0{g?-cB%w>;7+lh|V zg24vhOTgEchqj+XTEsGthkGv5v{&^G&=CM6cC&-l8@got{(YkZUte;Kjg9Pd@{w)> zV^Y(Y;EAH4rk+_m%rmw8mZ+&Icy50iqKv*A)!veh{naXc6O%T1q4Q_wC&`eVneLT0 z`4|@`aek6t^1AyYq;q=Gnk0JN2dQOUzrXJ01;2&cD;kohsXXCcd<~Al6VEeq9k+Gu zH-nb-npXR>Tho!5>y@d9(?4wD@mQ%jUg&~bvMIFoM@4BvM;;?F--+$nk$T|6$8R%? z6rN>!U3Nlbj{vN=lwyz5&qM;Q3Anlp&)Z@`$c}L{b!tYYfF|jBorgHC`%XdVj94Sn zo@(~pAqy53j_LCt0=Hf>gWUI_|H{&}KAuzVz;15pZqPT;? zv;Q>Upgl!=wJ%!?=nR4xLZZeNGF`Tdoshywj@WE3AF&Tn%97)Q(5ee)u1v2{fp(Sf zXqmU{s4m1mh^Gffluc-%5q8&;d9FzRo`+WES=bRs)eYgP=J!+aqPzEWE1l`}a@J zk(o70-^jqZVKZi!EghU_=(0^hZj&U?C^=8wG@f zPyo6Bb4iS#XJYcf=PjXU)S#roLDF%_z)2I^|7<;d{bM!h?92=>j>eIZySkGbkZ5_k zGoQ+ZO=0KQ=~wP_W2DT&ctmJmKm`@Q$LHD&-o$Ukqr<}pPRUvmMyE{I7D0uz+_x;N zX!8o(DFQdPXOW-i|2fS(EO*_UCgs5!Yvx*-NGZnMAOo#rC=hgw|C4|Revzd7X zHzJXimd?#($X3a_&SnytZZ=r{!*-rmv;3m#$B+jApa!I;05Bhbhk8Pfqmiwk-rJWH z#g{WQJgfk8^fu~}444j?i>rA{M1zcnf=<(7D*6|h_|w6t9Ic9^Weo-+Vqp4F4C)VI zVUCXPdwg}Zsjyp|DegMyNe}Q_-X9)P%i`-FYzE+%uAfBY#b9iGQ&U9#4o}DvNjAYb zZa*X-VE%Y9C{bI!c1MblT8_xvl@zAEJXyy^%7?Sb39_74r;l}5_oP3{984YlC%iVqASF#T4({8Y zy@zuDJial62JbmJc~@?lxO{K?+QJl&#NJ@eU~2jkU9pZLN+tm}U9rg9wQ>DV-?9CKIHysYn#MtMU(}mHU!_! zG?)=S-}zX^Bu&OIlj_hyaDPN?N~w8>4&7{ZVEQ5R#D_ras`qeI$#=Nh&ne&8awG+J zkdvDdp;XJ|c*aP5LDW#>>+;$#{X=ai%hNV4XwVlWrW|>)^sL1l>QA)vL?(9iRe(Bq0GDi(CR1;BS5c1rQji3$lX9@U{@Lv~a z{^P^{U#`{vSC`BGp1^Q+t(;lLeI1O*y1#lSvuEGXYj;z)@nf^%RjtNl;nr~lH5I!8 zNeAKId{wK=e6%_D^uohpvia+W8)1Su&qMAR<$W|QG24);!hiRNzyS7HO-pOM+xo0P zdey0l#c|tJPB)Cj5!Z$KYTfl8l6LOf2_JP4K9x_k%&mB}_K^i+ae!^nz{+@oLrkP7 zRM3Qc=jhJ^o9!o6u^}1qOx{clWQGH*aEnH$^uyme2B7zy822 zjwiKqrlipBHjySr3+i~MOXBC z`|*(9fX?I5>6TCUqZO}*J_~#1JEN&LG!Xi!vo-n+bVQz%Z*(X6_@Nr`9)$kvEvA_C zi93{4KRmwI(iK0p(O=4S&$|a77n3kyk0f)AqTn{_j%Gu5l!biEwnf{|MTVItglCoU zn_(={Jl}LfMdvGKT(DR&%);#(RF%n+EABmK@l|^D9mUXth)x#m6!ojK zIVS7=!0-LFororquLJM7w8``r(a;(RPj2U#JiqzS;;(;^?_Ys+qP9=?7eqDTNvHwb zzd|1i1`oOK%cUL_=i)E543!Ee$uHxAl^W#Wjqb}*XU0c*#_4^rJkW}sNo{FH|71aWm#&_Z}{vK!JJn%5(V)qMH{e4*MkcDc1S zG2UiPMQ1Ns!!V|A9@n%~&BoepJ!^I0@bx#iXea7!F0n(4ZC#$a-Iiv#P-{jq7NOMR~ zAkQ#8X?eqGd6)W?0aE0MGSbwPZ%5|6#@@EuPZlX(e1Gh{ur8?)o4u**D07;S=9?~O z{%o6Xb-ct+T|08X&2_f2ghIIJ=Xq*Zj4R{F$5d-h^RbjS=^e_P1(Rqh_m`*U^+%kp zr6ne~rrR+2d;3(fI4JknOR`hP8Bwtsad6y-t=n76Z#|yMj6=$q zOY1xIg%K~lNPdtpP1@xxmiZlSy`_6|hf@M|NSwC;p)5JPS8yfXlz)5brs&qnn_uLi z+PbUV;MI=gsO6{7aTZraJ%1cAS$~Ap9&dcM&q*=rSl2adgLeCx(x7Uq56bjPxicCKeT;|&Am}a zY^kzWb8EzsO?$F#YSV)uMJm>=6Kb3USRy+z3RlP*Z^|pOTUoNf@s{He%PYm`!;?}n zFWc0!5Z;$vcO46Koff67<{ZzQt}7?(Nd4klZTmQQoAs-wsd+9^;&mmjEWZ0lokTRI z*1u6a$8qld`0KgGoe(2aIaHsC)L-Q(IZ5|(zhjNtxJ+etUt?HdfX1Z;_j!f!lB<*H zy|#(cPv&AN1yWADO4l42jqF-|mg1vxQQmzK9M5(t(4|!@e$yi*78gVux!;7t!uzC$vktIdPcl7rvD>b*&yO-I z`|MD9T~hb@nsjf;%k}hw!IQrYeLC+BHcOBo_jVlH{MX zQ2p+GeD+Gsou%$MPnG+}uSXHwAEtu?|OV>aRktO-M9T?ujA+K5^yy<*Jw6m#4#~kkT{REzV^K)n_W0>{=^%a zP3|OSc9Io^#uphi#WeCov@z4HQFnf71p{>@P9gG7wD4+(qRQr@j*3NwtWG4fkk{5- zlybIpN9!`|14i5S8RNm};Xc#lQ6F)xJiE+>jNcvOj-q~~ zOF_~fs$nzbmGT~GNxMClZ_Z!YJ8>&CU%h3ydHw7M50RhPxM|EV27d$#nzE??@7s`j znZ2LSusLOxC03mpGxN|XfZsb=+7PujDig-7j0TJ_nRdB6PUCPgmrf{iIl=W}ntA5! ziZ2l*ev@^dSl+i|cX26NhEh(1gzai>tT{588mf{cMeasy7w@M2w$se^zGTfH6AikK z(R9q#!4UcaZ9_g`MX_%fuPrk-!Ydn9yJN+4b(nbbccPWsm{ZD`2T#?DhyL6i{Oie& zo_P;>VbHGp#u}Dw85K)gHdah)CtdDuYvJW&A}Kl0?m(Z_n6fq!pjfy?Pz8}7p$hlGop>_fgzHiK~+0@!K%=;^k1@ zkk~NkkFrS&Zd&9E!w=he$|!&TpT}Wz(UAH>w-Bt;AWURBL{=dv_NGOs=hphxV&(Qh zFuuw=Re}m6zjz*39OME@+>#Lfwhhx8adx+@ObL)wgVCF_)Yiw#W3ocE^JQMI%t zRgcBkt*<>hJ2Di0Fc_KD_(x}`vk#z}fOdp7(n+qBZeDXn`}Pp0FGkP}9@21IzYM&5 zQjOLj_3V4=f^Sj1I`#b}@B>L)=Pwi!L3i-9=XFPYF1|p(I>w6{n>2Ps?e$!w>)Vq= zZ+I`XtK!(j%e0b>m6#H=A}LFe69VIG(eBSz$s>PX_^Yh1xY23%=%Y{CS%g)U*1Jp{ zY_f?|X0Za4!s>Wq1!03Tjbs?p&0-7{+ejTelolXQ*gIRPXr$`(7Jbc`1eTo#t%rI8{6ZRo z3?a{@u08kbQL>tE`r=dD=SkU{$NJTfCX*>qeo{=iCG})?%iTf)okZ;UY*$IV^`*_nTR92^X{4K#G^x)w zN0_t!o*@@3{dg?NFf%)g6%x`E#tb?I69TT3SEvD?0T>yR$F$yOkjZY%&N&h~cl6q5 z9ZFVSt}+*#pbMtk`8#8PrOvU;o_C@?qtN&p56Al-Sso@cvzGy_be{I=yQ)*9KwNo~ zkuUsF{{-CWp-y@ROWBT|KIj6tTE9lEkUff7)tQz9?*z>^6xsB{dXVdvBh0ZLji>>b|{AdXO0bVHDbxkW#{U z7(#{ar__u(Vyh92pCGVeqpQ#v{4_kd`!YF+!$+0U=bzDE^qJsaBXoMwUyjw!5h4yD zqGYnoP4kgoV_nESdoENjC>O8z%T;#df2%dTO3+~ZA4?PeA7AeB%5E`#;czkx17uSO z1Aq{n8^NZVZ$K_w4}=GMn?mng_j!A=d!InLpkun8#y?E{i6bszVlFF)JQF!OCATvN z5>$6U@?(8=gm2uXBbq8`kgZxkv01%~G3i<5`|+b9qBsVh6e+~;5;1{L=j7xJg&f%K z{viEQkI|39AjIvP6(tck=JE=XnvK*Td>Pt>Y$hU|10Q)R1lUv7gH+6~Kj#J>=h{62 zt_?9Qt?I&{fEo`bgv6pRn-m|?YgboaX>AQ=|8wGP2NeYk?GY{Qhe=Pq-=J-RA}}S? z!IcVh!g(FOu~>}gV`BE;gm-}GPcaj=*yZ z2=-y2yuH}DPDyD>a5n^Teb#TtzcR*jM1J(wFY!BQXw!c`VI~!ot8nHif_9_+YdUa_B+X9vd_$B9n4=5;g{ zKYn>*gvn4nd$_5*|f z&wP?>96Ot;T?{%-Bo@?0@ihNPNJeF)c7`36+srbzCzdBTtk$yr$GKg*JhKb%Mpne6 zZsN9Eu)2%O^fa1o-g!A=r|+9`JQM~AaNWodO36B}j6(IfTF?!~33_lN6nUS`=|QD1 zsJkhwq*TIU2s!+~8aGwEMA4!s1geCkumnULEIvb=BO;z1nzq=>4+Wcs`~q$}AXHGV zIxvBHxASHV=h@kAIh2|2L+X8bY?!YNllCnp?T!pW8?ic2aHaB!e|a5|w=zM1(A;CY z{Wo}gP8*9k1u@+@gC>31y`j_fSvGr1sfameD+=j@c*^~Bo%{BE*I20B%PFP-L(vK& zu`)1qIh6hi%Bx0dnATIMmKq)Jq{8WwZyzr}f;(s)&4xuX=+=hAfKbQAmG4Sn(5X)O z@Ii#v-q~9=(YV<2Ts4@G>n*6SjFxG!FeKZ$SqDpZ{pQTmJ@AI$He(o1am?)Zp zr(F}|&;M3BHh*TbE)lUP^qt-tS$+n}-V%TyaZmKf5;;4JL3bF8-x~(auPZ+D5NhxGvyI7(Ot95E4-rI;@^^C#@Y&>L$6{;rYW4Agnfq=B?ZLWc%h~bl(qtVL)RJeG z;+lRCK=lCTY_c)Nf)JwNVFE4B`T&c&(=H9l%<{?5Csq@O?pwdO`T2RT>eTDyX5fXO zNT$M|vB%?fz+eL6@a5rNWYs}BHTC5ObmZ}hX=0)YoO#HIx_v0Akii-}dA1gacuBpI z*g1pvSx#<~k#{A5&h}tK;16gAx{DXHpyZqZYHx%<{djlLsQDukLgEKHb?~cxP!TFnn+CwZDt39iAPfrJ0^pV{SG@^e0AJOvj>hXXs+kMvJBLK z0~9^_FCFu+4yYxN(TL`!ei?lDaMl7`1Bn*2dZ5hAH13cB>{9p96-{{pCErYW(ojEf z(Cx=#l6bZ$DK5j%2oK?iAvsuK$A^NV9uON_#}bt>kiY+P+ykj0Xpj>sPPWx~ntqDa z&RBFRYj+9YQ1Sdi$ct77E?JCPpH(^#3eProB@OBEaMXDekBMN)g10RiJLmP_Jp+nE=_ zN1PS#j+CQ8Ve(|$+#h)CRJyae@T#j_ce}+ELGAS{L&|6yygDMnsN6R2Q{^yr<>*T2+MF>k99w@k%x|iwBJEsPuPqa z{;(@-dcTR_(9Ok9Prvk*jPwQXc=gzG0dOGZKxPbXia_w_6_Jik4bYLquK70A?H$)> zZ2DS+!LfLrJ*}=Gd;!{&SvuI?65spdz=~|3j6V+N&czr+Zht_C$Avf{Ks=ib><-o@ zbG1*|D8xNm60HuV>(OcK=9*J~RH{s`7Kl%83Ly*CeYRhk60NY!2o3_MvO{PI%?c{6 zS%bs}Aw7YU7mNMK^$H%HcImZ7 z>De#$M7-&z!^6eJ2v-6bQ!C%5`yY@jLA^1Yi2liz6DY@j|J$ReuK+D)@w(6eDMnbV zs#WdD8+;Jz*ssiWgb8)(HwMcu0YHEl;(K8sCldgn6N{~(7061O4=0fk1!nS{ID|=} zQyB$z0wzk-26dX;MD}|DKw{i+5(PGGc(ir6wYT@_={1_!8F(sTkVeFDm{EG)u0h!1 zoEjYi{qR-0z~jcpyn=$>YSqpHoSXxD8{?s*US|pF#e#qZDoT0Z$X|iyXqgazz3s=*Fz{SP;hNgn}&gPF{%X!ro@eF?f>1_p-UAULT1 z6Aa;-$}08MG4=6(A0iM@lK&1J8d`J8bDD2;c=nuG zvGmPBb)>;WHH(@$6<#70^6-C%6T)f9yYfL_GgN3m8cDyC!- zE)J{4PxO92)hKmMUQAJBd4>_5L`z4P@Zn}hH*R>AuDv}fSjd%61ap~ta44OG_?B^p z&La@q%zgnwuLn_~&8*mug%yZ74OsxeQuKl6O9p`UK@veFVUzvCAV`7Wgbo7HxmF`H za~v0a=pl4zMf8|~*6!#;F4JN4np6@*vjm_-0X=BL$jP)-auP8p$^)S*4sg0YAUK%a zSCkUDP0q(iwcsMfxT9LF=ETiFBIOZGj-LwQXMca-sXjk=3jHyNezR215kFGTBL$dC zIMEzLU%?~-F)DfPuLs(L;14_=+lO9f7&}jU?Pg|XKrPJ4nMDsKd2x>1Q!t4H0Hu!_ z)XYW>T{XI1;~mJPdy64l)u!;}&g7~mW&>Pjhm&578|oW}ljuF*@oFzz%U1X#%ixqs za5@4KwkPZp1AI3^o1mT^7h-4320dFopxiK>s1`il;UU0lUXqSi07dE{BGQVKK8@Ln?#_pJ2M0wR8F_aoHoYT%?6^v1a}%58-4E+dRCiZ z&RIfF5{)VoAN0}s$4kdD6?&eBar5!9>Ho2Q)Bi01mILJ44<9RhKo?vBfg$4$*L^yn z^OECtnRv!A85vZZoIGi@k#ndB(-giucM6$rvG#2!r5+*`zDw#;eT<4|cPKhOKFeIPUH+ za01=A@wnQR_9pedq|h(Q!dU0DDR^>7D&p+S?T1Fp*{^jx6O{e&+bjKIV;$4GKN_2w zb`b{BJu8sF_v1R=8tuPU<{m`0pU$$b_>&aRyVc}nEW5@SkRIYx9c%EG|%gI`c z6+#@G#?#G176B6&sl;kB;MP5yH{ZgWv25p>UovS|e()352D)R4YM`el+?y%eoGK*r z=+UDOetyrX!$fu6S)z}3aj!q|x_H)mc^PFIOzOct)>r1be>gOxHaqn(N+~or*znhT zAN!3lA2`^ryT4%9`+6i9E49P1Kujx3E?K`Lp%iZ2Vjrwtd&XC68t!$zANx3EN5ZN~ zQ~~_+&P~XC0Gttxlo3CBHMQyN#`UWITQ=w+(W2>N*&xvtPP8%U#f*uABQ{)Q)Dp{_ z%7XefFOLxzkc7E811_@;d(ipCsj%mj%bpBr_w#-8#*oCVzbFAmN6z5uebtL= zr&GP2NkXRU(W7^fH1gZqO{rj28pR?~&}}r^E~xYv@gGK4;J`k;A0=s zhKZJ2O+p(kO0LF!P4HPlvNeqK}<4CDc z+(|TpdIYe;ERCH`$F6ubc^?ZZL}`ZvWZh~5xx>Gqqj4ruK2y)Ypd;#WeH@P+C8H)M zxjcy*;+XIxl$J&pF2`dN6U)M)0317=&pg}76TAk$Y#*UlqU~B6E*>gb79S|kZQGhA zeF>!Jy|6+wr-XjF|=V(K<9{IZzgFx|1dfY4NWK!5A+9{bPPNu51RnkAnPw&uw-Cl z1XVW$@5ouFEOty)2*Ph@Bui6whsQJxwfxJ&z4iserdYY;Pc= zopsuEMbG3EWFqF6t6i0Fus(`ONZ95ynI{q1S6EmGq}T5XzAUx6sx}=PfB$~}^QS=O zOGGd7(Fqy{A5I2Q@xdlKE1z)yrza zSB74_h%!Se8X63)YieqOh?PXZ%@G;e^vH_C$pLl_W%|-%K7M?4;!tkVweh2J0C6Qf zJ$(Y_e!8ime7;UiYdD2?M@){|w&;X=?>#p+H}JyNPEKjhe0Bg`<7u&D0quRaO-MB$_MgE1`n3R?-F=2!qRHRsjVKX)o3~Q{XtvXZd-WJ<=?##6qpqf)w5)>v|~SJIUzKA%3ll1n~`WHpk?!pDwCv0J<#=jTt-ZwS=0N-f(^*%&*3 z+~0(Q1mD}_WMY@y1uAm#_ieEqk&qlfIolS$V`yy{+#SOxWOuTMzcSzv4?g_rOixsI zE71#!kkqwC)4xoYz&O|#hnFNY1?xesd$?%c1h@{gu|=rx2p;KjGU?6+I zu(PKJ6FsaF%znFrtC+`ShZ6iSP~x5QL$je;4`k86ho5cdr5Z&yS9>zj^+VtY!L?Mf z$uWK9WU@8m;-N&cTrHI3=miqtP0iha+@(R{sG7(VY2g zdxi;~$zXN{Ul3r$>HYiny$`)P0z*RTfB(L#I;a6YgvD-Q@NBnB2$~3OcNb)#6Q_B) z-pi2tSCWRkJ^Nt3c710jnv)Y3)EGKKMH>xdTOBvYt2Xn~Zc{CSU~}$TLqkLHt6%8$ zn}QLDq{i{0cN{e5>bP}uAdF|O7CM2Rms@IoFDo+!a4xYN_eHqt@yh%6a2UurIpJ*t z6LNN%uiipM=;`S}^1rBd9KXxm>FH_2?29#>aOhQnadl|Lfu+>el6HS-(1dpX*}m-b z(S*#!`PkLJ-}P=>9MeQyyK%d>`Z%%V&3yg)TS5LoL1{+Po5%?|Q3~mfjluDmuCyHq zE)ds0len;rj*xi#^2<$Noe0|n_}hjZKsCb(&+RG6rnyg0-3V<8_`vvebQoVxoI!W# zQbUTsWqnIaK&{7V`st-$TGN+r%DTVd2SOKjSoRP1&uPa;$!Gu)2?_nm4-*k&41V)j zJWPk(>Vn#0)bZ79V`_6WJ+7djRhHzF$*`Il0p)K>)BrDV|9Ik{GI(c+h{(;lOV7Vi zGVpQ%>RWdoPAzpC?5&Tc_GWd(SuQekp&=aePiWIxp76Li>2ZjqU0DJ|Xq&(V+%0+o z_>)0ht9HoUTHED>09T>Zog2)a?d;2rTplWXURh4UsF=wfO{dI0PF~?`gL@mDL?Tsi zGjYGXyxgSuqj2@f8xKVrQ8P0$AeU~$NZ?OS4lmzM)VRghvcs`Z$W{=AHv>Ek!kK6k zWle{Q!_s&auAH3Q$7+j?1djP2=8G_(62-tPJCk^Bw2b~O(A9+?X%nnT3Z;6An1`krEd|p}GKY zNWP4ko}3{ukCneYB=zEN-y@hG{--T~f9^k3C%a0ZpTE$s7;}AhqQzcVnE3FnAD?B5d~4WU4adPmMXVFJ{v?iml*u$SkrK^7aP0`WFUXM_3vlx z9d7mW4@MSqcJocFhLv!#l)+^5D*Um^O2IET92mij~{>Ls;Blq zw!r`@&*4P%&NO%7az-Yml&`edR?%xv-wd}0kYa;8E~3E;QQCpbC*b4@t3kMgV;1D7enCDjT|Sj%ZP@N3bL|!+&N;6#yF7BO z#81d6dMAjVi_A$D78g@NjMr!!P9p~QR4Ow^Nw=CTguGRIdpw29zOwRXpzJ2%Df|cU zLW8!e3`PrhILQNeO93L)x>?-|;p6QW(A56VvviD%5J*dFlLSf}eEwY&F}}p`_u=jLG*chvtT5B>Z11q0)3@1LUH=ORTZ+n4H&&L8|Hr`qF- zO-G9B>w8$Q-Mcrd6P45nVXa_?`Vzb(3SPY=Guwz2{3x8r1k$%M@kMu_ZKlMuw-3e+ z7f+W7~9jvzZMS zg|sJCB*D^5L4WMk6B|2htaWTnZ$d5{5-~1_%a*5p&BA3wFnM;1|54prM`g8leZLoC zf`WxeE8Pf4NUDHzcMC{22uNdr(%qqSBhrl`UDDkp-5`DDa_{?o_Wh3cIpaBFyyuK@ zu7CE{&1S7@tzXRfo!|NSsdXYhc4HE-NQsFrTlH=@+We<_J{xuG)~!}$Z3d(|W`Yp_ z1A(`4yF(b_gfKA9Zn+rI-u~R=8tex_9v)-a8f8PsrIY`&c(Wy;QZR1_Eq?EzVeIe! z0n|d*!$K;0`cb4h<(LYI=p(HqS!!r9#;b$d3PywEDiN6hFe`;y>XI&oP+nvH>nTAO zl0kbXpbI8fb250KgdvLfFGSY8FIjd9+sr{gl_K zsD%IA0?T5}S?=~+g!oY9finCJd27aB`mTuo-u^@cr|aQ4=nOPMEGbRs>Ci+5l|4Vb zMkxZ2Z&g7{`%|E^DNGVRBL}?$B>F%0r6zO}cwcWXIl!%gljW6IqKN;Un_E=RTFP7mpNk@wSl14aqq zGCVO^fF1n(GeCQQSRA!I?`nzEjRG-n;?v}*EdO3QXH}5$7U|Zjxz>fI(K0=6LWxR66&3xUe49@;GLYUAKC{OJI|&UP6l0y#G9y0MWio z9F;0A52*bk78|@oWVu3W4DbmMga%)ivy+GA4wmM~YvT#~i?|jfoC@^?Xe7T<3#cxn zd`iW|)c{Rsq(Tqklx_Cqho-IEP} ze)@QPxNLcq_?Qto8u99ay&?G^4bUoVDl6rR?E{$kcCLQGlEbj23Mny9kVIPP$CiPGBAKXyr9FO4NZNunH(*D zdRj9*!}>usshX6MvL7OF8%~_?uoc)YVV%6uTs-cWc0t>n*Spe@=u1%%+T`JGOoIh7 zg#I$yLG7|HSM&XSf%3>xVy@nRTuuHdSoIA~1j!d@RDOOm>C^g`xDVHDlGh*nLJSdB zaEiG5Lr>r@WT=;1OmOFG`d1+hezSBKbj=$6_^=4U`M}+Fw{9!&Yn}5kCt#l*m<{5B z0_y|u+MkI(6c4P3@|TW2Kt8hpSO6j!>pJfpcQlen!)ry#kFd5)xDVX@7j7?L4D1-t zuWGP0=D`2Qv$k~|dQXk}S8&4VqXeNgj{-OV)x~SkP2kdiw8{voEb%v$bKhD23S1%) z-TO@5f=(-&c=`0y_A-`M-27$-H-qn3K`1OoE2Cw|1`p-|hRO)w0Fpy>5fWIx&qpmw z`>$Xz2JI?jaF7#NcV7z%^r2tXY@8G_V%x4;01$^$1%%&Tckv@w1YrSkCdkNj;(GM4&fU*e< zb<^M&g6jR!zAga1rp@Sh=gNiMTaX)IkT8fPQnN8GC1qmusw?u+cy6 zvrb(u{OJ#U0o*7Ez77~|j2fkvYgb2Pp`gHmz!SkX1pY9`vy-maM|yk?zv0n#*PNa2 zNH~i?>`GHz&^umSXw3QnFf~!TV?}h4p4TeA+Ag@sYr|dP|Am(01UeEtaw8M>qt(}o zSXot2(8FU5?*cMj4$Zy|zYeYkc+u|ysOG}e)PyyS^ zdZ|}C6`ur5E#IO094>>j*%#RHrGrX`(71pmUJd$dyt(i+69WNy82L@WD?X|;Khlhd>KpP0D&Q&?NdIHlA z0DA~$544e1vp58sCK>ajw2WeR@n2B6eZ!XGLbC%jgww}>X|*wFJ??B7x_DwbUWp4E z&plY3d#UJ3z~nkByEKqT29`QM@NcFT19BpA7iMr7E`==dPZ+z2#y$HI+K>H2{cZy@ z<|@J71*ocvLYYS7w7bm74%L&&Knbjxg#;#l7?OnC_MSkEjAS4oB>X;9aJJDvkQdDF z&R3w~1j=*E3ly4iyh9*v{{A4_zh*T&HTb<@Y#e+YHt7d1e*yLF+-T{Ij;%QY$NjN@1HdCl ztO9_q4z?HrAYn+fo*k{bzg#`M0&6?#wSp>FZf^u#vCvW1cJnqlRXF0`0(wQ{Ap(mV zDp1aMIe1o3jXmSGp8r>t&U)>Bbp*UwK<|M8 zB48f;oUnRC?j68dpg;Y?G4;IcpDU$FRl`z#1HLnuYA4~Ru9EPzhq`cCO;RKN1Ykyn z1P1mZtUOR>qH^eXk@pGN1|g?a@6M?vz`)@4fU=nU@Jfwv6)&uG*jX@yt)lt-g&f`1 za7Rc9e*g+%Wl$&H3XK|e8~_KrfZH=0VNaNEUq(kb7)&*U9e^^ET>jwiKQ*B3{&sc% zV4vr}5PXS*L>e4+AVQh^Cpyi5j06Rw7^vitAU6mwI)>5Xd9_K3kUrs=p@6c+1X0Pk zPwr<@sl&A30eiYd6oFWv^L5`N)X}{)&2MnW5E+xEh~dmMk~n;EKhr5#@COA9MhgLZ z8)Ba}?Uw*}L@?s|1qamo+2{xG&?`3^vQ~zRe(Y4{s8wM-1|$jm>D_QqR%8x0K)jIY z#mMNtKfbLqkV}C)MBtr59qyTo%w;sRdE6M)d}K%jj3{gSeL}ny^uM5C6G}U(B#p7&=;Jt7B~3OqbW22;Uuso$dBK11eM5JqY{{1zDCvBJ8py$^=rkAD{*x%uEE! z2-NNT5KL1ie`icimT*9c6BT0f9Jr*Hs43H9)=4=v~A>7BXZJR~yjCD$m?TuGSdBf_(n` z3S!;uj?BI1V!L0>a zs83B#vnaRi!Q_7DsWlIID6GySFy=u1NA&-8_$|OkdI5+lgQG)P3nWKP0)b2QaBtNk z%d{IC1DL%pe*HX4a@^L6<+Scc(7;H?E6@FgiY2g7OwaAo0=5TPM_^WO?oapuodnnx zFO0-4KL$((jm%^R6AcOh7QG)s=vpaaWs&tOD`t+H_1#E;9tX$#4(nI2Ua;${ogN=p zSv8p-9zm{Q4KEN9T{#e)3Nl##2|!~Z`KbHC*!Xpde#4%uQbBQXBD_J6w(g=pc1eDM z&Y@RQ;qB`?KjD4`5u=FH-f^!P2^iOZ!e*?iH`6VVAR4gA>jWNZWMu5EpS?|$bY?MV zqel{+Y-uOCU}A86i*2jAu06s9LmS*;oPl?ctdcqMbY|p=OdO%w$qcf0BA~r&kAleD zp?sk>HYPlKWn<5xHdV6VZ$Il0GJ=R%%HUhNih1X_7HC&c(iLI7d9MJpLMxk=R=^b@ z^3$CP*lqv~g!C;S)M*_ z0{y143rZK}d5!%oyYL34 zK5WF8yU-&FVJ9?Q1R1;(a$4Ib1_IVsn>howlU)vA`J@Q>JOk)dD(qRXQnNtIOTnyg zj#?OWa5O@wDVeujwg1c-Jm|2UA)+f7j>Q9r$s~7mAeR4@D71{&!C4C1p8-z#0k3k) zA;SFwKl@tLLtASai99WH6nMC??3V3ofq3P5HZ_(dm-S5-!}zoC<5Tr`}G|B_#Nj?C1dUEU&-a&K5zqoqfTY9=xte7qn4Ui;x;G52n;_bmo z4c#nW-`|J0J%S{Nf|2pGTIeO~G!oNm9+JT#5gX6zDsd$b14oP%_^%)gvLb`>%@;^@ z4W@s5gRJvru<$1c?aX}uJPHn6Jm3n=wenlyPfe}FV#7oRhZ22V{d;+zzd1wmFViX) zZc$;eyJD>&en*66iy)B91AwyR;#$FK+9l0qq3d%od;(l0P?lu zN5FrrKae{q%tER(s|sB&*8rjvh{#C!U|5sh-roCXIpL4afxN@?F2UHiR{T0r>>Tie zr>hnO8wlnCGlBf*{VaIo%M;2VE8{3p z@}X(@1sT*bU<18nZM`(w10%|jI_UP zY^XN~3C81rW;a-9T>LK!Hhh5?kU1tN14ptM^l!I}-J~b&^e(qEjXZS^rB(D@>ZAK= zzuE~#&@r?PXx&1>{x6}h(MbJ$Bl7V65y)7-0k9Gy7#Z4!1>^0IaSOk7qeproGWFZ) zV1B~>IDrrt+kMA`Z0P?>iE+$!+P6UJ6oEV#^&=Jc>wU8BcsHFO=3YRJe;X*N$S^f5(gL}=qCQO9>O)D_(%XUc7D|- za9m8mHR@Zk(^HxK=(Hw;X|quDfZdS$-_Bcyo75=V`8FL0R{>(}35Ec)>-hL!tng8- z@%?Al-c83@5Qq@UE>o4l_}!b1^#ABfMRfA0VCpSuUO&;$`k9+eaU2<(pGE9}82I76 z(B4@hZD)A&wOiE6?Kdw`>5(6mso$ii2L}<2M(G2TA3hr?*!I8${=PqlmE%wx1Tn{O zQ2RQsLY+X?NiBrha?cgZ>zEyB%|XR191De&TR)=w7(Cn@LN!$7%)!VAvE}e>4{*JK zj(cILKgTDeXH5GG+!47kxi^n-1G%>eGDboCwt~y1sh3!!p2w&~9Fj8%y6 zQ{8=DAgp^<(6Ih4DK* z5scf^sK?+2fzA@5TU1iX&;0OFz!Qutv(-~6`~}sEQX>_)*)AyX{393(CPR>e&`b)} z8;+hC$RChp7UZ(Jo&qZ9%z}QdfWPsw1hXfqKody7sos=x;GA8B% z@Klj^i`4J_bfeBPdgIVFnC7W6yE-WYHIoYk%-2@nsUaM~gM$TL6k-%!R!Y_}4r-&5 zP5iJpd}4tuE{?g>FNx1Uu~iB$@6j_b`TI&5fb}xX0nAhe$dhb-2RQ6}IMxC|#esH> zf|vxASAB?ue#y;Zg)x{0{o+eX$PM%g@Pr$A8YqJrK^<*o<~vBng$#*>J!ZDUTp9?F zfAzg?p^ywlBq-U578r(5QT`15r9W*(O;{C3h-1A;q3N zO9!Y0=z*_y_Ac-UA7{uhHW-L>DDAILToD&{okhBFzeYn*0_dgN;N+4prx3dhb*?+6 z{l{h|BOt{f64FkIh|}Tz`n#&CxO_Yh01BsTPxOJZI{1qqWtJKe-|yer5F>Ag6C2ZUnorT*1gf1)Gb`_1x3tIzwaUq_S#BUl3WB|ildXBKMw%$p`9p0c*a(U9| zua#O1dlGVT1$2EH_3v9C9&}2|aB04%4k)wu>NKN4Xn&VI+c|oe8Ulf63_>3s8bpnS zGT)_wDfcqlkse^%74RWLZ|en8NO0KCOsz?iJc^Wx8-GY3$paDte0r+%z))}7^Jpz{V9tnTQ@F%zkh70@<3vUw z%)TLY-LAn`$G@LG6>v|rp5eB|DNvJ;IKK?TL^kQ;A6>s7B}Tbtg|<1>pYR|ABEi>? zXWU^pB&4I8!%Vp2h{;1#!$`>aAmZ0Ag39A989i$Ca!0lxSkqn=tlM(VmN0`5e14E; zfhn`sFG+(uO_Mq(j_3uvpB5X{m?0-`zCk9)|;63+17fE^2Y9JLslN&Y3C;%{IYGejl!$6 z|IrdHHou}0))aIGO%OulKEJOPCO6qiH+Ct&q8St`EE>AQ+f42)3-r!4u4x3OA57uH zQh9dXKBt%+4EF?!-1TCjp>4>bI>lilpYv@D@(@z&`Nk-B;Q3ufDn~Z%Vu{I2+!V6V zvkMa#gocdGr}FsyP61rwqCFKtxc)M^CKarja6)QImb&Ep z4LW$-rMw8xr4ueDy}fc-WIf-vAG_TBtItuD^ggs_K@|e&FZ$~va`8_wGFaAGI63ox z`OQ7~d!cMqn#R0j9|nJ}wh{gXrsG}icAC6wukj!|Y5AcPdTdlf1Z@Jh-#vSa8$66!U?t9)R{4BmWv*>NOo)TMgqbW9Yb#F_* z(J%C5B53_7R)K*pc1{e{dQ5-()#&`VZQNqkg&FQuEluZw2TjM1axGU3(#L{#h|M2Z zw4RKo9o5T^a<*Npu_)XV8&V?iY#;9ssw1$f+23@UeCW9=Qg!CUYM18S0S|=7;?H*d zBIrXq`l~E2CIbKWR8%y&A2{bbf4nBU?EP@B+Uvt(O8Y&7mEn6G!sI3Op0+PzNZt-R zypUW_}bJQ(zKeR`4q2-^K<1_G_dH7D1ONhbN(CNW{honiG!Tq z%IP)9sq$6KILztipDiRb!+IU+soI+oxZ)???#uNT{hRS-weYC_4+k#GY{Kq$$Jf1U zcx5z-tKoiVzGe#djB6~%-3;G#{23-Q*sR-i#g$2DaGQfWcSA*ST{RLHfYXMM?4L%>mreX#08hbmx)ep>L{}Zq)Hn z0<*jo?&p{xtIHdA8+%`0qnQgVWL&|NsalTM$vO9K<#__L&onbuO|GK#7qO+~=hzCS zkvvP&lwCAQ>|a%!-s|&chTQbi+3#3I^=_YdGWKDR`+4MlO$kjSA#r^4)a5$&o7_}2 zvgdt)0etHMDK4U}+Y933muO6Yn$}YOU&ypkN30`^Lie-_s2ex-(~nK$J)C%tWQZmw z=Gw2diI0zOmY27%X??((ZdRYk8Oib5Rp6p4 zbKo#X1WURkx|18vwKLXz5$YFZbQ(vvpV*7E#VSZ>YeGYhF9&>J$L3KE^ETFMgDsNF zIQheqA7#6uMe=e>p@jskPxR8fUT!|^ewgAz7ih`Q%ow<}5Oj?QqJ zxz#v-xIF{@gCTJLOFtyiUgxh1(8{E9qV%23L>5lO9ev3hN#z<; z9?A9F-V3>7Iax)^Oc=-eh7H#*4!+o|?4PY^)>{10QT$MwKdYxP-hV>22m=D94nL>( z#)W16Ha4jDycNWA?bmb|cOQR8-l}JWp{5gK(~>&Lh}?RS=VML+zWw?$KxEnL=Gj>7 zdb#8?5N6|d*Yd6^BnVGCQJ*!SzvnTMsdyJPBdv5T(BIiGD`vzA@ADy+HjFmOJhHo&8*>aewbkrO^kkZ>fOfll9z(%QSej~)vE9_*MagdNi;KFc9&KKmPMRd94NE+BZ-u_dCq z0L#oeeK53I`*&CG!?z6=I{94F<5Q!Jm1rKnm9924sYz8}8PliI=ROxXOe((}Oe}Yy zTp~tl+1o$$WKHHPdk(*9dp5GvSiN~aks=j7wt#$_&mAJ+ZQDt9?cJP_T%2-+y7J>k z>9@jiU|?D1bF5O!bApVZ{h8TZ@H$Ku{RhB{Xb#V=vCQE(kzWUArmz1tFQp(XiZv-JG< z$`K*ffqeDHkE1tc7g|0PpsViKr6otxZz*&i{kCH7Jn*5l11`oNap2+6e?$6~P~3FX z^}j@AWfVc=H^HEDmACGxYR^c_BSYGa@i%S#eK(uAAf_~c!1Pcm|NHb}>5Ab$Fxbx$ zXX&BKXlAv9Ao?1=U2& zX8~sx+f))byQqP22##&!!DWn{saT)yDM-VvaIoaCcTA1rafC4V;`Q61?|1P8XYuYx z{lq=l%;Ss;YL{C|Zt4+UPipF+-+M+ajK08Hlt2|nvctZk{6=MFAV|klz%R&9fpY;J z@V!~u9b&ajx6;VPuoSAC%%Mmi^!V|EEG2XO$y#YhOgH+`VI(YQf4Q^C?zG@mDCU0+$v!EYI{G~FSf>vbTA}q#1P)IEFbaD+lSY*jGYSqZ z+1PA!1^eq2Dk(x{h6rftSnBhEni5yGR#oIkiDgQ~anf^hbICFrrsz{FjN!Kt1FguY z(oJ;ao&EB~6sj}fPu`Y;deV(*0zbOj!JOf^bKbS~=(4WLGHx(wE(GvnMIzmwjKjs| z-+^BjMQnC?zJjWQF zI;ZXJP6D*MY$gw2>8(7m7m$kMGEh^7VpC&)7n~&WT&*}eAT5oKkIxUt44@yKL}Vl& z$-)aJtguX3+PQ$xkr-^%db@3lT1ED&*7XHtOci7y-eNV}>*rBv3yv|leN<~~jF*^k zO8_5EqQ>D+-&4T2?#AQuiJ(F2PYQ6!iE`hzKFbeVPnm@ByIHb0wW(7@x6`xh`JYFk z9z8fv+Kaa{=CwM{EjPi=hbg#1^n_bldH4V?l}G42OMV<({OYsow}a#yC=d2_f3uRN z6pO8=Xh>9Pm{I?sb1%=9Dx+UK$eB*paX)`RQH70bNodd>8S1(qwoF{5`igqA()NcA z`)|9XBIPYEb!Qf%HaY)iy2IKu>(U8*o?UyJ$|1#Rl4HqyfLFKpL{cGejV$C3XPbb4 z5hDJg^|)2b)w(bBPq5jEBv>RwLk)jy&fFIidm3RF z;yG$|$eb%Jm#UA3MT9Ybd{FSv;`pMJREI(SQS(aixH!Ci z(*Z`qjmfo@u?nB2rV$hzt@hT#pG?UXiR_%A;@gN$&oaEIdEb2Kc4^a}lcZ=JZ)!zL2g8Wyk{3*h* z`NmIsM5=lcsP_^{!i^SfS0siUu3O*#uSYpUGOHMlWgn`2Sb^JGe2y1W()UT)Dq+q=| zPsO%`Go0dL`&X|XKJQM>!{c@G&IgC5!hD>All9d1N2!tojbPN!Z}9yH$A`v_S9$50 zntD~au2nE5D8g~aV2Y}V;$kxC{=_wGfm*GzO^GAX>9t)OJk;KWo{=RVxq1@M68@1slkP-L$>NX7Oep!$F4GX4YYO*XP4dcH6**`9(uM)H+664g$D9|)o2M%vR!nNcE#LUtmPnn}?l>BUAY{2Xd58CrUzB=o zblyWqP z|B?pV>diGYn)S|qgTYVEy}6*;OnS%nexRI`h} zMEgN`J8h9FYp9ea(nHcYvX5<%)yipxODe`8j6NB5ua_Io1C8;8W7z$o9`ywL`b75*B|C}$X)!z6Yabk% zOVn#5PVFMHu-K*6D5ZvTeuKaoi-NT&Lcr?{7>RJLt!bXTm^HUw9TtP`{Da>!n^37m zLk^_L$$@Sy;YNSn%a|1nT}fVT@im}wKQ!qjgjyv0SH}}OCTI$7@gvar(LhOboTZQ< zRb*21`(*z_qtpt^1By-Gg2=p}i&!;vzvr!msS}K{A&6>9OI4iq2t7(12v$~Y0VnX< zM_d%JMR$dK%I^X&12QbCskVpXlEl_ieZw()tjA@<*atDLEfqA)9wrR0dM+^LYIi>A z!Tog$&L%*^YTpo9jL^Z^SnT<@bYPD5g=XlDgL?SI$>aCQU6}bt$3sNey(C@}+(pd^ z8V9|pFEF3Ejb6MoIq5&7g4;n@a_kC&+#D zAdg@?@d*iGg%V)TpB|&2m6nE}M4Xtd@zQJbc#(&U>NrMS<+Os?-}&{Eo1)BDF27G? zP?O=s^cEdaqj1-ew%@IBN2O~Os10*BhUSUcd2Cp%MUXzoQ@0HG2%ZebgVy67t4oW@g|Vyn-7M3}@0eKOo=esB2sxn#p7( zw;XqQXg268pXQ&hTYt`Cyz)s1<+zG!im1?pvXVtsP7cyAPDZ~HJv8QoL<_St1`~lC zF^|6IrkGXR+&%OAER%AJq1#vG_u1YWfA-Sh+RSfEsh|3~o~1&8HHo?pnd}$^-&YEW z{v_&ZwqlPHiWtJ4XNV>f|B@2w8TK$j>ZO6!Ft&n)b+VP0E^Th&BfA%qak`~PZDY-) zVKe1uo1^Zr=-+V*^Xz*C_(%qJPZqXMW0@xOJiTxeIu}-n(Izm%$z3;vmbcL|KLn{zlL!&^aaxZuDLz`(96kN3rY#Kt;^c4v)*05(7v?1 zymK^BlUZ|iVj0b~Yuz5ttBro?S^B5vK77X;{C+(ncC$@7C)2n|Y=#{#Pqq`xtI_0gp*;L`YNc=Dqzeome{UT&j=1>4 zH?+n&czNGZ*x}BvUmWHFW#iq-h-s7^x=-p+`0}dr>=TjRZHnW(rAyQF_;ry)OKDMU0@lEd<@oxVMV(Q9? zw9fJzgbPO+rK4p_3nN((C)uVmA*%}9IhirE(xXC%bt^$h*)RGC$m}(RLUg634+wSd4f69xdQYsn;MO^XgSH-|4G>_*c5Y z&jN^(OG~XNC{7gAiz~C>8a*bba~M~zcE80|o12+Qio9!T`$eZDp-cO8>tjcJ(Q+L& zzY&g&M%x_U^5nO=*=6SfZ|`wSzQ>%bw$+4KUZiBgMs1N-xSacQDa7L=`j%Fh`Sn|* zLt~EYW1P`Ys88sn%L`(^=;C+|T;+EMzhv2ti;moBl#Iyg%dZmjVYN|6 zlHvVIuDGvCUh{2xcjp(Xx%k<(7DLy2P1Y%Ie4Kk3O7%Xv`gUWc)*oXvZQ{kdT>1KF z#~#QBP;m0IHu_svcUCzr7oA|Zlej!red)76oGI!P`>n_0S9^$;rlenO0Q@7|dl?%a-h zv|XcCVSm6uYz60hXFYkF=v!woP?S~k^l9wTWB22kZ%d=~ptJ3W<4!9tKkJd?7)zd=RcMbpN?a>n9-n7;Hdf)Ty}5Y{2bZI| zuL^}i{k(DB=y7S*k;IEwQZBsZj^gU5yi{u1behSHu!*y{vP4FP(>m6o!#)KeFFRu` z>*=1Ngha#au8OEzn&xlviqygwwLeYc)4WjgWVH$;KcIDKu-ugiR4CAU?Y1v#?z34E zW^pY{yC)Y4A48_Gnjd=gyu&S2l4gTWW+!%%-lg~)JA2XT?6KloXZ)B+H0hh%N8eo; zPjO6M>|}6#IWn1rBc4vInyw8~8{q_zar_f^7S^Dfo)-8>xEk`zXb}rwyb91Kp z1+JeWBO`n%N;2|F=$M#9$%Gk|z@tJYPuF3czPH2R9c$%UZT|8$iEE*HUgZ`6gW8Vg zS{YTFian-R-DeoF0|{rxL0~g_@3g-cTO$DHZZe(Bb4V}mjjaF7R$Yu3%U^ibE90OQ z6HX|v>s?~8-p71e3DDh?^70;hmKXl{vq2pS+=YxYl?{~p!P@e9PbbBO`j<13>4~c7 zge-F+ZQ}SO(AP?MkHmM0oTMD~_roX58!{Ijxw%BNw2X)JsXeDJQ?#&1CM7kXy|d{_;dL!(>r#dBq843 z@$yz1)bHO@h-M4Eu6RU~R_Dk9mr1Y6$%;6Zj(W+a*a+2+oBJIw{jZe+q(%`3kn_eGshow=}s@+ z%yDIxy`rbav%D2iM9U$L$x(b&W693Oq5r*e1D4`bvFPG(Jmu-aSN)!1=9-h``;o75 zcy%K&P$&zLcho43V%D*CQ!kN%3gF)KoO*Vsdub&+aXS z_-@M1UhX5h7y*K#k8L=>%ePBU+K61rgzLr}DX5f6ujkI+6GovX1wWia zp%ls)gxN5<1u(UgpPr!(RLGl^-KrXCPKG{i$>-RI6PlbPuJ8AFjBC!4iSlXo+NzW* zF+@}Ii+W8=(09_Jr;X_~%`=kn$@hjVx$`JzZ!Cb=j(5w8YaMnD5E zpX~iO_|32L@tk<%;C(JrUGz3_Qu4_=KH^WoO<1B@3=|Xddo3ME ztQMG2dQV%ldTW1y5bpHP{nlRl^}}6RB-m;1a_|dz#T4?PosO#u2c$Wa#O)Cvo#n3n3(5m_`*hC5E@CRoGwQuH^iyM{@inwRGYv0-elFzb6~dzd#D=T z2Hy~w=oJ2S6M8M-*Hien$rpb+w{+ym2qYzYnyhLTD>zduj+3OP zk<*Bve}7A^NNcI@@9)MSx|=yv^_WhaT-EJUMV?j?CkkbSP9}(kn)H;*%XBCx>|@NZ zEF?Xq$fzhEyD$1V`gA^xmcFtn4Bxm?RlN~w$@URCwxNHQ=Ihrs#PdsBY00WFb%p}F zO>b_GEy(9|>xbwQ+1BXhYJG^oRsFyeSDHb0$+5J^s+1pRr=&%Z065?A-&zfatuT2AeJu2 z>sc;1Y_w8tnKFCF?`b*ZRy8h=W_;7isA`ofI#5}577adK2*e_Eu-h`uR&Ea>WRTKM z3JJdGi5fI-IxaZ zk8M+)Gk<;O_@_Q5U)!9g)>|ZT87ZvOx2G5IHgB9PbDUv zIJ~a1{6n~?^vhRAijOCul5Dhn1lZW-uFtdC)CyR(75W}_bqimKdauSsCbe%@vk`w% zzTf3>W$~~NT~Y_KmRgQ&6Em}ycQ3WJ4zw5?J!WQR!V|ZU*S1vF(h7d&uaRvr_S9ED zKp}QUW_3~h_M^{p!UCuXC4n(Vb2S@@k2K@uRS^;SD?$Hlgp%OiI?;n3U+?xnJOi_T zIekpU+B>>Lda=%h!a3t>f@I%38SdiUhxGCX+l;ZF&qe0{w}H!WM?WV=OS_)}(Aq9s z;#LlGEZ>suT%KHu!P(x3Yq;sLyz*kMMxpXs>g)jh*3w;)BSnRs*f(#5Y3S)ibtz!W z*`VH&H~Dpx&Z2aOu4Zv#fZ@GZfL-q0gQE=j+>b?vhOYd)q4}~g+nU?Ot34IljgLCz z9~s{wu!H2T;zlBjP;A-Hl3ADvyRysM;<}BECOSGrv$ryS>vTwQ3ELJZxKs+RCsWXV zTZ-l|NT+0IlJ|4Lu`uTvyaUhK6`7MBUYGmGhSbBDb9N6X_%!1dBIqYJ%BRb@8=t0H zbgSdhcw=E2@r4K>i}2*_b~V}bs{<`KaA5~hSY=T0byOl#AMw=6KbHy(#Q8ZLY+7S1 z4%;N=ovTYTvQYZWZfR@2(9G1IDMaI4(fZ1W5w7Tb9l3G%L?W{b`8+>&AD#t#Jgy)c z8}gz2zxyFAKR-XLndgoNYC~ou)RglSdd=ob%d0J|;@wR_K7BdrAK?9a+Y)B-y80Yj zY%_2`g)l2rbSi*U_PfxNGlpWLrJlmMzPf;db{ra&3gR@#&+Y8QjQH6%i zdl5_AJF#nP>kKs`zKWf;$G;iF!m6mUifUDCvPMTm;7l9^E2~n7eOvf>^WIii_U}8r zWC=&T@~As92|bP$(juDCtNBM@`i?pxjkEDHYhQybYK`TU?`7HCn=mzh8@!`lUH))i zOvt$LHxJrq`gFnusbHA~5wjqg2PHg>jWK}_-PQhg5>X!9cmlUOkf#ox2d}Tg?1oS6 zd1QhkpIgZLL_QMt{*V38#{Xa{qBe|<_VeU4$Bcp4*{HH5Vwg#!7GbS*#=eN9cLg@baGQ`vOh-rbCJYLVDF3^O+3p$bCC(_1Z$Dq%NW2RJqcjM{ zz6Zg}!s|l8gbRLTC=^*9R^d<_Jd#{Ky${{5Poq#M7Xqzu4dgTN5)DGqWBI=x-2cSpN9!tD*#>bVcGrXX1=J;%|C0IIAff7fEvAyPtZxj`6~4L_uypl_taRzZ>{g5 zHi#zY<|w?9c1zqEa@+6b=IoskJZKoKZ^#YXtKKUis#vdH%xM^1E$CFj_wq1Z({(@d z(=#aCFSlehc;=kP%59(0Hl9`GxawCX@4Rnmxnjb4#8y@1%0!g-%Fz+eYxn`{r9Z36 dWX1Fu+8sY_o$5sDUgU2?g`@;?pFV%{e*w?I>G1#n literal 0 HcmV?d00001 From 46fd0846de3acd38feec35ab23977bee9b760344 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 21 Jan 2025 13:16:42 -0800 Subject: [PATCH 058/328] Handle activation disposes correctly (#128) Fixes https://github.com/microsoft/vscode-python-environments/issues/127 --- src/features/terminal/terminalManager.ts | 47 +++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index da16015..94dcca8 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -157,10 +157,18 @@ export class TerminalManagerImpl implements TerminalManager { const execPromise = createDeferred(); const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); const disposables: Disposable[] = []; + let timer: NodeJS.Timeout | undefined = setTimeout(() => { + execPromise.resolve(); + traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + }, 2000); disposables.push( this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { if (e.execution === execution) { execPromise.resolve(); + if (timer) { + clearTimeout(timer); + timer = undefined; + } } }), this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { @@ -170,8 +178,18 @@ export class TerminalManagerImpl implements TerminalManager { ); } }), + new Disposable(() => { + if (timer) { + clearTimeout(timer); + timer = undefined; + } + }), ); - await execPromise.promise; + try { + await execPromise.promise; + } finally { + disposables.forEach((d) => d.dispose()); + } } } finally { this.activatedTerminals.set(terminal, environment); @@ -191,10 +209,18 @@ export class TerminalManagerImpl implements TerminalManager { const execPromise = createDeferred(); const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); const disposables: Disposable[] = []; + let timer: NodeJS.Timeout | undefined = setTimeout(() => { + execPromise.resolve(); + traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + }, 2000); disposables.push( this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { if (e.execution === execution) { execPromise.resolve(); + if (timer) { + clearTimeout(timer); + timer = undefined; + } } }), this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { @@ -204,6 +230,12 @@ export class TerminalManagerImpl implements TerminalManager { ); } }), + new Disposable(() => { + if (timer) { + clearTimeout(timer); + timer = undefined; + } + }), ); await execPromise.promise; @@ -348,7 +380,16 @@ export class TerminalManagerImpl implements TerminalManager { return env?.envId.id === environment?.envId.id; } + private isTaskTerminal(terminal: Terminal): boolean { + // TODO: Need API for core for this https://github.com/microsoft/vscode/issues/234440 + return terminal.name.toLowerCase().includes('task'); + } + private async activateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (this.isTaskTerminal(terminal)) { + return; + } + if (terminal.shellIntegration) { await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); } else { @@ -383,6 +424,10 @@ export class TerminalManagerImpl implements TerminalManager { } private async deactivateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (this.isTaskTerminal(terminal)) { + return; + } + if (terminal.shellIntegration) { await this.deactivateUsingShellIntegration(terminal.shellIntegration, terminal, environment); } else { From 21b79e51e3316e2afaf764b6915f017cc72225a2 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 21 Jan 2025 13:17:01 -0800 Subject: [PATCH 059/328] Fix bug with updating activation state for terminal activate button (#126) Fixes https://github.com/microsoft/vscode-python-environments/issues/125 --- src/features/terminal/terminalManager.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 94dcca8..9a6decb 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -28,6 +28,7 @@ import { traceError, traceVerbose } from '../../common/logging'; import { getConfiguration } from '../../common/workspace.apis'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; import { waitForShellIntegration } from './utils'; +import { setActivateMenuButtonContext } from './activateMenuButton'; export interface TerminalActivation { isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean; @@ -272,6 +273,7 @@ export class TerminalManagerImpl implements TerminalManager { await this.activate(terminal, env); }, ); + await setActivateMenuButtonContext(this, terminal, env); } } From 027308ed68f8bdb76cf7bec01ca82fcff94035c3 Mon Sep 17 00:00:00 2001 From: Abdelrahman AL MAROUK <72821992+almarouk@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:18:02 +0100 Subject: [PATCH 060/328] Quote arguments systematically when calling conda (#121) Moved quoting conda arguments to `runConda` to systematically handle paths with spaces (related to https://github.com/microsoft/vscode-python-environments/pull/113) --- src/managers/conda/condaUtils.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 0e44d0d..13a4560 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -143,6 +143,7 @@ async function runConda(args: string[], token?: CancellationToken): Promise(); + args = quoteArgs(args); const proc = ch.spawn(conda, args, { shell: true }); token?.onCancellationRequested(() => { @@ -586,7 +587,7 @@ async function createPrefixCondaEnvironment( } export async function deleteCondaEnvironment(environment: PythonEnvironment, log: LogOutputChannel): Promise { - let args = quoteArgs(['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]); + let args = ['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]; return await withProgress( { location: ProgressLocation.Notification, From d13ebba88508979212e119e6b591bc30016dc375 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 23 Jan 2025 11:54:45 -0800 Subject: [PATCH 061/328] Add tooltip message to indicate selected (#134) --- src/common/localize.ts | 5 ++++ src/common/utils/pythonPath.ts | 10 ++++---- src/common/window.apis.ts | 5 ++++ src/extension.ts | 1 + src/features/views/envManagersView.ts | 33 ++++++++++++++++++++++++--- src/features/views/treeViewItems.ts | 15 ++++++++++-- src/internal.api.ts | 18 +++++++++++++++ 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index fcda9e5..ab39e50 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -138,3 +138,8 @@ export namespace ProjectCreatorString { export const noProjectsFound = l10n.t('No projects found'); } + +export namespace EnvViewStrings { + export const selectedGlobalTooltip = l10n.t('This environment is selected for non-workspace files'); + export const selectedWorkspaceTooltip = l10n.t('This environment is selected for workspace files'); +} diff --git a/src/common/utils/pythonPath.ts b/src/common/utils/pythonPath.ts index 451da4b..bdc469e 100644 --- a/src/common/utils/pythonPath.ts +++ b/src/common/utils/pythonPath.ts @@ -2,7 +2,7 @@ import { Uri, Progress, CancellationToken } from 'vscode'; import { PythonEnvironment } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; import { showErrorMessage } from '../errors/utils'; -import { traceInfo, traceVerbose, traceError } from '../logging'; +import { traceVerbose, traceError } from '../logging'; import { PYTHON_EXTENSION_ID } from '../constants'; const priorityOrder = [ @@ -47,10 +47,10 @@ export async function handlePythonPath( return; } reporter?.report({ message: `Checking ${manager.displayName}` }); - traceInfo(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); + traceVerbose(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); const env = await manager.resolve(interpreterUri); if (env) { - traceInfo(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); + traceVerbose(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); return env; } traceVerbose(`Manager ${manager.displayName} (${manager.id}) cannot handle ${interpreterUri.fsPath}`); @@ -66,10 +66,10 @@ export async function handlePythonPath( return; } reporter?.report({ message: `Checking ${manager.displayName}` }); - traceInfo(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); + traceVerbose(`Checking ${manager.displayName} (${manager.id}) for ${interpreterUri.fsPath}`); const env = await manager.resolve(interpreterUri); if (env) { - traceInfo(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); + traceVerbose(`Using ${manager.displayName} (${manager.id}) to handle ${interpreterUri.fsPath}`); return env; } } diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 55f06c1..ed9611a 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -3,6 +3,7 @@ import { CancellationToken, Disposable, ExtensionTerminalOptions, + FileDecorationProvider, InputBox, InputBoxOptions, LogOutputChannel, @@ -290,3 +291,7 @@ export function createOutputChannel(name: string, languageId?: string): OutputCh export function createLogOutputChannel(name: string): LogOutputChannel { return window.createOutputChannel(name, { log: true }); } + +export function registerFileDecorationProvider(provider: FileDecorationProvider): Disposable { + return window.registerFileDecorationProvider(provider); +} diff --git a/src/extension.ts b/src/extension.ts index 142da28..b6880ee 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -212,6 +212,7 @@ export async function activate(context: ExtensionContext): Promise { + managerView.environmentChanged(e); const location = e.uri?.fsPath ?? 'global'; traceInfo( `Internal: Changed environment from ${e.old?.displayName} to ${e.new?.displayName} for: ${location}`, diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index 2c04ade..5a131fc 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -1,5 +1,5 @@ import { Disposable, Event, EventEmitter, ProviderResult, TreeDataProvider, TreeItem, TreeView, window } from 'vscode'; -import { EnvironmentGroupInfo, PythonEnvironment } from '../../api'; +import { DidChangeEnvironmentEventArgs, EnvironmentGroupInfo, PythonEnvironment } from '../../api'; import { DidChangeEnvironmentManagerEventArgs, DidChangePackageManagerEventArgs, @@ -32,6 +32,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable private revealMap = new Map(); private managerViews = new Map(); private packageRoots = new Map(); + private selected: Map = new Map(); private disposables: Disposable[] = []; public constructor(public providers: EnvironmentManagers) { @@ -44,6 +45,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable this.packageRoots.clear(); this.revealMap.clear(); this.managerViews.clear(); + this.selected.clear(); }), this.treeView, this.treeDataChanged, @@ -99,7 +101,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable const views: EnvTreeItem[] = []; const envs = await manager.getEnvironments('all'); envs.filter((e) => !e.group).forEach((env) => { - const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem); + const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem, this.selected.get(env.envId.id)); views.push(view); this.revealMap.set(env.envId.id, view); }); @@ -142,7 +144,7 @@ export class EnvManagerView implements TreeDataProvider, Disposable }); grouped.forEach((env) => { - const view = new PythonEnvTreeItem(env, groupItem); + const view = new PythonEnvTreeItem(env, groupItem, this.selected.get(env.envId.id)); views.push(view); this.revealMap.set(env.envId.id, view); }); @@ -227,4 +229,29 @@ export class EnvManagerView implements TreeDataProvider, Disposable const roots = Array.from(this.packageRoots.values()).filter((r) => r.manager.id === args.manager.id); this.fireDataChanged(roots); } + + public environmentChanged(e: DidChangeEnvironmentEventArgs) { + const views = []; + if (e.old) { + this.selected.delete(e.old.envId.id); + let view: EnvTreeItem | undefined = this.packageRoots.get(e.old.envId.id); + if (!view) { + view = this.managerViews.get(e.old.envId.managerId); + } + if (view) { + views.push(view); + } + } + if (e.new) { + this.selected.set(e.new.envId.id, e.uri === undefined ? 'global' : e.uri.fsPath); + let view: EnvTreeItem | undefined = this.packageRoots.get(e.new.envId.id); + if (!view) { + view = this.managerViews.get(e.new.envId.managerId); + } + if (view && !views.includes(view)) { + views.push(view); + } + } + this.fireDataChanged(views); + } } diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 7197c87..842ef8c 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -3,6 +3,7 @@ import { InternalEnvironmentManager, InternalPackageManager } from '../../intern import { PythonEnvironment, IconPath, Package, PythonProject, EnvironmentGroupInfo } from '../../api'; import { removable } from './utils'; import { isActivatableEnvironment } from '../common/activation'; +import { EnvViewStrings } from '../../common/localize'; export enum EnvTreeItemKind { manager = 'python-env-manager', @@ -66,11 +67,21 @@ export class PythonEnvTreeItem implements EnvTreeItem { constructor( public readonly environment: PythonEnvironment, public readonly parent: EnvManagerTreeItem | PythonGroupEnvTreeItem, + public readonly selected?: string, ) { - const item = new TreeItem(environment.displayName ?? environment.name, TreeItemCollapsibleState.Collapsed); + let name = environment.displayName ?? environment.name; + let tooltip = environment.tooltip; + if (selected) { + const tooltipEnd = environment.tooltip ?? environment.description; + tooltip = + selected === 'global' ? EnvViewStrings.selectedGlobalTooltip : EnvViewStrings.selectedWorkspaceTooltip; + tooltip = tooltipEnd ? `${tooltip} ● ${tooltipEnd}` : tooltip; + } + + const item = new TreeItem(name, TreeItemCollapsibleState.Collapsed); item.contextValue = this.getContextValue(); item.description = environment.description; - item.tooltip = environment.tooltip; + item.tooltip = tooltip; item.iconPath = environment.iconPath; this.treeItem = item; } diff --git a/src/internal.api.ts b/src/internal.api.ts index 59165bd..fb38d49 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -71,8 +71,26 @@ export interface EnvironmentManagers extends Disposable { registerEnvironmentManager(manager: EnvironmentManager): Disposable; registerPackageManager(manager: PackageManager): Disposable; + /** + * This event is fired when any environment manager changes its collection of environments. + * This can be any environment manager even if it is not the one selected by the user for the workspace. + */ onDidChangeEnvironments: Event; + + /** + * This event is fired when an environment manager changes the environment for + * a particular scope (global, uri, workspace, etc). This can be any environment manager even if it is not the + * one selected by the user for the workspace. It is also fired if the change + * involves unselected to selected or selected to unselected. + */ onDidChangeEnvironment: Event; + + /** + * This event is fired when a selected environment manager changes the environment + * for a particular scope (global, uri, workspace, etc). This is also only fired if + * the previous and current environments are different. It is also fired if the change + * involves unselected to selected or selected to unselected. + */ onDidChangeEnvironmentFiltered: Event; onDidChangePackages: Event; From 2dbf4af59e3b5cfd164cdc1bc92851baeb32fc39 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 23 Jan 2025 17:17:46 -0800 Subject: [PATCH 062/328] Ensure activate button is not shown on task terminals (#131) Fixes https://github.com/microsoft/vscode-python-environments/issues/130 For https://github.com/microsoft/vscode-python-environments/issues/27 --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/features/terminal/activateMenuButton.ts | 7 ++++++- src/features/terminal/terminalManager.ts | 11 +++-------- src/features/terminal/utils.ts | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/features/terminal/activateMenuButton.ts b/src/features/terminal/activateMenuButton.ts index 69e9f6e..896b232 100644 --- a/src/features/terminal/activateMenuButton.ts +++ b/src/features/terminal/activateMenuButton.ts @@ -6,6 +6,7 @@ import { PythonEnvironment } from '../../api'; import { isActivatableEnvironment } from '../common/activation'; import { executeCommand } from '../../common/command.api'; import { getWorkspaceFolders } from '../../common/workspace.apis'; +import { isTaskTerminal } from './utils'; async function getDistinctProjectEnvs(pm: PythonProjectManager, em: EnvironmentManagers): Promise { const projects = pm.getProjects(); @@ -99,9 +100,13 @@ export async function setActivateMenuButtonContext( terminal: Terminal, env: PythonEnvironment, ): Promise { - const activatable = isActivatableEnvironment(env); + const activatable = !isTaskTerminal(terminal) && isActivatableEnvironment(env); await executeCommand('setContext', 'pythonTerminalActivation', activatable); + if (!activatable) { + return; + } + if (tm.isActivated(terminal)) { await executeCommand('setContext', 'pythonTerminalActivated', true); } else { diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 9a6decb..f68ca19 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -27,7 +27,7 @@ import { createDeferred } from '../../common/utils/deferred'; import { traceError, traceVerbose } from '../../common/logging'; import { getConfiguration } from '../../common/workspace.apis'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; -import { waitForShellIntegration } from './utils'; +import { isTaskTerminal, waitForShellIntegration } from './utils'; import { setActivateMenuButtonContext } from './activateMenuButton'; export interface TerminalActivation { @@ -382,13 +382,8 @@ export class TerminalManagerImpl implements TerminalManager { return env?.envId.id === environment?.envId.id; } - private isTaskTerminal(terminal: Terminal): boolean { - // TODO: Need API for core for this https://github.com/microsoft/vscode/issues/234440 - return terminal.name.toLowerCase().includes('task'); - } - private async activateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { - if (this.isTaskTerminal(terminal)) { + if (isTaskTerminal(terminal)) { return; } @@ -426,7 +421,7 @@ export class TerminalManagerImpl implements TerminalManager { } private async deactivateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { - if (this.isTaskTerminal(terminal)) { + if (isTaskTerminal(terminal)) { return; } diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 3b66337..124ff29 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -12,3 +12,8 @@ export async function waitForShellIntegration(terminal: Terminal): Promise Date: Thu, 23 Jan 2025 17:18:04 -0800 Subject: [PATCH 063/328] Include native finder conda when searching (#133) Fixes https://github.com/microsoft/vscode-python-environments/issues/132 --- src/managers/conda/condaUtils.ts | 23 +++++++++++++++++++++-- src/managers/conda/main.ts | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 13a4560..d503d93 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -32,6 +32,7 @@ import { showErrorMessage } from '../../common/errors/utils'; import { showInputBox, showQuickPick, withProgress } from '../../common/window.apis'; import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers'; import { quoteArgs } from '../../features/execution/execUtils'; +import { traceInfo } from '../../common/logging'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -55,7 +56,7 @@ async function setConda(conda: string): Promise { export function getCondaPathSetting(): string | undefined { const config = getConfiguration('python'); const value = config.get('condaPath'); - return (value && typeof value === 'string') ? untildify(value) : value; + return value && typeof value === 'string' ? untildify(value) : value; } export async function getCondaForWorkspace(fsPath: string): Promise { @@ -113,29 +114,47 @@ async function findConda(): Promise { } } -export async function getConda(): Promise { +export async function getConda(native?: NativePythonFinder): Promise { const conda = getCondaPathSetting(); if (conda) { + traceInfo(`Using conda from settings: ${conda}`); return conda; } if (condaPath) { + traceInfo(`Using conda from cache: ${condaPath}`); return untildify(condaPath); } const state = await getWorkspacePersistentState(); condaPath = await state.get(CONDA_PATH_KEY); if (condaPath) { + traceInfo(`Using conda from persistent state: ${condaPath}`); return untildify(condaPath); } const paths = await findConda(); if (paths && paths.length > 0) { condaPath = paths[0]; + traceInfo(`Using conda from PATH: ${condaPath}`); await state.set(CONDA_PATH_KEY, condaPath); return condaPath; } + if (native) { + const data = await native.refresh(false); + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'conda'); + if (managers.length > 0) { + condaPath = managers[0].executable; + traceInfo(`Using conda from native finder: ${condaPath}`); + await state.set(CONDA_PATH_KEY, condaPath); + return condaPath; + } + } + throw new Error('Conda not found'); } diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts index f234b2a..bfcae68 100644 --- a/src/managers/conda/main.ts +++ b/src/managers/conda/main.ts @@ -15,7 +15,7 @@ export async function registerCondaFeatures( const api: PythonEnvironmentApi = await getPythonApi(); try { - await getConda(); + await getConda(nativeFinder); const envManager = new CondaEnvManager(nativeFinder, api, log); const packageManager = new CondaPackageManager(api, log); From c84c3881955f28d7382f6663321029cd742dedc6 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Mon, 27 Jan 2025 08:21:50 -0800 Subject: [PATCH 064/328] Add get package copilot tool (#135) add new copilot tool `pythonGetPackages` that can be called by the user or other agents / tools --- package-lock.json | 14 +- package.json | 36 +- src/common/lm.apis.ts | 4 + src/copilotTools.ts | 92 ++++ src/extension.ts | 6 + src/test/copilotTools.unit.test.ts | 228 ++++++++++ src/test/mocks/vsc/copilotTools.ts | 56 +++ src/test/mocks/vsc/extHostedTypes.ts | 9 +- src/test/mocks/vsc/index.ts | 1 + src/test/unittests.ts | 2 + vscode.proposed.chatParticipantAdditions.d.ts | 397 ++++++++++++++++++ vscode.proposed.chatParticipantPrivate.d.ts | 125 ++++++ vscode.proposed.chatVariableResolver.d.ts | 110 +++++ 13 files changed, 1068 insertions(+), 12 deletions(-) create mode 100644 src/common/lm.apis.ts create mode 100644 src/copilotTools.ts create mode 100644 src/test/copilotTools.unit.test.ts create mode 100644 src/test/mocks/vsc/copilotTools.ts create mode 100644 vscode.proposed.chatParticipantAdditions.d.ts create mode 100644 vscode.proposed.chatParticipantPrivate.d.ts create mode 100644 vscode.proposed.chatVariableResolver.d.ts diff --git a/package-lock.json b/package-lock.json index 8058ece..4e1cd6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.93.0", + "@types/vscode": "^1.96.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", @@ -715,9 +715,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.93.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.93.0.tgz", - "integrity": "sha512-kUK6jAHSR5zY8ps42xuW89NLcBpw1kOabah7yv38J8MyiYuOHxLQBi0e7zeXbQgVefDy/mZZetqEFC+Fl5eIEQ==", + "version": "1.96.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.96.0.tgz", + "integrity": "sha512-qvZbSZo+K4ZYmmDuaodMbAa67Pl6VDQzLKFka6rq+3WUTY4Kro7Bwoi0CuZLO/wema0ygcmpwow7zZfPJTs5jg==", "dev": true }, "node_modules/@types/which": { @@ -5995,9 +5995,9 @@ "dev": true }, "@types/vscode": { - "version": "1.93.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.93.0.tgz", - "integrity": "sha512-kUK6jAHSR5zY8ps42xuW89NLcBpw1kOabah7yv38J8MyiYuOHxLQBi0e7zeXbQgVefDy/mZZetqEFC+Fl5eIEQ==", + "version": "1.96.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.96.0.tgz", + "integrity": "sha512-qvZbSZo+K4ZYmmDuaodMbAa67Pl6VDQzLKFka6rq+3WUTY4Kro7Bwoi0CuZLO/wema0ygcmpwow7zZfPJTs5jg==", "dev": true }, "@types/which": { diff --git a/package.json b/package.json index 03f3ad0..a4c84c4 100644 --- a/package.json +++ b/package.json @@ -444,6 +444,31 @@ { "type": "python" } + ], + "languageModelTools": [ + { + "name": "python_get_packages", + "displayName": "Get Python Packages", + "modelDescription": "Returns the packages installed in the given Python file's environment. You should call this when you want to generate Python code to determine the users preferred packages. Also call this to determine if you need to provide installation instructions in a response.", + "toolReferenceName": "pythonGetPackages", + "tags": [ + "vscode_editing" + ], + "icon": "$(files)", + "inputSchema": { + "type": "object", + "properties": { + "filePath": { + "type": "string" + } + }, + "description": "The path to the Python file or workspace to get the installed packages for.", + "required": [ + "filePath" + ] + }, + "canBeReferencedInPrompt": true + } ] }, "scripts": { @@ -465,7 +490,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.93.0", + "@types/vscode": "^1.96.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", @@ -491,5 +516,10 @@ "stack-trace": "0.0.10", "vscode-jsonrpc": "^9.0.0-next.5", "which": "^4.0.0" - } -} + }, + "enabledApiProposals": [ + "chatParticipantPrivate", + "chatParticipantAdditions", + "chatVariableResolver" + ] +} \ No newline at end of file diff --git a/src/common/lm.apis.ts b/src/common/lm.apis.ts new file mode 100644 index 0000000..61de4fa --- /dev/null +++ b/src/common/lm.apis.ts @@ -0,0 +1,4 @@ +import * as vscode from 'vscode'; +export function registerTools(name: string, tool: vscode.LanguageModelTool): vscode.Disposable { + return vscode.lm.registerTool(name, tool); +} diff --git a/src/copilotTools.ts b/src/copilotTools.ts new file mode 100644 index 0000000..414be7c --- /dev/null +++ b/src/copilotTools.ts @@ -0,0 +1,92 @@ +import { + CancellationToken, + LanguageModelTextPart, + LanguageModelTool, + LanguageModelToolInvocationOptions, + LanguageModelToolInvocationPrepareOptions, + LanguageModelToolResult, + PreparedToolInvocation, + Uri, +} from 'vscode'; +import { PythonPackageGetterApi, PythonProjectEnvironmentApi } from './api'; +import { createDeferred } from './common/utils/deferred'; + +export interface IGetActiveFile { + filePath?: string; +} + +/** + * A tool to get the list of installed Python packages in the active environment. + */ +export class GetPackagesTool implements LanguageModelTool { + constructor(private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi) {} + /** + * Invokes the tool to get the list of installed packages. + * @param options - The invocation options containing the file path. + * @param token - The cancellation token. + * @returns The result containing the list of installed packages or an error message. + */ + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const deferredReturn = createDeferred(); + token.onCancellationRequested(() => { + const errorMessage: string = `Operation cancelled by the user.`; + deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); + }); + + const parameters: IGetActiveFile = options.input; + + if (parameters.filePath === undefined || parameters.filePath === '') { + throw new Error('Invalid input: filePath is required'); + } + const fileUri = Uri.file(parameters.filePath); + + try { + const environment = await this.api.getEnvironment(fileUri); + if (!environment) { + // Check if the file is a notebook or a notebook cell to throw specific error messages. + if (fileUri.fsPath.endsWith('.ipynb') || fileUri.fsPath.includes('.ipynb#')) { + throw new Error('Unable to access Jupyter kernels for notebook cells'); + } + throw new Error('No environment found'); + } + await this.api.refreshPackages(environment); + const installedPackages = await this.api.getPackages(environment); + + let resultMessage: string; + if (!installedPackages || installedPackages.length === 0) { + resultMessage = 'No packages are installed in the current environment.'; + } else { + const packageNames = installedPackages + .map((pkg) => pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name) + .join(', '); + resultMessage = 'The packages installed in the current environment are as follows:\n' + packageNames; + } + + const textPart = new LanguageModelTextPart(resultMessage || ''); + deferredReturn.resolve({ content: [textPart] }); + } catch (error) { + const errorMessage: string = `An error occurred while fetching packages: ${error}`; + deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); + } + return deferredReturn.promise; + } + + /** + * Prepares the invocation of the tool. + * @param _options - The preparation options. + * @param _token - The cancellation token. + * @returns The prepared tool invocation. + */ + async prepareInvocation?( + _options: LanguageModelToolInvocationPrepareOptions, + _token: CancellationToken, + ): Promise { + const message = 'Preparing to fetch the list of installed Python packages...'; + return { + invocationMessage: message, + }; + } +} diff --git a/src/extension.ts b/src/extension.ts index b6880ee..7cb7173 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -55,6 +55,8 @@ import { EventNames } from './common/telemetry/constants'; import { ensureCorrectVersion } from './common/extVersion'; import { ExistingProjects } from './features/creators/existingProjects'; import { AutoFindProjects } from './features/creators/autoFindProjects'; +import { GetPackagesTool } from './copilotTools'; +import { registerTools } from './common/lm.apis'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -103,6 +105,8 @@ export async function activate(context: ExtensionContext): Promise outputChannel.show()), commands.registerCommand('python-envs.refreshManager', async (item) => { await refreshManagerCommand(item); @@ -238,6 +242,8 @@ export async function activate(context: ExtensionContext): Promise { + let tool: GetPackagesTool; + let mockApi: typeMoq.IMock; + let mockEnvironment: typeMoq.IMock; + + setup(() => { + // Create mock functions + mockApi = typeMoq.Mock.ofType(); + mockEnvironment = typeMoq.Mock.ofType(); + + // refresh will always return a resolved promise + mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); + + // Create an instance of GetPackagesTool with the mock functions + tool = new GetPackagesTool(mockApi.object); + }); + + teardown(() => { + sinon.restore(); + }); + + test('should throw error if filePath is undefined', async () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + const testFile: IGetActiveFile = { + filePath: '', + }; + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + await assert.rejects(tool.invoke(options, token), { message: 'Invalid input: filePath is required' }); + }); + + test('should throw error for notebook files', async () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + const testFile: IGetActiveFile = { + filePath: 'test.ipynb', + }; + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await tool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.LanguageModelTextPart; + + assert.strictEqual( + firstPart.value, + 'An error occurred while fetching packages: Error: Unable to access Jupyter kernels for notebook cells', + ); + }); + + test('should throw error for notebook cells', async () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + const testFile: IGetActiveFile = { + filePath: 'test.ipynb#123', + }; + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await tool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.strictEqual( + firstPart.value, + 'An error occurred while fetching packages: Error: Unable to access Jupyter kernels for notebook cells', + ); + }); + + test('should return no packages message if no packages are installed', async () => { + const testFile: IGetActiveFile = { + filePath: 'test.py', + }; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(() => { + return Promise.resolve(mockEnvironment.object); + }); + + mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve([])); + + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await tool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.strictEqual(firstPart.value, 'No packages are installed in the current environment.'); + }); + + test('should return just packages if versions do not exist', async () => { + const testFile: IGetActiveFile = { + filePath: 'test.py', + }; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(() => { + return Promise.resolve(mockEnvironment.object); + }); + + const mockPackages: Package[] = [ + { + pkgId: { id: 'pkg1', managerId: 'pip', environmentId: 'env1' }, + name: 'package1', + displayName: 'package1', + }, + { + pkgId: { id: 'pkg2', managerId: 'pip', environmentId: 'env1' }, + name: 'package2', + displayName: 'package2', + }, + ]; + + mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); + mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve(mockPackages)); + + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await tool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.ok( + firstPart.value.includes('The packages installed in the current environment are as follows:') && + firstPart.value.includes('package1') && + firstPart.value.includes('package2'), + ); + }); + + test('should return installed packages with versions', async () => { + const testFile: IGetActiveFile = { + filePath: 'test.py', + }; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(() => { + return Promise.resolve(mockEnvironment.object); + }); + + const mockPackages: Package[] = [ + { + pkgId: { id: 'pkg1', managerId: 'pip', environmentId: 'env1' }, + name: 'package1', + displayName: 'package1', + version: '1.0.0', + }, + { + pkgId: { id: 'pkg2', managerId: 'pip', environmentId: 'env1' }, + name: 'package2', + displayName: 'package2', + version: '2.0.0', + }, + ]; + + mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); + mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve(mockPackages)); + + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await tool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.ok( + firstPart.value.includes('The packages installed in the current environment are as follows:') && + firstPart.value.includes('package1 (1.0.0)') && + firstPart.value.includes('package2 (2.0.0)'), + ); + }); + + test('should handle cancellation', async () => { + const testFile: IGetActiveFile = { + filePath: 'test.py', + }; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(async () => { + return Promise.resolve(mockEnvironment.object); + }); + + mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); + mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve([])); + + const options = { input: testFile, toolInvocationToken: undefined }; + const tokenSource = new vscode.CancellationTokenSource(); + const token = tokenSource.token; + + const deferred = createDeferred(); + tool.invoke(options, token).then((result) => { + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.strictEqual(firstPart.value, 'Operation cancelled by the user.'); + deferred.resolve(); + }); + + tokenSource.cancel(); + await deferred.promise; + }); +}); diff --git a/src/test/mocks/vsc/copilotTools.ts b/src/test/mocks/vsc/copilotTools.ts new file mode 100644 index 0000000..7ec49d4 --- /dev/null +++ b/src/test/mocks/vsc/copilotTools.ts @@ -0,0 +1,56 @@ +/** + * A language model response part containing a piece of text, returned from a {@link LanguageModelChatResponse}. + */ +export class LanguageModelTextPart { + /** + * The text content of the part. + */ + value: string; + + /** + * Construct a text part with the given content. + * @param value The text content of the part. + */ + constructor(value: string) { + this.value = value; + } +} + +/** + * A result returned from a tool invocation. If using `@vscode/prompt-tsx`, this result may be rendered using a `ToolResult`. + */ +export class LanguageModelToolResult { + /** + * A list of tool result content parts. Includes `unknown` becauses this list may be extended with new content types in + * the future. + * @see {@link lm.invokeTool}. + */ + content: Array; + + /** + * Create a LanguageModelToolResult + * @param content A list of tool result content parts + */ + constructor(content: Array) { + this.content = content; + } +} + +/** + * A language model response part containing a PromptElementJSON from `@vscode/prompt-tsx`. + * @see {@link LanguageModelToolResult} + */ +export class LanguageModelPromptTsxPart { + /** + * The value of the part. + */ + value: unknown; + + /** + * Construct a prompt-tsx part with the given content. + * @param value The value of the part, the result of `renderPromptElementJSON` from `@vscode/prompt-tsx`. + */ + constructor(value: unknown) { + this.value = value; + } +} diff --git a/src/test/mocks/vsc/extHostedTypes.ts b/src/test/mocks/vsc/extHostedTypes.ts index 1da8659..d80b45d 100644 --- a/src/test/mocks/vsc/extHostedTypes.ts +++ b/src/test/mocks/vsc/extHostedTypes.ts @@ -1986,17 +1986,22 @@ export enum TreeItemCollapsibleState { export class TreeItem { label?: string; + id?: string; + description?: string | boolean; resourceUri?: vscUri.URI; - iconPath?: string | vscUri.URI | { light: string | vscUri.URI; dark: string | vscUri.URI }; - + iconPath?: string | vscode.IconPath; command?: vscode.Command; contextValue?: string; tooltip?: string; + checkboxState?: vscode.TreeItemCheckboxState; + + accessibilityInformation?: vscode.AccessibilityInformation; + constructor(label: string, collapsibleState?: vscode.TreeItemCollapsibleState); constructor(resourceUri: vscUri.URI, collapsibleState?: vscode.TreeItemCollapsibleState); diff --git a/src/test/mocks/vsc/index.ts b/src/test/mocks/vsc/index.ts index 6049339..39e96b0 100644 --- a/src/test/mocks/vsc/index.ts +++ b/src/test/mocks/vsc/index.ts @@ -8,6 +8,7 @@ import * as vscode from 'vscode'; // export * from './selection'; export * as vscMockExtHostedTypes from './extHostedTypes'; export * as vscUri from './uri'; +export * as vscMockCopilotTools from './copilotTools'; const escapeCodiconsRegex = /(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi; export function escapeCodicons(text: string): string { diff --git a/src/test/unittests.ts b/src/test/unittests.ts index caf5fa0..4d0ad93 100644 --- a/src/test/unittests.ts +++ b/src/test/unittests.ts @@ -130,4 +130,6 @@ mockedVSCode.LogLevel = vscodeMocks.LogLevel; (mockedVSCode as any).CancellationError = vscodeMocks.vscMockExtHostedTypes.CancellationError; (mockedVSCode as any).LSPCancellationError = vscodeMocks.vscMockExtHostedTypes.LSPCancellationError; mockedVSCode.TestRunProfileKind = vscodeMocks.TestRunProfileKind; +mockedVSCode.LanguageModelTextPart = vscodeMocks.vscMockCopilotTools.LanguageModelTextPart; + initialize(); diff --git a/vscode.proposed.chatParticipantAdditions.d.ts b/vscode.proposed.chatParticipantAdditions.d.ts new file mode 100644 index 0000000..1be58f2 --- /dev/null +++ b/vscode.proposed.chatParticipantAdditions.d.ts @@ -0,0 +1,397 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + + export interface ChatParticipant { + onDidPerformAction: Event; + } + + /** + * Now only used for the "intent detection" API below + */ + export interface ChatCommand { + readonly name: string; + readonly description: string; + } + + export class ChatResponseDetectedParticipantPart { + participant: string; + // TODO@API validate this against statically-declared slash commands? + command?: ChatCommand; + constructor(participant: string, command?: ChatCommand); + } + + export interface ChatVulnerability { + title: string; + description: string; + // id: string; // Later we will need to be able to link these across multiple content chunks. + } + + export class ChatResponseMarkdownWithVulnerabilitiesPart { + value: MarkdownString; + vulnerabilities: ChatVulnerability[]; + constructor(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]); + } + + export class ChatResponseCodeblockUriPart { + value: Uri; + constructor(value: Uri); + } + + /** + * Displays a {@link Command command} as a button in the chat response. + */ + export interface ChatCommandButton { + command: Command; + } + + export interface ChatDocumentContext { + uri: Uri; + version: number; + ranges: Range[]; + } + + export class ChatResponseTextEditPart { + uri: Uri; + edits: TextEdit[]; + isDone?: boolean; + constructor(uri: Uri, done: true); + constructor(uri: Uri, edits: TextEdit | TextEdit[]); + } + + export class ChatResponseConfirmationPart { + title: string; + message: string; + data: any; + buttons?: string[]; + constructor(title: string, message: string, data: any, buttons?: string[]); + } + + export class ChatResponseCodeCitationPart { + value: Uri; + license: string; + snippet: string; + constructor(value: Uri, license: string, snippet: string); + } + + export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart; + + export class ChatResponseWarningPart { + value: MarkdownString; + constructor(value: string | MarkdownString); + } + + export class ChatResponseProgressPart2 extends ChatResponseProgressPart { + value: string; + task?: (progress: Progress) => Thenable; + constructor(value: string, task?: (progress: Progress) => Thenable); + } + + export class ChatResponseReferencePart2 { + /** + * The reference target. + */ + value: Uri | Location | { variableName: string; value?: Uri | Location } | string; + + /** + * The icon for the reference. + */ + iconPath?: Uri | ThemeIcon | { + /** + * The icon path for the light theme. + */ + light: Uri; + /** + * The icon path for the dark theme. + */ + dark: Uri; + }; + options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }; + + /** + * Create a new ChatResponseReferencePart. + * @param value A uri or location + * @param iconPath Icon for the reference shown in UI + */ + constructor(value: Uri | Location | { variableName: string; value?: Uri | Location } | string, iconPath?: Uri | ThemeIcon | { + /** + * The icon path for the light theme. + */ + light: Uri; + /** + * The icon path for the dark theme. + */ + dark: Uri; + }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }); + } + + export class ChatResponseMovePart { + + readonly uri: Uri; + readonly range: Range; + + constructor(uri: Uri, range: Range); + } + + export interface ChatResponseAnchorPart { + /** + * The target of this anchor. + * + * If this is a {@linkcode Uri} or {@linkcode Location}, this is rendered as a normal link. + * + * If this is a {@linkcode SymbolInformation}, this is rendered as a symbol link. + * + * TODO mjbvz: Should this be a full `SymbolInformation`? Or just the parts we need? + * TODO mjbvz: Should we allow a `SymbolInformation` without a location? For example, until `resolve` completes? + */ + value2: Uri | Location | SymbolInformation; + + /** + * Optional method which fills in the details of the anchor. + * + * THis is currently only implemented for symbol links. + */ + resolve?(token: CancellationToken): Thenable; + } + + export interface ChatResponseStream { + + /** + * Push a progress part to this stream. Short-hand for + * `push(new ChatResponseProgressPart(value))`. + * + * @param value A progress message + * @param task If provided, a task to run while the progress is displayed. When the Thenable resolves, the progress will be marked complete in the UI, and the progress message will be updated to the resolved string if one is specified. + * @returns This stream. + */ + progress(value: string, task?: (progress: Progress) => Thenable): void; + + textEdit(target: Uri, edits: TextEdit | TextEdit[]): void; + + textEdit(target: Uri, isDone: true): void; + + markdownWithVulnerabilities(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]): void; + codeblockUri(uri: Uri): void; + detectedParticipant(participant: string, command?: ChatCommand): void; + push(part: ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseWarningPart | ChatResponseProgressPart2): void; + + /** + * Show an inline message in the chat view asking the user to confirm an action. + * Multiple confirmations may be shown per response. The UI might show "Accept All" / "Reject All" actions. + * @param title The title of the confirmation entry + * @param message An extra message to display to the user + * @param data An arbitrary JSON-stringifiable object that will be included in the ChatRequest when + * the confirmation is accepted or rejected + * TODO@API should this be MarkdownString? + * TODO@API should actually be a more generic function that takes an array of buttons + */ + confirmation(title: string, message: string, data: any, buttons?: string[]): void; + + /** + * Push a warning to this stream. Short-hand for + * `push(new ChatResponseWarningPart(message))`. + * + * @param message A warning message + * @returns This stream. + */ + warning(message: string | MarkdownString): void; + + reference(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }): void; + + reference2(value: Uri | Location | string | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }): void; + + codeCitation(value: Uri, license: string, snippet: string): void; + + push(part: ExtendedChatResponsePart): void; + } + + export enum ChatResponseReferencePartStatusKind { + Complete = 1, + Partial = 2, + Omitted = 3 + } + + /** + * Does this piggy-back on the existing ChatRequest, or is it a different type of request entirely? + * Does it show up in history? + */ + export interface ChatRequest { + /** + * The `data` for any confirmations that were accepted + */ + acceptedConfirmationData?: any[]; + + /** + * The `data` for any confirmations that were rejected + */ + rejectedConfirmationData?: any[]; + } + + // TODO@API fit this into the stream + export interface ChatUsedContext { + documents: ChatDocumentContext[]; + } + + export interface ChatParticipant { + /** + * Provide a set of variables that can only be used with this participant. + */ + participantVariableProvider?: { provider: ChatParticipantCompletionItemProvider; triggerCharacters: string[] }; + } + + export interface ChatParticipantCompletionItemProvider { + provideCompletionItems(query: string, token: CancellationToken): ProviderResult; + } + + export class ChatCompletionItem { + id: string; + label: string | CompletionItemLabel; + values: ChatVariableValue[]; + fullName?: string; + icon?: ThemeIcon; + insertText?: string; + detail?: string; + documentation?: string | MarkdownString; + command?: Command; + + constructor(id: string, label: string | CompletionItemLabel, values: ChatVariableValue[]); + } + + export type ChatExtendedRequestHandler = (request: ChatRequest, context: ChatContext, response: ChatResponseStream, token: CancellationToken) => ProviderResult; + + export interface ChatResult { + nextQuestion?: { + prompt: string; + participant?: string; + command?: string; + }; + } + + export namespace chat { + /** + * Create a chat participant with the extended progress type + */ + export function createChatParticipant(id: string, handler: ChatExtendedRequestHandler): ChatParticipant; + + export function registerChatParticipantDetectionProvider(participantDetectionProvider: ChatParticipantDetectionProvider): Disposable; + } + + export interface ChatParticipantMetadata { + participant: string; + command?: string; + disambiguation: { category: string; description: string; examples: string[] }[]; + } + + export interface ChatParticipantDetectionResult { + participant: string; + command?: string; + } + + export interface ChatParticipantDetectionProvider { + provideParticipantDetection(chatRequest: ChatRequest, context: ChatContext, options: { participants?: ChatParticipantMetadata[]; location: ChatLocation }, token: CancellationToken): ProviderResult; + } + + /* + * User action events + */ + + export enum ChatCopyKind { + // Keyboard shortcut or context menu + Action = 1, + Toolbar = 2 + } + + export interface ChatCopyAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'copy'; + codeBlockIndex: number; + copyKind: ChatCopyKind; + copiedCharacters: number; + totalCharacters: number; + copiedText: string; + } + + export interface ChatInsertAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'insert'; + codeBlockIndex: number; + totalCharacters: number; + newFile?: boolean; + } + + export interface ChatApplyAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'apply'; + codeBlockIndex: number; + totalCharacters: number; + newFile?: boolean; + codeMapper?: string; + } + + export interface ChatTerminalAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'runInTerminal'; + codeBlockIndex: number; + languageId?: string; + } + + export interface ChatCommandAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'command'; + commandButton: ChatCommandButton; + } + + export interface ChatFollowupAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'followUp'; + followup: ChatFollowup; + } + + export interface ChatBugReportAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'bug'; + } + + export interface ChatEditorAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'editor'; + accepted: boolean; + } + + export interface ChatEditingSessionAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals + kind: 'chatEditingSessionAction'; + uri: Uri; + hasRemainingEdits: boolean; + outcome: ChatEditingSessionActionOutcome; + } + + export enum ChatEditingSessionActionOutcome { + Accepted = 1, + Rejected = 2, + Saved = 3 + } + + export interface ChatUserActionEvent { + readonly result: ChatResult; + readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction | ChatEditingSessionAction; + } + + export interface ChatPromptReference { + /** + * TODO Needed for now to drive the variableName-type reference, but probably both of these should go away in the future. + */ + readonly name: string; + } + + export interface ChatResultFeedback { + readonly unhelpfulReason?: string; + } + + export namespace lm { + export function fileIsIgnored(uri: Uri, token: CancellationToken): Thenable; + } +} diff --git a/vscode.proposed.chatParticipantPrivate.d.ts b/vscode.proposed.chatParticipantPrivate.d.ts new file mode 100644 index 0000000..4f08ef3 --- /dev/null +++ b/vscode.proposed.chatParticipantPrivate.d.ts @@ -0,0 +1,125 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// version: 2 + +declare module 'vscode' { + + /** + * The location at which the chat is happening. + */ + export enum ChatLocation { + /** + * The chat panel + */ + Panel = 1, + /** + * Terminal inline chat + */ + Terminal = 2, + /** + * Notebook inline chat + */ + Notebook = 3, + /** + * Code editor inline chat + */ + Editor = 4, + /** + * Chat is happening in an editing session + */ + EditingSession = 5, + } + + export class ChatRequestEditorData { + //TODO@API should be the editor + document: TextDocument; + selection: Selection; + wholeRange: Range; + + constructor(document: TextDocument, selection: Selection, wholeRange: Range); + } + + export class ChatRequestNotebookData { + //TODO@API should be the editor + readonly cell: TextDocument; + + constructor(cell: TextDocument); + } + + export interface ChatRequest { + /** + * The attempt number of the request. The first request has attempt number 0. + */ + readonly attempt: number; + + /** + * If automatic command detection is enabled. + */ + readonly enableCommandDetection: boolean; + + /** + * If the chat participant or command was automatically assigned. + */ + readonly isParticipantDetected: boolean; + + /** + * The location at which the chat is happening. This will always be one of the supported values + * + * @deprecated + */ + readonly location: ChatLocation; + + /** + * Information that is specific to the location at which chat is happening, e.g within a document, notebook, + * or terminal. Will be `undefined` for the chat panel. + */ + readonly location2: ChatRequestEditorData | ChatRequestNotebookData | undefined; + } + + export interface ChatParticipant { + supportIssueReporting?: boolean; + + /** + * Temp, support references that are slow to resolve and should be tools rather than references. + */ + supportsSlowReferences?: boolean; + } + + export interface ChatErrorDetails { + /** + * If set to true, the message content is completely hidden. Only ChatErrorDetails#message will be shown. + */ + responseIsRedacted?: boolean; + + isQuotaExceeded?: boolean; + } + + export namespace chat { + export function createDynamicChatParticipant(id: string, dynamicProps: DynamicChatParticipantProps, handler: ChatExtendedRequestHandler): ChatParticipant; + } + + /** + * These don't get set on the ChatParticipant after creation, like other props, because they are typically defined in package.json and we want them at the time of creation. + */ + export interface DynamicChatParticipantProps { + name: string; + publisherName: string; + description?: string; + fullName?: string; + } + + export namespace lm { + export function registerIgnoredFileProvider(provider: LanguageModelIgnoredFileProvider): Disposable; + } + + export interface LanguageModelIgnoredFileProvider { + provideFileIgnored(uri: Uri, token: CancellationToken): ProviderResult; + } + + export interface LanguageModelToolInvocationOptions { + chatRequestId?: string; + } +} diff --git a/vscode.proposed.chatVariableResolver.d.ts b/vscode.proposed.chatVariableResolver.d.ts new file mode 100644 index 0000000..ec386ec --- /dev/null +++ b/vscode.proposed.chatVariableResolver.d.ts @@ -0,0 +1,110 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + + export namespace chat { + + /** + * Register a variable which can be used in a chat request to any participant. + * @param id A unique ID for the variable. + * @param name The name of the variable, to be used in the chat input as `#name`. + * @param userDescription A description of the variable for the chat input suggest widget. + * @param modelDescription A description of the variable for the model. + * @param isSlow Temp, to limit access to '#codebase' which is not a 'reference' and will fit into a tools API later. + * @param resolver Will be called to provide the chat variable's value when it is used. + * @param fullName The full name of the variable when selecting context in the picker UI. + * @param icon An icon to display when selecting context in the picker UI. + */ + export function registerChatVariableResolver(id: string, name: string, userDescription: string, modelDescription: string | undefined, isSlow: boolean | undefined, resolver: ChatVariableResolver, fullName?: string, icon?: ThemeIcon): Disposable; + } + + export interface ChatVariableValue { + /** + * The detail level of this chat variable value. If possible, variable resolvers should try to offer shorter values that will consume fewer tokens in an LLM prompt. + */ + level: ChatVariableLevel; + + /** + * The variable's value, which can be included in an LLM prompt as-is, or the chat participant may decide to read the value and do something else with it. + */ + value: string | Uri; + + /** + * A description of this value, which could be provided to the LLM as a hint. + */ + description?: string; + } + + // TODO@API align with ChatRequest + export interface ChatVariableContext { + /** + * The message entered by the user, which includes this variable. + */ + // TODO@API AS-IS, variables as types, agent/commands stripped + prompt: string; + + // readonly variables: readonly ChatResolvedVariable[]; + } + + export interface ChatVariableResolver { + /** + * A callback to resolve the value of a chat variable. + * @param name The name of the variable. + * @param context Contextual information about this chat request. + * @param token A cancellation token. + */ + resolve(name: string, context: ChatVariableContext, token: CancellationToken): ProviderResult; + + /** + * A callback to resolve the value of a chat variable. + * @param name The name of the variable. + * @param context Contextual information about this chat request. + * @param token A cancellation token. + */ + resolve2?(name: string, context: ChatVariableContext, stream: ChatVariableResolverResponseStream, token: CancellationToken): ProviderResult; + } + + + /** + * The detail level of this chat variable value. + */ + export enum ChatVariableLevel { + Short = 1, + Medium = 2, + Full = 3 + } + + export interface ChatVariableResolverResponseStream { + /** + * Push a progress part to this stream. Short-hand for + * `push(new ChatResponseProgressPart(value))`. + * + * @param value + * @returns This stream. + */ + progress(value: string): ChatVariableResolverResponseStream; + + /** + * Push a reference to this stream. Short-hand for + * `push(new ChatResponseReferencePart(value))`. + * + * *Note* that the reference is not rendered inline with the response. + * + * @param value A uri or location + * @returns This stream. + */ + reference(value: Uri | Location): ChatVariableResolverResponseStream; + + /** + * Pushes a part to this stream. + * + * @param part A response part, rendered or metadata + */ + push(part: ChatVariableResolverResponsePart): ChatVariableResolverResponseStream; + } + + export type ChatVariableResolverResponsePart = ChatResponseProgressPart | ChatResponseReferencePart; +} From 5eee27cabe8187a84ab2633a88455f263f13c426 Mon Sep 17 00:00:00 2001 From: "Philipp A." Date: Mon, 27 Jan 2025 20:33:50 +0100 Subject: [PATCH 065/328] =?UTF-8?q?Handle=20all=20shells=E2=80=99=20de/act?= =?UTF-8?q?ivation=20(#137)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #138 This adds shell activation for - gitbash - wsl - ksh - tcshell - xonsh - nushell and fixes shell activation for C shell. it also makes sure that it’s impossible to add a terminal to the enum without also adding shell activation/deactivation commands by using a `Record` type that needs to be exhaustive. --- src/common/utils/unsafeEntries.ts | 5 ++ src/features/common/shellDetector.ts | 32 +++++---- src/managers/builtin/venvUtils.ts | 102 +++++++++++++++------------ 3 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 src/common/utils/unsafeEntries.ts diff --git a/src/common/utils/unsafeEntries.ts b/src/common/utils/unsafeEntries.ts new file mode 100644 index 0000000..9aef5ad --- /dev/null +++ b/src/common/utils/unsafeEntries.ts @@ -0,0 +1,5 @@ +/** Converts an object from a trusted source (i.e. without unknown entries) to a typed array */ +export default function unsafeEntries(o: T): [keyof T, T[K]][] { + return Object.entries(o) as [keyof T, T[K]][]; +} + \ No newline at end of file diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index 5d5acb4..fe5644e 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -3,6 +3,7 @@ import { isWindows } from '../../managers/common/utils'; import * as os from 'os'; import { vscodeShell } from '../../common/vscodeEnv.apis'; import { getConfiguration } from '../../common/workspace.apis'; +import unsafeEntries from '../../common/utils/unsafeEntries'; import { TerminalShellType } from '../../api'; /* @@ -30,20 +31,23 @@ const IS_TCSHELL = /(tcsh$)/i; const IS_NUSHELL = /(nu$)/i; const IS_XONSH = /(xonsh$)/i; -const detectableShells = new Map(); -detectableShells.set(TerminalShellType.powershell, IS_POWERSHELL); -detectableShells.set(TerminalShellType.gitbash, IS_GITBASH); -detectableShells.set(TerminalShellType.bash, IS_BASH); -detectableShells.set(TerminalShellType.wsl, IS_WSL); -detectableShells.set(TerminalShellType.zsh, IS_ZSH); -detectableShells.set(TerminalShellType.ksh, IS_KSH); -detectableShells.set(TerminalShellType.commandPrompt, IS_COMMAND); -detectableShells.set(TerminalShellType.fish, IS_FISH); -detectableShells.set(TerminalShellType.tcshell, IS_TCSHELL); -detectableShells.set(TerminalShellType.cshell, IS_CSHELL); -detectableShells.set(TerminalShellType.nushell, IS_NUSHELL); -detectableShells.set(TerminalShellType.powershellCore, IS_POWERSHELL_CORE); -detectableShells.set(TerminalShellType.xonsh, IS_XONSH); +type KnownShellType = Exclude; +const detectableShells = new Map(unsafeEntries({ + [TerminalShellType.powershell]: IS_POWERSHELL, + [TerminalShellType.gitbash]: IS_GITBASH, + [TerminalShellType.bash]: IS_BASH, + [TerminalShellType.wsl]: IS_WSL, + [TerminalShellType.zsh]: IS_ZSH, + [TerminalShellType.ksh]: IS_KSH, + [TerminalShellType.commandPrompt]: IS_COMMAND, + [TerminalShellType.fish]: IS_FISH, + [TerminalShellType.tcshell]: IS_TCSHELL, + [TerminalShellType.cshell]: IS_CSHELL, + [TerminalShellType.nushell]: IS_NUSHELL, + [TerminalShellType.powershellCore]: IS_POWERSHELL_CORE, + [TerminalShellType.xonsh]: IS_XONSH, +// This `satisfies` makes sure all shells are covered +} satisfies Record)); function identifyShellFromShellPath(shellPath: string): TerminalShellType { // Remove .exe extension so shells can be more consistently detected diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index f3a3140..4d94e86 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -31,6 +31,7 @@ import { } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; +import unsafeEntries from '../../common/utils/unsafeEntries'; import { isUvInstalled, runUV, runPython } from './helpers'; import { getWorkspacePackagesToInstall } from './pipUtils'; @@ -117,56 +118,65 @@ async function getPythonInfo(env: NativeEnvInfo): Promise const name = `${venvName} (${sv})`; const binDir = path.dirname(env.executable); + + interface VenvManager { + activate: PythonCommandRunConfiguration, + deactivate: PythonCommandRunConfiguration, + /// true if created by the builtin `venv` module and not just the `virtualenv` package. + supportsStdlib: boolean, + } + + /** Venv activation/deactivation using a command */ + const cmdMgr = (suffix = ''): VenvManager => ({ + activate: { executable: path.join(binDir, `activate${suffix}`) }, + deactivate: { executable: path.join(binDir, `deactivate${suffix}`) }, + supportsStdlib: ['', '.bat'].includes(suffix), + }); + /** Venv activation/deactivation for a POSIXy shell */ + const sourceMgr = (suffix = '', executable = 'source'): VenvManager => ({ + activate: { executable, args: [path.join(binDir, `activate${suffix}`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: ['', '.ps1'].includes(suffix), + }); + // satisfies `Record` to make sure all shells are covered + const venvManagers: Record = { + // Shells supported by the builtin `venv` module + [TerminalShellType.bash]: sourceMgr(), + [TerminalShellType.gitbash]: sourceMgr(), + [TerminalShellType.zsh]: sourceMgr(), + [TerminalShellType.wsl]: sourceMgr(), + [TerminalShellType.ksh]: sourceMgr('', '.'), + [TerminalShellType.powershell]: sourceMgr('.ps1', '&'), + [TerminalShellType.powershellCore]: sourceMgr('.ps1', '&'), + [TerminalShellType.commandPrompt]: cmdMgr('.bat'), + // Shells supported by the `virtualenv` package + [TerminalShellType.cshell]: sourceMgr('.csh'), + [TerminalShellType.tcshell]: sourceMgr('.csh'), + [TerminalShellType.fish]: sourceMgr('.fish'), + [TerminalShellType.xonsh]: sourceMgr('.xsh'), + [TerminalShellType.nushell]: { + activate: { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, + deactivate: { executable: 'overlay', args: ['hide', 'activate'] }, + supportsStdlib: false, + }, + // Fallback + [TerminalShellType.unknown]: isWindows() ? cmdMgr() : sourceMgr(), + }; const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); - // Commands for bash - shellActivation.set(TerminalShellType.bash, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); - shellDeactivation.set(TerminalShellType.bash, [{ executable: 'deactivate' }]); - - // Commands for csh - shellActivation.set(TerminalShellType.cshell, [ - { executable: 'source', args: [path.join(binDir, 'activate')] }, - ]); - shellDeactivation.set(TerminalShellType.cshell, [{ executable: 'deactivate' }]); - - // Commands for zsh - shellActivation.set(TerminalShellType.zsh, [{ executable: 'source', args: [path.join(binDir, 'activate')] }]); - shellDeactivation.set(TerminalShellType.zsh, [{ executable: 'deactivate' }]); - - // Commands for powershell - shellActivation.set(TerminalShellType.powershell, [ - { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, - ]); - shellActivation.set(TerminalShellType.powershellCore, [ - { executable: '&', args: [path.join(binDir, 'Activate.ps1')] }, - ]); - shellDeactivation.set(TerminalShellType.powershell, [{ executable: 'deactivate' }]); - shellDeactivation.set(TerminalShellType.powershellCore, [{ executable: 'deactivate' }]); - - // Commands for command prompt - shellActivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'activate.bat') }]); - shellDeactivation.set(TerminalShellType.commandPrompt, [{ executable: path.join(binDir, 'deactivate.bat') }]); - - // Commands for fish - if (await fsapi.pathExists(path.join(binDir, 'activate.fish'))) { - shellActivation.set(TerminalShellType.fish, [ - { executable: 'source', args: [path.join(binDir, 'activate.fish')] }, - ]); - shellDeactivation.set(TerminalShellType.fish, [{ executable: 'deactivate' }]); - } - - // Commands for unknown cases - if (isWindows()) { - shellActivation.set(TerminalShellType.unknown, [{ executable: path.join(binDir, 'activate') }]); - shellDeactivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); - } else { - shellActivation.set(TerminalShellType.unknown, [ - { executable: 'source', args: [path.join(binDir, 'activate')] }, - ]); - shellDeactivation.set(TerminalShellType.unknown, [{ executable: 'deactivate' }]); - } + await Promise.all(unsafeEntries(venvManagers).map(async ([shell, mgr]) => { + if ( + !mgr.supportsStdlib && + mgr.activate.args && + !await fsapi.pathExists(mgr.activate.args[mgr.activate.args.length - 1]) + ) { + return; + } + shellActivation.set(shell, [mgr.activate]); + shellDeactivation.set(shell, [mgr.deactivate]); + })); return { name: name, From 69cdd38de6438af9d254b58ae4372e8f9b0cc6e1 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:08:24 -0600 Subject: [PATCH 066/328] Update README.md (#144) Fixing broken links to diagrams --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb45c06..31a9a71 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Tools that may rely on these APIs in their own extensions include: ### API Dependency The relationship between these extensions can be represented as follows: - + Users who do not need to execute code or work in **Virtual Workspaces** can use the Python extension to access language features like hover, completion, and go-to definition. However, executing code (e.g., running a debugger, linter, or formatter), creating/modifying environments, or managing packages requires the Python Environments extension to enable these functionalities. @@ -79,7 +79,7 @@ VS Code supports trust management, allowing extensions to function in either **t The relationship is illustrated below: - + In **trusted mode**, the Python Environments extension supports tasks like managing environments, installing/removing packages, and running tools. In **untrusted mode**, functionality is limited to language features, ensuring a secure and restricted environment. From 1565af08600509a9fac0d2589465bed03eb4b9ab Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 29 Jan 2025 10:27:24 -0800 Subject: [PATCH 067/328] Handle venv creation when running in no-workspace case (#145) Fixes https://github.com/microsoft/vscode-python-environments/issues/140 --- src/common/pickers/projects.ts | 2 + src/features/envCommands.ts | 63 ++++---- src/test/copilotTools.unit.test.ts | 21 +-- src/test/features/envCommands.unit.test.ts | 177 +++++++++++++++++++++ 4 files changed, 215 insertions(+), 48 deletions(-) create mode 100644 src/test/features/envCommands.unit.test.ts diff --git a/src/common/pickers/projects.ts b/src/common/pickers/projects.ts index 919943a..19e93f6 100644 --- a/src/common/pickers/projects.ts +++ b/src/common/pickers/projects.ts @@ -49,6 +49,8 @@ export async function pickProjectMany( } } else if (projects.length === 1) { return [...projects]; + } else if (projects.length === 0) { + return []; } return undefined; } diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index b6a7060..afb9c9a 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -111,44 +111,47 @@ export async function createAnyEnvironmentCommand( options?: any, ): Promise { const select = options?.selectEnvironment; - const projects = await pickProjectMany(pm.getProjects()); - if (projects && projects.length > 0) { - const defaultManagers: InternalEnvironmentManager[] = []; - - projects.forEach((p) => { - const manager = em.getEnvironmentManager(p.uri); - if (manager && manager.supportsCreate && !defaultManagers.includes(manager)) { - defaultManagers.push(manager); - } - }); - - const managerId = await pickEnvironmentManager( - em.managers.filter((m) => m.supportsCreate), - defaultManagers, - ); - - const manager = em.managers.find((m) => m.id === managerId); - if (manager) { - const env = await manager.create(projects.map((p) => p.uri)); - if (select) { - await em.setEnvironments( - projects.map((p) => p.uri), - env, - ); - } - return env; - } - } else if (projects && projects.length === 0) { + const projects = pm.getProjects(); + if (projects.length === 0) { const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); - const manager = em.managers.find((m) => m.id === managerId); if (manager) { const env = await manager.create('global'); - if (select) { + if (select && env) { await manager.set(undefined, env); } return env; } + } else if (projects.length > 0) { + const selected = await pickProjectMany(projects); + + if (selected && selected.length > 0) { + const defaultManagers: InternalEnvironmentManager[] = []; + + selected.forEach((p) => { + const manager = em.getEnvironmentManager(p.uri); + if (manager && manager.supportsCreate && !defaultManagers.includes(manager)) { + defaultManagers.push(manager); + } + }); + + const managerId = await pickEnvironmentManager( + em.managers.filter((m) => m.supportsCreate), + defaultManagers, + ); + + const manager = em.managers.find((m) => m.id === managerId); + if (manager) { + const env = await manager.create(selected.map((p) => p.uri)); + if (select && env) { + await em.setEnvironments( + selected.map((p) => p.uri), + env, + ); + } + return env; + } + } } } diff --git a/src/test/copilotTools.unit.test.ts b/src/test/copilotTools.unit.test.ts index 70d2337..e04c1f5 100644 --- a/src/test/copilotTools.unit.test.ts +++ b/src/test/copilotTools.unit.test.ts @@ -18,6 +18,9 @@ suite('GetPackagesTool Tests', () => { mockApi = typeMoq.Mock.ofType(); mockEnvironment = typeMoq.Mock.ofType(); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + // refresh will always return a resolved promise mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); @@ -30,9 +33,6 @@ suite('GetPackagesTool Tests', () => { }); test('should throw error if filePath is undefined', async () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - const testFile: IGetActiveFile = { filePath: '', }; @@ -61,9 +61,6 @@ suite('GetPackagesTool Tests', () => { }); test('should throw error for notebook cells', async () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - const testFile: IGetActiveFile = { filePath: 'test.ipynb#123', }; @@ -84,9 +81,6 @@ suite('GetPackagesTool Tests', () => { filePath: 'test.py', }; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) .returns(() => { @@ -109,9 +103,6 @@ suite('GetPackagesTool Tests', () => { filePath: 'test.py', }; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) .returns(() => { @@ -152,9 +143,6 @@ suite('GetPackagesTool Tests', () => { filePath: 'test.py', }; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) .returns(() => { @@ -197,9 +185,6 @@ suite('GetPackagesTool Tests', () => { filePath: 'test.py', }; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) .returns(async () => { diff --git a/src/test/features/envCommands.unit.test.ts b/src/test/features/envCommands.unit.test.ts new file mode 100644 index 0000000..7805751 --- /dev/null +++ b/src/test/features/envCommands.unit.test.ts @@ -0,0 +1,177 @@ +import * as assert from 'assert'; +import * as typeMoq from 'typemoq'; +import * as sinon from 'sinon'; +import { EnvironmentManagers, InternalEnvironmentManager, PythonProjectManager } from '../../internal.api'; +import * as projectApi from '../../common/pickers/projects'; +import * as managerApi from '../../common/pickers/managers'; +import { PythonEnvironment, PythonProject } from '../../api'; +import { createAnyEnvironmentCommand } from '../../features/envCommands'; +import { Uri } from 'vscode'; + +suite('Create Any Environment Command Tests', () => { + let em: typeMoq.IMock; + let pm: typeMoq.IMock; + let manager: typeMoq.IMock; + let env: typeMoq.IMock; + let pickProjectManyStub: sinon.SinonStub; + let pickEnvironmentManagerStub: sinon.SinonStub; + let project: PythonProject = { + uri: Uri.file('/some/test/workspace/folder'), + name: 'test-folder', + }; + let project2: PythonProject = { + uri: Uri.file('/some/test/workspace/folder2'), + name: 'test-folder2', + }; + let project3: PythonProject = { + uri: Uri.file('/some/test/workspace/folder3'), + name: 'test-folder3', + }; + + setup(() => { + manager = typeMoq.Mock.ofType(); + manager.setup((m) => m.id).returns(() => 'test'); + manager.setup((m) => m.displayName).returns(() => 'Test Manager'); + manager.setup((m) => m.description).returns(() => 'Test Manager Description'); + manager.setup((m) => m.supportsCreate).returns(() => true); + + env = typeMoq.Mock.ofType(); + env.setup((e) => e.envId).returns(() => ({ id: 'env1', managerId: 'test' })); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + env.setup((e: any) => e.then).returns(() => undefined); + + em = typeMoq.Mock.ofType(); + em.setup((e) => e.managers).returns(() => [manager.object]); + em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => manager.object); + + pm = typeMoq.Mock.ofType(); + + pickEnvironmentManagerStub = sinon.stub(managerApi, 'pickEnvironmentManager'); + pickProjectManyStub = sinon.stub(projectApi, 'pickProjectMany'); + }); + + teardown(() => { + sinon.restore(); + }); + + test('Create global venv (no-workspace): no-select', async () => { + pm.setup((p) => p.getProjects()).returns(() => []); + manager + .setup((m) => m.create('global')) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + manager.setup((m) => m.set(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: false }); + // Add assertions to verify the result + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + }); + + test('Create global venv (no-workspace): select', async () => { + pm.setup((p) => p.getProjects()).returns(() => []); + manager + .setup((m) => m.create('global')) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + manager.setup((m) => m.set(undefined, env.object)).verifiable(typeMoq.Times.once()); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: true }); + // Add assertions to verify the result + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + }); + + test('Create workspace venv: no-select', async () => { + pm.setup((p) => p.getProjects()).returns(() => [project]); + manager + .setup((m) => m.create([project.uri])) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + manager.setup((m) => m.set(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + em.setup((e) => e.setEnvironments(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([project]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: false }); + + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + em.verifyAll(); + }); + + test('Create workspace venv: select', async () => { + pm.setup((p) => p.getProjects()).returns(() => [project]); + manager + .setup((m) => m.create([project.uri])) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + // This is a case where env managers handler does this in batch to avoid writing to files for each case + manager.setup((m) => m.set(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + em.setup((e) => e.setEnvironments([project.uri], env.object)).verifiable(typeMoq.Times.once()); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([project]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: true }); + + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + em.verifyAll(); + }); + + test('Create multi-workspace venv: select all', async () => { + pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); + manager + .setup((m) => m.create([project.uri, project2.uri, project3.uri])) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + // This is a case where env managers handler does this in batch to avoid writing to files for each case + manager.setup((m) => m.set(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + em.setup((e) => e.setEnvironments([project.uri, project2.uri, project3.uri], env.object)).verifiable( + typeMoq.Times.once(), + ); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([project, project2, project3]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: true }); + + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + em.verifyAll(); + }); + + test('Create multi-workspace venv: select some', async () => { + pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); + manager + .setup((m) => m.create([project.uri, project3.uri])) + .returns(() => Promise.resolve(env.object)) + .verifiable(typeMoq.Times.once()); + + // This is a case where env managers handler does this in batch to avoid writing to files for each case + manager.setup((m) => m.set(typeMoq.It.isAny(), typeMoq.It.isAny())).verifiable(typeMoq.Times.never()); + em.setup((e) => e.setEnvironments([project.uri, project3.uri], env.object)).verifiable(typeMoq.Times.once()); + + pickEnvironmentManagerStub.resolves(manager.object.id); + pickProjectManyStub.resolves([project, project3]); + + const result = await createAnyEnvironmentCommand(em.object, pm.object, { selectEnvironment: true }); + + assert.strictEqual(result, env.object, 'Expected the created environment to match the mocked environment.'); + manager.verifyAll(); + em.verifyAll(); + }); +}); From 7783ba6d94f7327578c4c3067e50fac99ff47eb5 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:41:50 -0600 Subject: [PATCH 068/328] Fix GDPR tags (#147) Addressing unmatched GDPR names --- src/common/telemetry/constants.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index fca616a..c31d534 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -11,20 +11,20 @@ export enum EventNames { // Map all events to their properties export interface IEventNamePropertyMapping { /* __GDPR__ - "extension_activation_duration": { + "extension.activation_duration": { "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.EXTENSION_ACTIVATION_DURATION]: never | undefined; /* __GDPR__ - "extension_manager_registration_duration": { + "extension.manager_registration_duration": { "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ [EventNames.EXTENSION_MANAGER_REGISTRATION_DURATION]: never | undefined; /* __GDPR__ - "environment_manager_registered": { + "environment_manager.registered": { "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ @@ -33,7 +33,7 @@ export interface IEventNamePropertyMapping { }; /* __GDPR__ - "package_manager_registered": { + "package_manager.registered": { "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } */ @@ -42,7 +42,7 @@ export interface IEventNamePropertyMapping { }; /* __GDPR__ - "venv_using_uv": {"owner": "karthiknadig" } + "venv.using_uv": {"owner": "karthiknadig" } */ [EventNames.VENV_USING_UV]: never | undefined; } From 0210f6d622110bc908ed2f23c66303fbe31d9804 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Fri, 31 Jan 2025 09:33:52 -0800 Subject: [PATCH 069/328] remove ability to reference get_packages from prompting (#148) as we determine the best use of this tool, do not expose it as reference-able in copilot chat. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index a4c84c4..26268ee 100644 --- a/package.json +++ b/package.json @@ -466,8 +466,7 @@ "required": [ "filePath" ] - }, - "canBeReferencedInPrompt": true + } } ] }, From b0d09269ed296c14f4cc9e83b11fc1f2e1e179ce Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Mon, 3 Feb 2025 14:19:17 -0800 Subject: [PATCH 070/328] update release version to 0.2.0 (#150) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e1cd6e..ad09e59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "0.1.0-dev", + "version": "0.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "0.1.0-dev", + "version": "0.2.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 26268ee..0981106 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "0.1.0-dev", + "version": "0.2.0", "publisher": "ms-python", "preview": true, "engines": { From 550db33b67b9d2bfe56bf12d2fecb7e76a743ebf Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Mon, 3 Feb 2025 14:39:47 -0800 Subject: [PATCH 071/328] update to version 0.3.0-dev (#151) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad09e59..c9e4cd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "0.2.0", + "version": "0.3.0-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "0.2.0", + "version": "0.3.0-dev", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 0981106..e978416 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "0.2.0", + "version": "0.3.0-dev", "publisher": "ms-python", "preview": true, "engines": { From 8755435948ba496ea23c72271ebea4d738d7e328 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 4 Feb 2025 10:11:46 -0800 Subject: [PATCH 072/328] Adopt Terminal Shell Type API from VSCode with legacy fallback (#153) @anthonykim1 The VSCode shell type is missing following types: `tcshell`, `wsl`, `xonsh` --- package.json | 5 +- src/features/common/shellDetector.ts | 68 ++++++++++++++++------ src/vscode.proposed.terminalShellType.d.ts | 38 ++++++++++++ 3 files changed, 91 insertions(+), 20 deletions(-) create mode 100644 src/vscode.proposed.terminalShellType.d.ts diff --git a/package.json b/package.json index e978416..a368ba5 100644 --- a/package.json +++ b/package.json @@ -519,6 +519,7 @@ "enabledApiProposals": [ "chatParticipantPrivate", "chatParticipantAdditions", - "chatVariableResolver" + "chatVariableResolver", + "terminalShellType" ] -} \ No newline at end of file +} diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index fe5644e..aeb5103 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -1,4 +1,4 @@ -import { Terminal } from 'vscode'; +import { Terminal, TerminalShellType as TerminalShellTypeVscode } from 'vscode'; import { isWindows } from '../../managers/common/utils'; import * as os from 'os'; import { vscodeShell } from '../../common/vscodeEnv.apis'; @@ -32,22 +32,24 @@ const IS_NUSHELL = /(nu$)/i; const IS_XONSH = /(xonsh$)/i; type KnownShellType = Exclude; -const detectableShells = new Map(unsafeEntries({ - [TerminalShellType.powershell]: IS_POWERSHELL, - [TerminalShellType.gitbash]: IS_GITBASH, - [TerminalShellType.bash]: IS_BASH, - [TerminalShellType.wsl]: IS_WSL, - [TerminalShellType.zsh]: IS_ZSH, - [TerminalShellType.ksh]: IS_KSH, - [TerminalShellType.commandPrompt]: IS_COMMAND, - [TerminalShellType.fish]: IS_FISH, - [TerminalShellType.tcshell]: IS_TCSHELL, - [TerminalShellType.cshell]: IS_CSHELL, - [TerminalShellType.nushell]: IS_NUSHELL, - [TerminalShellType.powershellCore]: IS_POWERSHELL_CORE, - [TerminalShellType.xonsh]: IS_XONSH, -// This `satisfies` makes sure all shells are covered -} satisfies Record)); +const detectableShells = new Map( + unsafeEntries({ + [TerminalShellType.powershell]: IS_POWERSHELL, + [TerminalShellType.gitbash]: IS_GITBASH, + [TerminalShellType.bash]: IS_BASH, + [TerminalShellType.wsl]: IS_WSL, + [TerminalShellType.zsh]: IS_ZSH, + [TerminalShellType.ksh]: IS_KSH, + [TerminalShellType.commandPrompt]: IS_COMMAND, + [TerminalShellType.fish]: IS_FISH, + [TerminalShellType.tcshell]: IS_TCSHELL, + [TerminalShellType.cshell]: IS_CSHELL, + [TerminalShellType.nushell]: IS_NUSHELL, + [TerminalShellType.powershellCore]: IS_POWERSHELL_CORE, + [TerminalShellType.xonsh]: IS_XONSH, + // This `satisfies` makes sure all shells are covered + } satisfies Record), +); function identifyShellFromShellPath(shellPath: string): TerminalShellType { // Remove .exe extension so shells can be more consistently detected @@ -122,8 +124,38 @@ function identifyShellFromSettings(): TerminalShellType { return shellPath ? identifyShellFromShellPath(shellPath) : TerminalShellType.unknown; } +function fromShellTypeApi(terminal: Terminal): TerminalShellType { + switch (terminal.state.shellType) { + case TerminalShellTypeVscode.Sh: + case TerminalShellTypeVscode.Bash: + return TerminalShellType.bash; + case TerminalShellTypeVscode.Fish: + return TerminalShellType.fish; + case TerminalShellTypeVscode.Csh: + return TerminalShellType.cshell; + case TerminalShellTypeVscode.Ksh: + return TerminalShellType.ksh; + case TerminalShellTypeVscode.Zsh: + return TerminalShellType.zsh; + case TerminalShellTypeVscode.CommandPrompt: + return TerminalShellType.commandPrompt; + case TerminalShellTypeVscode.GitBash: + return TerminalShellType.gitbash; + case TerminalShellTypeVscode.PowerShell: + return TerminalShellType.powershellCore; + case TerminalShellTypeVscode.NuShell: + return TerminalShellType.nushell; + default: + return TerminalShellType.unknown; + } +} + export function identifyTerminalShell(terminal: Terminal): TerminalShellType { - let shellType = identifyShellFromTerminalName(terminal); + let shellType = fromShellTypeApi(terminal); + + if (shellType === TerminalShellType.unknown) { + shellType = identifyShellFromTerminalName(terminal); + } if (shellType === TerminalShellType.unknown) { shellType = identifyShellFromSettings(); diff --git a/src/vscode.proposed.terminalShellType.d.ts b/src/vscode.proposed.terminalShellType.d.ts new file mode 100644 index 0000000..26e84b6 --- /dev/null +++ b/src/vscode.proposed.terminalShellType.d.ts @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + // https://github.com/microsoft/vscode/issues/230165 + + /** + * Known terminal shell types. + */ + export enum TerminalShellType { + Sh = 1, + Bash = 2, + Fish = 3, + Csh = 4, + Ksh = 5, + Zsh = 6, + CommandPrompt = 7, + GitBash = 8, + PowerShell = 9, + Python = 10, + Julia = 11, + NuShell = 12, + Node = 13, + } + + // Part of TerminalState since the shellType can change multiple times and this comes with an event. + export interface TerminalState { + /** + * The current detected shell type of the terminal. New shell types may be added in the + * future in which case they will be returned as a number that is not part of + * {@link TerminalShellType}. + * Includes number type to prevent the breaking change when new enum members are added? + */ + readonly shellType?: TerminalShellType | number | undefined; + } +} From 9d1e582f482b2d0afa45332b25cac890855cb636 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 4 Feb 2025 10:50:28 -0800 Subject: [PATCH 073/328] Use Terminal Shell Env API to detect activations (#155) This was a very easy API to consume. --- package.json | 1 + src/features/terminal/terminalManager.ts | 5 +++++ src/vscode.proposed.terminalShellEnv.d.ts | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 src/vscode.proposed.terminalShellEnv.d.ts diff --git a/package.json b/package.json index a368ba5..9dc7176 100644 --- a/package.json +++ b/package.json @@ -520,6 +520,7 @@ "chatParticipantPrivate", "chatParticipantAdditions", "chatVariableResolver", + "terminalShellEnv", "terminalShellType" ] } diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index f68ca19..6ae6940 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -375,6 +375,11 @@ export class TerminalManagerImpl implements TerminalManager { } public isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean { + const envVar = terminal.shellIntegration?.env; + if (envVar) { + return !!envVar['VIRTUAL_ENV']; + } + if (!environment) { return this.activatedTerminals.has(terminal); } diff --git a/src/vscode.proposed.terminalShellEnv.d.ts b/src/vscode.proposed.terminalShellEnv.d.ts new file mode 100644 index 0000000..ffe0b76 --- /dev/null +++ b/src/vscode.proposed.terminalShellEnv.d.ts @@ -0,0 +1,18 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + // @anthonykim1 @tyriar https://github.com/microsoft/vscode/issues/227467 + + export interface TerminalShellIntegration { + /** + * The environment of the shell process. This is undefined if the shell integration script + * does not send the environment. + */ + readonly env: { [key: string]: string | undefined } | undefined; + } + + // TODO: Is it fine that this shares onDidChangeTerminalShellIntegration with cwd and the shellIntegration object itself? +} From 7d0cb13414f82270c70d6a2d6628ae63f2c24953 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 5 Feb 2025 20:08:48 -0800 Subject: [PATCH 074/328] Relax version check to handle >2024 versions of python extension (#157) --- src/common/extVersion.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/extVersion.ts b/src/common/extVersion.ts index 955eecb..39229c0 100644 --- a/src/common/extVersion.ts +++ b/src/common/extVersion.ts @@ -12,7 +12,7 @@ export function ensureCorrectVersion() { const parts = version.split('.'); const major = parseInt(parts[0]); const minor = parseInt(parts[1]); - if (major >= 2024 && minor >= 23) { + if (major >= 2025 || (major === 2024 && minor >= 23)) { return; } traceError('Incompatible Python extension. Please update `ms-python.python` to version 2024.23 or later.'); From 2e8592793cae014380a4ef4293251719858073cb Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 6 Feb 2025 08:28:46 -0800 Subject: [PATCH 075/328] Move copilot tools to features directory (#152) --- src/extension.ts | 3 +-- src/{ => features}/copilotTools.ts | 6 +++--- src/test/copilotTools.unit.test.ts | 4 +--- 3 files changed, 5 insertions(+), 8 deletions(-) rename src/{ => features}/copilotTools.ts (95%) diff --git a/src/extension.ts b/src/extension.ts index 7cb7173..5f7eaf3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -55,8 +55,8 @@ import { EventNames } from './common/telemetry/constants'; import { ensureCorrectVersion } from './common/extVersion'; import { ExistingProjects } from './features/creators/existingProjects'; import { AutoFindProjects } from './features/creators/autoFindProjects'; -import { GetPackagesTool } from './copilotTools'; import { registerTools } from './common/lm.apis'; +import { GetPackagesTool } from './features/copilotTools'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -243,7 +243,6 @@ export async function activate(context: ExtensionContext): Promise { resultMessage = 'No packages are installed in the current environment.'; } else { const packageNames = installedPackages - .map((pkg) => pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name) + .map((pkg) => (pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name)) .join(', '); resultMessage = 'The packages installed in the current environment are as follows:\n' + packageNames; } diff --git a/src/test/copilotTools.unit.test.ts b/src/test/copilotTools.unit.test.ts index e04c1f5..2857fa5 100644 --- a/src/test/copilotTools.unit.test.ts +++ b/src/test/copilotTools.unit.test.ts @@ -1,12 +1,10 @@ import * as assert from 'assert'; import * as vscode from 'vscode'; -import { GetPackagesTool } from '../copilotTools'; -//import { PythonEnvironment, Package } from '../api'; -import { IGetActiveFile } from '../copilotTools'; import * as sinon from 'sinon'; import * as typeMoq from 'typemoq'; import { Package, PythonEnvironment, PythonPackageGetterApi, PythonProjectEnvironmentApi } from '../api'; import { createDeferred } from '../common/utils/deferred'; +import { GetPackagesTool, IGetActiveFile } from '../features/copilotTools'; suite('GetPackagesTool Tests', () => { let tool: GetPackagesTool; From 42ef623da073608d267c32aa4ad05ea550ae9952 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 6 Feb 2025 08:59:33 -0800 Subject: [PATCH 076/328] Typos and clean up (#154) --- examples/sample1/src/api.ts | 2 +- package.json | 15 +++++++-------- src/api.ts | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index 76b2284..627cb96 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -58,7 +58,7 @@ export enum TerminalShellType { ksh = 'ksh', fish = 'fish', cshell = 'cshell', - tcshell = 'tshell', + tcshell = 'tcshell', nushell = 'nushell', wsl = 'wsl', xonsh = 'xonsh', diff --git a/package.json b/package.json index 9dc7176..ce746be 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,12 @@ "categories": [ "Other" ], + "enabledApiProposals": [ + "chatParticipantPrivate", + "chatParticipantAdditions", + "chatVariableResolver", + "terminalShellType" + ], "capabilities": { "untrustedWorkspaces": { "supported": false, @@ -515,12 +521,5 @@ "stack-trace": "0.0.10", "vscode-jsonrpc": "^9.0.0-next.5", "which": "^4.0.0" - }, - "enabledApiProposals": [ - "chatParticipantPrivate", - "chatParticipantAdditions", - "chatVariableResolver", - "terminalShellEnv", - "terminalShellType" - ] + } } diff --git a/src/api.ts b/src/api.ts index 76b2284..627cb96 100644 --- a/src/api.ts +++ b/src/api.ts @@ -58,7 +58,7 @@ export enum TerminalShellType { ksh = 'ksh', fish = 'fish', cshell = 'cshell', - tcshell = 'tshell', + tcshell = 'tcshell', nushell = 'nushell', wsl = 'wsl', xonsh = 'xonsh', From dd33af122d4c663956814695d0b2adc0e38007c6 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 6 Feb 2025 13:15:40 -0800 Subject: [PATCH 077/328] Pin engine version to enable proposed features (#161) Fixes https://github.com/microsoft/vscode-python-environments/issues/159 --- package-lock.json | 19 ++++++++++--------- package.json | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9e4cd6..f4652ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.96.0", + "@types/vscode": "^1.97.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", @@ -42,7 +42,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.96.0-insider" + "vscode": "^1.97.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -715,10 +715,11 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.96.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.96.0.tgz", - "integrity": "sha512-qvZbSZo+K4ZYmmDuaodMbAa67Pl6VDQzLKFka6rq+3WUTY4Kro7Bwoi0CuZLO/wema0ygcmpwow7zZfPJTs5jg==", - "dev": true + "version": "1.97.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.97.0.tgz", + "integrity": "sha512-ueE73loeOTe7olaVyqP9mrRI54kVPJifUPjblZo9fYcv1CuVLPOEKEkqW0GkqPC454+nCEoigLWnC2Pp7prZ9w==", + "dev": true, + "license": "MIT" }, "node_modules/@types/which": { "version": "3.0.4", @@ -5995,9 +5996,9 @@ "dev": true }, "@types/vscode": { - "version": "1.96.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.96.0.tgz", - "integrity": "sha512-qvZbSZo+K4ZYmmDuaodMbAa67Pl6VDQzLKFka6rq+3WUTY4Kro7Bwoi0CuZLO/wema0ygcmpwow7zZfPJTs5jg==", + "version": "1.97.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.97.0.tgz", + "integrity": "sha512-ueE73loeOTe7olaVyqP9mrRI54kVPJifUPjblZo9fYcv1CuVLPOEKEkqW0GkqPC454+nCEoigLWnC2Pp7prZ9w==", "dev": true }, "@types/which": { diff --git a/package.json b/package.json index ce746be..14dd103 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "publisher": "ms-python", "preview": true, "engines": { - "vscode": "^1.96.0-insider" + "vscode": "^1.97.0" }, "categories": [ "Other" @@ -495,7 +495,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.96.0", + "@types/vscode": "^1.97.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", From 000350a2c50571c930bb1875a4331ea5138374e3 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Thu, 6 Feb 2025 16:42:31 -0800 Subject: [PATCH 078/328] remove chat proposed API references (#164) --- package.json | 3 - vscode.proposed.chatParticipantAdditions.d.ts | 397 ------------------ vscode.proposed.chatParticipantPrivate.d.ts | 125 ------ vscode.proposed.chatVariableResolver.d.ts | 110 ----- 4 files changed, 635 deletions(-) delete mode 100644 vscode.proposed.chatParticipantAdditions.d.ts delete mode 100644 vscode.proposed.chatParticipantPrivate.d.ts delete mode 100644 vscode.proposed.chatVariableResolver.d.ts diff --git a/package.json b/package.json index 14dd103..2805b11 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,6 @@ "Other" ], "enabledApiProposals": [ - "chatParticipantPrivate", - "chatParticipantAdditions", - "chatVariableResolver", "terminalShellType" ], "capabilities": { diff --git a/vscode.proposed.chatParticipantAdditions.d.ts b/vscode.proposed.chatParticipantAdditions.d.ts deleted file mode 100644 index 1be58f2..0000000 --- a/vscode.proposed.chatParticipantAdditions.d.ts +++ /dev/null @@ -1,397 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - export interface ChatParticipant { - onDidPerformAction: Event; - } - - /** - * Now only used for the "intent detection" API below - */ - export interface ChatCommand { - readonly name: string; - readonly description: string; - } - - export class ChatResponseDetectedParticipantPart { - participant: string; - // TODO@API validate this against statically-declared slash commands? - command?: ChatCommand; - constructor(participant: string, command?: ChatCommand); - } - - export interface ChatVulnerability { - title: string; - description: string; - // id: string; // Later we will need to be able to link these across multiple content chunks. - } - - export class ChatResponseMarkdownWithVulnerabilitiesPart { - value: MarkdownString; - vulnerabilities: ChatVulnerability[]; - constructor(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]); - } - - export class ChatResponseCodeblockUriPart { - value: Uri; - constructor(value: Uri); - } - - /** - * Displays a {@link Command command} as a button in the chat response. - */ - export interface ChatCommandButton { - command: Command; - } - - export interface ChatDocumentContext { - uri: Uri; - version: number; - ranges: Range[]; - } - - export class ChatResponseTextEditPart { - uri: Uri; - edits: TextEdit[]; - isDone?: boolean; - constructor(uri: Uri, done: true); - constructor(uri: Uri, edits: TextEdit | TextEdit[]); - } - - export class ChatResponseConfirmationPart { - title: string; - message: string; - data: any; - buttons?: string[]; - constructor(title: string, message: string, data: any, buttons?: string[]); - } - - export class ChatResponseCodeCitationPart { - value: Uri; - license: string; - snippet: string; - constructor(value: Uri, license: string, snippet: string); - } - - export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart; - - export class ChatResponseWarningPart { - value: MarkdownString; - constructor(value: string | MarkdownString); - } - - export class ChatResponseProgressPart2 extends ChatResponseProgressPart { - value: string; - task?: (progress: Progress) => Thenable; - constructor(value: string, task?: (progress: Progress) => Thenable); - } - - export class ChatResponseReferencePart2 { - /** - * The reference target. - */ - value: Uri | Location | { variableName: string; value?: Uri | Location } | string; - - /** - * The icon for the reference. - */ - iconPath?: Uri | ThemeIcon | { - /** - * The icon path for the light theme. - */ - light: Uri; - /** - * The icon path for the dark theme. - */ - dark: Uri; - }; - options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }; - - /** - * Create a new ChatResponseReferencePart. - * @param value A uri or location - * @param iconPath Icon for the reference shown in UI - */ - constructor(value: Uri | Location | { variableName: string; value?: Uri | Location } | string, iconPath?: Uri | ThemeIcon | { - /** - * The icon path for the light theme. - */ - light: Uri; - /** - * The icon path for the dark theme. - */ - dark: Uri; - }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }); - } - - export class ChatResponseMovePart { - - readonly uri: Uri; - readonly range: Range; - - constructor(uri: Uri, range: Range); - } - - export interface ChatResponseAnchorPart { - /** - * The target of this anchor. - * - * If this is a {@linkcode Uri} or {@linkcode Location}, this is rendered as a normal link. - * - * If this is a {@linkcode SymbolInformation}, this is rendered as a symbol link. - * - * TODO mjbvz: Should this be a full `SymbolInformation`? Or just the parts we need? - * TODO mjbvz: Should we allow a `SymbolInformation` without a location? For example, until `resolve` completes? - */ - value2: Uri | Location | SymbolInformation; - - /** - * Optional method which fills in the details of the anchor. - * - * THis is currently only implemented for symbol links. - */ - resolve?(token: CancellationToken): Thenable; - } - - export interface ChatResponseStream { - - /** - * Push a progress part to this stream. Short-hand for - * `push(new ChatResponseProgressPart(value))`. - * - * @param value A progress message - * @param task If provided, a task to run while the progress is displayed. When the Thenable resolves, the progress will be marked complete in the UI, and the progress message will be updated to the resolved string if one is specified. - * @returns This stream. - */ - progress(value: string, task?: (progress: Progress) => Thenable): void; - - textEdit(target: Uri, edits: TextEdit | TextEdit[]): void; - - textEdit(target: Uri, isDone: true): void; - - markdownWithVulnerabilities(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]): void; - codeblockUri(uri: Uri): void; - detectedParticipant(participant: string, command?: ChatCommand): void; - push(part: ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseWarningPart | ChatResponseProgressPart2): void; - - /** - * Show an inline message in the chat view asking the user to confirm an action. - * Multiple confirmations may be shown per response. The UI might show "Accept All" / "Reject All" actions. - * @param title The title of the confirmation entry - * @param message An extra message to display to the user - * @param data An arbitrary JSON-stringifiable object that will be included in the ChatRequest when - * the confirmation is accepted or rejected - * TODO@API should this be MarkdownString? - * TODO@API should actually be a more generic function that takes an array of buttons - */ - confirmation(title: string, message: string, data: any, buttons?: string[]): void; - - /** - * Push a warning to this stream. Short-hand for - * `push(new ChatResponseWarningPart(message))`. - * - * @param message A warning message - * @returns This stream. - */ - warning(message: string | MarkdownString): void; - - reference(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }): void; - - reference2(value: Uri | Location | string | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }): void; - - codeCitation(value: Uri, license: string, snippet: string): void; - - push(part: ExtendedChatResponsePart): void; - } - - export enum ChatResponseReferencePartStatusKind { - Complete = 1, - Partial = 2, - Omitted = 3 - } - - /** - * Does this piggy-back on the existing ChatRequest, or is it a different type of request entirely? - * Does it show up in history? - */ - export interface ChatRequest { - /** - * The `data` for any confirmations that were accepted - */ - acceptedConfirmationData?: any[]; - - /** - * The `data` for any confirmations that were rejected - */ - rejectedConfirmationData?: any[]; - } - - // TODO@API fit this into the stream - export interface ChatUsedContext { - documents: ChatDocumentContext[]; - } - - export interface ChatParticipant { - /** - * Provide a set of variables that can only be used with this participant. - */ - participantVariableProvider?: { provider: ChatParticipantCompletionItemProvider; triggerCharacters: string[] }; - } - - export interface ChatParticipantCompletionItemProvider { - provideCompletionItems(query: string, token: CancellationToken): ProviderResult; - } - - export class ChatCompletionItem { - id: string; - label: string | CompletionItemLabel; - values: ChatVariableValue[]; - fullName?: string; - icon?: ThemeIcon; - insertText?: string; - detail?: string; - documentation?: string | MarkdownString; - command?: Command; - - constructor(id: string, label: string | CompletionItemLabel, values: ChatVariableValue[]); - } - - export type ChatExtendedRequestHandler = (request: ChatRequest, context: ChatContext, response: ChatResponseStream, token: CancellationToken) => ProviderResult; - - export interface ChatResult { - nextQuestion?: { - prompt: string; - participant?: string; - command?: string; - }; - } - - export namespace chat { - /** - * Create a chat participant with the extended progress type - */ - export function createChatParticipant(id: string, handler: ChatExtendedRequestHandler): ChatParticipant; - - export function registerChatParticipantDetectionProvider(participantDetectionProvider: ChatParticipantDetectionProvider): Disposable; - } - - export interface ChatParticipantMetadata { - participant: string; - command?: string; - disambiguation: { category: string; description: string; examples: string[] }[]; - } - - export interface ChatParticipantDetectionResult { - participant: string; - command?: string; - } - - export interface ChatParticipantDetectionProvider { - provideParticipantDetection(chatRequest: ChatRequest, context: ChatContext, options: { participants?: ChatParticipantMetadata[]; location: ChatLocation }, token: CancellationToken): ProviderResult; - } - - /* - * User action events - */ - - export enum ChatCopyKind { - // Keyboard shortcut or context menu - Action = 1, - Toolbar = 2 - } - - export interface ChatCopyAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'copy'; - codeBlockIndex: number; - copyKind: ChatCopyKind; - copiedCharacters: number; - totalCharacters: number; - copiedText: string; - } - - export interface ChatInsertAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'insert'; - codeBlockIndex: number; - totalCharacters: number; - newFile?: boolean; - } - - export interface ChatApplyAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'apply'; - codeBlockIndex: number; - totalCharacters: number; - newFile?: boolean; - codeMapper?: string; - } - - export interface ChatTerminalAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'runInTerminal'; - codeBlockIndex: number; - languageId?: string; - } - - export interface ChatCommandAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'command'; - commandButton: ChatCommandButton; - } - - export interface ChatFollowupAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'followUp'; - followup: ChatFollowup; - } - - export interface ChatBugReportAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'bug'; - } - - export interface ChatEditorAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'editor'; - accepted: boolean; - } - - export interface ChatEditingSessionAction { - // eslint-disable-next-line local/vscode-dts-string-type-literals - kind: 'chatEditingSessionAction'; - uri: Uri; - hasRemainingEdits: boolean; - outcome: ChatEditingSessionActionOutcome; - } - - export enum ChatEditingSessionActionOutcome { - Accepted = 1, - Rejected = 2, - Saved = 3 - } - - export interface ChatUserActionEvent { - readonly result: ChatResult; - readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction | ChatEditingSessionAction; - } - - export interface ChatPromptReference { - /** - * TODO Needed for now to drive the variableName-type reference, but probably both of these should go away in the future. - */ - readonly name: string; - } - - export interface ChatResultFeedback { - readonly unhelpfulReason?: string; - } - - export namespace lm { - export function fileIsIgnored(uri: Uri, token: CancellationToken): Thenable; - } -} diff --git a/vscode.proposed.chatParticipantPrivate.d.ts b/vscode.proposed.chatParticipantPrivate.d.ts deleted file mode 100644 index 4f08ef3..0000000 --- a/vscode.proposed.chatParticipantPrivate.d.ts +++ /dev/null @@ -1,125 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -// version: 2 - -declare module 'vscode' { - - /** - * The location at which the chat is happening. - */ - export enum ChatLocation { - /** - * The chat panel - */ - Panel = 1, - /** - * Terminal inline chat - */ - Terminal = 2, - /** - * Notebook inline chat - */ - Notebook = 3, - /** - * Code editor inline chat - */ - Editor = 4, - /** - * Chat is happening in an editing session - */ - EditingSession = 5, - } - - export class ChatRequestEditorData { - //TODO@API should be the editor - document: TextDocument; - selection: Selection; - wholeRange: Range; - - constructor(document: TextDocument, selection: Selection, wholeRange: Range); - } - - export class ChatRequestNotebookData { - //TODO@API should be the editor - readonly cell: TextDocument; - - constructor(cell: TextDocument); - } - - export interface ChatRequest { - /** - * The attempt number of the request. The first request has attempt number 0. - */ - readonly attempt: number; - - /** - * If automatic command detection is enabled. - */ - readonly enableCommandDetection: boolean; - - /** - * If the chat participant or command was automatically assigned. - */ - readonly isParticipantDetected: boolean; - - /** - * The location at which the chat is happening. This will always be one of the supported values - * - * @deprecated - */ - readonly location: ChatLocation; - - /** - * Information that is specific to the location at which chat is happening, e.g within a document, notebook, - * or terminal. Will be `undefined` for the chat panel. - */ - readonly location2: ChatRequestEditorData | ChatRequestNotebookData | undefined; - } - - export interface ChatParticipant { - supportIssueReporting?: boolean; - - /** - * Temp, support references that are slow to resolve and should be tools rather than references. - */ - supportsSlowReferences?: boolean; - } - - export interface ChatErrorDetails { - /** - * If set to true, the message content is completely hidden. Only ChatErrorDetails#message will be shown. - */ - responseIsRedacted?: boolean; - - isQuotaExceeded?: boolean; - } - - export namespace chat { - export function createDynamicChatParticipant(id: string, dynamicProps: DynamicChatParticipantProps, handler: ChatExtendedRequestHandler): ChatParticipant; - } - - /** - * These don't get set on the ChatParticipant after creation, like other props, because they are typically defined in package.json and we want them at the time of creation. - */ - export interface DynamicChatParticipantProps { - name: string; - publisherName: string; - description?: string; - fullName?: string; - } - - export namespace lm { - export function registerIgnoredFileProvider(provider: LanguageModelIgnoredFileProvider): Disposable; - } - - export interface LanguageModelIgnoredFileProvider { - provideFileIgnored(uri: Uri, token: CancellationToken): ProviderResult; - } - - export interface LanguageModelToolInvocationOptions { - chatRequestId?: string; - } -} diff --git a/vscode.proposed.chatVariableResolver.d.ts b/vscode.proposed.chatVariableResolver.d.ts deleted file mode 100644 index ec386ec..0000000 --- a/vscode.proposed.chatVariableResolver.d.ts +++ /dev/null @@ -1,110 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - export namespace chat { - - /** - * Register a variable which can be used in a chat request to any participant. - * @param id A unique ID for the variable. - * @param name The name of the variable, to be used in the chat input as `#name`. - * @param userDescription A description of the variable for the chat input suggest widget. - * @param modelDescription A description of the variable for the model. - * @param isSlow Temp, to limit access to '#codebase' which is not a 'reference' and will fit into a tools API later. - * @param resolver Will be called to provide the chat variable's value when it is used. - * @param fullName The full name of the variable when selecting context in the picker UI. - * @param icon An icon to display when selecting context in the picker UI. - */ - export function registerChatVariableResolver(id: string, name: string, userDescription: string, modelDescription: string | undefined, isSlow: boolean | undefined, resolver: ChatVariableResolver, fullName?: string, icon?: ThemeIcon): Disposable; - } - - export interface ChatVariableValue { - /** - * The detail level of this chat variable value. If possible, variable resolvers should try to offer shorter values that will consume fewer tokens in an LLM prompt. - */ - level: ChatVariableLevel; - - /** - * The variable's value, which can be included in an LLM prompt as-is, or the chat participant may decide to read the value and do something else with it. - */ - value: string | Uri; - - /** - * A description of this value, which could be provided to the LLM as a hint. - */ - description?: string; - } - - // TODO@API align with ChatRequest - export interface ChatVariableContext { - /** - * The message entered by the user, which includes this variable. - */ - // TODO@API AS-IS, variables as types, agent/commands stripped - prompt: string; - - // readonly variables: readonly ChatResolvedVariable[]; - } - - export interface ChatVariableResolver { - /** - * A callback to resolve the value of a chat variable. - * @param name The name of the variable. - * @param context Contextual information about this chat request. - * @param token A cancellation token. - */ - resolve(name: string, context: ChatVariableContext, token: CancellationToken): ProviderResult; - - /** - * A callback to resolve the value of a chat variable. - * @param name The name of the variable. - * @param context Contextual information about this chat request. - * @param token A cancellation token. - */ - resolve2?(name: string, context: ChatVariableContext, stream: ChatVariableResolverResponseStream, token: CancellationToken): ProviderResult; - } - - - /** - * The detail level of this chat variable value. - */ - export enum ChatVariableLevel { - Short = 1, - Medium = 2, - Full = 3 - } - - export interface ChatVariableResolverResponseStream { - /** - * Push a progress part to this stream. Short-hand for - * `push(new ChatResponseProgressPart(value))`. - * - * @param value - * @returns This stream. - */ - progress(value: string): ChatVariableResolverResponseStream; - - /** - * Push a reference to this stream. Short-hand for - * `push(new ChatResponseReferencePart(value))`. - * - * *Note* that the reference is not rendered inline with the response. - * - * @param value A uri or location - * @returns This stream. - */ - reference(value: Uri | Location): ChatVariableResolverResponseStream; - - /** - * Pushes a part to this stream. - * - * @param part A response part, rendered or metadata - */ - push(part: ChatVariableResolverResponsePart): ChatVariableResolverResponseStream; - } - - export type ChatVariableResolverResponsePart = ChatResponseProgressPart | ChatResponseReferencePart; -} From e4abfee2ab0e3e8661335a0f50377e6f7932e64e Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 7 Feb 2025 08:57:49 -0800 Subject: [PATCH 079/328] Use activation event and shell integration for activation tracking (#160) --- src/common/utils/debounce.ts | 8 +- src/common/utils/pathUtils.ts | 10 + src/common/window.apis.ts | 8 + src/extension.ts | 61 ++-- src/features/terminal/activateMenuButton.ts | 105 +----- .../terminal/terminalActivationState.ts | 323 ++++++++++++++++ src/features/terminal/terminalManager.ts | 345 +++--------------- src/features/terminal/utils.ts | 74 +++- 8 files changed, 509 insertions(+), 425 deletions(-) create mode 100644 src/common/utils/pathUtils.ts create mode 100644 src/features/terminal/terminalActivationState.ts diff --git a/src/common/utils/debounce.ts b/src/common/utils/debounce.ts index bbc44f2..1b19706 100644 --- a/src/common/utils/debounce.ts +++ b/src/common/utils/debounce.ts @@ -5,7 +5,7 @@ export interface SimpleDebounce { class SimpleDebounceImpl { private timeout: NodeJS.Timeout | undefined; - constructor(private readonly delay: number, private readonly callback: () => void) {} + constructor(private readonly ms: number, private readonly callback: () => void) {} public trigger() { if (this.timeout) { @@ -13,10 +13,10 @@ class SimpleDebounceImpl { } this.timeout = setTimeout(() => { this.callback(); - }, this.delay); + }, this.ms); } } -export function createSimpleDebounce(delay: number, callback: () => void): SimpleDebounce { - return new SimpleDebounceImpl(delay, callback); +export function createSimpleDebounce(ms: number, callback: () => void): SimpleDebounce { + return new SimpleDebounceImpl(ms, callback); } diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts new file mode 100644 index 0000000..ac9f4cc --- /dev/null +++ b/src/common/utils/pathUtils.ts @@ -0,0 +1,10 @@ +import * as path from 'path'; + +export function areSamePaths(a: string, b: string): boolean { + return path.resolve(a) === path.resolve(b); +} + +export function isParentPath(parent: string, child: string): boolean { + const relative = path.relative(path.resolve(parent), path.resolve(child)); + return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative); +} diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index ed9611a..bdbfa8a 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -110,6 +110,14 @@ export function onDidCloseTerminal( return window.onDidCloseTerminal(listener, thisArgs, disposables); } +export function onDidChangeTerminalState( + listener: (e: Terminal) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return window.onDidChangeTerminalState(listener, thisArgs, disposables); +} + export function showTextDocument(uri: Uri): Thenable { return window.showTextDocument(uri); } diff --git a/src/extension.ts b/src/extension.ts index 5f7eaf3..8513351 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,4 +1,4 @@ -import { commands, ExtensionContext, LogOutputChannel } from 'vscode'; +import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode'; import { PythonEnvironmentManagers } from './features/envManagers'; import { registerLogger, traceInfo } from './common/logging'; @@ -30,7 +30,7 @@ import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './in import { getPythonApi, setPythonApi } from './features/pythonApi'; import { setPersistentState } from './common/persistentState'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; -import { PythonEnvironmentApi } from './api'; +import { PythonEnvironment, PythonEnvironmentApi } from './api'; import { ProjectCreatorsImpl } from './features/creators/projectCreators'; import { ProjectView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; @@ -40,12 +40,9 @@ import { createLogOutputChannel, onDidChangeActiveTerminal, onDidChangeActiveTextEditor, + onDidChangeTerminalShellIntegration, } from './common/window.apis'; -import { - getEnvironmentForTerminal, - setActivateMenuButtonContext, - updateActivateMenuButtonContext, -} from './features/terminal/activateMenuButton'; +import { setActivateMenuButtonContext } from './features/terminal/activateMenuButton'; import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; import { EnvVarManager, PythonEnvVariableManager } from './features/execution/envVariableManager'; @@ -57,6 +54,8 @@ import { ExistingProjects } from './features/creators/existingProjects'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { registerTools } from './common/lm.apis'; import { GetPackagesTool } from './features/copilotTools'; +import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; +import { getEnvironmentForTerminal } from './features/terminal/utils'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -82,8 +81,9 @@ export async function activate(context: ExtensionContext): Promise(); + context.subscriptions.push( registerCompletionProvider(envManagers), - registerTools('python_get_packages', new GetPackagesTool(api)), commands.registerCommand('python-envs.viewLogs', () => outputChannel.show()), commands.registerCommand('python-envs.refreshManager', async (item) => { @@ -181,10 +182,9 @@ export async function activate(context: ExtensionContext): Promise { const terminal = activeTerminal(); if (terminal) { - const env = await getEnvironmentForTerminal(terminalManager, projectManager, envManagers, terminal); + const env = await getEnvironmentForTerminal(api, terminal); if (env) { await terminalManager.activate(terminal, env); - await setActivateMenuButtonContext(terminalManager, terminal, env); } } }), @@ -192,27 +192,26 @@ export async function activate(context: ExtensionContext): Promise { - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); + terminalActivation.onDidChangeTerminalActivationState(async (e) => { + await setActivateMenuButtonContext(e.terminal, e.environment, e.activated); }), onDidChangeActiveTerminal(async (t) => { - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers, t); + if (t) { + const env = terminalActivation.getEnvironment(t) ?? (await getEnvironmentForTerminal(api, t)); + if (env) { + await setActivateMenuButtonContext(t, env, terminalActivation.isActivated(t)); + } + } }), onDidChangeActiveTextEditor(async () => { updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), envManagers.onDidChangeEnvironment(async () => { - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), envManagers.onDidChangeEnvironments(async () => { - await updateActivateMenuButtonContext(terminalManager, projectManager, envManagers); updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), envManagers.onDidChangeEnvironmentFiltered(async (e) => { @@ -221,9 +220,25 @@ export async function activate(context: ExtensionContext): Promise { + const envVar = e.shellIntegration?.env; + if (envVar) { + if (envVar['VIRTUAL_ENV']) { + const env = await api.resolveEnvironment(Uri.file(envVar['VIRTUAL_ENV'])); + if (env) { + monitoredTerminals.set(e.terminal, env); + terminalActivation.updateActivationState(e.terminal, env, true); + } + } else if (monitoredTerminals.has(e.terminal)) { + const env = monitoredTerminals.get(e.terminal); + if (env) { + terminalActivation.updateActivationState(e.terminal, env, false); + } + } + } + }), ); /** @@ -238,7 +253,7 @@ export async function activate(context: ExtensionContext): Promise { - const projects = pm.getProjects(); - const envs: PythonEnvironment[] = []; - const projectEnvs = await Promise.all( - projects.map(async (p) => { - const manager = em.getEnvironmentManager(p.uri); - return manager?.get(p.uri); - }), - ); - projectEnvs.forEach((e) => { - if (e && !envs.find((x) => x.envId.id === e.envId.id)) { - envs.push(e); - } - }); - return envs; -} - -export async function getEnvironmentForTerminal( - tm: TerminalEnvironment, - pm: PythonProjectManager, - em: EnvironmentManagers, - t: Terminal, -): Promise { - let env = await tm.getEnvironment(t); - if (env) { - return env; - } - - const projects = pm.getProjects(); - if (projects.length === 0) { - const manager = em.getEnvironmentManager(undefined); - env = await manager?.get(undefined); - } else if (projects.length === 1) { - const manager = em.getEnvironmentManager(projects[0].uri); - env = await manager?.get(projects[0].uri); - } else { - const envs = await getDistinctProjectEnvs(pm, em); - if (envs.length === 1) { - // If we have only one distinct environment, then use that. - env = envs[0]; - } else { - // If we have multiple distinct environments, then we can't pick one - // So skip selecting so we can try heuristic approach - } - } - if (env) { - return env; - } - - // This is a heuristic approach to attempt to find the environment for this terminal. - // This is not guaranteed to work, but is better than nothing. - let tempCwd = t.shellIntegration?.cwd ?? (t.creationOptions as TerminalOptions)?.cwd; - let cwd = typeof tempCwd === 'string' ? Uri.file(tempCwd) : tempCwd; - if (cwd) { - const manager = em.getEnvironmentManager(cwd); - env = await manager?.get(cwd); - } else { - const workspaces = getWorkspaceFolders() ?? []; - if (workspaces.length === 1) { - const manager = em.getEnvironmentManager(workspaces[0].uri); - env = await manager?.get(workspaces[0].uri); - } - } - - return env; -} - -export async function updateActivateMenuButtonContext( - tm: TerminalEnvironment & TerminalActivation, - pm: PythonProjectManager, - em: EnvironmentManagers, - terminal?: Terminal, -): Promise { - const selected = terminal ?? activeTerminal(); - - if (!selected) { - return; - } - - const env = await getEnvironmentForTerminal(tm, pm, em, selected); - if (!env) { - return; - } - - await setActivateMenuButtonContext(tm, selected, env); -} - export async function setActivateMenuButtonContext( - tm: TerminalActivation, terminal: Terminal, env: PythonEnvironment, + activated?: boolean, ): Promise { const activatable = !isTaskTerminal(terminal) && isActivatableEnvironment(env); await executeCommand('setContext', 'pythonTerminalActivation', activatable); - if (!activatable) { - return; - } - - if (tm.isActivated(terminal)) { - await executeCommand('setContext', 'pythonTerminalActivated', true); - } else { - await executeCommand('setContext', 'pythonTerminalActivated', false); + if (activated !== undefined) { + await executeCommand('setContext', 'pythonTerminalActivated', activated); } } diff --git a/src/features/terminal/terminalActivationState.ts b/src/features/terminal/terminalActivationState.ts new file mode 100644 index 0000000..e6cfed3 --- /dev/null +++ b/src/features/terminal/terminalActivationState.ts @@ -0,0 +1,323 @@ +import { + Disposable, + Event, + EventEmitter, + Terminal, + TerminalShellExecutionEndEvent, + TerminalShellExecutionStartEvent, + TerminalShellIntegration, +} from 'vscode'; +import { PythonEnvironment } from '../../api'; +import { onDidEndTerminalShellExecution, onDidStartTerminalShellExecution } from '../../common/window.apis'; +import { traceError, traceInfo, traceVerbose } from '../../common/logging'; +import { isTaskTerminal } from './utils'; +import { createDeferred } from '../../common/utils/deferred'; +import { getActivationCommand, getDeactivationCommand } from '../common/activation'; +import { quoteArgs } from '../execution/execUtils'; + +export interface DidChangeTerminalActivationStateEvent { + terminal: Terminal; + environment: PythonEnvironment; + activated: boolean; +} + +export interface TerminalActivation { + isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean; + activate(terminal: Terminal, environment: PythonEnvironment): Promise; + deactivate(terminal: Terminal): Promise; + onDidChangeTerminalActivationState: Event; +} + +export interface TerminalEnvironment { + getEnvironment(terminal: Terminal): PythonEnvironment | undefined; +} + +export interface TerminalActivationInternal extends TerminalActivation, TerminalEnvironment, Disposable { + updateActivationState(terminal: Terminal, environment: PythonEnvironment, activated: boolean): void; +} + +export class TerminalActivationImpl implements TerminalActivationInternal { + private disposables: Disposable[] = []; + + private onTerminalShellExecutionStartEmitter = new EventEmitter(); + private onTerminalShellExecutionStart = this.onTerminalShellExecutionStartEmitter.event; + + private onTerminalShellExecutionEndEmitter = new EventEmitter(); + private onTerminalShellExecutionEnd = this.onTerminalShellExecutionEndEmitter.event; + + private onDidChangeTerminalActivationStateEmitter = new EventEmitter(); + onDidChangeTerminalActivationState = this.onDidChangeTerminalActivationStateEmitter.event; + + private onTerminalClosedEmitter = new EventEmitter(); + private onTerminalClosed = this.onTerminalClosedEmitter.event; + + private activatedTerminals = new Map(); + private activatingTerminals = new Map>(); + private deactivatingTerminals = new Map>(); + + constructor() { + this.disposables.push( + this.onDidChangeTerminalActivationStateEmitter, + this.onTerminalShellExecutionStartEmitter, + this.onTerminalShellExecutionEndEmitter, + this.onTerminalClosedEmitter, + onDidStartTerminalShellExecution((e: TerminalShellExecutionStartEvent) => { + this.onTerminalShellExecutionStartEmitter.fire(e); + }), + onDidEndTerminalShellExecution((e: TerminalShellExecutionEndEvent) => { + this.onTerminalShellExecutionEndEmitter.fire(e); + }), + this.onTerminalClosed((terminal) => { + this.activatedTerminals.delete(terminal); + this.activatingTerminals.delete(terminal); + this.deactivatingTerminals.delete(terminal); + }), + ); + } + + isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean { + if (!environment) { + return this.activatedTerminals.has(terminal); + } + const env = this.activatedTerminals.get(terminal); + return env?.envId.id === environment?.envId.id; + } + + getEnvironment(terminal: Terminal): PythonEnvironment | undefined { + return this.activatedTerminals.get(terminal); + } + + async activate(terminal: Terminal, environment: PythonEnvironment): Promise { + if (isTaskTerminal(terminal)) { + traceVerbose('Cannot activate environment in a task terminal'); + return; + } + + if (this.deactivatingTerminals.has(terminal)) { + traceVerbose('Terminal is being deactivated, cannot activate.'); + return this.deactivatingTerminals.get(terminal); + } + + if (this.activatingTerminals.has(terminal)) { + traceVerbose('Terminal is being activated, skipping.'); + return this.activatingTerminals.get(terminal); + } + + const terminalEnv = this.activatedTerminals.get(terminal); + if (terminalEnv) { + if (terminalEnv.envId.id === environment.envId.id) { + traceVerbose('Terminal is already activated with the same environment'); + return; + } else { + traceInfo( + `Terminal is activated with a different environment, deactivating: ${terminalEnv.environmentPath.fsPath}`, + ); + await this.deactivate(terminal); + } + } + + try { + const promise = this.activateInternal(terminal, environment); + traceVerbose(`Activating terminal: ${environment.environmentPath.fsPath}`); + this.activatingTerminals.set(terminal, promise); + await promise; + this.activatingTerminals.delete(terminal); + this.updateActivationState(terminal, environment, true); + traceInfo(`Terminal is activated: ${environment.environmentPath.fsPath}`); + } catch (ex) { + this.activatingTerminals.delete(terminal); + traceError('Failed to activate environment:\r\n', ex); + } + } + + async deactivate(terminal: Terminal): Promise { + if (isTaskTerminal(terminal)) { + traceVerbose('Cannot deactivate environment in a task terminal'); + return; + } + + if (this.activatingTerminals.has(terminal)) { + traceVerbose('Terminal is being activated, cannot deactivate.'); + return this.activatingTerminals.get(terminal); + } + + if (this.deactivatingTerminals.has(terminal)) { + traceVerbose('Terminal is being deactivated, skipping.'); + return this.deactivatingTerminals.get(terminal); + } + + const terminalEnv = this.activatedTerminals.get(terminal); + if (terminalEnv) { + try { + const promise = this.deactivateInternal(terminal, terminalEnv); + traceVerbose(`Deactivating terminal: ${terminalEnv.environmentPath.fsPath}`); + this.deactivatingTerminals.set(terminal, promise); + await promise; + this.deactivatingTerminals.delete(terminal); + this.updateActivationState(terminal, terminalEnv, false); + traceInfo(`Terminal is deactivated: ${terminalEnv.environmentPath.fsPath}`); + } catch (ex) { + this.deactivatingTerminals.delete(terminal); + traceError('Failed to deactivate environment:\r\n', ex); + } + } else { + traceVerbose('Terminal is not activated'); + } + } + + updateActivationState(terminal: Terminal, environment: PythonEnvironment, activated: boolean): void { + if (activated) { + this.activatedTerminals.set(terminal, environment); + } else { + this.activatedTerminals.delete(terminal); + } + setImmediate(() => { + this.onDidChangeTerminalActivationStateEmitter.fire({ terminal, environment, activated }); + }); + } + + dispose() { + this.disposables.forEach((d) => d.dispose()); + } + + private async activateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (terminal.shellIntegration) { + await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); + } else { + this.activateLegacy(terminal, environment); + } + } + + private async deactivateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { + if (terminal.shellIntegration) { + await this.deactivateUsingShellIntegration(terminal.shellIntegration, terminal, environment); + } else { + this.deactivateLegacy(terminal, environment); + } + } + + private activateLegacy(terminal: Terminal, environment: PythonEnvironment) { + const activationCommands = getActivationCommand(terminal, environment); + if (activationCommands) { + for (const command of activationCommands) { + const args = command.args ?? []; + const text = quoteArgs([command.executable, ...args]).join(' '); + terminal.sendText(text); + } + this.activatedTerminals.set(terminal, environment); + } + } + + private deactivateLegacy(terminal: Terminal, environment: PythonEnvironment) { + const deactivationCommands = getDeactivationCommand(terminal, environment); + if (deactivationCommands) { + for (const command of deactivationCommands) { + const args = command.args ?? []; + const text = quoteArgs([command.executable, ...args]).join(' '); + terminal.sendText(text); + } + this.activatedTerminals.delete(terminal); + } + } + + private async activateUsingShellIntegration( + shellIntegration: TerminalShellIntegration, + terminal: Terminal, + environment: PythonEnvironment, + ): Promise { + const activationCommands = getActivationCommand(terminal, environment); + if (activationCommands) { + try { + for (const command of activationCommands) { + const execPromise = createDeferred(); + const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const disposables: Disposable[] = []; + let timer: NodeJS.Timeout | undefined = setTimeout(() => { + execPromise.resolve(); + traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + }, 2000); + disposables.push( + this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { + if (e.execution === execution) { + execPromise.resolve(); + if (timer) { + clearTimeout(timer); + timer = undefined; + } + } + }), + this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { + if (e.execution === execution) { + traceVerbose( + `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, + ); + } + }), + new Disposable(() => { + if (timer) { + clearTimeout(timer); + timer = undefined; + } + }), + ); + try { + await execPromise.promise; + } finally { + disposables.forEach((d) => d.dispose()); + } + } + } finally { + this.activatedTerminals.set(terminal, environment); + } + } + } + + private async deactivateUsingShellIntegration( + shellIntegration: TerminalShellIntegration, + terminal: Terminal, + environment: PythonEnvironment, + ): Promise { + const deactivationCommands = getDeactivationCommand(terminal, environment); + if (deactivationCommands) { + try { + for (const command of deactivationCommands) { + const execPromise = createDeferred(); + const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const disposables: Disposable[] = []; + let timer: NodeJS.Timeout | undefined = setTimeout(() => { + execPromise.resolve(); + traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + }, 2000); + disposables.push( + this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { + if (e.execution === execution) { + execPromise.resolve(); + if (timer) { + clearTimeout(timer); + timer = undefined; + } + } + }), + this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { + if (e.execution === execution) { + traceVerbose( + `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, + ); + } + }), + new Disposable(() => { + if (timer) { + clearTimeout(timer); + timer = undefined; + } + }), + ); + + await execPromise.promise; + } + } finally { + this.activatedTerminals.delete(terminal); + } + } + } +} diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 6ae6940..f94d93c 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -1,40 +1,24 @@ import * as path from 'path'; import * as fsapi from 'fs-extra'; -import { - Disposable, - EventEmitter, - ProgressLocation, - TerminalShellIntegration, - Terminal, - TerminalShellExecutionEndEvent, - TerminalShellExecutionStartEvent, - Uri, - TerminalOptions, -} from 'vscode'; +import { Disposable, EventEmitter, ProgressLocation, Terminal, Uri, TerminalOptions } from 'vscode'; import { createTerminal, onDidCloseTerminal, - onDidEndTerminalShellExecution, onDidOpenTerminal, - onDidStartTerminalShellExecution, terminals, withProgress, } from '../../common/window.apis'; -import { PythonEnvironment, PythonProject, PythonTerminalCreateOptions } from '../../api'; -import { getActivationCommand, getDeactivationCommand, isActivatableEnvironment } from '../common/activation'; -import { quoteArgs } from '../execution/execUtils'; -import { createDeferred } from '../../common/utils/deferred'; -import { traceError, traceVerbose } from '../../common/logging'; +import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonTerminalCreateOptions } from '../../api'; +import { isActivatableEnvironment } from '../common/activation'; import { getConfiguration } from '../../common/workspace.apis'; -import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; -import { isTaskTerminal, waitForShellIntegration } from './utils'; -import { setActivateMenuButtonContext } from './activateMenuButton'; - -export interface TerminalActivation { - isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean; - activate(terminal: Terminal, environment: PythonEnvironment): Promise; - deactivate(terminal: Terminal): Promise; -} +import { getEnvironmentForTerminal, waitForShellIntegration } from './utils'; +import { + DidChangeTerminalActivationStateEvent, + TerminalActivation, + TerminalActivationInternal, + TerminalEnvironment, +} from './terminalActivationState'; +import { getPythonApi } from '../pythonApi'; export interface TerminalCreation { create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; @@ -54,12 +38,8 @@ export interface TerminalGetters { ): Promise; } -export interface TerminalEnvironment { - getEnvironment(terminal: Terminal): Promise; -} - export interface TerminalInit { - initialize(): Promise; + initialize(api: PythonEnvironmentApi): Promise; } export interface TerminalManager @@ -72,9 +52,6 @@ export interface TerminalManager export class TerminalManagerImpl implements TerminalManager { private disposables: Disposable[] = []; - private activatedTerminals = new Map(); - private activatingTerminals = new Map>(); - private deactivatingTerminals = new Map>(); private skipActivationOnOpen = new Set(); private onTerminalOpenedEmitter = new EventEmitter(); @@ -83,197 +60,59 @@ export class TerminalManagerImpl implements TerminalManager { private onTerminalClosedEmitter = new EventEmitter(); private onTerminalClosed = this.onTerminalClosedEmitter.event; - private onTerminalShellExecutionStartEmitter = new EventEmitter(); - private onTerminalShellExecutionStart = this.onTerminalShellExecutionStartEmitter.event; - - private onTerminalShellExecutionEndEmitter = new EventEmitter(); - private onTerminalShellExecutionEnd = this.onTerminalShellExecutionEndEmitter.event; + private onDidChangeTerminalActivationStateEmitter = new EventEmitter(); + public onDidChangeTerminalActivationState = this.onDidChangeTerminalActivationStateEmitter.event; - constructor(private readonly projectManager: PythonProjectManager, private readonly em: EnvironmentManagers) { + constructor(private readonly ta: TerminalActivationInternal) { this.disposables.push( + this.onTerminalOpenedEmitter, + this.onTerminalClosedEmitter, + this.onDidChangeTerminalActivationStateEmitter, onDidOpenTerminal((t: Terminal) => { this.onTerminalOpenedEmitter.fire(t); }), onDidCloseTerminal((t: Terminal) => { this.onTerminalClosedEmitter.fire(t); }), - onDidStartTerminalShellExecution((e: TerminalShellExecutionStartEvent) => { - this.onTerminalShellExecutionStartEmitter.fire(e); - }), - onDidEndTerminalShellExecution((e: TerminalShellExecutionEndEvent) => { - this.onTerminalShellExecutionEndEmitter.fire(e); - }), - this.onTerminalOpenedEmitter, - this.onTerminalClosedEmitter, - this.onTerminalShellExecutionStartEmitter, - this.onTerminalShellExecutionEndEmitter, this.onTerminalOpened(async (t) => { if (this.skipActivationOnOpen.has(t) || (t.creationOptions as TerminalOptions)?.hideFromUser) { return; } - await this.autoActivateOnTerminalOpen(t); + let env = this.ta.getEnvironment(t); + if (!env) { + const api = await getPythonApi(); + env = await getEnvironmentForTerminal(api, t); + } + if (env) { + await this.autoActivateOnTerminalOpen(t, env); + } }), this.onTerminalClosed((t) => { - this.activatedTerminals.delete(t); - this.activatingTerminals.delete(t); - this.deactivatingTerminals.delete(t); this.skipActivationOnOpen.delete(t); }), + this.ta.onDidChangeTerminalActivationState((e) => { + this.onDidChangeTerminalActivationStateEmitter.fire(e); + }), ); } - private activateLegacy(terminal: Terminal, environment: PythonEnvironment) { - const activationCommands = getActivationCommand(terminal, environment); - if (activationCommands) { - for (const command of activationCommands) { - const args = command.args ?? []; - const text = quoteArgs([command.executable, ...args]).join(' '); - terminal.sendText(text); - } - this.activatedTerminals.set(terminal, environment); - } - } - - private deactivateLegacy(terminal: Terminal, environment: PythonEnvironment) { - const deactivationCommands = getDeactivationCommand(terminal, environment); - if (deactivationCommands) { - for (const command of deactivationCommands) { - const args = command.args ?? []; - const text = quoteArgs([command.executable, ...args]).join(' '); - terminal.sendText(text); - } - this.activatedTerminals.delete(terminal); - } - } - - private async activateUsingShellIntegration( - shellIntegration: TerminalShellIntegration, - terminal: Terminal, - environment: PythonEnvironment, - ): Promise { - const activationCommands = getActivationCommand(terminal, environment); - if (activationCommands) { - try { - for (const command of activationCommands) { - const execPromise = createDeferred(); - const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); - const disposables: Disposable[] = []; - let timer: NodeJS.Timeout | undefined = setTimeout(() => { - execPromise.resolve(); - traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); - }, 2000); - disposables.push( - this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { - if (e.execution === execution) { - execPromise.resolve(); - if (timer) { - clearTimeout(timer); - timer = undefined; - } - } - }), - this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { - if (e.execution === execution) { - traceVerbose( - `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, - ); - } - }), - new Disposable(() => { - if (timer) { - clearTimeout(timer); - timer = undefined; - } - }), - ); - try { - await execPromise.promise; - } finally { - disposables.forEach((d) => d.dispose()); - } - } - } finally { - this.activatedTerminals.set(terminal, environment); - } - } - } - - private async deactivateUsingShellIntegration( - shellIntegration: TerminalShellIntegration, - terminal: Terminal, - environment: PythonEnvironment, - ): Promise { - const deactivationCommands = getDeactivationCommand(terminal, environment); - if (deactivationCommands) { - try { - for (const command of deactivationCommands) { - const execPromise = createDeferred(); - const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); - const disposables: Disposable[] = []; - let timer: NodeJS.Timeout | undefined = setTimeout(() => { - execPromise.resolve(); - traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); - }, 2000); - disposables.push( - this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { - if (e.execution === execution) { - execPromise.resolve(); - if (timer) { - clearTimeout(timer); - timer = undefined; - } - } - }), - this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { - if (e.execution === execution) { - traceVerbose( - `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, - ); - } - }), - new Disposable(() => { - if (timer) { - clearTimeout(timer); - timer = undefined; - } - }), - ); - - await execPromise.promise; - } - } finally { - this.activatedTerminals.delete(terminal); - } - } - } - - private async getActivationEnvironment(): Promise { - const projects = this.projectManager.getProjects(); - const uri = projects.length === 0 ? undefined : projects[0].uri; - const manager = this.em.getEnvironmentManager(uri); - const env = await manager?.get(uri); - return env; - } - - private async autoActivateOnTerminalOpen(terminal: Terminal, environment?: PythonEnvironment): Promise { + private async autoActivateOnTerminalOpen(terminal: Terminal, environment: PythonEnvironment): Promise { const config = getConfiguration('python'); if (!config.get('terminal.activateEnvironment', false)) { return; } - const env = environment ?? (await this.getActivationEnvironment()); - if (env && isActivatableEnvironment(env)) { + if (isActivatableEnvironment(environment)) { await withProgress( { location: ProgressLocation.Window, - title: `Activating environment: ${env.displayName}`, + title: `Activating environment: ${environment.environmentPath.fsPath}`, }, async () => { await waitForShellIntegration(terminal); - await this.activate(terminal, env); + await this.activate(terminal, environment); }, ); - await setActivateMenuButtonContext(this, terminal, env); } } @@ -374,103 +213,15 @@ export class TerminalManagerImpl implements TerminalManager { return newTerminal; } - public isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean { - const envVar = terminal.shellIntegration?.env; - if (envVar) { - return !!envVar['VIRTUAL_ENV']; - } - - if (!environment) { - return this.activatedTerminals.has(terminal); - } - const env = this.activatedTerminals.get(terminal); - return env?.envId.id === environment?.envId.id; - } - - private async activateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { - if (isTaskTerminal(terminal)) { - return; - } - - if (terminal.shellIntegration) { - await this.activateUsingShellIntegration(terminal.shellIntegration, terminal, environment); - } else { - this.activateLegacy(terminal, environment); - } - } - - public async activate(terminal: Terminal, environment: PythonEnvironment): Promise { - if (this.isActivated(terminal, environment)) { - return; - } - - if (this.deactivatingTerminals.has(terminal)) { - traceVerbose('Terminal is being deactivated, cannot activate. Waiting...'); - return this.deactivatingTerminals.get(terminal); - } - - if (this.activatingTerminals.has(terminal)) { - return this.activatingTerminals.get(terminal); - } - - try { - traceVerbose(`Activating terminal for environment: ${environment.displayName}`); - const promise = this.activateInternal(terminal, environment); - this.activatingTerminals.set(terminal, promise); - await promise; - } catch (ex) { - traceError('Failed to activate environment:\r\n', ex); - } finally { - this.activatingTerminals.delete(terminal); - } - } - - private async deactivateInternal(terminal: Terminal, environment: PythonEnvironment): Promise { - if (isTaskTerminal(terminal)) { - return; - } - - if (terminal.shellIntegration) { - await this.deactivateUsingShellIntegration(terminal.shellIntegration, terminal, environment); - } else { - this.deactivateLegacy(terminal, environment); - } - } - - public async deactivate(terminal: Terminal): Promise { - if (this.activatingTerminals.has(terminal)) { - traceVerbose('Terminal is being activated, cannot deactivate. Waiting...'); - await this.activatingTerminals.get(terminal); - } - - if (this.deactivatingTerminals.has(terminal)) { - return this.deactivatingTerminals.get(terminal); - } - - const environment = this.activatedTerminals.get(terminal); - if (!environment) { - return; - } - - try { - traceVerbose(`Deactivating terminal for environment: ${environment.displayName}`); - const promise = this.deactivateInternal(terminal, environment); - this.deactivatingTerminals.set(terminal, promise); - await promise; - } catch (ex) { - traceError('Failed to deactivate environment:\r\n', ex); - } finally { - this.deactivatingTerminals.delete(terminal); - } - } - - public async initialize(): Promise { + public async initialize(api: PythonEnvironmentApi): Promise { const config = getConfiguration('python'); if (config.get('terminal.activateEnvInCurrentTerminal', false)) { await Promise.all( terminals().map(async (t) => { this.skipActivationOnOpen.add(t); - const env = await this.getActivationEnvironment(); + + const env = this.ta.getEnvironment(t) ?? (await getEnvironmentForTerminal(api, t)); + if (env && isActivatableEnvironment(env)) { await this.activate(t, env); } @@ -479,18 +230,20 @@ export class TerminalManagerImpl implements TerminalManager { } } - public async getEnvironment(terminal: Terminal): Promise { - if (this.deactivatingTerminals.has(terminal)) { - return undefined; - } + public getEnvironment(terminal: Terminal): PythonEnvironment | undefined { + return this.ta.getEnvironment(terminal); + } - if (this.activatingTerminals.has(terminal)) { - await this.activatingTerminals.get(terminal); - } + public activate(terminal: Terminal, environment: PythonEnvironment): Promise { + return this.ta.activate(terminal, environment); + } - if (this.activatedTerminals.has(terminal)) { - return Promise.resolve(this.activatedTerminals.get(terminal)); - } + public deactivate(terminal: Terminal): Promise { + return this.ta.deactivate(terminal); + } + + isActivated(terminal: Terminal, environment?: PythonEnvironment): boolean { + return this.ta.isActivated(terminal, environment); } dispose(): void { diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 124ff29..612fbe2 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -1,5 +1,8 @@ -import { Terminal } from 'vscode'; +import * as path from 'path'; +import { Terminal, TerminalOptions, Uri } from 'vscode'; import { sleep } from '../../common/utils/asyncUtils'; +import { PythonEnvironment, PythonProject, PythonProjectEnvironmentApi, PythonProjectGetterApi } from '../../api'; +import { getWorkspaceFolders } from '../../common/workspace.apis'; const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds @@ -17,3 +20,72 @@ export function isTaskTerminal(terminal: Terminal): boolean { // TODO: Need API for core for this https://github.com/microsoft/vscode/issues/234440 return terminal.name.toLowerCase().includes('task'); } + +export function getTerminalCwd(terminal: Terminal): string | undefined { + if (terminal.shellIntegration?.cwd) { + return terminal.shellIntegration.cwd.fsPath; + } + const cwd = (terminal.creationOptions as TerminalOptions)?.cwd; + if (cwd) { + return typeof cwd === 'string' ? cwd : cwd.fsPath; + } + return undefined; +} + +async function getDistinctProjectEnvs( + api: PythonProjectEnvironmentApi, + projects: readonly PythonProject[], +): Promise { + const envs: PythonEnvironment[] = []; + await Promise.all( + projects.map(async (p) => { + const e = await api.getEnvironment(p.uri); + if (e && !envs.find((x) => x.envId.id === e.envId.id)) { + envs.push(e); + } + }), + ); + return envs; +} + +export async function getEnvironmentForTerminal( + api: PythonProjectGetterApi & PythonProjectEnvironmentApi, + terminal?: Terminal, +): Promise { + let env: PythonEnvironment | undefined; + + const projects = api.getPythonProjects(); + if (projects.length === 0) { + env = await api.getEnvironment(undefined); + } else if (projects.length === 1) { + env = await api.getEnvironment(projects[0].uri); + } else { + const envs = await getDistinctProjectEnvs(api, projects); + if (envs.length === 1) { + // If we have only one distinct environment, then use that. + env = envs[0]; + } else { + // If we have multiple distinct environments, then we can't pick one + // So skip selecting so we can try heuristic approach + env = undefined; + } + } + + if (env) { + return env; + } + + // This is a heuristic approach to attempt to find the environment for this terminal. + // This is not guaranteed to work, but is better than nothing. + const terminalCwd = terminal ? getTerminalCwd(terminal) : undefined; + if (terminalCwd) { + env = await api.getEnvironment(Uri.file(path.resolve(terminalCwd))); + } else { + const workspaces = getWorkspaceFolders() ?? []; + if (workspaces.length === 1) { + env = await api.getEnvironment(workspaces[0].uri); + } + } + + return env; +} From 0e6cec074b10f795bbb6d0a84a5746eb75787689 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 7 Feb 2025 14:23:49 -0800 Subject: [PATCH 080/328] feat: Add copy path to Project and Environments (#170) Closes https://github.com/microsoft/vscode-python-environments/issues/166 --- package.json | 35 ++++++++++ package.nls.json | 2 + src/common/env.apis.ts | 4 ++ src/extension.ts | 7 ++ src/features/envCommands.ts | 31 +++++++-- .../commands/copyPathToClipboard.unit.test.ts | 68 +++++++++++++++++++ 6 files changed, 141 insertions(+), 6 deletions(-) create mode 100644 src/test/features/commands/copyPathToClipboard.unit.test.ts diff --git a/package.json b/package.json index 2805b11..29ef2f6 100644 --- a/package.json +++ b/package.json @@ -218,6 +218,18 @@ "title": "%python-envs.uninstallPackage.title%", "category": "Python Envs", "icon": "$(trash)" + }, + { + "command": "python-envs.copyEnvPath", + "title": "%python-envs.copyEnvPath.title%", + "category": "Python Envs", + "icon": "$(copy)" + }, + { + "command": "python-envs.copyProjectPath", + "title": "%python-envs.copyProjectPath.title%", + "category": "Python Envs", + "icon": "$(copy)" } ], "menus": { @@ -285,6 +297,14 @@ { "command": "python-envs.uninstallPackage", "when": "false" + }, + { + "command": "python-envs.copyEnvPath", + "when": "false" + }, + { + "command": "python-envs.copyProjectPath", + "when": "false" } ], "view/item/context": [ @@ -322,6 +342,11 @@ "group": "inline", "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" }, + { + "command": "python-envs.copyEnvPath", + "group": "inline", + "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" + }, { "command": "python-envs.uninstallPackage", "group": "inline", @@ -332,6 +357,11 @@ "group": "inline", "when": "view == python-projects && viewItem == python-env" }, + { + "command": "python-envs.copyEnvPath", + "group": "inline", + "when": "view == python-projects && viewItem == python-env" + }, { "command": "python-envs.refreshPackages", "group": "inline", @@ -355,6 +385,11 @@ "group": "inline", "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" }, + { + "command": "python-envs.copyProjectPath", + "group": "inline", + "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" + }, { "command": "python-envs.uninstallPackage", "group": "inline", diff --git a/package.nls.json b/package.nls.json index 5e1fdb1..f7547a6 100644 --- a/package.nls.json +++ b/package.nls.json @@ -10,6 +10,8 @@ "python-envs.setPkgManager.title": "Set Package Manager", "python-envs.addPythonProject.title": "Add Python Project", "python-envs.removePythonProject.title": "Remove Python Project", + "python-envs.copyEnvPath.title": "Copy Environment Path", + "python-envs.copyProjectPath.title": "Copy Project Path", "python-envs.create.title": "Create Environment", "python-envs.createAny.title": "Create Environment", "python-envs.set.title": "Set Workspace Environment", diff --git a/src/common/env.apis.ts b/src/common/env.apis.ts index 157c9a4..21369ed 100644 --- a/src/common/env.apis.ts +++ b/src/common/env.apis.ts @@ -3,3 +3,7 @@ import { env, Uri } from 'vscode'; export function launchBrowser(uri: string | Uri): Thenable { return env.openExternal(uri instanceof Uri ? uri : Uri.parse(uri)); } + +export function clipboardWriteText(text: string): Thenable { + return env.clipboard.writeText(text); +} diff --git a/src/extension.ts b/src/extension.ts index 8513351..86c1445 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -22,6 +22,7 @@ import { createAnyEnvironmentCommand, runInDedicatedTerminalCommand, handlePackageUninstall, + copyPathToClipboard, } from './features/envCommands'; import { registerCondaFeatures } from './managers/conda/main'; import { registerSystemPythonFeatures } from './managers/builtin/main'; @@ -179,6 +180,12 @@ export async function activate(context: ExtensionContext): Promise { return createTerminalCommand(item, api, terminalManager); }), + commands.registerCommand('python-envs.copyEnvPath', async (item) => { + await copyPathToClipboard(item); + }), + commands.registerCommand('python-envs.copyProjectPath', async (item) => { + await copyPathToClipboard(item); + }), commands.registerCommand('python-envs.terminal.activate', async () => { const terminal = activeTerminal(); if (terminal) { diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index afb9c9a..5afe342 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,4 +1,4 @@ -import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, window } from 'vscode'; +import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode'; import { EnvironmentManagers, InternalEnvironmentManager, @@ -40,6 +40,10 @@ import { pickPackageOptions } from '../common/pickers/packages'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { TerminalManager } from './terminal/terminalManager'; import { runInTerminal } from './terminal/runInTerminal'; +import { quoteArgs } from './execution/execUtils'; +import { showErrorMessage } from '../common/errors/utils'; +import { activeTextEditor } from '../common/window.apis'; +import { clipboardWriteText } from '../common/env.apis'; export async function refreshManagerCommand(context: unknown): Promise { if (context instanceof EnvManagerTreeItem) { @@ -278,7 +282,7 @@ export async function setEnvironmentCommand( } } else { traceError(`Invalid context for setting environment command: ${context}`); - window.showErrorMessage('Invalid context for setting environment'); + showErrorMessage('Invalid context for setting environment'); } } @@ -296,7 +300,7 @@ export async function resetEnvironmentCommand( if (manager) { manager.set(uri, undefined); } else { - window.showErrorMessage(`No environment manager found for: ${uri.fsPath}`); + showErrorMessage(`No environment manager found for: ${uri.fsPath}`); traceError(`No environment manager found for ${uri.fsPath}`); } return; @@ -308,7 +312,7 @@ export async function resetEnvironmentCommand( return; } traceError(`Invalid context for unset environment command: ${context}`); - window.showErrorMessage('Invalid context for unset environment'); + showErrorMessage('Invalid context for unset environment'); } export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { @@ -338,7 +342,7 @@ export async function addPythonProject( pc: ProjectCreators, ): Promise { if (wm.getProjects().length === 0) { - window.showErrorMessage('Please open a folder/project before adding a workspace'); + showErrorMessage('Please open a folder/project before adding a workspace'); return; } @@ -554,9 +558,24 @@ export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi) ); } } else if (item === undefined) { - const uri = window.activeTextEditor?.document.uri; + const uri = activeTextEditor()?.document.uri; if (uri) { return runAsTaskCommand(uri, api); } } } + +export async function copyPathToClipboard(item: unknown): Promise { + if (item instanceof ProjectItem) { + const projectPath = item.project.uri.fsPath; + await clipboardWriteText(projectPath); + traceInfo(`Copied project path to clipboard: ${projectPath}`); + } else if (item instanceof ProjectEnvironment || item instanceof PythonEnvTreeItem) { + const run = item.environment.execInfo.activatedRun ?? item.environment.execInfo.run; + const envPath = quoteArgs([run.executable, ...(run.args ?? [])]).join(' '); + await clipboardWriteText(envPath); + traceInfo(`Copied environment path to clipboard: ${envPath}`); + } else { + traceVerbose(`Invalid context for copy path to clipboard: ${item}`); + } +} diff --git a/src/test/features/commands/copyPathToClipboard.unit.test.ts b/src/test/features/commands/copyPathToClipboard.unit.test.ts new file mode 100644 index 0000000..2e43ce1 --- /dev/null +++ b/src/test/features/commands/copyPathToClipboard.unit.test.ts @@ -0,0 +1,68 @@ +import * as sinon from 'sinon'; +import * as envApis from '../../../common/env.apis'; +import { copyPathToClipboard } from '../../../features/envCommands'; +import { + ProjectItem, + ProjectEnvironment, + PythonEnvTreeItem, + EnvManagerTreeItem, +} from '../../../features/views/treeViewItems'; +import { Uri } from 'vscode'; +import { PythonEnvironment } from '../../../api'; +import { InternalEnvironmentManager } from '../../../internal.api'; + +suite('Copy Path To Clipboard', () => { + let clipboardWriteTextStub: sinon.SinonStub; + + setup(() => { + clipboardWriteTextStub = sinon.stub(envApis, 'clipboardWriteText'); + clipboardWriteTextStub.resolves(); + }); + + teardown(() => { + sinon.restore(); + }); + + test('Copy project path to clipboard', async () => { + const uri = Uri.file('/test'); + const item = new ProjectItem({ name: 'test', uri }); + await copyPathToClipboard(item); + + sinon.assert.calledOnce(clipboardWriteTextStub); + sinon.assert.calledWith(clipboardWriteTextStub, uri.fsPath); + }); + + test('Copy env path to clipboard: project view', async () => { + const uri = Uri.file('/test'); + const item = new ProjectEnvironment(new ProjectItem({ name: 'test', uri }), { + envId: { managerId: 'test-manager', id: 'env1' }, + name: 'env1', + displayName: 'Environment 1', + displayPath: '/test-env', + execInfo: { run: { executable: '/test-env/bin/test', args: ['-m', 'env'] } }, + } as PythonEnvironment); + + await copyPathToClipboard(item); + + sinon.assert.calledOnce(clipboardWriteTextStub); + sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test -m env'); + }); + + test('Copy env path to clipboard: env manager view', async () => { + const item = new PythonEnvTreeItem( + { + envId: { managerId: 'test-manager', id: 'env1' }, + name: 'env1', + displayName: 'Environment 1', + displayPath: '/test-env', + execInfo: { run: { executable: '/test-env/bin/test', args: ['-m', 'env'] } }, + } as PythonEnvironment, + new EnvManagerTreeItem({ name: 'test-manager', id: 'test-manager' } as InternalEnvironmentManager), + ); + + await copyPathToClipboard(item); + + sinon.assert.calledOnce(clipboardWriteTextStub); + sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test -m env'); + }); +}); From 1576c4b91d84eaa741d132a51200897da879a2d0 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:33:19 -0600 Subject: [PATCH 081/328] Update README.md (#174) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31a9a71..7739817 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Python Environments and Package Manager (preview) +# Python Environments and Package Manager (experimental) ## Overview From eec0bfacd7b6225e19d4bcdeaf4816563b77753f Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 10 Feb 2025 08:03:13 -0800 Subject: [PATCH 082/328] fix: wrap the experimental shell type API with try-catch (#175) fixes https://github.com/microsoft/vscode-python-environments/issues/159 We need to wrap the API in a try-catch block to handle any potential errors that might occur as it is currently being worked on. --- src/features/common/shellDetector.ts | 49 +++++++++++++++------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index aeb5103..a62c85c 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -125,28 +125,33 @@ function identifyShellFromSettings(): TerminalShellType { } function fromShellTypeApi(terminal: Terminal): TerminalShellType { - switch (terminal.state.shellType) { - case TerminalShellTypeVscode.Sh: - case TerminalShellTypeVscode.Bash: - return TerminalShellType.bash; - case TerminalShellTypeVscode.Fish: - return TerminalShellType.fish; - case TerminalShellTypeVscode.Csh: - return TerminalShellType.cshell; - case TerminalShellTypeVscode.Ksh: - return TerminalShellType.ksh; - case TerminalShellTypeVscode.Zsh: - return TerminalShellType.zsh; - case TerminalShellTypeVscode.CommandPrompt: - return TerminalShellType.commandPrompt; - case TerminalShellTypeVscode.GitBash: - return TerminalShellType.gitbash; - case TerminalShellTypeVscode.PowerShell: - return TerminalShellType.powershellCore; - case TerminalShellTypeVscode.NuShell: - return TerminalShellType.nushell; - default: - return TerminalShellType.unknown; + try { + switch (terminal.state.shellType) { + case TerminalShellTypeVscode.Sh: + case TerminalShellTypeVscode.Bash: + return TerminalShellType.bash; + case TerminalShellTypeVscode.Fish: + return TerminalShellType.fish; + case TerminalShellTypeVscode.Csh: + return TerminalShellType.cshell; + case TerminalShellTypeVscode.Ksh: + return TerminalShellType.ksh; + case TerminalShellTypeVscode.Zsh: + return TerminalShellType.zsh; + case TerminalShellTypeVscode.CommandPrompt: + return TerminalShellType.commandPrompt; + case TerminalShellTypeVscode.GitBash: + return TerminalShellType.gitbash; + case TerminalShellTypeVscode.PowerShell: + return TerminalShellType.powershellCore; + case TerminalShellTypeVscode.NuShell: + return TerminalShellType.nushell; + default: + return TerminalShellType.unknown; + } + } catch { + // If the API is not available, return unknown + return TerminalShellType.unknown; } } From 0d8d47058f6c52627ee7a429bb94a1bb27ce4b9c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 10 Feb 2025 17:03:08 -0800 Subject: [PATCH 083/328] Move description of env managers to tooltip (#180) fixes https://github.com/microsoft/vscode-python-environments/issues/167 --- src/features/views/treeViewItems.ts | 6 ++++-- src/managers/builtin/venvManager.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 842ef8c..756e09d 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -31,8 +31,10 @@ export class EnvManagerTreeItem implements EnvTreeItem { constructor(public readonly manager: InternalEnvironmentManager) { const item = new TreeItem(manager.displayName, TreeItemCollapsibleState.Collapsed); item.contextValue = this.getContextValue(); - item.description = manager.description; - item.tooltip = manager.tooltip; + // Descriptions were a bit too visually noisy + // https://github.com/microsoft/vscode-python-environments/issues/167 + item.description = undefined; + item.tooltip = manager.tooltip ?? manager.description; item.iconPath = manager.iconPath; this.treeItem = item; } diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 596d2d0..0bdc28e 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -61,7 +61,7 @@ export class VenvManager implements EnvironmentManager { public readonly log: LogOutputChannel, ) { this.name = 'venv'; - this.displayName = 'venv Environments'; + this.displayName = 'venv'; this.description = VenvManagerStrings.venvManagerDescription; this.tooltip = new MarkdownString(VenvManagerStrings.venvManagerDescription, true); this.preferredPackageManagerId = 'ms-python.python:pip'; From 6c8197224d1aa01cf7fd02c58d473802d3f87824 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 11 Feb 2025 19:48:48 -0800 Subject: [PATCH 084/328] fix: use '/' delimiter on windows when using gitbash. (#178) fixes https://github.com/microsoft/vscode-python-environments/issues/173 --- src/common/utils/unsafeEntries.ts | 5 - src/features/common/shellDetector.ts | 23 ++- src/managers/builtin/venvUtils.ts | 144 +++++++++++------ src/managers/conda/condaUtils.ts | 38 ++++- .../common/shellDetector.unit.test.ts | 152 ++++++++++++++++++ 5 files changed, 302 insertions(+), 60 deletions(-) delete mode 100644 src/common/utils/unsafeEntries.ts create mode 100644 src/test/features/common/shellDetector.unit.test.ts diff --git a/src/common/utils/unsafeEntries.ts b/src/common/utils/unsafeEntries.ts deleted file mode 100644 index 9aef5ad..0000000 --- a/src/common/utils/unsafeEntries.ts +++ /dev/null @@ -1,5 +0,0 @@ -/** Converts an object from a trusted source (i.e. without unknown entries) to a typed array */ -export default function unsafeEntries(o: T): [keyof T, T[K]][] { - return Object.entries(o) as [keyof T, T[K]][]; -} - \ No newline at end of file diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index a62c85c..da6d16c 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -1,9 +1,8 @@ +import * as os from 'os'; import { Terminal, TerminalShellType as TerminalShellTypeVscode } from 'vscode'; import { isWindows } from '../../managers/common/utils'; -import * as os from 'os'; import { vscodeShell } from '../../common/vscodeEnv.apis'; import { getConfiguration } from '../../common/workspace.apis'; -import unsafeEntries from '../../common/utils/unsafeEntries'; import { TerminalShellType } from '../../api'; /* @@ -17,7 +16,7 @@ When identifying the shell use the following algorithm: // Types of shells can be found here: // 1. https://wiki.ubuntu.com/ChangingShells -const IS_GITBASH = /(gitbash$)/i; +const IS_GITBASH = /(gitbash$|git.bin.bash$|git-bash$)/i; const IS_BASH = /(bash$)/i; const IS_WSL = /(wsl$)/i; const IS_ZSH = /(zsh$)/i; @@ -31,9 +30,14 @@ const IS_TCSHELL = /(tcsh$)/i; const IS_NUSHELL = /(nu$)/i; const IS_XONSH = /(xonsh$)/i; +/** Converts an object from a trusted source (i.e. without unknown entries) to a typed array */ +function _entries(o: T): [keyof T, T[K]][] { + return Object.entries(o) as [keyof T, T[K]][]; +} + type KnownShellType = Exclude; const detectableShells = new Map( - unsafeEntries({ + _entries({ [TerminalShellType.powershell]: IS_POWERSHELL, [TerminalShellType.gitbash]: IS_GITBASH, [TerminalShellType.bash]: IS_BASH, @@ -70,6 +74,11 @@ function identifyShellFromShellPath(shellPath: string): TerminalShellType { } function identifyShellFromTerminalName(terminal: Terminal): TerminalShellType { + if (terminal.name === 'sh') { + // Specifically checking this because other shells have `sh` at the end of their name + // We can match and return bash for this case + return TerminalShellType.bash; + } return identifyShellFromShellPath(terminal.name); } @@ -159,15 +168,15 @@ export function identifyTerminalShell(terminal: Terminal): TerminalShellType { let shellType = fromShellTypeApi(terminal); if (shellType === TerminalShellType.unknown) { - shellType = identifyShellFromTerminalName(terminal); + shellType = identifyShellFromVSC(terminal); } if (shellType === TerminalShellType.unknown) { - shellType = identifyShellFromSettings(); + shellType = identifyShellFromTerminalName(terminal); } if (shellType === TerminalShellType.unknown) { - shellType = identifyShellFromVSC(terminal); + shellType = identifyShellFromSettings(); } if (shellType === TerminalShellType.unknown) { diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 4d94e86..4d372c7 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -31,7 +31,6 @@ import { } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; -import unsafeEntries from '../../common/utils/unsafeEntries'; import { isUvInstalled, runUV, runPython } from './helpers'; import { getWorkspacePackagesToInstall } from './pipUtils'; @@ -111,6 +110,10 @@ function getName(binPath: string): string { return path.basename(dir1); } +function pathForGitBash(binPath: string): string { + return isWindows() ? binPath.replace(/\\/g, '/') : binPath; +} + async function getPythonInfo(env: NativeEnvInfo): Promise { if (env.executable && env.version && env.prefix) { const venvName = env.name ?? getName(env.executable); @@ -118,65 +121,114 @@ async function getPythonInfo(env: NativeEnvInfo): Promise const name = `${venvName} (${sv})`; const binDir = path.dirname(env.executable); - - interface VenvManager { - activate: PythonCommandRunConfiguration, - deactivate: PythonCommandRunConfiguration, + + interface VenvCommand { + activate: PythonCommandRunConfiguration; + deactivate: PythonCommandRunConfiguration; /// true if created by the builtin `venv` module and not just the `virtualenv` package. - supportsStdlib: boolean, + supportsStdlib: boolean; + checkPath?: string; } - - /** Venv activation/deactivation using a command */ - const cmdMgr = (suffix = ''): VenvManager => ({ - activate: { executable: path.join(binDir, `activate${suffix}`) }, - deactivate: { executable: path.join(binDir, `deactivate${suffix}`) }, - supportsStdlib: ['', '.bat'].includes(suffix), - }); - /** Venv activation/deactivation for a POSIXy shell */ - const sourceMgr = (suffix = '', executable = 'source'): VenvManager => ({ - activate: { executable, args: [path.join(binDir, `activate${suffix}`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: ['', '.ps1'].includes(suffix), - }); - // satisfies `Record` to make sure all shells are covered - const venvManagers: Record = { + + const venvManagers: Record = { // Shells supported by the builtin `venv` module - [TerminalShellType.bash]: sourceMgr(), - [TerminalShellType.gitbash]: sourceMgr(), - [TerminalShellType.zsh]: sourceMgr(), - [TerminalShellType.wsl]: sourceMgr(), - [TerminalShellType.ksh]: sourceMgr('', '.'), - [TerminalShellType.powershell]: sourceMgr('.ps1', '&'), - [TerminalShellType.powershellCore]: sourceMgr('.ps1', '&'), - [TerminalShellType.commandPrompt]: cmdMgr('.bat'), + [TerminalShellType.bash]: { + activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.gitbash]: { + activate: { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.zsh]: { + activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.wsl]: { + activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.ksh]: { + activate: { executable: '.', args: [path.join(binDir, `activate`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.powershell]: { + activate: { executable: '&', args: [path.join(binDir, `activate.ps1`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.powershellCore]: { + activate: { executable: '&', args: [path.join(binDir, `activate.ps1`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + [TerminalShellType.commandPrompt]: { + activate: { executable: path.join(binDir, `activate.bat`) }, + deactivate: { executable: path.join(binDir, `deactivate.bat`) }, + supportsStdlib: true, + }, // Shells supported by the `virtualenv` package - [TerminalShellType.cshell]: sourceMgr('.csh'), - [TerminalShellType.tcshell]: sourceMgr('.csh'), - [TerminalShellType.fish]: sourceMgr('.fish'), - [TerminalShellType.xonsh]: sourceMgr('.xsh'), + [TerminalShellType.cshell]: { + activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: false, + checkPath: path.join(binDir, `activate.csh`), + }, + [TerminalShellType.tcshell]: { + activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: false, + checkPath: path.join(binDir, `activate.csh`), + }, + [TerminalShellType.fish]: { + activate: { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: false, + checkPath: path.join(binDir, `activate.fish`), + }, + [TerminalShellType.xonsh]: { + activate: { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: false, + checkPath: path.join(binDir, `activate.xsh`), + }, [TerminalShellType.nushell]: { activate: { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, deactivate: { executable: 'overlay', args: ['hide', 'activate'] }, supportsStdlib: false, + checkPath: path.join(binDir, `activate.nu`), }, // Fallback - [TerminalShellType.unknown]: isWindows() ? cmdMgr() : sourceMgr(), - }; + [TerminalShellType.unknown]: isWindows() + ? { + activate: { executable: path.join(binDir, `activate`) }, + deactivate: { executable: path.join(binDir, `deactivate`) }, + supportsStdlib: true, + } + : { + activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, + deactivate: { executable: 'deactivate' }, + supportsStdlib: true, + }, + } satisfies Record; const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); - await Promise.all(unsafeEntries(venvManagers).map(async ([shell, mgr]) => { - if ( - !mgr.supportsStdlib && - mgr.activate.args && - !await fsapi.pathExists(mgr.activate.args[mgr.activate.args.length - 1]) - ) { - return; - } - shellActivation.set(shell, [mgr.activate]); - shellDeactivation.set(shell, [mgr.deactivate]); - })); + await Promise.all( + (Object.entries(venvManagers) as [TerminalShellType, VenvCommand][]).map(async ([shell, mgr]) => { + if (!mgr.supportsStdlib && mgr.checkPath && !(await fsapi.pathExists(mgr.checkPath))) { + return; + } + shellActivation.set(shell, [mgr.activate]); + shellDeactivation.set(shell, [mgr.deactivate]); + }), + ); return { name: name, diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index d503d93..317265b 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -5,9 +5,11 @@ import { PackageInfo, PackageInstallOptions, PackageManager, + PythonCommandRunConfiguration, PythonEnvironment, PythonEnvironmentApi, PythonProject, + TerminalShellType, } from '../../api'; import * as path from 'path'; import * as os from 'os'; @@ -25,7 +27,7 @@ import { import { getConfiguration } from '../../common/workspace.apis'; import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; import which from 'which'; -import { shortVersion, sortEnvironments, untildify } from '../common/utils'; +import { isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils'; import { pickProject } from '../../common/pickers/projects'; import { CondaStrings } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; @@ -236,6 +238,10 @@ function isPrefixOf(roots: string[], e: string): boolean { return false; } +function pathForGitBash(binPath: string): string { + return isWindows() ? binPath.replace(/\\/g, '/') : binPath; +} + function nativeToPythonEnv( e: NativeEnvInfo, api: PythonEnvironmentApi, @@ -250,6 +256,13 @@ function nativeToPythonEnv( } const sv = shortVersion(e.version); if (e.name === 'base') { + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set(TerminalShellType.gitbash, [ + { executable: pathForGitBash(conda), args: ['activate', 'base'] }, + ]); + shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + const environment = api.createPythonEnvironmentItem( { name: 'base', @@ -261,10 +274,12 @@ function nativeToPythonEnv( version: e.version, sysPrefix: e.prefix, execInfo: { - run: { executable: path.join(e.executable) }, + run: { executable: e.executable }, activatedRun: { executable: conda, args: ['run', '--live-stream', '--name', 'base', 'python'] }, activation: [{ executable: conda, args: ['activate', 'base'] }], deactivation: [{ executable: conda, args: ['deactivate'] }], + shellActivation, + shellDeactivation, }, }, manager, @@ -272,6 +287,13 @@ function nativeToPythonEnv( log.info(`Found base environment: ${e.prefix}`); return environment; } else if (!isPrefixOf(condaPrefixes, e.prefix)) { + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set(TerminalShellType.gitbash, [ + { executable: pathForGitBash(conda), args: ['activate', pathForGitBash(e.prefix)] }, + ]); + shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + const basename = path.basename(e.prefix); const environment = api.createPythonEnvironmentItem( { @@ -291,6 +313,8 @@ function nativeToPythonEnv( }, activation: [{ executable: conda, args: ['activate', e.prefix] }], deactivation: [{ executable: conda, args: ['deactivate'] }], + shellActivation, + shellDeactivation, }, group: 'Prefix', }, @@ -301,6 +325,14 @@ function nativeToPythonEnv( } else { const basename = path.basename(e.prefix); const name = e.name ?? basename; + + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set(TerminalShellType.gitbash, [ + { executable: pathForGitBash(conda), args: ['activate', name] }, + ]); + shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + const environment = api.createPythonEnvironmentItem( { name: name, @@ -319,6 +351,8 @@ function nativeToPythonEnv( }, activation: [{ executable: conda, args: ['activate', name] }], deactivation: [{ executable: conda, args: ['deactivate'] }], + shellActivation, + shellDeactivation, }, group: 'Named', }, diff --git a/src/test/features/common/shellDetector.unit.test.ts b/src/test/features/common/shellDetector.unit.test.ts new file mode 100644 index 0000000..aab9133 --- /dev/null +++ b/src/test/features/common/shellDetector.unit.test.ts @@ -0,0 +1,152 @@ +import { TerminalShellType } from '../../../api'; +import { Terminal, TerminalShellType as VSCTerminalShellType } from 'vscode'; +import { identifyTerminalShell } from '../../../features/common/shellDetector'; +import assert from 'assert'; +import { isWindows } from '../../../managers/common/utils'; + +const testShellTypes: string[] = [ + 'sh', + 'bash', + 'powershell', + 'pwsh', + 'cmd', + 'gitbash', + 'zsh', + 'ksh', + 'fish', + 'cshell', + 'tcshell', + 'nushell', + 'wsl', + 'xonsh', + 'unknown', +]; + +function getNameByShellType(shellType: string): string { + return shellType === 'unknown' ? '' : shellType; +} + +function getVSCShellType(shellType: string): VSCTerminalShellType | undefined { + try { + switch (shellType) { + case 'sh': + return VSCTerminalShellType.Sh; + case 'bash': + return VSCTerminalShellType.Bash; + case 'powershell': + case 'pwsh': + return VSCTerminalShellType.PowerShell; + case 'cmd': + return VSCTerminalShellType.CommandPrompt; + case 'gitbash': + return VSCTerminalShellType.GitBash; + case 'zsh': + return VSCTerminalShellType.Zsh; + case 'ksh': + return VSCTerminalShellType.Ksh; + case 'fish': + return VSCTerminalShellType.Fish; + case 'cshell': + return VSCTerminalShellType.Csh; + case 'nushell': + return VSCTerminalShellType.NuShell; + default: + return undefined; + } + } catch { + return undefined; + } +} + +function getShellPath(shellType: string): string | undefined { + switch (shellType) { + case 'sh': + return '/bin/sh'; + case 'bash': + return '/bin/bash'; + case 'powershell': + return 'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'; + case 'pwsh': + return 'C:\\Program Files\\PowerShell\\7\\pwsh.exe'; + case 'cmd': + return 'C:\\Windows\\System32\\cmd.exe'; + case 'gitbash': + return isWindows() ? 'C:\\Program Files\\Git\\bin\\bash.exe' : '/usr/bin/gitbash'; + case 'zsh': + return '/bin/zsh'; + case 'ksh': + return '/bin/ksh'; + case 'fish': + return '/usr/bin/fish'; + case 'cshell': + return '/bin/csh'; + case 'nushell': + return '/usr/bin/nu'; + case 'tcshell': + return '/usr/bin/tcsh'; + case 'wsl': + return '/mnt/c/Windows/System32/wsl.exe'; + case 'xonsh': + return '/usr/bin/xonsh'; + default: + return undefined; + } +} + +function expectedShellType(shellType: string): TerminalShellType { + switch (shellType) { + case 'sh': + return TerminalShellType.bash; + case 'bash': + return TerminalShellType.bash; + case 'powershell': + return TerminalShellType.powershell; + case 'pwsh': + return TerminalShellType.powershellCore; + case 'cmd': + return TerminalShellType.commandPrompt; + case 'gitbash': + return TerminalShellType.gitbash; + case 'zsh': + return TerminalShellType.zsh; + case 'ksh': + return TerminalShellType.ksh; + case 'fish': + return TerminalShellType.fish; + case 'cshell': + return TerminalShellType.cshell; + case 'nushell': + return TerminalShellType.nushell; + case 'tcshell': + return TerminalShellType.tcshell; + case 'wsl': + return TerminalShellType.wsl; + case 'xonsh': + return TerminalShellType.xonsh; + default: + return TerminalShellType.unknown; + } +} + +suite('Shell Detector', () => { + testShellTypes.forEach((shellType) => { + if (shellType === TerminalShellType.unknown) { + return; + } + + const name = getNameByShellType(shellType); + const vscShellType = getVSCShellType(shellType); + test(`Detect ${shellType}`, () => { + const terminal = { + name, + state: { shellType: vscShellType }, + creationOptions: { + shellPath: getShellPath(shellType), + }, + } as Terminal; + const detected = identifyTerminalShell(terminal); + const expected = expectedShellType(shellType); + assert.strictEqual(detected, expected); + }); + }); +}); From 489897bdf60fd10d881f2735080829276e68e0e2 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 12 Feb 2025 09:15:55 -0800 Subject: [PATCH 085/328] bug: reduce noise in the environments view (#183) Fixes https://github.com/microsoft/vscode-python-environments/issues/182 --- src/features/views/treeViewItems.ts | 11 ++++------- src/managers/builtin/sysPythonManager.ts | 4 ++-- src/managers/builtin/utils.ts | 3 ++- src/managers/builtin/venvManager.ts | 4 +++- src/managers/builtin/venvUtils.ts | 3 ++- src/managers/conda/condaEnvManager.ts | 6 +++--- src/managers/conda/condaUtils.ts | 9 ++++++--- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 756e09d..8a966aa 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -31,9 +31,7 @@ export class EnvManagerTreeItem implements EnvTreeItem { constructor(public readonly manager: InternalEnvironmentManager) { const item = new TreeItem(manager.displayName, TreeItemCollapsibleState.Collapsed); item.contextValue = this.getContextValue(); - // Descriptions were a bit too visually noisy - // https://github.com/microsoft/vscode-python-environments/issues/167 - item.description = undefined; + item.description = manager.description; item.tooltip = manager.tooltip ?? manager.description; item.iconPath = manager.iconPath; this.treeItem = item; @@ -72,12 +70,11 @@ export class PythonEnvTreeItem implements EnvTreeItem { public readonly selected?: string, ) { let name = environment.displayName ?? environment.name; - let tooltip = environment.tooltip; + let tooltip = environment.tooltip ?? environment.description; if (selected) { - const tooltipEnd = environment.tooltip ?? environment.description; - tooltip = + const selectedTooltip = selected === 'global' ? EnvViewStrings.selectedGlobalTooltip : EnvViewStrings.selectedWorkspaceTooltip; - tooltip = tooltipEnd ? `${tooltip} ● ${tooltipEnd}` : tooltip; + tooltip = tooltip ? `${selectedTooltip} ● ${tooltip}` : tooltip; } const item = new TreeItem(name, TreeItemCollapsibleState.Collapsed); diff --git a/src/managers/builtin/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts index 5298cf1..14895a3 100644 --- a/src/managers/builtin/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -43,7 +43,7 @@ export class SysPythonManager implements EnvironmentManager { public readonly name: string; public readonly displayName: string; public readonly preferredPackageManagerId: string; - public readonly description: string; + public readonly description: string | undefined; public readonly tooltip: string | MarkdownString; public readonly iconPath: IconPath; @@ -55,7 +55,7 @@ export class SysPythonManager implements EnvironmentManager { this.name = 'system'; this.displayName = 'Global'; this.preferredPackageManagerId = 'ms-python.python:pip'; - this.description = SysManagerStrings.sysManagerDescription; + this.description = undefined; this.tooltip = new MarkdownString(SysManagerStrings.sysManagerDescription, true); this.iconPath = new ThemeIcon('globe'); } diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index 6e41a9e..fab88a7 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -81,7 +81,8 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { shortDisplayName: shortDisplayName, displayPath: env.executable, version: env.version, - description: env.executable, + description: undefined, + tooltip: env.executable, environmentPath: Uri.file(env.executable), iconPath: new ThemeIcon('globe'), sysPrefix: env.prefix, diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 0bdc28e..08fa90c 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -62,7 +62,9 @@ export class VenvManager implements EnvironmentManager { ) { this.name = 'venv'; this.displayName = 'venv'; - this.description = VenvManagerStrings.venvManagerDescription; + // Descriptions were a bit too visually noisy + // https://github.com/microsoft/vscode-python-environments/issues/167 + this.description = undefined; this.tooltip = new MarkdownString(VenvManagerStrings.venvManagerDescription, true); this.preferredPackageManagerId = 'ms-python.python:pip'; this.iconPath = new ThemeIcon('python'); diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 4d372c7..75b7424 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -236,7 +236,8 @@ async function getPythonInfo(env: NativeEnvInfo): Promise shortDisplayName: `${sv} (${venvName})`, displayPath: env.executable, version: env.version, - description: env.executable, + description: undefined, + tooltip: env.executable, environmentPath: Uri.file(env.executable), iconPath: new ThemeIcon('python'), sysPrefix: env.prefix, diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index f71543e..7cf27fd 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -53,14 +53,14 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { this.name = 'conda'; this.displayName = 'Conda'; this.preferredPackageManagerId = 'ms-python.python:conda'; - this.description = CondaStrings.condaManager; - this.tooltip = CondaStrings.condaManager; + this.description = undefined; + this.tooltip = new MarkdownString(CondaStrings.condaManager, true); } name: string; displayName: string; preferredPackageManagerId: string = 'ms-python.python:conda'; - description: string; + description: string | undefined; tooltip: string | MarkdownString; iconPath?: IconPath; diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 317265b..cd8dd4c 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -270,7 +270,8 @@ function nativeToPythonEnv( displayName: `base (${sv})`, shortDisplayName: `base:${sv}`, displayPath: e.name, - description: e.prefix, + description: undefined, + tooltip: e.prefix, version: e.version, sysPrefix: e.prefix, execInfo: { @@ -302,7 +303,8 @@ function nativeToPythonEnv( displayName: `${basename} (${sv})`, shortDisplayName: `${basename}:${sv}`, displayPath: e.prefix, - description: e.prefix, + description: undefined, + tooltip: e.prefix, version: e.version, sysPrefix: e.prefix, execInfo: { @@ -340,7 +342,8 @@ function nativeToPythonEnv( displayName: `${name} (${sv})`, shortDisplayName: `${name}:${sv}`, displayPath: e.prefix, - description: e.prefix, + description: undefined, + tooltip: e.prefix, version: e.version, sysPrefix: e.prefix, execInfo: { From fb36b37c3d01a6b88cd0e4e70919821208d019f8 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:48:05 -0800 Subject: [PATCH 086/328] Conform to new shell env API shape (#192) Adding isTrusted field as part of shell env api, meaning the shape would change a bit. Accessing shell env would be `.env.value` instead of `.env`. Trying to prevent breaking where this api is already being used, so that I can safely merge: https://github.com/microsoft/vscode/pull/240971 --- package.json | 2 +- src/extension.ts | 2 +- src/vscode.proposed.terminalShellEnv.d.ts | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 29ef2f6..710dc33 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "publisher": "ms-python", "preview": true, "engines": { - "vscode": "^1.97.0" + "vscode": "^1.98.0-20250221" }, "categories": [ "Other" diff --git a/src/extension.ts b/src/extension.ts index 86c1445..cbca018 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -230,7 +230,7 @@ export async function activate(context: ExtensionContext): Promise { - const envVar = e.shellIntegration?.env; + const envVar = e.shellIntegration?.env.value; if (envVar) { if (envVar['VIRTUAL_ENV']) { const env = await api.resolveEnvironment(Uri.file(envVar['VIRTUAL_ENV'])); diff --git a/src/vscode.proposed.terminalShellEnv.d.ts b/src/vscode.proposed.terminalShellEnv.d.ts index ffe0b76..13f4635 100644 --- a/src/vscode.proposed.terminalShellEnv.d.ts +++ b/src/vscode.proposed.terminalShellEnv.d.ts @@ -6,12 +6,30 @@ declare module 'vscode' { // @anthonykim1 @tyriar https://github.com/microsoft/vscode/issues/227467 + export interface TerminalShellIntegrationEnvironment { + /** + * The dictionary of environment variables. + */ + value: { [key: string]: string | undefined } | undefined; + + /** + * Whether the environment came from a trusted source and is therefore safe to use its + * values in a manner that could lead to execution of arbitrary code. If this value is + * `false`, {@link value} should either not be used for something that could lead to arbitrary + * code execution, or the user should be warned beforehand. + * + * This is `true` only when the environment was reported explicitly and it used a nonce for + * verification. + */ + isTrusted: boolean; + } + export interface TerminalShellIntegration { /** * The environment of the shell process. This is undefined if the shell integration script * does not send the environment. */ - readonly env: { [key: string]: string | undefined } | undefined; + readonly env: TerminalShellIntegrationEnvironment; } // TODO: Is it fine that this shares onDidChangeTerminalShellIntegration with cwd and the shellIntegration object itself? From 750f901a7f6207163abec84ae589be95e486d065 Mon Sep 17 00:00:00 2001 From: InSync Date: Mon, 24 Feb 2025 04:23:13 +0700 Subject: [PATCH 087/328] Fix broken link to `examples` in `README.md` (#197) Full diff: ```diff -https://github.com/microsoft/vscode-python-environments/blob/main/src/examples/README.md +https://github.com/microsoft/vscode-python-environments/blob/main/examples/README.md ``` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7739817..96750c7 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ The extension uses `pip` as the default package manager. You can change this by See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/src/api.ts) for the full list of Extension APIs. To consume these APIs you can look at the example here: -https://github.com/microsoft/vscode-python-environments/blob/main/src/examples/README.md +https://github.com/microsoft/vscode-python-environments/blob/main/examples/README.md ## Extension Dependency From 6f9d7e79c0370a29d8787f5b54c1c90bbbc5846b Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 5 Mar 2025 09:29:27 -0800 Subject: [PATCH 088/328] fix: cannot read properties of undefined reading 'value' (#211) fixes https://github.com/microsoft/vscode-python-environments/issues/210 --- src/extension.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index cbca018..ac5a1b3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -230,7 +230,11 @@ export async function activate(context: ExtensionContext): Promise { - const envVar = e.shellIntegration?.env.value; + const shellEnv = e.shellIntegration?.env; + if (!shellEnv) { + return; + } + const envVar = shellEnv.value; if (envVar) { if (envVar['VIRTUAL_ENV']) { const env = await api.resolveEnvironment(Uri.file(envVar['VIRTUAL_ENV'])); From df3719e865c7eb696bb8f2e2a80e9f431c947291 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 5 Mar 2025 09:40:39 -0800 Subject: [PATCH 089/328] fix: cannot register tools starting with `vscode_` (#209) fixes https://github.com/microsoft/vscode-python-environments/issues/208 fix for this: ![image](https://github.com/user-attachments/assets/4244103a-e388-4b5e-89f1-f1635d8bc759) --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 710dc33..19ad578 100644 --- a/package.json +++ b/package.json @@ -489,9 +489,7 @@ "displayName": "Get Python Packages", "modelDescription": "Returns the packages installed in the given Python file's environment. You should call this when you want to generate Python code to determine the users preferred packages. Also call this to determine if you need to provide installation instructions in a response.", "toolReferenceName": "pythonGetPackages", - "tags": [ - "vscode_editing" - ], + "tags": [], "icon": "$(files)", "inputSchema": { "type": "object", From 5b2cae371c8b76143b4c689b7155c4c905c4e630 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 7 Mar 2025 08:41:33 -0800 Subject: [PATCH 090/328] feat: add option to skip package installation in `venv` and `conda` installers (#213) closes: https://github.com/microsoft/vscode-python-environments/issues/212 --- src/common/localize.ts | 1 + src/managers/builtin/pipUtils.ts | 80 ++++++++++++++++++-------------- src/managers/conda/condaUtils.ts | 62 ++++++++++++++++++++++--- 3 files changed, 102 insertions(+), 41 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index ab39e50..f9864f7 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -29,6 +29,7 @@ export namespace PackageManagement { export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); export const editArguments = l10n.t('Edit arguments'); + export const skipPackageInstallation = l10n.t('Skip package installation'); } export namespace Pickers { diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 9a4fa94..259e5ce 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -8,6 +8,7 @@ import { PythonEnvironmentApi, PythonProject } from '../../api'; import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { Installable, selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; +import { traceInfo } from '../../common/logging'; async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { try { @@ -75,47 +76,56 @@ async function selectWorkspaceOrCommon( installable: Installable[], common: Installable[], ): Promise { - if (installable.length > 0) { - const selected = await showQuickPickWithButtons( - [ - { - label: PackageManagement.workspaceDependencies, - description: PackageManagement.workspaceDependenciesDescription, - }, - { - label: PackageManagement.commonPackages, - description: PackageManagement.commonPackagesDescription, - }, - ], - { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - showBackButton: true, - matchOnDescription: false, - matchOnDetail: false, - }, - ); - if (selected && !Array.isArray(selected)) { - try { - if (selected.label === PackageManagement.workspaceDependencies) { - return await selectFromInstallableToInstall(installable); - } else if (selected.label === PackageManagement.commonPackages) { - return await selectFromCommonPackagesToInstall(common); - } - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } catch (ex: any) { - if (ex === QuickInputButtons.Back) { - return selectWorkspaceOrCommon(installable, common); - } - } - } + if (installable.length === 0 && common.length === 0) { return undefined; } + const items = []; + if (installable.length > 0) { + items.push({ + label: PackageManagement.workspaceDependencies, + description: PackageManagement.workspaceDependenciesDescription, + }); + } + if (common.length > 0) { - return selectFromCommonPackagesToInstall(common); + items.push({ + label: PackageManagement.commonPackages, + description: PackageManagement.commonPackagesDescription, + }); } + if (items.length > 0) { + items.push({ label: PackageManagement.skipPackageInstallation }); + } else { + return undefined; + } + + const selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); + + if (selected && !Array.isArray(selected)) { + try { + if (selected.label === PackageManagement.workspaceDependencies) { + return await selectFromInstallableToInstall(installable); + } else if (selected.label === PackageManagement.commonPackages) { + return await selectFromCommonPackagesToInstall(common); + } else { + traceInfo('Package Installer: user selected skip package installation'); + return undefined; + } + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + return selectWorkspaceOrCommon(installable, common); + } + } + } return undefined; } diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index cd8dd4c..a0bd297 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -14,7 +14,15 @@ import { import * as path from 'path'; import * as os from 'os'; import * as fse from 'fs-extra'; -import { CancellationError, CancellationToken, l10n, LogOutputChannel, ProgressLocation, Uri } from 'vscode'; +import { + CancellationError, + CancellationToken, + l10n, + LogOutputChannel, + ProgressLocation, + QuickInputButtons, + Uri, +} from 'vscode'; import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { createDeferred } from '../../common/utils/deferred'; import { @@ -29,9 +37,9 @@ import { getGlobalPersistentState, getWorkspacePersistentState } from '../../com import which from 'which'; import { isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils'; import { pickProject } from '../../common/pickers/projects'; -import { CondaStrings } from '../../common/localize'; +import { CondaStrings, PackageManagement, Pickers } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; -import { showInputBox, showQuickPick, withProgress } from '../../common/window.apis'; +import { showInputBox, showQuickPick, showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers'; import { quoteArgs } from '../../features/execution/execUtils'; import { traceInfo } from '../../common/logging'; @@ -758,11 +766,53 @@ async function getCommonPackages(): Promise { } } -export async function getCommonCondaPackagesToInstall(): Promise { - const common = await getCommonPackages(); +async function selectCommonPackagesOrSkip(common: Installable[]): Promise { if (common.length === 0) { return undefined; } - const selected = await selectFromCommonPackagesToInstall(common); + + const items = []; + if (common.length > 0) { + items.push({ + label: PackageManagement.commonPackages, + description: PackageManagement.commonPackagesDescription, + }); + } + + if (items.length > 0) { + items.push({ label: PackageManagement.skipPackageInstallation }); + } else { + return undefined; + } + + const selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); + + if (selected && !Array.isArray(selected)) { + try { + if (selected.label === PackageManagement.commonPackages) { + return await selectFromCommonPackagesToInstall(common); + } else { + traceInfo('Package Installer: user selected skip package installation'); + return undefined; + } + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } catch (ex: any) { + if (ex === QuickInputButtons.Back) { + return selectCommonPackagesOrSkip(common); + } + } + } + return undefined; +} + +export async function getCommonCondaPackagesToInstall(): Promise { + const common = await getCommonPackages(); + const selected = await selectCommonPackagesOrSkip(common); return selected; } From 1ba28ae2f648f87a207313d624498a8b8a3f4009 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 13 Mar 2025 08:26:56 -0700 Subject: [PATCH 091/328] bug: hide duplicate command from the command palette (#217) Hides the second one: ![image](https://github.com/user-attachments/assets/03bdf89a-56ba-4737-8715-def8bc0d8f82) --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 19ad578..549ebb4 100644 --- a/package.json +++ b/package.json @@ -305,6 +305,10 @@ { "command": "python-envs.copyProjectPath", "when": "false" + }, + { + "command": "python-envs.createAny", + "when": "false" } ], "view/item/context": [ From 12389de4bf46ba81f60e994ee9442ba12758ee10 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 13 Mar 2025 08:27:20 -0700 Subject: [PATCH 092/328] feat: add remove environment command to project view (#216) ![image](https://github.com/user-attachments/assets/3370a0ce-44ea-48a8-8381-be190d377b72) --- package.json | 4 ++++ src/features/envCommands.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/package.json b/package.json index 549ebb4..71a9969 100644 --- a/package.json +++ b/package.json @@ -366,6 +366,10 @@ "group": "inline", "when": "view == python-projects && viewItem == python-env" }, + { + "command": "python-envs.remove", + "when": "view == python-projects && viewItem == python-env" + }, { "command": "python-envs.refreshPackages", "group": "inline", diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 5afe342..6d0c4e4 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -171,6 +171,10 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir if (environment) { await manager?.remove(environment); } + } else if (context instanceof ProjectEnvironment) { + const view = context as ProjectEnvironment; + const manager = managers.getEnvironmentManager(view.parent.project.uri); + await manager?.remove(view.environment); } else { traceError(`Invalid context for remove command: ${context}`); } From da3ed457b893ff73ef892b4cc5fc6eaa886375d1 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 20 Mar 2025 07:56:49 -0700 Subject: [PATCH 093/328] fix: Shell Type API updated in core (#221) --- .vscode/tasks.json | 14 ++ package-lock.json | 2 +- package.json | 5 +- src/api.ts | 33 ++--- src/features/common/activation.ts | 6 +- src/features/common/shellDetector.ts | 120 ++++++++---------- src/managers/builtin/venvUtils.ts | 46 +++---- src/managers/conda/condaUtils.ts | 29 ++--- .../common/shellDetector.unit.test.ts | 100 ++++++--------- src/vscode.proposed.terminalShellType.d.ts | 33 ++--- 10 files changed, 162 insertions(+), 226 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 400c607..bdda214 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -32,6 +32,20 @@ "label": "tasks: watch-tests", "dependsOn": ["npm: watch", "npm: watch-tests"], "problemMatcher": [] + }, + { + "type": "npm", + "script": "unittest", + "dependsOn": ["tasks: watch-tests"], + "problemMatcher": "$tsc", + "presentation": { + "reveal": "never", + "group": "test" + }, + "group": { + "kind": "test", + "isDefault": false + } } ] } diff --git a/package-lock.json b/package-lock.json index f4652ac..315b2d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.97.0" + "vscode": "^1.99.0-20250317" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 71a9969..ce1be62 100644 --- a/package.json +++ b/package.json @@ -6,13 +6,14 @@ "publisher": "ms-python", "preview": true, "engines": { - "vscode": "^1.98.0-20250221" + "vscode": "^1.99.0-20250317" }, "categories": [ "Other" ], "enabledApiProposals": [ - "terminalShellType" + "terminalShellType", + "terminalShellEnv" ], "capabilities": { "untrustedWorkspaces": { diff --git a/src/api.ts b/src/api.ts index 627cb96..e7d2245 100644 --- a/src/api.ts +++ b/src/api.ts @@ -48,23 +48,6 @@ export interface PythonCommandRunConfiguration { args?: string[]; } -export enum TerminalShellType { - powershell = 'powershell', - powershellCore = 'powershellCore', - commandPrompt = 'commandPrompt', - gitbash = 'gitbash', - bash = 'bash', - zsh = 'zsh', - ksh = 'ksh', - fish = 'fish', - cshell = 'cshell', - tcshell = 'tcshell', - nushell = 'nushell', - wsl = 'wsl', - xonsh = 'xonsh', - unknown = 'unknown', -} - /** * Contains details on how to use a particular python environment * @@ -73,7 +56,7 @@ export enum TerminalShellType { * 2. If {@link PythonEnvironmentExecutionInfo.activatedRun} is not provided, then: * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then: - * - {@link TerminalShellType.unknown} will be used if provided. + * - 'unknown' will be used if provided. * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then {@link PythonEnvironmentExecutionInfo.activation} will be used. * - If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. @@ -82,7 +65,7 @@ export enum TerminalShellType { * 1. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. * 2. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then {@link PythonEnvironmentExecutionInfo.activation} will be used. * 3. If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then: - * - {@link TerminalShellType.unknown} will be used if provided. + * - 'unknown' will be used if provided. * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. * 4. If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. * @@ -107,11 +90,11 @@ export interface PythonEnvironmentExecutionInfo { /** * Details on how to activate an environment using a shell specific command. * If set this will override the {@link PythonEnvironmentExecutionInfo.activation}. - * {@link TerminalShellType.unknown} is used if shell type is not known. - * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * 'unknown' is used if shell type is not known. + * If 'unknown' is not provided and shell type is not known then * {@link PythonEnvironmentExecutionInfo.activation} if set. */ - shellActivation?: Map; + shellActivation?: Map; /** * Details on how to deactivate an environment. @@ -121,11 +104,11 @@ export interface PythonEnvironmentExecutionInfo { /** * Details on how to deactivate an environment using a shell specific command. * If set this will override the {@link PythonEnvironmentExecutionInfo.deactivation} property. - * {@link TerminalShellType.unknown} is used if shell type is not known. - * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * 'unknown' is used if shell type is not known. + * If 'unknown' is not provided and shell type is not known then * {@link PythonEnvironmentExecutionInfo.deactivation} if set. */ - shellDeactivation?: Map; + shellDeactivation?: Map; } /** diff --git a/src/features/common/activation.ts b/src/features/common/activation.ts index 34d359a..4d28dca 100644 --- a/src/features/common/activation.ts +++ b/src/features/common/activation.ts @@ -1,5 +1,5 @@ import { Terminal } from 'vscode'; -import { PythonCommandRunConfiguration, PythonEnvironment, TerminalShellType } from '../../api'; +import { PythonCommandRunConfiguration, PythonEnvironment } from '../../api'; import { identifyTerminalShell } from './shellDetector'; export function isActivatableEnvironment(environment: PythonEnvironment): boolean { @@ -20,7 +20,7 @@ export function getActivationCommand( if (environment.execInfo?.shellActivation) { activation = environment.execInfo.shellActivation.get(shell); if (!activation) { - activation = environment.execInfo.shellActivation.get(TerminalShellType.unknown); + activation = environment.execInfo.shellActivation.get('unknown'); } } @@ -41,7 +41,7 @@ export function getDeactivationCommand( if (environment.execInfo?.shellDeactivation) { deactivation = environment.execInfo.shellDeactivation.get(shell); if (!deactivation) { - deactivation = environment.execInfo.shellDeactivation.get(TerminalShellType.unknown); + deactivation = environment.execInfo.shellDeactivation.get('unknown'); } } diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index da6d16c..27e3ff2 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -1,9 +1,8 @@ import * as os from 'os'; -import { Terminal, TerminalShellType as TerminalShellTypeVscode } from 'vscode'; +import { Terminal } from 'vscode'; import { isWindows } from '../../managers/common/utils'; import { vscodeShell } from '../../common/vscodeEnv.apis'; import { getConfiguration } from '../../common/workspace.apis'; -import { TerminalShellType } from '../../api'; /* When identifying the shell use the following algorithm: @@ -22,67 +21,56 @@ const IS_WSL = /(wsl$)/i; const IS_ZSH = /(zsh$)/i; const IS_KSH = /(ksh$)/i; const IS_COMMAND = /(cmd$)/i; -const IS_POWERSHELL = /(powershell$)/i; -const IS_POWERSHELL_CORE = /(pwsh$)/i; +const IS_POWERSHELL = /(powershell$|pwsh$)/i; const IS_FISH = /(fish$)/i; const IS_CSHELL = /(csh$)/i; const IS_TCSHELL = /(tcsh$)/i; const IS_NUSHELL = /(nu$)/i; const IS_XONSH = /(xonsh$)/i; -/** Converts an object from a trusted source (i.e. without unknown entries) to a typed array */ -function _entries(o: T): [keyof T, T[K]][] { - return Object.entries(o) as [keyof T, T[K]][]; -} - -type KnownShellType = Exclude; -const detectableShells = new Map( - _entries({ - [TerminalShellType.powershell]: IS_POWERSHELL, - [TerminalShellType.gitbash]: IS_GITBASH, - [TerminalShellType.bash]: IS_BASH, - [TerminalShellType.wsl]: IS_WSL, - [TerminalShellType.zsh]: IS_ZSH, - [TerminalShellType.ksh]: IS_KSH, - [TerminalShellType.commandPrompt]: IS_COMMAND, - [TerminalShellType.fish]: IS_FISH, - [TerminalShellType.tcshell]: IS_TCSHELL, - [TerminalShellType.cshell]: IS_CSHELL, - [TerminalShellType.nushell]: IS_NUSHELL, - [TerminalShellType.powershellCore]: IS_POWERSHELL_CORE, - [TerminalShellType.xonsh]: IS_XONSH, - // This `satisfies` makes sure all shells are covered - } satisfies Record), -); - -function identifyShellFromShellPath(shellPath: string): TerminalShellType { +const detectableShells = new Map([ + ['pwsh', IS_POWERSHELL], + ['gitbash', IS_GITBASH], + ['bash', IS_BASH], + ['wsl', IS_WSL], + ['zsh', IS_ZSH], + ['ksh', IS_KSH], + ['cmd', IS_COMMAND], + ['fish', IS_FISH], + ['tcsh', IS_TCSHELL], + ['csh', IS_CSHELL], + ['nu', IS_NUSHELL], + ['xonsh', IS_XONSH], +]); + +function identifyShellFromShellPath(shellPath: string): string { // Remove .exe extension so shells can be more consistently detected // on Windows (including Cygwin). const basePath = shellPath.replace(/\.exe$/i, ''); const shell = Array.from(detectableShells.keys()).reduce((matchedShell, shellToDetect) => { - if (matchedShell === TerminalShellType.unknown) { + if (matchedShell === 'unknown') { const pat = detectableShells.get(shellToDetect); if (pat && pat.test(basePath)) { return shellToDetect; } } return matchedShell; - }, TerminalShellType.unknown); + }, 'unknown'); return shell; } -function identifyShellFromTerminalName(terminal: Terminal): TerminalShellType { +function identifyShellFromTerminalName(terminal: Terminal): string { if (terminal.name === 'sh') { // Specifically checking this because other shells have `sh` at the end of their name // We can match and return bash for this case - return TerminalShellType.bash; + return 'bash'; } return identifyShellFromShellPath(terminal.name); } -function identifyPlatformDefaultShell(): TerminalShellType { +function identifyPlatformDefaultShell(): string { if (isWindows()) { return identifyShellFromShellPath(getTerminalDefaultShellWindows()); } @@ -99,16 +87,16 @@ function getTerminalDefaultShellWindows(): string { return isAtLeastWindows10 ? powerShellPath : process.env.comspec || 'cmd.exe'; } -function identifyShellFromVSC(terminal: Terminal): TerminalShellType { +function identifyShellFromVSC(terminal: Terminal): string { const shellPath = terminal?.creationOptions && 'shellPath' in terminal.creationOptions && terminal.creationOptions.shellPath ? terminal.creationOptions.shellPath : vscodeShell(); - return shellPath ? identifyShellFromShellPath(shellPath) : TerminalShellType.unknown; + return shellPath ? identifyShellFromShellPath(shellPath) : 'unknown'; } -function identifyShellFromSettings(): TerminalShellType { +function identifyShellFromSettings(): string { const shellConfig = getConfiguration('terminal.integrated.shell'); let shellPath: string | undefined; switch (process.platform) { @@ -130,56 +118,52 @@ function identifyShellFromSettings(): TerminalShellType { shellPath = undefined; } } - return shellPath ? identifyShellFromShellPath(shellPath) : TerminalShellType.unknown; + return shellPath ? identifyShellFromShellPath(shellPath) : 'unknown'; } -function fromShellTypeApi(terminal: Terminal): TerminalShellType { +function fromShellTypeApi(terminal: Terminal): string { try { - switch (terminal.state.shellType) { - case TerminalShellTypeVscode.Sh: - case TerminalShellTypeVscode.Bash: - return TerminalShellType.bash; - case TerminalShellTypeVscode.Fish: - return TerminalShellType.fish; - case TerminalShellTypeVscode.Csh: - return TerminalShellType.cshell; - case TerminalShellTypeVscode.Ksh: - return TerminalShellType.ksh; - case TerminalShellTypeVscode.Zsh: - return TerminalShellType.zsh; - case TerminalShellTypeVscode.CommandPrompt: - return TerminalShellType.commandPrompt; - case TerminalShellTypeVscode.GitBash: - return TerminalShellType.gitbash; - case TerminalShellTypeVscode.PowerShell: - return TerminalShellType.powershellCore; - case TerminalShellTypeVscode.NuShell: - return TerminalShellType.nushell; - default: - return TerminalShellType.unknown; + const known = [ + 'bash', + 'cmd', + 'csh', + 'fish', + 'gitbash', + 'julia', + 'ksh', + 'node', + 'nu', + 'pwsh', + 'python', + 'sh', + 'wsl', + 'zsh', + ]; + if (terminal.state.shell && known.includes(terminal.state.shell)) { + return terminal.state.shell; } } catch { // If the API is not available, return unknown - return TerminalShellType.unknown; } + return 'unknown'; } -export function identifyTerminalShell(terminal: Terminal): TerminalShellType { +export function identifyTerminalShell(terminal: Terminal): string { let shellType = fromShellTypeApi(terminal); - if (shellType === TerminalShellType.unknown) { + if (shellType === 'unknown') { shellType = identifyShellFromVSC(terminal); } - if (shellType === TerminalShellType.unknown) { + if (shellType === 'unknown') { shellType = identifyShellFromTerminalName(terminal); } - if (shellType === TerminalShellType.unknown) { + if (shellType === 'unknown') { shellType = identifyShellFromSettings(); } - if (shellType === TerminalShellType.unknown) { + if (shellType === 'unknown') { shellType = identifyPlatformDefaultShell(); } diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 75b7424..5e43d54 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -5,7 +5,6 @@ import { PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo, - TerminalShellType, } from '../../api'; import * as path from 'path'; import * as os from 'os'; @@ -130,81 +129,76 @@ async function getPythonInfo(env: NativeEnvInfo): Promise checkPath?: string; } - const venvManagers: Record = { + const venvManagers: Record = { // Shells supported by the builtin `venv` module - [TerminalShellType.bash]: { + ['sh']: { activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.gitbash]: { - activate: { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, + ['bash']: { + activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.zsh]: { - activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, + ['gitbash']: { + activate: { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.wsl]: { + ['zsh']: { activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.ksh]: { + ['ksh']: { activate: { executable: '.', args: [path.join(binDir, `activate`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.powershell]: { - activate: { executable: '&', args: [path.join(binDir, `activate.ps1`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - [TerminalShellType.powershellCore]: { + ['pwsh']: { activate: { executable: '&', args: [path.join(binDir, `activate.ps1`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - [TerminalShellType.commandPrompt]: { + ['cmd']: { activate: { executable: path.join(binDir, `activate.bat`) }, deactivate: { executable: path.join(binDir, `deactivate.bat`) }, supportsStdlib: true, }, // Shells supported by the `virtualenv` package - [TerminalShellType.cshell]: { + ['csh']: { activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: false, checkPath: path.join(binDir, `activate.csh`), }, - [TerminalShellType.tcshell]: { + ['tcsh']: { activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: false, checkPath: path.join(binDir, `activate.csh`), }, - [TerminalShellType.fish]: { + ['fish']: { activate: { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: false, checkPath: path.join(binDir, `activate.fish`), }, - [TerminalShellType.xonsh]: { + ['xonsh']: { activate: { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, deactivate: { executable: 'deactivate' }, supportsStdlib: false, checkPath: path.join(binDir, `activate.xsh`), }, - [TerminalShellType.nushell]: { + ['nu']: { activate: { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, deactivate: { executable: 'overlay', args: ['hide', 'activate'] }, supportsStdlib: false, checkPath: path.join(binDir, `activate.nu`), }, // Fallback - [TerminalShellType.unknown]: isWindows() + ['unknown']: isWindows() ? { activate: { executable: path.join(binDir, `activate`) }, deactivate: { executable: path.join(binDir, `deactivate`) }, @@ -215,13 +209,13 @@ async function getPythonInfo(env: NativeEnvInfo): Promise deactivate: { executable: 'deactivate' }, supportsStdlib: true, }, - } satisfies Record; + } satisfies Record; - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); await Promise.all( - (Object.entries(venvManagers) as [TerminalShellType, VenvCommand][]).map(async ([shell, mgr]) => { + (Object.entries(venvManagers) as [string, VenvCommand][]).map(async ([shell, mgr]) => { if (!mgr.supportsStdlib && mgr.checkPath && !(await fsapi.pathExists(mgr.checkPath))) { return; } diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index a0bd297..49d822b 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -9,7 +9,6 @@ import { PythonEnvironment, PythonEnvironmentApi, PythonProject, - TerminalShellType, } from '../../api'; import * as path from 'path'; import * as os from 'os'; @@ -264,12 +263,10 @@ function nativeToPythonEnv( } const sv = shortVersion(e.version); if (e.name === 'base') { - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set(TerminalShellType.gitbash, [ - { executable: pathForGitBash(conda), args: ['activate', 'base'] }, - ]); - shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', 'base'] }]); + shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); const environment = api.createPythonEnvironmentItem( { @@ -296,12 +293,12 @@ function nativeToPythonEnv( log.info(`Found base environment: ${e.prefix}`); return environment; } else if (!isPrefixOf(condaPrefixes, e.prefix)) { - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set(TerminalShellType.gitbash, [ + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set('gitbash', [ { executable: pathForGitBash(conda), args: ['activate', pathForGitBash(e.prefix)] }, ]); - shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); const basename = path.basename(e.prefix); const environment = api.createPythonEnvironmentItem( @@ -336,12 +333,10 @@ function nativeToPythonEnv( const basename = path.basename(e.prefix); const name = e.name ?? basename; - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set(TerminalShellType.gitbash, [ - { executable: pathForGitBash(conda), args: ['activate', name] }, - ]); - shellDeactivation.set(TerminalShellType.gitbash, [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', name] }]); + shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); const environment = api.createPythonEnvironmentItem( { diff --git a/src/test/features/common/shellDetector.unit.test.ts b/src/test/features/common/shellDetector.unit.test.ts index aab9133..683a43a 100644 --- a/src/test/features/common/shellDetector.unit.test.ts +++ b/src/test/features/common/shellDetector.unit.test.ts @@ -1,5 +1,4 @@ -import { TerminalShellType } from '../../../api'; -import { Terminal, TerminalShellType as VSCTerminalShellType } from 'vscode'; +import { Terminal } from 'vscode'; import { identifyTerminalShell } from '../../../features/common/shellDetector'; import assert from 'assert'; import { isWindows } from '../../../managers/common/utils'; @@ -9,13 +8,18 @@ const testShellTypes: string[] = [ 'bash', 'powershell', 'pwsh', + 'powershellcore', 'cmd', + 'commandPrompt', 'gitbash', 'zsh', 'ksh', 'fish', + 'csh', 'cshell', + 'tcsh', 'tcshell', + 'nu', 'nushell', 'wsl', 'xonsh', @@ -26,38 +30,6 @@ function getNameByShellType(shellType: string): string { return shellType === 'unknown' ? '' : shellType; } -function getVSCShellType(shellType: string): VSCTerminalShellType | undefined { - try { - switch (shellType) { - case 'sh': - return VSCTerminalShellType.Sh; - case 'bash': - return VSCTerminalShellType.Bash; - case 'powershell': - case 'pwsh': - return VSCTerminalShellType.PowerShell; - case 'cmd': - return VSCTerminalShellType.CommandPrompt; - case 'gitbash': - return VSCTerminalShellType.GitBash; - case 'zsh': - return VSCTerminalShellType.Zsh; - case 'ksh': - return VSCTerminalShellType.Ksh; - case 'fish': - return VSCTerminalShellType.Fish; - case 'cshell': - return VSCTerminalShellType.Csh; - case 'nushell': - return VSCTerminalShellType.NuShell; - default: - return undefined; - } - } catch { - return undefined; - } -} - function getShellPath(shellType: string): string | undefined { switch (shellType) { case 'sh': @@ -67,8 +39,10 @@ function getShellPath(shellType: string): string | undefined { case 'powershell': return 'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'; case 'pwsh': + case 'powershellcore': return 'C:\\Program Files\\PowerShell\\7\\pwsh.exe'; case 'cmd': + case 'commandPrompt': return 'C:\\Windows\\System32\\cmd.exe'; case 'gitbash': return isWindows() ? 'C:\\Program Files\\Git\\bin\\bash.exe' : '/usr/bin/gitbash'; @@ -78,10 +52,13 @@ function getShellPath(shellType: string): string | undefined { return '/bin/ksh'; case 'fish': return '/usr/bin/fish'; + case 'csh': case 'cshell': return '/bin/csh'; + case 'nu': case 'nushell': return '/usr/bin/nu'; + case 'tcsh': case 'tcshell': return '/usr/bin/tcsh'; case 'wsl': @@ -93,59 +70,62 @@ function getShellPath(shellType: string): string | undefined { } } -function expectedShellType(shellType: string): TerminalShellType { +function expectedShellType(shellType: string): string { switch (shellType) { case 'sh': - return TerminalShellType.bash; + return 'sh'; case 'bash': - return TerminalShellType.bash; - case 'powershell': - return TerminalShellType.powershell; + return 'bash'; case 'pwsh': - return TerminalShellType.powershellCore; + case 'powershell': + case 'powershellcore': + return 'pwsh'; case 'cmd': - return TerminalShellType.commandPrompt; + case 'commandPrompt': + return 'cmd'; case 'gitbash': - return TerminalShellType.gitbash; + return 'gitbash'; case 'zsh': - return TerminalShellType.zsh; + return 'zsh'; case 'ksh': - return TerminalShellType.ksh; + return 'ksh'; case 'fish': - return TerminalShellType.fish; + return 'fish'; + case 'csh': case 'cshell': - return TerminalShellType.cshell; + return 'csh'; + case 'nu': case 'nushell': - return TerminalShellType.nushell; + return 'nu'; + case 'tcsh': case 'tcshell': - return TerminalShellType.tcshell; - case 'wsl': - return TerminalShellType.wsl; + return 'tcsh'; case 'xonsh': - return TerminalShellType.xonsh; + return 'xonsh'; + case 'wsl': + return 'wsl'; default: - return TerminalShellType.unknown; + return 'unknown'; } } suite('Shell Detector', () => { - testShellTypes.forEach((shellType) => { - if (shellType === TerminalShellType.unknown) { + testShellTypes.forEach((shell) => { + if (shell === 'unknown') { return; } - const name = getNameByShellType(shellType); - const vscShellType = getVSCShellType(shellType); - test(`Detect ${shellType}`, () => { + const name = getNameByShellType(shell); + test(`Detect ${shell}`, () => { const terminal = { name, - state: { shellType: vscShellType }, + state: { shell }, creationOptions: { - shellPath: getShellPath(shellType), + shellPath: getShellPath(shell), }, } as Terminal; const detected = identifyTerminalShell(terminal); - const expected = expectedShellType(shellType); + const expected = expectedShellType(shell); assert.strictEqual(detected, expected); }); }); diff --git a/src/vscode.proposed.terminalShellType.d.ts b/src/vscode.proposed.terminalShellType.d.ts index 26e84b6..75e1546 100644 --- a/src/vscode.proposed.terminalShellType.d.ts +++ b/src/vscode.proposed.terminalShellType.d.ts @@ -6,33 +6,18 @@ declare module 'vscode' { // https://github.com/microsoft/vscode/issues/230165 - /** - * Known terminal shell types. - */ - export enum TerminalShellType { - Sh = 1, - Bash = 2, - Fish = 3, - Csh = 4, - Ksh = 5, - Zsh = 6, - CommandPrompt = 7, - GitBash = 8, - PowerShell = 9, - Python = 10, - Julia = 11, - NuShell = 12, - Node = 13, - } - // Part of TerminalState since the shellType can change multiple times and this comes with an event. export interface TerminalState { /** - * The current detected shell type of the terminal. New shell types may be added in the - * future in which case they will be returned as a number that is not part of - * {@link TerminalShellType}. - * Includes number type to prevent the breaking change when new enum members are added? + * The detected shell type of the {@link Terminal}. This will be `undefined` when there is + * not a clear signal as to what the shell is, or the shell is not supported yet. This + * value should change to the shell type of a sub-shell when launched (for example, running + * `bash` inside `zsh`). + * + * Note that the possible values are currently defined as any of the following: + * 'bash', 'cmd', 'csh', 'fish', 'gitbash', 'julia', 'ksh', 'node', 'nu', 'pwsh', 'python', + * 'sh', 'wsl', 'zsh'. */ - readonly shellType?: TerminalShellType | number | undefined; + readonly shell: string | undefined; } } From ac59aa30df26623d45d915929e93702cc4d6f446 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 21 Mar 2025 11:55:45 -0700 Subject: [PATCH 094/328] fix: use vsceTarget to rustTarget conversion when pulling `pet` (#225) --- build/azure-pipeline.pre-release.yml | 28 +++++++++++++++++++++++++++- build/azure-pipeline.stable.yml | 28 +++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index b4e4e95..3b6a918 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -90,6 +90,32 @@ extends: chmod +x $(Build.SourcesDirectory)/python-env-tools/bin displayName: Make Directory for python-env-tool binary + - bash: | + if [ "$(vsceTarget)" == "win32-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc" + elif [ "$(vsceTarget)" == "win32-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc" + elif [ "$(vsceTarget)" == "linux-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + elif [ "$(vsceTarget)" == "linux-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu" + elif [ "$(vsceTarget)" == "linux-armhf" ]; then + echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf" + elif [ "$(vsceTarget)" == "darwin-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin" + elif [ "$(vsceTarget)" == "darwin-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin" + elif [ "$(vsceTarget)" == "alpine-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + elif [ "$(vsceTarget)" == "alpine-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu" + elif [ "$(vsceTarget)" == "web" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + else + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + fi + displayName: Set buildTarget variable + - task: DownloadPipelineArtifact@2 inputs: buildType: 'specific' @@ -98,7 +124,7 @@ extends: buildVersionToDownload: 'latest' branchName: 'refs/heads/main' targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' - artifactName: 'bin-$(vsceTarget)' + artifactName: 'bin-$(buildTarget)' itemPattern: | pet.exe pet diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml index 517be17..6d88068 100644 --- a/build/azure-pipeline.stable.yml +++ b/build/azure-pipeline.stable.yml @@ -80,6 +80,32 @@ extends: chmod +x $(Build.SourcesDirectory)/python-env-tools/bin displayName: Make Directory for python-env-tool binary + - bash: | + if [ "$(vsceTarget)" == "win32-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc" + elif [ "$(vsceTarget)" == "win32-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc" + elif [ "$(vsceTarget)" == "linux-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + elif [ "$(vsceTarget)" == "linux-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu" + elif [ "$(vsceTarget)" == "linux-armhf" ]; then + echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf" + elif [ "$(vsceTarget)" == "darwin-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin" + elif [ "$(vsceTarget)" == "darwin-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin" + elif [ "$(vsceTarget)" == "alpine-x64" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + elif [ "$(vsceTarget)" == "alpine-arm64" ]; then + echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu" + elif [ "$(vsceTarget)" == "web" ]; then + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + else + echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl" + fi + displayName: Set buildTarget variable + - task: DownloadPipelineArtifact@2 inputs: buildType: 'specific' @@ -88,7 +114,7 @@ extends: buildVersionToDownload: 'latestFromBranch' branchName: 'refs/heads/release/2024.18' targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' - artifactName: 'bin-$(vsceTarget)' + artifactName: 'bin-$(buildTarget)' itemPattern: | pet.exe pet From 16726966ea28fa774abb5383166827c4266c8c8d Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 21 Mar 2025 11:59:32 -0700 Subject: [PATCH 095/328] fix: UX when installing packages (#222) * ensure skip install is only shown when relevant * ensure delete env message is modal fixes https://github.com/microsoft/vscode-python-environments/issues/220 --- src/api.ts | 5 ++++ src/common/window.apis.ts | 16 +++++++++++- src/features/envCommands.ts | 2 +- src/managers/builtin/pipManager.ts | 2 +- src/managers/builtin/pipUtils.ts | 29 +++++++++++--------- src/managers/builtin/venvUtils.ts | 15 ++++++++--- src/managers/conda/condaPackageManager.ts | 2 +- src/managers/conda/condaUtils.ts | 32 +++++++++++++---------- 8 files changed, 68 insertions(+), 35 deletions(-) diff --git a/src/api.ts b/src/api.ts index e7d2245..50e804e 100644 --- a/src/api.ts +++ b/src/api.ts @@ -721,6 +721,11 @@ export interface PackageInstallOptions { * Upgrade the packages if it is already installed. */ upgrade?: boolean; + + /** + * Show option to skip package installation + */ + showSkipOption?: boolean; } export interface PythonProcess { diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index bdbfa8a..892a3a3 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -7,6 +7,8 @@ import { InputBox, InputBoxOptions, LogOutputChannel, + MessageItem, + MessageOptions, OpenDialogOptions, OutputChannel, Progress, @@ -284,7 +286,19 @@ export async function showInputBoxWithButtons( } } -export function showWarningMessage(message: string, ...items: string[]): Thenable { +export function showWarningMessage(message: string, ...items: T[]): Thenable; +export function showWarningMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable; +export function showWarningMessage(message: string, ...items: T[]): Thenable; +export function showWarningMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable; +export function showWarningMessage(message: string, ...items: any[]): Thenable { return window.showWarningMessage(message, ...items); } diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 6d0c4e4..9c3d413 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -188,7 +188,7 @@ export async function handlePackagesCommand( try { if (action === Common.install) { - await packageManager.install(environment); + await packageManager.install(environment, undefined, { showSkipOption: false }); } else if (action === Common.uninstall) { await packageManager.uninstall(environment); } diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index d4c5a73..b06edd6 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -54,7 +54,7 @@ export class PipPackageManager implements PackageManager, Disposable { if (selected.length === 0) { const projects = this.venv.getProjectsByEnvironment(environment); - selected = (await getWorkspacePackagesToInstall(this.api, projects)) ?? []; + selected = (await getWorkspacePackagesToInstall(this.api, options, projects)) ?? []; } if (selected.length === 0) { diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 259e5ce..c3d1175 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -4,7 +4,7 @@ import * as tomljs from '@iarna/toml'; import { LogOutputChannel, ProgressLocation, QuickInputButtons, Uri } from 'vscode'; import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; -import { PythonEnvironmentApi, PythonProject } from '../../api'; +import { PackageInstallOptions, PythonEnvironmentApi, PythonProject } from '../../api'; import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { Installable, selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; @@ -75,6 +75,7 @@ async function getCommonPackages(): Promise { async function selectWorkspaceOrCommon( installable: Installable[], common: Installable[], + showSkipOption: boolean, ): Promise { if (installable.length === 0 && common.length === 0) { return undefined; @@ -95,19 +96,20 @@ async function selectWorkspaceOrCommon( }); } - if (items.length > 0) { + if (showSkipOption && items.length > 0) { items.push({ label: PackageManagement.skipPackageInstallation }); - } else { - return undefined; } - const selected = await showQuickPickWithButtons(items, { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - showBackButton: true, - matchOnDescription: false, - matchOnDetail: false, - }); + const selected = + items.length === 1 + ? items[0] + : await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); if (selected && !Array.isArray(selected)) { try { @@ -122,7 +124,7 @@ async function selectWorkspaceOrCommon( // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { if (ex === QuickInputButtons.Back) { - return selectWorkspaceOrCommon(installable, common); + return selectWorkspaceOrCommon(installable, common, showSkipOption); } } } @@ -131,11 +133,12 @@ async function selectWorkspaceOrCommon( export async function getWorkspacePackagesToInstall( api: PythonEnvironmentApi, + options?: PackageInstallOptions, project?: PythonProject[], ): Promise { const installable = (await getProjectInstallable(api, project)) ?? []; const common = await getCommonPackages(); - return selectWorkspaceOrCommon(installable, common); + return selectWorkspaceOrCommon(installable, common, !!options?.showSkipOption); } export async function getProjectInstallable( diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 5e43d54..e346074 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -400,7 +400,11 @@ export async function createPythonVenv( os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); const project = api.getPythonProject(venvRoot); - const packages = await getWorkspacePackagesToInstall(api, project ? [project] : undefined); + const packages = await getWorkspacePackagesToInstall( + api, + { showSkipOption: true }, + project ? [project] : undefined, + ); return await withProgress( { @@ -455,10 +459,13 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC const confirm = await showWarningMessage( l10n.t('Are you sure you want to remove {0}?', envPath), - Common.yes, - Common.no, + { + modal: true, + }, + { title: Common.yes }, + { title: Common.no, isCloseAffordance: true }, ); - if (confirm === Common.yes) { + if (confirm?.title === Common.yes) { await withProgress( { location: ProgressLocation.Notification, diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index fe77508..03b6d94 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -56,7 +56,7 @@ export class CondaPackageManager implements PackageManager, Disposable { let selected: string[] = packages ?? []; if (selected.length === 0) { - selected = (await getCommonCondaPackagesToInstall()) ?? []; + selected = (await getCommonCondaPackagesToInstall(options)) ?? []; } if (selected.length === 0) { diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 49d822b..c240fbf 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -761,7 +761,10 @@ async function getCommonPackages(): Promise { } } -async function selectCommonPackagesOrSkip(common: Installable[]): Promise { +async function selectCommonPackagesOrSkip( + common: Installable[], + showSkipOption: boolean, +): Promise { if (common.length === 0) { return undefined; } @@ -774,19 +777,20 @@ async function selectCommonPackagesOrSkip(common: Installable[]): Promise 0) { + if (showSkipOption && items.length > 0) { items.push({ label: PackageManagement.skipPackageInstallation }); - } else { - return undefined; } - const selected = await showQuickPickWithButtons(items, { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - showBackButton: true, - matchOnDescription: false, - matchOnDetail: false, - }); + const selected = + items.length === 1 + ? items[0] + : await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); if (selected && !Array.isArray(selected)) { try { @@ -799,15 +803,15 @@ async function selectCommonPackagesOrSkip(common: Installable[]): Promise { +export async function getCommonCondaPackagesToInstall(options?: PackageInstallOptions): Promise { const common = await getCommonPackages(); - const selected = await selectCommonPackagesOrSkip(common); + const selected = await selectCommonPackagesOrSkip(common, !!options?.showSkipOption); return selected; } From 637751cf63e3fd7915b77d65ba35c333a80b75d1 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 26 Mar 2025 09:20:49 -0700 Subject: [PATCH 096/328] fix: package refresh issue when installed externally (#253) --- src/managers/builtin/pipManager.ts | 8 +++++++- src/managers/conda/condaPackageManager.ts | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index b06edd6..986299d 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -135,7 +135,13 @@ export class PipPackageManager implements PackageManager, Disposable { title: 'Refreshing packages', }, async () => { - this.packages.set(environment.envId.id, await refreshPackages(environment, this.api, this)); + const before = this.packages.get(environment.envId.id) ?? []; + const after = await refreshPackages(environment, this.api, this); + const changes = getChanges(before, after); + this.packages.set(environment.envId.id, after); + if (changes.length > 0) { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + } }, ); } diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 03b6d94..7125dfe 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -131,14 +131,20 @@ export class CondaPackageManager implements PackageManager, Disposable { }, ); } - async refresh(context: PythonEnvironment): Promise { + async refresh(environment: PythonEnvironment): Promise { await withProgress( { location: ProgressLocation.Window, title: CondaStrings.condaRefreshingPackages, }, async () => { - this.packages.set(context.envId.id, await refreshPackages(context, this.api, this)); + const before = this.packages.get(environment.envId.id) ?? []; + const after = await refreshPackages(environment, this.api, this); + const changes = getChanges(before, after); + this.packages.set(environment.envId.id, after); + if (changes.length > 0) { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + } }, ); } From f0e089352c034805bf67e10de1f5a847c5a7ffd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 07:44:58 -0700 Subject: [PATCH 097/328] Bump tar-fs from 2.1.1 to 2.1.2 (#255) Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.1 to 2.1.2.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tar-fs&package-manager=npm_and_yarn&previous-version=2.1.1&new-version=2.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 315b2d8..65755ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4810,10 +4810,11 @@ } }, "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "chownr": "^1.1.1", @@ -8930,9 +8931,9 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", "dev": true, "optional": true, "requires": { From aed4e53e0f71f241bf79600a2d63f9acbebacf6d Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 2 Apr 2025 15:10:18 -0700 Subject: [PATCH 098/328] chore: refactor common shell execution code (#181) --- .../terminal/terminalActivationState.ts | 123 +++++++----------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/src/features/terminal/terminalActivationState.ts b/src/features/terminal/terminalActivationState.ts index e6cfed3..5ea1bc1 100644 --- a/src/features/terminal/terminalActivationState.ts +++ b/src/features/terminal/terminalActivationState.ts @@ -7,11 +7,10 @@ import { TerminalShellExecutionStartEvent, TerminalShellIntegration, } from 'vscode'; -import { PythonEnvironment } from '../../api'; +import { PythonCommandRunConfiguration, PythonEnvironment } from '../../api'; import { onDidEndTerminalShellExecution, onDidStartTerminalShellExecution } from '../../common/window.apis'; import { traceError, traceInfo, traceVerbose } from '../../common/logging'; import { isTaskTerminal } from './utils'; -import { createDeferred } from '../../common/utils/deferred'; import { getActivationCommand, getDeactivationCommand } from '../common/activation'; import { quoteArgs } from '../execution/execUtils'; @@ -229,46 +228,14 @@ export class TerminalActivationImpl implements TerminalActivationInternal { if (activationCommands) { try { for (const command of activationCommands) { - const execPromise = createDeferred(); - const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); - const disposables: Disposable[] = []; - let timer: NodeJS.Timeout | undefined = setTimeout(() => { - execPromise.resolve(); - traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); - }, 2000); - disposables.push( - this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { - if (e.execution === execution) { - execPromise.resolve(); - if (timer) { - clearTimeout(timer); - timer = undefined; - } - } - }), - this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { - if (e.execution === execution) { - traceVerbose( - `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, - ); - } - }), - new Disposable(() => { - if (timer) { - clearTimeout(timer); - timer = undefined; - } - }), - ); - try { - await execPromise.promise; - } finally { - disposables.forEach((d) => d.dispose()); - } + await this.executeTerminalShellCommandInternal(shellIntegration, command); } - } finally { this.activatedTerminals.set(terminal, environment); + } catch { + traceError('Failed to activate environment using shell integration'); } + } else { + traceVerbose('No activation commands found for terminal.'); } } @@ -281,43 +248,53 @@ export class TerminalActivationImpl implements TerminalActivationInternal { if (deactivationCommands) { try { for (const command of deactivationCommands) { - const execPromise = createDeferred(); - const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); - const disposables: Disposable[] = []; - let timer: NodeJS.Timeout | undefined = setTimeout(() => { - execPromise.resolve(); - traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); - }, 2000); - disposables.push( - this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { - if (e.execution === execution) { - execPromise.resolve(); - if (timer) { - clearTimeout(timer); - timer = undefined; - } - } - }), - this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { - if (e.execution === execution) { - traceVerbose( - `Shell execution started: ${command.executable} ${command.args?.join(' ')}`, - ); - } - }), - new Disposable(() => { - if (timer) { - clearTimeout(timer); - timer = undefined; - } - }), - ); - - await execPromise.promise; + await this.executeTerminalShellCommandInternal(shellIntegration, command); } - } finally { this.activatedTerminals.delete(terminal); + } catch { + traceError('Failed to deactivate environment using shell integration'); } + } else { + traceVerbose('No deactivation commands found for terminal.'); + } + } + + private async executeTerminalShellCommandInternal( + shellIntegration: TerminalShellIntegration, + command: PythonCommandRunConfiguration, + ): Promise { + const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const disposables: Disposable[] = []; + + const promise = new Promise((resolve) => { + const timer = setTimeout(() => { + traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + resolve(); + }, 2000); + + disposables.push( + new Disposable(() => clearTimeout(timer)), + this.onTerminalShellExecutionEnd((e: TerminalShellExecutionEndEvent) => { + if (e.execution === execution) { + resolve(); + } + }), + this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { + if (e.execution === execution) { + traceVerbose(`Shell execution started: ${command.executable} ${command.args?.join(' ')}`); + } + }), + ); + }); + + try { + await promise; + return true; + } catch { + traceError(`Failed to execute shell command: ${command.executable} ${command.args?.join(' ')}`); + return false; + } finally { + disposables.forEach((d) => d.dispose()); } } } From 649b865fd1f1e798e7f6d7e77a473356ac820bd6 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 7 Apr 2025 09:30:02 -0700 Subject: [PATCH 099/328] fix: use '&' when sending commands using `sendtext` to powershell (#262) Fixes https://github.com/microsoft/vscode-python-environments/issues/257 --- src/features/terminal/runInTerminal.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/features/terminal/runInTerminal.ts b/src/features/terminal/runInTerminal.ts index 5115b58..8a3d918 100644 --- a/src/features/terminal/runInTerminal.ts +++ b/src/features/terminal/runInTerminal.ts @@ -3,6 +3,7 @@ import { PythonEnvironment, PythonTerminalExecutionOptions } from '../../api'; import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createDeferred } from '../../common/utils/deferred'; import { quoteArgs } from '../execution/execUtils'; +import { identifyTerminalShell } from '../common/shellDetector'; export async function runInTerminal( environment: PythonEnvironment, @@ -28,9 +29,14 @@ export async function runInTerminal( } }); execution = terminal.shellIntegration.executeCommand(executable, allArgs); - return deferred.promise; + await deferred.promise; } else { - const text = quoteArgs([executable, ...allArgs]).join(' '); + const shellType = identifyTerminalShell(terminal); + let text = quoteArgs([executable, ...allArgs]).join(' '); + if (shellType === 'pwsh' && !text.startsWith('&')) { + // PowerShell requires commands to be prefixed with '&' to run them. + text = `& ${text}`; + } terminal.sendText(`${text}\n`); } } From cf73da4621ac64559ebb9644405b5d39e3694fd5 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 7 Apr 2025 10:02:21 -0700 Subject: [PATCH 100/328] fix: for venv common packages shows installed packages pre ticked (#263) closes https://github.com/microsoft/vscode-python-environments/issues/224 --- src/managers/builtin/pipManager.ts | 2 +- src/managers/builtin/pipUtils.ts | 12 +++++++++--- src/managers/common/pickers.ts | 7 +++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index 986299d..45753d8 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -54,7 +54,7 @@ export class PipPackageManager implements PackageManager, Disposable { if (selected.length === 0) { const projects = this.venv.getProjectsByEnvironment(environment); - selected = (await getWorkspacePackagesToInstall(this.api, options, projects)) ?? []; + selected = (await getWorkspacePackagesToInstall(this.api, options, projects, environment)) ?? []; } if (selected.length === 0) { diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index c3d1175..3bbd6c8 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -4,7 +4,7 @@ import * as tomljs from '@iarna/toml'; import { LogOutputChannel, ProgressLocation, QuickInputButtons, Uri } from 'vscode'; import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; -import { PackageInstallOptions, PythonEnvironmentApi, PythonProject } from '../../api'; +import { PackageInstallOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { Installable, selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; @@ -76,6 +76,7 @@ async function selectWorkspaceOrCommon( installable: Installable[], common: Installable[], showSkipOption: boolean, + installed?: string[], ): Promise { if (installable.length === 0 && common.length === 0) { return undefined; @@ -116,7 +117,7 @@ async function selectWorkspaceOrCommon( if (selected.label === PackageManagement.workspaceDependencies) { return await selectFromInstallableToInstall(installable); } else if (selected.label === PackageManagement.commonPackages) { - return await selectFromCommonPackagesToInstall(common); + return await selectFromCommonPackagesToInstall(common, installed); } else { traceInfo('Package Installer: user selected skip package installation'); return undefined; @@ -135,10 +136,15 @@ export async function getWorkspacePackagesToInstall( api: PythonEnvironmentApi, options?: PackageInstallOptions, project?: PythonProject[], + environment?: PythonEnvironment, ): Promise { const installable = (await getProjectInstallable(api, project)) ?? []; const common = await getCommonPackages(); - return selectWorkspaceOrCommon(installable, common, !!options?.showSkipOption); + let installed: string[] | undefined; + if (environment) { + installed = (await api.getPackages(environment))?.map((pkg) => pkg.name); + } + return selectWorkspaceOrCommon(installable, common, !!options?.showSkipOption, installed); } export async function getProjectInstallable( diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts index 7173209..8149956 100644 --- a/src/managers/common/pickers.ts +++ b/src/managers/common/pickers.ts @@ -119,14 +119,13 @@ async function enterPackageManually(filler?: string): Promise { const items: PackageQuickPickItem[] = common.map(installableToQuickPickItem); const preSelectedItems = items .filter((i) => i.kind !== QuickPickItemKind.Separator) - .filter((i) => - preSelected?.find((s) => s.label === i.label && s.description === i.description && s.detail === i.detail), - ); + .filter((i) => installed?.find((p) => i.id === p) || preSelected?.find((s) => s.id === i.id)); let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; try { @@ -173,7 +172,7 @@ export async function selectFromCommonPackagesToInstall( return result; } catch (ex) { if (ex === QuickInputButtons.Back) { - return selectFromCommonPackagesToInstall(common, selected); + return selectFromCommonPackagesToInstall(common, installed, selected); } return undefined; } From e516d15eb22ef20405b9b9617bdff9188c1fb873 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 7 Apr 2025 11:59:59 -0700 Subject: [PATCH 101/328] fix: filter telemetry from in development extensions (#264) --- src/features/envManagers.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 2861d3a..405b1cd 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -99,9 +99,11 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { this._environmentManagers.set(managerId, mgr); this._onDidChangeEnvironmentManager.fire({ kind: 'registered', manager: mgr }); - sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_REGISTERED, undefined, { - managerId, - }); + if (!managerId.toLowerCase().startsWith('undefined_publisher.')) { + sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_REGISTERED, undefined, { + managerId, + }); + } return new Disposable(() => { this._environmentManagers.delete(managerId); @@ -137,9 +139,11 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { this._packageManagers.set(managerId, mgr); this._onDidChangePackageManager.fire({ kind: 'registered', manager: mgr }); - sendTelemetryEvent(EventNames.PACKAGE_MANAGER_REGISTERED, undefined, { - managerId, - }); + if (!managerId.toLowerCase().startsWith('undefined_publisher.')) { + sendTelemetryEvent(EventNames.PACKAGE_MANAGER_REGISTERED, undefined, { + managerId, + }); + } return new Disposable(() => { this._packageManagers.delete(managerId); From eeed4cdc8d328d23b342ed926d03529057722f84 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 7 Apr 2025 15:30:25 -0700 Subject: [PATCH 102/328] feat: add "Quick Create" option for venvs (#265) closes https://github.com/microsoft/vscode-python-environments/issues/258 ![image](https://github.com/user-attachments/assets/ac6f339f-5234-49fc-bf0a-92e2f4ea10dc) /cc @cwebster-99 Need your input on the text --- src/common/localize.ts | 6 ++ src/managers/builtin/venvUtils.ts | 154 +++++++++++++++++++++--------- 2 files changed, 113 insertions(+), 47 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index f9864f7..57df944 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -89,6 +89,12 @@ export namespace VenvManagerStrings { export const installEditable = l10n.t('Install project as editable'); export const searchingDependencies = l10n.t('Searching for dependencies'); + + export const selectQuickOrCustomize = l10n.t('Select environment creation mode'); + export const quickCreate = l10n.t('Quick Create'); + export const quickCreateDescription = l10n.t('Create a virtual environment in the workspace root'); + export const customize = l10n.t('Custom'); + export const customizeDescription = l10n.t('Choose python version, location, packages, name, etc.'); } export namespace SysManagerStrings { diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index e346074..a89dcd6 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -31,7 +31,7 @@ import { import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; -import { getWorkspacePackagesToInstall } from './pipUtils'; +import { getProjectInstallable, getWorkspacePackagesToInstall } from './pipUtils'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -347,6 +347,90 @@ export async function getGlobalVenvLocation(): Promise { return undefined; } +async function createWithCustomization(version: string): Promise { + const selection: QuickPickItem | undefined = await showQuickPick( + [ + { + label: VenvManagerStrings.quickCreate, + description: VenvManagerStrings.quickCreateDescription, + detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', version), + }, + { + label: VenvManagerStrings.customize, + description: VenvManagerStrings.customizeDescription, + }, + ], + { + placeHolder: VenvManagerStrings.selectQuickOrCustomize, + ignoreFocusOut: true, + }, + ); + + if (selection === undefined) { + return undefined; + } else if (selection.label === VenvManagerStrings.quickCreate) { + return false; + } + return true; +} + +async function createWithProgress( + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + basePython: PythonEnvironment, + venvRoot: Uri, + envPath: string, + packages?: string[], +) { + const pythonPath = + os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); + + return await withProgress( + { + location: ProgressLocation.Notification, + title: VenvManagerStrings.venvCreating, + }, + async () => { + try { + const useUv = await isUvInstalled(log); + if (basePython.execInfo?.run.executable) { + if (useUv) { + await runUV( + ['venv', '--verbose', '--seed', '--python', basePython.execInfo?.run.executable, envPath], + venvRoot.fsPath, + log, + ); + } else { + await runPython( + basePython.execInfo.run.executable, + ['-m', 'venv', envPath], + venvRoot.fsPath, + manager.log, + ); + } + if (!(await fsapi.pathExists(pythonPath))) { + log.error('no python executable found in virtual environment'); + throw new Error('no python executable found in virtual environment'); + } + } + + const resolved = await nativeFinder.resolve(pythonPath); + const env = api.createPythonEnvironmentItem(await getPythonInfo(resolved), manager); + if (packages && packages?.length > 0) { + await api.installPackages(env, packages, { upgrade: false }); + } + return env; + } catch (e) { + log.error(`Failed to create virtual environment: ${e}`); + showErrorMessage(VenvManagerStrings.venvCreateFailed); + return; + } + }, + ); +} + export async function createPythonVenv( nativeFinder: NativePythonFinder, api: PythonEnvironmentApi, @@ -371,7 +455,27 @@ export async function createPythonVenv( return; } - const basePython = await pickEnvironmentFrom(sortEnvironments(filtered)); + const sortedEnvs = sortEnvironments(filtered); + const project = api.getPythonProject(venvRoot); + + const customize = await createWithCustomization(sortedEnvs[0].version); + if (customize === undefined) { + return; + } else if (customize === false) { + const installables = await getProjectInstallable(api, project ? [project] : undefined); + return await createWithProgress( + nativeFinder, + api, + log, + manager, + sortedEnvs[0], + venvRoot, + path.join(venvRoot.fsPath, '.venv'), + installables?.flatMap((i) => i.args ?? []), + ); + } + + const basePython = await pickEnvironmentFrom(sortedEnvs); if (!basePython || !basePython.execInfo) { log.error('No base python selected, cannot create virtual environment.'); return; @@ -396,58 +500,14 @@ export async function createPythonVenv( } const envPath = path.join(venvRoot.fsPath, name); - const pythonPath = - os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); - const project = api.getPythonProject(venvRoot); const packages = await getWorkspacePackagesToInstall( api, { showSkipOption: true }, project ? [project] : undefined, ); - return await withProgress( - { - location: ProgressLocation.Notification, - title: VenvManagerStrings.venvCreating, - }, - async () => { - try { - const useUv = await isUvInstalled(log); - if (basePython.execInfo?.run.executable) { - if (useUv) { - await runUV( - ['venv', '--verbose', '--seed', '--python', basePython.execInfo?.run.executable, envPath], - venvRoot.fsPath, - log, - ); - } else { - await runPython( - basePython.execInfo.run.executable, - ['-m', 'venv', envPath], - venvRoot.fsPath, - manager.log, - ); - } - if (!(await fsapi.pathExists(pythonPath))) { - log.error('no python executable found in virtual environment'); - throw new Error('no python executable found in virtual environment'); - } - } - - const resolved = await nativeFinder.resolve(pythonPath); - const env = api.createPythonEnvironmentItem(await getPythonInfo(resolved), manager); - if (packages && packages?.length > 0) { - await api.installPackages(env, packages, { upgrade: false }); - } - return env; - } catch (e) { - log.error(`Failed to create virtual environment: ${e}`); - showErrorMessage(VenvManagerStrings.venvCreateFailed); - return; - } - }, - ); + return await createWithProgress(nativeFinder, api, log, manager, basePython, venvRoot, envPath, packages); } export async function removeVenv(environment: PythonEnvironment, log: LogOutputChannel): Promise { From 3036ce80ac4ecd1c1dd4b835d292a51365056660 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 7 Apr 2025 16:02:46 -0700 Subject: [PATCH 103/328] feat: telemetry when using quick create (#269) closes https://github.com/microsoft/vscode-python-environments/issues/268 --- src/common/telemetry/constants.ts | 20 +++++++++++++++----- src/managers/builtin/venvUtils.ts | 5 +++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index c31d534..2c2a560 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -1,11 +1,12 @@ export enum EventNames { - EXTENSION_ACTIVATION_DURATION = "EXTENSION.ACTIVATION_DURATION", - EXTENSION_MANAGER_REGISTRATION_DURATION = "EXTENSION.MANAGER_REGISTRATION_DURATION", + EXTENSION_ACTIVATION_DURATION = 'EXTENSION.ACTIVATION_DURATION', + EXTENSION_MANAGER_REGISTRATION_DURATION = 'EXTENSION.MANAGER_REGISTRATION_DURATION', - ENVIRONMENT_MANAGER_REGISTERED = "ENVIRONMENT_MANAGER.REGISTERED", - PACKAGE_MANAGER_REGISTERED = "PACKAGE_MANAGER.REGISTERED", + ENVIRONMENT_MANAGER_REGISTERED = 'ENVIRONMENT_MANAGER.REGISTERED', + PACKAGE_MANAGER_REGISTERED = 'PACKAGE_MANAGER.REGISTERED', - VENV_USING_UV = "VENV.USING_UV", + VENV_USING_UV = 'VENV.USING_UV', + VENV_CREATION = 'VENV.CREATION', } // Map all events to their properties @@ -45,4 +46,13 @@ export interface IEventNamePropertyMapping { "venv.using_uv": {"owner": "karthiknadig" } */ [EventNames.VENV_USING_UV]: never | undefined; + + /* __GDPR__ + "venv.creation": { + "creationType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + } + */ + [EventNames.VENV_CREATION]: { + creationType: 'quick' | 'custom'; + }; } diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index a89dcd6..fd27973 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -32,6 +32,8 @@ import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; import { getProjectInstallable, getWorkspacePackagesToInstall } from './pipUtils'; +import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { EventNames } from '../../common/telemetry/constants'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -462,6 +464,7 @@ export async function createPythonVenv( if (customize === undefined) { return; } else if (customize === false) { + sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); const installables = await getProjectInstallable(api, project ? [project] : undefined); return await createWithProgress( nativeFinder, @@ -473,6 +476,8 @@ export async function createPythonVenv( path.join(venvRoot.fsPath, '.venv'), installables?.flatMap((i) => i.args ?? []), ); + } else { + sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); } const basePython = await pickEnvironmentFrom(sortedEnvs); From 34579c8acc19c15f0b86f190398ec1bb71efe490 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 8 Apr 2025 09:02:43 -0700 Subject: [PATCH 104/328] fix: bug with `filePath` when finding calling extension (#271) fixes: https://github.com/microsoft/vscode-python-environments/issues/261 fixes: https://github.com/microsoft/vscode-python-environments/issues/223 --- src/common/utils/frameUtils.ts | 66 +++++++++++++++++++++++----------- src/common/utils/pathUtils.ts | 15 ++++---- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/src/common/utils/frameUtils.ts b/src/common/utils/frameUtils.ts index f0b32d4..057fc5b 100644 --- a/src/common/utils/frameUtils.ts +++ b/src/common/utils/frameUtils.ts @@ -1,7 +1,8 @@ +import { Uri } from 'vscode'; import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../constants'; import { parseStack } from '../errors/utils'; import { allExtensions, getExtension } from '../extension.apis'; - +import { normalizePath } from './pathUtils'; interface FrameData { filePath: string; functionName: string; @@ -15,38 +16,63 @@ function getFrameData(): FrameData[] { })); } +function getPathFromFrame(frame: FrameData): string { + if (frame.filePath && frame.filePath.startsWith('file://')) { + return Uri.parse(frame.filePath).fsPath; + } + return frame.filePath; +} + export function getCallingExtension(): string { const pythonExts = [ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID]; - const extensions = allExtensions(); const otherExts = extensions.filter((ext) => !pythonExts.includes(ext.id)); - const frames = getFrameData().filter((frame) => !!frame.filePath); + const frames = getFrameData(); + const filePaths: string[] = []; for (const frame of frames) { - const filename = frame.filePath; - if (filename) { - const ext = otherExts.find((ext) => filename.includes(ext.id)); - if (ext) { - return ext.id; - } + if (!frame || !frame.filePath) { + continue; + } + const filePath = normalizePath(getPathFromFrame(frame)); + if (!filePath) { + continue; + } + + if (filePath.toLowerCase().endsWith('extensionhostprocess.js')) { + continue; + } + + if (filePath.startsWith('node:')) { + continue; + } + + filePaths.push(filePath); + + const ext = otherExts.find((ext) => filePath.includes(ext.id)); + if (ext) { + return ext.id; } } // `ms-python.vscode-python-envs` extension in Development mode - const candidates = frames.filter((frame) => otherExts.some((s) => frame.filePath.includes(s.extensionPath))); - const envsExtPath = getExtension(ENVS_EXTENSION_ID)?.extensionPath; - if (!envsExtPath) { + const candidates = filePaths.filter((filePath) => + otherExts.some((s) => filePath.includes(normalizePath(s.extensionPath))), + ); + const envExt = getExtension(ENVS_EXTENSION_ID); + + if (!envExt) { throw new Error('Something went wrong with feature registration'); } - - if (candidates.length === 0 && frames.every((frame) => frame.filePath.startsWith(envsExtPath))) { + const envsExtPath = normalizePath(envExt.extensionPath); + if (candidates.length === 0 && filePaths.every((filePath) => filePath.startsWith(envsExtPath))) { return PYTHON_EXTENSION_ID; - } - - // 3rd party extension in Development mode - const candidateExt = otherExts.find((ext) => candidates[0].filePath.includes(ext.extensionPath)); - if (candidateExt) { - return candidateExt.id; + } else if (candidates.length > 0) { + // 3rd party extension in Development mode + const candidateExt = otherExts.find((ext) => candidates[0].includes(ext.extensionPath)); + if (candidateExt) { + return candidateExt.id; + } } throw new Error('Unable to determine calling extension id, registration failed'); diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index ac9f4cc..09a3ef2 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -1,10 +1,9 @@ -import * as path from 'path'; +import { isWindows } from '../../managers/common/utils'; -export function areSamePaths(a: string, b: string): boolean { - return path.resolve(a) === path.resolve(b); -} - -export function isParentPath(parent: string, child: string): boolean { - const relative = path.relative(path.resolve(parent), path.resolve(child)); - return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative); +export function normalizePath(path: string): string { + const path1 = path.replace(/\\/g, '/'); + if (isWindows()) { + return path1.toLowerCase(); + } + return path1; } From 7d88d2fd79766ca57d91531103678f29826a5984 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 10 Apr 2025 10:09:20 -0700 Subject: [PATCH 105/328] feat: improve package management (#279) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ⚠️ BREAKING CHANGE: This PR has an API change that replaces `install` and `uninstall` methods on package manager with `manage`. Reasoning: Both the install and uninstall flows did very similar things. In all the implementations this was duplicating the steps. The idea here is to make it easier from the flow perspective. ![image](https://github.com/user-attachments/assets/53087fca-ddc9-44f4-bcb9-9b005264db56) --- examples/sample1/src/api.ts | 107 +++++++++-------- package-lock.json | 16 +-- package.json | 7 +- package.nls.json | 4 +- src/api.ts | 77 +++++++------ src/common/localize.ts | 10 +- src/common/pickers/packages.ts | 22 ---- src/extension.ts | 3 +- src/features/envCommands.ts | 24 +--- src/features/pythonApi.ts | 13 +-- src/internal.api.ts | 12 +- src/managers/builtin/pipManager.ts | 76 ++++-------- src/managers/builtin/pipUtils.ts | 34 +++--- src/managers/builtin/utils.ts | 72 +++--------- src/managers/builtin/venvUtils.ts | 16 ++- src/managers/common/pickers.ts | 128 +++++++++++---------- src/managers/common/utils.ts | 66 ++++++++--- src/managers/conda/condaPackageManager.ts | 72 +++--------- src/managers/conda/condaUtils.ts | 83 ++++++------- src/vscode.proposed.terminalShellType.d.ts | 23 ---- 20 files changed, 368 insertions(+), 497 deletions(-) delete mode 100644 src/common/pickers/packages.ts delete mode 100644 src/vscode.proposed.terminalShellType.d.ts diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index 627cb96..2cad951 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -48,23 +48,6 @@ export interface PythonCommandRunConfiguration { args?: string[]; } -export enum TerminalShellType { - powershell = 'powershell', - powershellCore = 'powershellCore', - commandPrompt = 'commandPrompt', - gitbash = 'gitbash', - bash = 'bash', - zsh = 'zsh', - ksh = 'ksh', - fish = 'fish', - cshell = 'cshell', - tcshell = 'tcshell', - nushell = 'nushell', - wsl = 'wsl', - xonsh = 'xonsh', - unknown = 'unknown', -} - /** * Contains details on how to use a particular python environment * @@ -73,7 +56,7 @@ export enum TerminalShellType { * 2. If {@link PythonEnvironmentExecutionInfo.activatedRun} is not provided, then: * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then: - * - {@link TerminalShellType.unknown} will be used if provided. + * - 'unknown' will be used if provided. * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. * - If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then {@link PythonEnvironmentExecutionInfo.activation} will be used. * - If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. @@ -82,7 +65,7 @@ export enum TerminalShellType { * 1. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is known, then that will be used. * 2. If {@link PythonEnvironmentExecutionInfo.shellActivation} is provided and shell type is not known, then {@link PythonEnvironmentExecutionInfo.activation} will be used. * 3. If {@link PythonEnvironmentExecutionInfo.shellActivation} is not provided, then: - * - {@link TerminalShellType.unknown} will be used if provided. + * - 'unknown' will be used if provided. * - {@link PythonEnvironmentExecutionInfo.activation} will be used otherwise. * 4. If {@link PythonEnvironmentExecutionInfo.activation} is not provided, then {@link PythonEnvironmentExecutionInfo.run} will be used. * @@ -107,11 +90,11 @@ export interface PythonEnvironmentExecutionInfo { /** * Details on how to activate an environment using a shell specific command. * If set this will override the {@link PythonEnvironmentExecutionInfo.activation}. - * {@link TerminalShellType.unknown} is used if shell type is not known. - * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * 'unknown' is used if shell type is not known. + * If 'unknown' is not provided and shell type is not known then * {@link PythonEnvironmentExecutionInfo.activation} if set. */ - shellActivation?: Map; + shellActivation?: Map; /** * Details on how to deactivate an environment. @@ -121,11 +104,11 @@ export interface PythonEnvironmentExecutionInfo { /** * Details on how to deactivate an environment using a shell specific command. * If set this will override the {@link PythonEnvironmentExecutionInfo.deactivation} property. - * {@link TerminalShellType.unknown} is used if shell type is not known. - * If {@link TerminalShellType.unknown} is not provided and shell type is not known then + * 'unknown' is used if shell type is not known. + * If 'unknown' is not provided and shell type is not known then * {@link PythonEnvironmentExecutionInfo.deactivation} if set. */ - shellDeactivation?: Map; + shellDeactivation?: Map; } /** @@ -592,20 +575,12 @@ export interface PackageManager { log?: LogOutputChannel; /** - * Installs packages in the specified Python environment. + * Installs/Uninstall packages in the specified Python environment. * @param environment - The Python environment in which to install packages. * @param packages - The packages to install. * @returns A promise that resolves when the installation is complete. */ - install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise; - - /** - * Uninstalls packages from the specified Python environment. - * @param environment - The Python environment from which to uninstall packages. - * @param packages - The packages to uninstall, which can be an array of packages or strings. - * @returns A promise that resolves when the uninstall is complete. - */ - uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise; + manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise; /** * Refreshes the package list for the specified Python environment. @@ -730,15 +705,47 @@ export interface DidChangePythonProjectsEventArgs { removed: PythonProject[]; } -/** - * Options for package installation. - */ -export interface PackageInstallOptions { - /** - * Upgrade the packages if it is already installed. - */ - upgrade?: boolean; -} +export type PackageManagementOptions = + | { + /** + * Upgrade the packages if it is already installed. + */ + upgrade?: boolean; + + /** + * Show option to skip package installation + */ + showSkipOption?: boolean; + /** + * The list of packages to install. + */ + install: string[]; + + /** + * The list of packages to uninstall. + */ + uninstall?: string[]; + } + | { + /** + * Upgrade the packages if it is already installed. + */ + upgrade?: boolean; + + /** + * Show option to skip package installation + */ + showSkipOption?: boolean; + /** + * The list of packages to install. + */ + install?: string[]; + + /** + * The list of packages to uninstall. + */ + uninstall: string[]; + }; export interface PythonProcess { /** @@ -921,21 +928,13 @@ export interface PythonPackageItemApi { export interface PythonPackageManagementApi { /** - * Install packages into a Python Environment. + * Install/Uninstall packages into a Python Environment. * * @param environment The Python Environment into which packages are to be installed. * @param packages The packages to install. * @param options Options for installing packages. */ - installPackages(environment: PythonEnvironment, packages: string[], options?: PackageInstallOptions): Promise; - - /** - * Uninstall packages from a Python Environment. - * - * @param environment The Python Environment from which packages are to be uninstalled. - * @param packages The packages to uninstall. - */ - uninstallPackages(environment: PythonEnvironment, packages: PackageInfo[] | string[]): Promise; + managePackages(environment: PythonEnvironment, options: PackageManagementOptions): Promise; } export interface PythonPackageManagerApi diff --git a/package-lock.json b/package-lock.json index 65755ba..346bf96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.97.0", + "@types/vscode": "^1.99.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", @@ -42,7 +42,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.99.0-20250317" + "vscode": "^1.100.0-20250407" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -715,9 +715,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.97.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.97.0.tgz", - "integrity": "sha512-ueE73loeOTe7olaVyqP9mrRI54kVPJifUPjblZo9fYcv1CuVLPOEKEkqW0GkqPC454+nCEoigLWnC2Pp7prZ9w==", + "version": "1.99.1", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.99.1.tgz", + "integrity": "sha512-cQlqxHZ040ta6ovZXnXRxs3fJiTmlurkIWOfZVcLSZPcm9J4ikFpXuB7gihofGn5ng+kDVma5EmJIclfk0trPQ==", "dev": true, "license": "MIT" }, @@ -5997,9 +5997,9 @@ "dev": true }, "@types/vscode": { - "version": "1.97.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.97.0.tgz", - "integrity": "sha512-ueE73loeOTe7olaVyqP9mrRI54kVPJifUPjblZo9fYcv1CuVLPOEKEkqW0GkqPC454+nCEoigLWnC2Pp7prZ9w==", + "version": "1.99.1", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.99.1.tgz", + "integrity": "sha512-cQlqxHZ040ta6ovZXnXRxs3fJiTmlurkIWOfZVcLSZPcm9J4ikFpXuB7gihofGn5ng+kDVma5EmJIclfk0trPQ==", "dev": true }, "@types/which": { diff --git a/package.json b/package.json index ce1be62..f552f1f 100644 --- a/package.json +++ b/package.json @@ -6,13 +6,12 @@ "publisher": "ms-python", "preview": true, "engines": { - "vscode": "^1.99.0-20250317" + "vscode": "^1.100.0-20250407" }, "categories": [ "Other" ], "enabledApiProposals": [ - "terminalShellType", "terminalShellEnv" ], "capabilities": { @@ -142,7 +141,6 @@ { "command": "python-envs.reset", "title": "%python-envs.reset.title%", - "shortTitle": "Reset Environment", "category": "Python", "icon": "$(sync)" }, @@ -174,7 +172,6 @@ { "command": "python-envs.packages", "title": "%python-envs.packages.title%", - "shortTitle": "Modify Packages", "category": "Python", "icon": "$(package)" }, @@ -534,7 +531,7 @@ "@types/node": "20.2.5", "@types/sinon": "^17.0.3", "@types/stack-trace": "0.0.29", - "@types/vscode": "^1.97.0", + "@types/vscode": "^1.99.0", "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^8.16.0", "@typescript-eslint/parser": "^8.16.0", diff --git a/package.nls.json b/package.nls.json index f7547a6..f170c24 100644 --- a/package.nls.json +++ b/package.nls.json @@ -16,12 +16,12 @@ "python-envs.createAny.title": "Create Environment", "python-envs.set.title": "Set Workspace Environment", "python-envs.setEnv.title": "Set As Workspace Environment", - "python-envs.reset.title": "Reset Environment Selection to Default", + "python-envs.reset.title": "Reset to Default", "python-envs.remove.title": "Delete Environment", "python-envs.refreshAllManagers.title": "Refresh All Environment Managers", "python-envs.refreshManager.title": "Refresh Environments List", "python-envs.refreshPackages.title": "Refresh Packages List", - "python-envs.packages.title": "Install or Remove Packages", + "python-envs.packages.title": "Manage Packages", "python-envs.clearCache.title": "Clear Cache", "python-envs.runInTerminal.title": "Run in Terminal", "python-envs.createTerminal.title": "Create Python Terminal", diff --git a/src/api.ts b/src/api.ts index 50e804e..2cad951 100644 --- a/src/api.ts +++ b/src/api.ts @@ -575,20 +575,12 @@ export interface PackageManager { log?: LogOutputChannel; /** - * Installs packages in the specified Python environment. + * Installs/Uninstall packages in the specified Python environment. * @param environment - The Python environment in which to install packages. * @param packages - The packages to install. * @returns A promise that resolves when the installation is complete. */ - install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise; - - /** - * Uninstalls packages from the specified Python environment. - * @param environment - The Python environment from which to uninstall packages. - * @param packages - The packages to uninstall, which can be an array of packages or strings. - * @returns A promise that resolves when the uninstall is complete. - */ - uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise; + manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise; /** * Refreshes the package list for the specified Python environment. @@ -713,20 +705,47 @@ export interface DidChangePythonProjectsEventArgs { removed: PythonProject[]; } -/** - * Options for package installation. - */ -export interface PackageInstallOptions { - /** - * Upgrade the packages if it is already installed. - */ - upgrade?: boolean; +export type PackageManagementOptions = + | { + /** + * Upgrade the packages if it is already installed. + */ + upgrade?: boolean; - /** - * Show option to skip package installation - */ - showSkipOption?: boolean; -} + /** + * Show option to skip package installation + */ + showSkipOption?: boolean; + /** + * The list of packages to install. + */ + install: string[]; + + /** + * The list of packages to uninstall. + */ + uninstall?: string[]; + } + | { + /** + * Upgrade the packages if it is already installed. + */ + upgrade?: boolean; + + /** + * Show option to skip package installation + */ + showSkipOption?: boolean; + /** + * The list of packages to install. + */ + install?: string[]; + + /** + * The list of packages to uninstall. + */ + uninstall: string[]; + }; export interface PythonProcess { /** @@ -909,21 +928,13 @@ export interface PythonPackageItemApi { export interface PythonPackageManagementApi { /** - * Install packages into a Python Environment. + * Install/Uninstall packages into a Python Environment. * * @param environment The Python Environment into which packages are to be installed. * @param packages The packages to install. * @param options Options for installing packages. */ - installPackages(environment: PythonEnvironment, packages: string[], options?: PackageInstallOptions): Promise; - - /** - * Uninstall packages from a Python Environment. - * - * @param environment The Python Environment from which packages are to be uninstalled. - * @param packages The packages to uninstall. - */ - uninstallPackages(environment: PythonEnvironment, packages: PackageInfo[] | string[]): Promise; + managePackages(environment: PythonEnvironment, options: PackageManagementOptions): Promise; } export interface PythonPackageManagerApi diff --git a/src/common/localize.ts b/src/common/localize.ts index 57df944..755508c 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -20,10 +20,14 @@ export namespace Interpreter { } export namespace PackageManagement { + export const install = l10n.t('Install'); + export const uninstall = l10n.t('Uninstall'); + export const installed = l10n.t('Installed'); + export const commonPackages = l10n.t('Common Packages'); export const selectPackagesToInstall = l10n.t('Select packages to install'); export const enterPackageNames = l10n.t('Enter package names'); - export const commonPackages = l10n.t('Search common `PyPI` packages'); - export const commonPackagesDescription = l10n.t('Search and Install common `PyPI` packages'); + export const searchCommonPackages = l10n.t('Search common `PyPI` packages'); + export const searchCommonPackagesDescription = l10n.t('Search and Install common `PyPI` packages'); export const workspaceDependencies = l10n.t('Install workspace dependencies'); export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); @@ -40,8 +44,6 @@ export namespace Pickers { export namespace Packages { export const selectOption = l10n.t('Select an option'); - export const installPackages = l10n.t('Install packages'); - export const uninstallPackages = l10n.t('Uninstall packages'); } export namespace Managers { diff --git a/src/common/pickers/packages.ts b/src/common/pickers/packages.ts deleted file mode 100644 index 8010224..0000000 --- a/src/common/pickers/packages.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Common, Pickers } from '../localize'; -import { showQuickPick } from '../window.apis'; - -export async function pickPackageOptions(): Promise { - const items = [ - { - label: Common.install, - description: Pickers.Packages.installPackages, - }, - { - label: Common.uninstall, - description: Pickers.Packages.uninstallPackages, - }, - ]; - const selected = await showQuickPick(items, { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - matchOnDescription: false, - matchOnDetail: false, - }); - return selected?.label; -} diff --git a/src/extension.ts b/src/extension.ts index ac5a1b3..004a983 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -8,7 +8,6 @@ import { createEnvironmentCommand, createTerminalCommand, getPackageCommandOptions, - handlePackagesCommand, refreshManagerCommand, removeEnvironmentCommand, removePythonProject, @@ -138,7 +137,7 @@ export async function activate(context: ExtensionContext): Promise { await handlePackageUninstall(context, envManagers); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 9c3d413..6838c0a 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -33,10 +33,8 @@ import { PackageTreeItem, ProjectPackage, } from './views/treeViewItems'; -import { Common } from '../common/localize'; import { pickEnvironment } from '../common/pickers/environments'; import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; -import { pickPackageOptions } from '../common/pickers/packages'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { TerminalManager } from './terminal/terminalManager'; import { runInTerminal } from './terminal/runInTerminal'; @@ -180,32 +178,12 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir } } -export async function handlePackagesCommand( - packageManager: InternalPackageManager, - environment: PythonEnvironment, -): Promise { - const action = await pickPackageOptions(); - - try { - if (action === Common.install) { - await packageManager.install(environment, undefined, { showSkipOption: false }); - } else if (action === Common.uninstall) { - await packageManager.uninstall(environment); - } - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return handlePackagesCommand(packageManager, environment); - } - throw ex; - } -} - export async function handlePackageUninstall(context: unknown, em: EnvironmentManagers) { if (context instanceof PackageTreeItem || context instanceof ProjectPackage) { const moduleName = context.pkg.name; const environment = context.parent.environment; const packageManager = em.getPackageManager(environment); - await packageManager?.uninstall(environment, [moduleName]); + await packageManager?.manage(environment, { uninstall: [moduleName], install: [] }); return; } traceError(`Invalid context for uninstall command: ${typeof context}`); diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 780413e..53aad43 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -21,7 +21,7 @@ import { PackageId, PythonProjectCreator, ResolveEnvironmentContext, - PackageInstallOptions, + PackageManagementOptions, PythonProcess, PythonTaskExecutionOptions, PythonTerminalExecutionOptions, @@ -216,19 +216,12 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } return new Disposable(() => disposables.forEach((d) => d.dispose())); } - installPackages(context: PythonEnvironment, packages: string[], options: PackageInstallOptions): Promise { + managePackages(context: PythonEnvironment, options: PackageManagementOptions): Promise { const manager = this.envManagers.getPackageManager(context); if (!manager) { return Promise.reject(new Error('No package manager found')); } - return manager.install(context, packages, options); - } - uninstallPackages(context: PythonEnvironment, packages: Package[] | string[]): Promise { - const manager = this.envManagers.getPackageManager(context); - if (!manager) { - return Promise.reject(new Error('No package manager found')); - } - return manager.uninstall(context, packages); + return manager.manage(context, options); } refreshPackages(context: PythonEnvironment): Promise { const manager = this.envManagers.getPackageManager(context); diff --git a/src/internal.api.ts b/src/internal.api.ts index fb38d49..2a45c6d 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -22,7 +22,7 @@ import { PackageInfo, PythonProjectCreator, ResolveEnvironmentContext, - PackageInstallOptions, + PackageManagementOptions, EnvironmentGroupInfo, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; @@ -225,15 +225,14 @@ export class InternalPackageManager implements PackageManager { return this.manager.log; } - install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { - return this.manager.install(environment, packages, options); - } - uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { - return this.manager.uninstall(environment, packages); + manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { + return this.manager.manage(environment, options); } + refresh(environment: PythonEnvironment): Promise { return this.manager.refresh(environment); } + getPackages(environment: PythonEnvironment): Promise { return this.manager.getPackages(environment); } @@ -241,6 +240,7 @@ export class InternalPackageManager implements PackageManager { onDidChangePackages(handler: (e: DidChangePackagesEventArgs) => void): Disposable { return this.manager.onDidChangePackages ? this.manager.onDidChangePackages(handler) : new Disposable(() => {}); } + equals(other: PackageManager): boolean { return this.manager === other; } diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index 45753d8..93cf55a 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -4,16 +4,15 @@ import { IconPath, Package, PackageChangeKind, - PackageInstallOptions, + PackageManagementOptions, PackageManager, PythonEnvironment, PythonEnvironmentApi, } from '../../api'; -import { installPackages, refreshPackages, uninstallPackages } from './utils'; +import { managePackages, refreshPackages } from './utils'; import { Disposable } from 'vscode-jsonrpc'; import { VenvManager } from './venvManager'; import { getWorkspacePackagesToInstall } from './pipUtils'; -import { getPackagesToUninstall } from '../common/utils'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -49,76 +48,43 @@ export class PipPackageManager implements PackageManager, Disposable { readonly tooltip?: string | MarkdownString; readonly iconPath?: IconPath; - async install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { - let selected: string[] = packages ?? []; + async manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { + let toInstall: string[] = [...(options.install ?? [])]; + let toUninstall: string[] = [...(options.uninstall ?? [])]; - if (selected.length === 0) { + if (toInstall.length === 0 && toUninstall.length === 0) { const projects = this.venv.getProjectsByEnvironment(environment); - selected = (await getWorkspacePackagesToInstall(this.api, options, projects, environment)) ?? []; - } - - if (selected.length === 0) { - return; - } - - const installOptions = options ?? { upgrade: false }; - await window.withProgress( - { - location: ProgressLocation.Notification, - title: 'Installing packages', - cancellable: true, - }, - async (_progress, token) => { - try { - const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, selected, installOptions, this.api, this, token); - const changes = getChanges(before, after); - this.packages.set(environment.envId.id, after); - this._onDidChangePackages.fire({ environment, manager: this, changes }); - } catch (e) { - this.log.error('Error installing packages', e); - setImmediate(async () => { - const result = await window.showErrorMessage('Error installing packages', 'View Output'); - if (result === 'View Output') { - this.log.show(); - } - }); - } - }, - ); - } - - async uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { - let selected: Package[] | string[] = packages ?? []; - if (selected.length === 0) { - const installed = await this.getPackages(environment); - if (!installed) { + const result = await getWorkspacePackagesToInstall(this.api, options, projects, environment); + if (result) { + toInstall = result.install; + toUninstall = result.uninstall; + } else { return; } - selected = (await getPackagesToUninstall(installed)) ?? []; - } - - if (selected.length === 0) { - return; } + const manageOptions = { + ...options, + install: toInstall, + uninstall: toUninstall, + }; await window.withProgress( { location: ProgressLocation.Notification, - title: 'Uninstalling packages', + title: 'Installing packages', cancellable: true, }, async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, this.api, this, selected, token); + const after = await managePackages(environment, manageOptions, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); - this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); + this._onDidChangePackages.fire({ environment, manager: this, changes }); } catch (e) { - this.log.error('Error uninstalling packages', e); + this.log.error('Error managing packages', e); setImmediate(async () => { - const result = await window.showErrorMessage('Error installing packages', 'View Output'); + const result = await window.showErrorMessage('Error managing packages', 'View Output'); if (result === 'View Output') { this.log.show(); } diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 3bbd6c8..c6912ab 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -4,11 +4,12 @@ import * as tomljs from '@iarna/toml'; import { LogOutputChannel, ProgressLocation, QuickInputButtons, Uri } from 'vscode'; import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; -import { PackageInstallOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; +import { PackageManagementOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; -import { Installable, selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; +import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; import { traceInfo } from '../../common/logging'; +import { Installable, mergePackages } from '../common/utils'; async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { try { @@ -76,8 +77,8 @@ async function selectWorkspaceOrCommon( installable: Installable[], common: Installable[], showSkipOption: boolean, - installed?: string[], -): Promise { + installed: string[], +): Promise { if (installable.length === 0 && common.length === 0) { return undefined; } @@ -92,8 +93,8 @@ async function selectWorkspaceOrCommon( if (common.length > 0) { items.push({ - label: PackageManagement.commonPackages, - description: PackageManagement.commonPackagesDescription, + label: PackageManagement.searchCommonPackages, + description: PackageManagement.searchCommonPackagesDescription, }); } @@ -115,8 +116,9 @@ async function selectWorkspaceOrCommon( if (selected && !Array.isArray(selected)) { try { if (selected.label === PackageManagement.workspaceDependencies) { - return await selectFromInstallableToInstall(installable); - } else if (selected.label === PackageManagement.commonPackages) { + const installArgs = await selectFromInstallableToInstall(installable); + return { install: installArgs ?? [], uninstall: [] }; + } else if (selected.label === PackageManagement.searchCommonPackages) { return await selectFromCommonPackagesToInstall(common, installed); } else { traceInfo('Package Installer: user selected skip package installation'); @@ -125,26 +127,32 @@ async function selectWorkspaceOrCommon( // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { if (ex === QuickInputButtons.Back) { - return selectWorkspaceOrCommon(installable, common, showSkipOption); + return selectWorkspaceOrCommon(installable, common, showSkipOption, installed); } } } return undefined; } +export interface PipPackages { + install: string[]; + uninstall: string[]; +} + export async function getWorkspacePackagesToInstall( api: PythonEnvironmentApi, - options?: PackageInstallOptions, + options: PackageManagementOptions, project?: PythonProject[], environment?: PythonEnvironment, -): Promise { +): Promise { const installable = (await getProjectInstallable(api, project)) ?? []; - const common = await getCommonPackages(); + let common = await getCommonPackages(); let installed: string[] | undefined; if (environment) { installed = (await api.getPackages(environment))?.map((pkg) => pkg.name); + common = mergePackages(common, installed ?? []); } - return selectWorkspaceOrCommon(installable, common, !!options?.showSkipOption, installed); + return selectWorkspaceOrCommon(installable, common, !!options.showSkipOption, installed ?? []); } export async function getProjectInstallable( diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index fab88a7..9c19e8a 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -2,7 +2,7 @@ import { CancellationToken, l10n, LogOutputChannel, QuickPickItem, ThemeIcon, Ur import { EnvironmentManager, Package, - PackageInstallOptions, + PackageManagementOptions, PackageManager, PythonEnvironment, PythonEnvironmentApi, @@ -173,10 +173,9 @@ export async function refreshPackages( return parsePipList(data).map((pkg) => api.createPackageItem(pkg, environment, manager)); } -export async function installPackages( +export async function managePackages( environment: PythonEnvironment, - packages: string[], - options: PackageInstallOptions, + options: PackageManagementOptions, api: PythonEnvironmentApi, manager: PackageManager, token?: CancellationToken, @@ -185,73 +184,36 @@ export async function installPackages( throw new Error('Python 2.* is not supported (deprecated)'); } - if (environment.execInfo) { - if (packages.length === 0) { - throw new Error('No packages selected to install'); - } - - const useUv = await isUvInstalled(); - - const installArgs = ['pip', 'install']; - if (options.upgrade) { - installArgs.push('--upgrade'); - } + const useUv = await isUvInstalled(); + const uninstallArgs = ['pip', 'uninstall']; + if (options.uninstall && options.uninstall.length > 0) { if (useUv) { await runUV( - [...installArgs, '--python', environment.execInfo.run.executable, ...packages], + [...uninstallArgs, '--python', environment.execInfo.run.executable, ...options.uninstall], undefined, manager.log, token, ); } else { + uninstallArgs.push('--yes'); await runPython( environment.execInfo.run.executable, - ['-m', ...installArgs, ...packages], + ['-m', ...uninstallArgs, ...options.uninstall], undefined, manager.log, token, ); } - - return refreshPackages(environment, api, manager); } - throw new Error(`No executable found for python: ${environment.environmentPath.fsPath}`); -} -export async function uninstallPackages( - environment: PythonEnvironment, - api: PythonEnvironmentApi, - manager: PackageManager, - packages: string[] | Package[], - token?: CancellationToken, -): Promise { - if (environment.version.startsWith('2.')) { - throw new Error('Python 2.* is not supported (deprecated)'); + const installArgs = ['pip', 'install']; + if (options.upgrade) { + installArgs.push('--upgrade'); } - - if (environment.execInfo) { - const remove = []; - for (let pkg of packages) { - if (typeof pkg === 'string') { - remove.push(pkg); - } else { - remove.push(pkg.name); - } - } - if (remove.length === 0) { - const installed = await manager.getPackages(environment); - if (installed) { - const packages = await pickPackages(true, installed); - if (packages.length === 0) { - throw new Error('No packages selected to uninstall'); - } - } - } - - const useUv = await isUvInstalled(); + if (options.install && options.install.length > 0) { if (useUv) { await runUV( - ['pip', 'uninstall', '--python', environment.execInfo.run.executable, ...remove], + [...installArgs, '--python', environment.execInfo.run.executable, ...options.install], undefined, manager.log, token, @@ -259,15 +221,15 @@ export async function uninstallPackages( } else { await runPython( environment.execInfo.run.executable, - ['-m', 'pip', 'uninstall', '-y', ...remove], + ['-m', ...installArgs, ...options.install], undefined, manager.log, token, ); } - return refreshPackages(environment, api, manager); } - throw new Error(`No executable found for python: ${environment.environmentPath.fsPath}`); + + return refreshPackages(environment, api, manager); } export async function resolveSystemPythonEnvironmentPath( diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index fd27973..9e4b8a2 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -31,7 +31,7 @@ import { import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; -import { getProjectInstallable, getWorkspacePackagesToInstall } from './pipUtils'; +import { getProjectInstallable, getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; import { EventNames } from '../../common/telemetry/constants'; @@ -384,7 +384,7 @@ async function createWithProgress( basePython: PythonEnvironment, venvRoot: Uri, envPath: string, - packages?: string[], + packages?: PipPackages, ) { const pythonPath = os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); @@ -420,8 +420,12 @@ async function createWithProgress( const resolved = await nativeFinder.resolve(pythonPath); const env = api.createPythonEnvironmentItem(await getPythonInfo(resolved), manager); - if (packages && packages?.length > 0) { - await api.installPackages(env, packages, { upgrade: false }); + if (packages && (packages.install.length > 0 || packages.uninstall.length > 0)) { + await api.managePackages(env, { + upgrade: false, + install: packages?.install, + uninstall: packages?.uninstall ?? [], + }); } return env; } catch (e) { @@ -474,7 +478,7 @@ export async function createPythonVenv( sortedEnvs[0], venvRoot, path.join(venvRoot.fsPath, '.venv'), - installables?.flatMap((i) => i.args ?? []), + { install: installables?.flatMap((i) => i.args ?? []), uninstall: [] }, ); } else { sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); @@ -508,7 +512,7 @@ export async function createPythonVenv( const packages = await getWorkspacePackagesToInstall( api, - { showSkipOption: true }, + { showSkipOption: true, install: [] }, project ? [project] : undefined, ); diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts index 8149956..beb099a 100644 --- a/src/managers/common/pickers.ts +++ b/src/managers/common/pickers.ts @@ -2,6 +2,7 @@ import { QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickIt import { Common, PackageManagement } from '../../common/localize'; import { launchBrowser } from '../../common/env.apis'; import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from '../../common/window.apis'; +import { Installable } from './utils'; const OPEN_BROWSER_BUTTON = { iconPath: new ThemeIcon('globe'), @@ -18,50 +19,6 @@ const EDIT_ARGUMENTS_BUTTON = { tooltip: PackageManagement.editArguments, }; -export interface Installable { - /** - * The name of the package, requirements, lock files, or step name. - */ - readonly name: string; - - /** - * The name of the package, requirements, pyproject.toml or any other project file, etc. - */ - readonly displayName: string; - - /** - * Arguments passed to the package manager to install the package. - * - * @example - * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. - * ['--pre', 'debugpy'] for `pip install --pre debugpy`. - * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. - */ - readonly args?: string[]; - - /** - * Installable group name, this will be used to group installable items in the UI. - * - * @example - * `Requirements` for any requirements file. - * `Packages` for any package. - */ - readonly group?: string; - - /** - * Description about the installable item. This can also be path to the requirements, - * version of the package, or any other project file path. - */ - readonly description?: string; - - /** - * External Uri to the package on pypi or docs. - * @example - * https://pypi.org/project/debugpy/ for `debugpy`. - */ - readonly uri?: Uri; -} - function handleItemButton(uri?: Uri) { if (uri) { if (uri.scheme.toLowerCase().startsWith('http')) { @@ -117,20 +74,67 @@ async function enterPackageManually(filler?: string): Promise { + if (installed?.find((p) => i.id === p)) { + installedItems.push(i); + } else { + result.push(i); + } + }); + const installedSeparator: PackageQuickPickItem = { + id: 'installed-sep', + label: PackageManagement.installed, + kind: QuickPickItemKind.Separator, + }; + const commonPackages: PackageQuickPickItem = { + id: 'common-packages-sep', + label: PackageManagement.commonPackages, + kind: QuickPickItemKind.Separator, + }; + return { + items: [installedSeparator, ...installedItems, commonPackages, ...result], + installedItems, + }; +} + +export interface CommonPackagesResult { + install: string[]; + uninstall: string[]; +} + +function selectionsToResult(selections: string[], installed: string[]): CommonPackagesResult { + const install: string[] = selections; + const uninstall: string[] = []; + installed.forEach((i) => { + if (!selections.find((s) => i === s)) { + uninstall.push(i); + } + }); + return { + install, + uninstall, + }; +} + export async function selectFromCommonPackagesToInstall( common: Installable[], - installed?: string[], + installed: string[], preSelected?: PackageQuickPickItem[] | undefined, -): Promise { - const items: PackageQuickPickItem[] = common.map(installableToQuickPickItem); - const preSelectedItems = items - .filter((i) => i.kind !== QuickPickItemKind.Separator) - .filter((i) => installed?.find((p) => i.id === p) || preSelected?.find((s) => s.id === i.id)); - +): Promise { + const { installedItems, items } = groupByInstalled(common.map(installableToQuickPickItem), installed); + const preSelectedItems = items.filter((i) => (preSelected ?? installedItems).some((s) => s.id === i.id)); let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; try { selected = await showQuickPickWithButtons( - items, + items as PackageQuickPickItem[], { placeHolder: PackageManagement.selectPackagesToInstall, ignoreFocusOut: true, @@ -163,21 +167,25 @@ export async function selectFromCommonPackagesToInstall( if (selected && Array.isArray(selected)) { if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { - const filler = selected - .filter((s) => s.label !== PackageManagement.enterPackageNames) - .map((s) => s.id) - .join(' '); + const filtered = selected.filter((s) => s.label !== PackageManagement.enterPackageNames); + const filler = filtered.map((s) => s.id).join(' '); try { - const result = await enterPackageManually(filler); - return result; + const selections = await enterPackageManually(filler); + if (selections) { + return selectionsToResult(selections, installed); + } + return undefined; } catch (ex) { if (ex === QuickInputButtons.Back) { - return selectFromCommonPackagesToInstall(common, installed, selected); + return selectFromCommonPackagesToInstall(common, installed, filtered); } return undefined; } } else { - return selected.map((s) => s.id); + return selectionsToResult( + selected.map((s) => s.id), + installed, + ); } } } diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 500ce19..11bcd9c 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,7 +1,50 @@ import * as os from 'os'; -import { Package, PythonEnvironment } from '../../api'; -import { showQuickPick } from '../../common/window.apis'; -import { PackageManagement } from '../../common/localize'; +import { PythonEnvironment } from '../../api'; +import { Uri } from 'vscode'; + +export interface Installable { + /** + * The name of the package, requirements, lock files, or step name. + */ + readonly name: string; + + /** + * The name of the package, requirements, pyproject.toml or any other project file, etc. + */ + readonly displayName: string; + + /** + * Arguments passed to the package manager to install the package. + * + * @example + * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. + * ['--pre', 'debugpy'] for `pip install --pre debugpy`. + * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. + */ + readonly args?: string[]; + + /** + * Installable group name, this will be used to group installable items in the UI. + * + * @example + * `Requirements` for any requirements file. + * `Packages` for any package. + */ + readonly group?: string; + + /** + * Description about the installable item. This can also be path to the requirements, + * version of the package, or any other project file path. + */ + readonly description?: string; + + /** + * External Uri to the package on pypi or docs. + * @example + * https://pypi.org/project/debugpy/ for `debugpy`. + */ + readonly uri?: Uri; +} export function isWindows(): boolean { return process.platform === 'win32'; @@ -89,16 +132,9 @@ export function getLatest(collection: PythonEnvironment[]): PythonEnvironment | return latest; } -export async function getPackagesToUninstall(packages: Package[]): Promise { - const items = packages.map((p) => ({ - label: p.name, - description: p.version, - p, - })); - const selected = await showQuickPick(items, { - placeHolder: PackageManagement.selectPackagesToUninstall, - ignoreFocusOut: true, - canPickMany: true, - }); - return Array.isArray(selected) ? selected?.map((s) => s.p) : undefined; +export function mergePackages(common: Installable[], installed: string[]): Installable[] { + const notInCommon = installed.filter((pkg) => !common.some((c) => c.name === pkg)); + return common + .concat(notInCommon.map((pkg) => ({ name: pkg, displayName: pkg }))) + .sort((a, b) => a.name.localeCompare(b.name)); } diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 7125dfe..b5b1023 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -12,16 +12,15 @@ import { IconPath, Package, PackageChangeKind, - PackageInstallOptions, + PackageManagementOptions, PackageManager, PythonEnvironment, PythonEnvironmentApi, } from '../../api'; -import { getCommonCondaPackagesToInstall, installPackages, refreshPackages, uninstallPackages } from './condaUtils'; +import { getCommonCondaPackagesToInstall, managePackages, refreshPackages } from './condaUtils'; import { withProgress } from '../../common/window.apis'; import { showErrorMessage } from '../../common/errors/utils'; import { CondaStrings } from '../../common/localize'; -import { getPackagesToUninstall } from '../common/utils'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -52,18 +51,25 @@ export class CondaPackageManager implements PackageManager, Disposable { tooltip?: string | MarkdownString; iconPath?: IconPath; - async install(environment: PythonEnvironment, packages?: string[], options?: PackageInstallOptions): Promise { - let selected: string[] = packages ?? []; + async manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { + let toInstall: string[] = [...(options.install ?? [])]; + let toUninstall: string[] = [...(options.uninstall ?? [])]; - if (selected.length === 0) { - selected = (await getCommonCondaPackagesToInstall(options)) ?? []; - } - - if (selected.length === 0) { - return; + if (toInstall.length === 0 && toUninstall.length === 0) { + const result = await getCommonCondaPackagesToInstall(environment, options, this.api); + if (result) { + toInstall = result.install; + toUninstall = result.uninstall; + } else { + return; + } } - const installOptions = options ?? { upgrade: false }; + const manageOptions = { + ...options, + install: toInstall, + uninstall: toUninstall, + }; await withProgress( { location: ProgressLocation.Notification, @@ -73,7 +79,7 @@ export class CondaPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await installPackages(environment, selected, installOptions, this.api, this, token); + const after = await managePackages(environment, manageOptions, this.api, this, token); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); @@ -91,46 +97,6 @@ export class CondaPackageManager implements PackageManager, Disposable { ); } - async uninstall(environment: PythonEnvironment, packages?: Package[] | string[]): Promise { - let selected: Package[] | string[] = packages ?? []; - if (selected.length === 0) { - const installed = await this.getPackages(environment); - if (!installed) { - return; - } - selected = (await getPackagesToUninstall(installed)) ?? []; - } - - if (selected.length === 0) { - return; - } - - await withProgress( - { - location: ProgressLocation.Notification, - title: CondaStrings.condaUninstallingPackages, - cancellable: true, - }, - async (_progress, token) => { - try { - const before = this.packages.get(environment.envId.id) ?? []; - const after = await uninstallPackages(environment, selected, this.api, this, token); - const changes = getChanges(before, after); - this.packages.set(environment.envId.id, after); - this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); - } catch (e) { - if (e instanceof CancellationError) { - return; - } - - this.log.error('Error uninstalling packages', e); - setImmediate(async () => { - await showErrorMessage(CondaStrings.condaUninstallError, this.log); - }); - } - }, - ); - } async refresh(environment: PythonEnvironment): Promise { await withProgress( { diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index c240fbf..2647ac1 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -2,8 +2,7 @@ import * as ch from 'child_process'; import { EnvironmentManager, Package, - PackageInfo, - PackageInstallOptions, + PackageManagementOptions, PackageManager, PythonCommandRunConfiguration, PythonEnvironment, @@ -34,12 +33,12 @@ import { import { getConfiguration } from '../../common/workspace.apis'; import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; import which from 'which'; -import { isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils'; +import { Installable, isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils'; import { pickProject } from '../../common/pickers/projects'; import { CondaStrings, PackageManagement, Pickers } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; import { showInputBox, showQuickPick, showQuickPickWithButtons, withProgress } from '../../common/window.apis'; -import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers'; +import { selectFromCommonPackagesToInstall } from '../common/pickers'; import { quoteArgs } from '../../features/execution/execUtils'; import { traceInfo } from '../../common/logging'; @@ -695,50 +694,27 @@ export async function refreshPackages( return packages; } -export async function installPackages( +export async function managePackages( environment: PythonEnvironment, - packages: string[], - options: PackageInstallOptions, + options: PackageManagementOptions, api: PythonEnvironmentApi, manager: PackageManager, token: CancellationToken, ): Promise { - if (!packages || packages.length === 0) { - // TODO: Ask user to pick packages - throw new Error('No packages to install'); - } - - const args = ['install', '--prefix', environment.environmentPath.fsPath, '--yes']; - if (options.upgrade) { - args.push('--update-all'); + if (options.uninstall && options.uninstall.length > 0) { + await runConda( + ['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...options.uninstall], + token, + ); } - args.push(...packages); - - await runConda(args, token); - return refreshPackages(environment, api, manager); -} - -export async function uninstallPackages( - environment: PythonEnvironment, - packages: PackageInfo[] | string[], - api: PythonEnvironmentApi, - manager: PackageManager, - token: CancellationToken, -): Promise { - const remove = []; - for (let pkg of packages) { - if (typeof pkg === 'string') { - remove.push(pkg); - } else { - remove.push(pkg.name); + if (options.install && options.install.length > 0) { + const args = ['install', '--prefix', environment.environmentPath.fsPath, '--yes']; + if (options.upgrade) { + args.push('--update-all'); } + args.push(...options.install); + await runConda(args, token); } - if (remove.length === 0) { - throw new Error('No packages to remove'); - } - - await runConda(['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...remove], token); - return refreshPackages(environment, api, manager); } @@ -761,10 +737,16 @@ async function getCommonPackages(): Promise { } } +interface CondaPackagesResult { + install: string[]; + uninstall: string[]; +} + async function selectCommonPackagesOrSkip( common: Installable[], + installed: string[], showSkipOption: boolean, -): Promise { +): Promise { if (common.length === 0) { return undefined; } @@ -772,8 +754,8 @@ async function selectCommonPackagesOrSkip( const items = []; if (common.length > 0) { items.push({ - label: PackageManagement.commonPackages, - description: PackageManagement.commonPackagesDescription, + label: PackageManagement.searchCommonPackages, + description: PackageManagement.searchCommonPackagesDescription, }); } @@ -794,8 +776,8 @@ async function selectCommonPackagesOrSkip( if (selected && !Array.isArray(selected)) { try { - if (selected.label === PackageManagement.commonPackages) { - return await selectFromCommonPackagesToInstall(common); + if (selected.label === PackageManagement.searchCommonPackages) { + return await selectFromCommonPackagesToInstall(common, installed); } else { traceInfo('Package Installer: user selected skip package installation'); return undefined; @@ -803,15 +785,20 @@ async function selectCommonPackagesOrSkip( // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { if (ex === QuickInputButtons.Back) { - return selectCommonPackagesOrSkip(common, showSkipOption); + return selectCommonPackagesOrSkip(common, installed, showSkipOption); } } } return undefined; } -export async function getCommonCondaPackagesToInstall(options?: PackageInstallOptions): Promise { +export async function getCommonCondaPackagesToInstall( + environment: PythonEnvironment, + options: PackageManagementOptions, + api: PythonEnvironmentApi, +): Promise { const common = await getCommonPackages(); - const selected = await selectCommonPackagesOrSkip(common, !!options?.showSkipOption); + const installed = (await api.getPackages(environment))?.map((p) => p.name); + const selected = await selectCommonPackagesOrSkip(common, installed ?? [], !!options.showSkipOption); return selected; } diff --git a/src/vscode.proposed.terminalShellType.d.ts b/src/vscode.proposed.terminalShellType.d.ts deleted file mode 100644 index 75e1546..0000000 --- a/src/vscode.proposed.terminalShellType.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - // https://github.com/microsoft/vscode/issues/230165 - - // Part of TerminalState since the shellType can change multiple times and this comes with an event. - export interface TerminalState { - /** - * The detected shell type of the {@link Terminal}. This will be `undefined` when there is - * not a clear signal as to what the shell is, or the shell is not supported yet. This - * value should change to the shell type of a sub-shell when launched (for example, running - * `bash` inside `zsh`). - * - * Note that the possible values are currently defined as any of the following: - * 'bash', 'cmd', 'csh', 'fish', 'gitbash', 'julia', 'ksh', 'node', 'nu', 'pwsh', 'python', - * 'sh', 'wsl', 'zsh'. - */ - readonly shell: string | undefined; - } -} From 2dd272e9629bb9446a63f8dd023079467f4a6876 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 10 Apr 2025 10:21:17 -0700 Subject: [PATCH 106/328] fix: avoid generating multiple events for the same environment (#277) --- src/features/envManagers.ts | 20 ++++--- src/managers/builtin/main.ts | 2 +- src/managers/builtin/venvManager.ts | 86 ++++++++++++++++++----------- 3 files changed, 68 insertions(+), 40 deletions(-) diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 405b1cd..6cfda52 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -283,9 +283,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } } - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const key = project ? project.uri.toString() : 'global'; + const oldEnv = this._previousEnvironments.get(key); if (oldEnv?.envId.id !== environment?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); + this._previousEnvironments.set(key, environment); setImmediate(() => this._onDidChangeEnvironmentFiltered.fire({ uri: project?.uri, new: environment, old: oldEnv }), ); @@ -320,9 +321,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } const project = this.pm.get(uri); - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const key = project ? project.uri.toString() : 'global'; + const oldEnv = this._previousEnvironments.get(key); if (oldEnv?.envId.id !== environment?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', environment); + this._previousEnvironments.set(key, environment); events.push({ uri: project?.uri, new: environment, old: oldEnv }); } }); @@ -361,9 +363,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { // Always get the new first, then compare with the old. This has minor impact on the ordering of // events. But it ensures that we always get the latest environment at the time of this call. const newEnv = await manager.get(uri); - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const key = project ? project.uri.toString() : 'global'; + const oldEnv = this._previousEnvironments.get(key); if (oldEnv?.envId.id !== newEnv?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); + this._previousEnvironments.set(key, newEnv); events.push({ uri: project?.uri, new: newEnv, old: oldEnv }); } }; @@ -404,9 +407,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { // Always get the new first, then compare with the old. This has minor impact on the ordering of // events. But it ensures that we always get the latest environment at the time of this call. const newEnv = await manager.get(scope); - const oldEnv = this._previousEnvironments.get(project?.uri.toString() ?? 'global'); + const key = project ? project.uri.toString() : 'global'; + const oldEnv = this._previousEnvironments.get(key); if (oldEnv?.envId.id !== newEnv?.envId.id) { - this._previousEnvironments.set(project?.uri.toString() ?? 'global', newEnv); + this._previousEnvironments.set(key, newEnv); setImmediate(() => this._onDidChangeEnvironmentFiltered.fire({ uri: project?.uri, new: newEnv, old: oldEnv }), ); diff --git a/src/managers/builtin/main.ts b/src/managers/builtin/main.ts index f2b0832..7171b78 100644 --- a/src/managers/builtin/main.ts +++ b/src/managers/builtin/main.ts @@ -27,7 +27,7 @@ export async function registerSystemPythonFeatures( ); const venvDebouncedRefresh = createSimpleDebounce(500, () => { - venvManager.refresh(undefined); + venvManager.watcherRefresh(); }); const watcher = createFileSystemWatcher('{**/pyenv.cfg,**/bin/python,**/python.exe}', false, true, false); disposables.push( diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 08fa90c..86860c2 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -40,6 +40,7 @@ export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; private readonly fsPathToEnv: Map = new Map(); private globalEnv: PythonEnvironment | undefined; + private skipWatcherRefresh = false; private readonly _onDidChangeEnvironment = new EventEmitter(); public readonly onDidChangeEnvironment = this._onDidChangeEnvironment.event; @@ -86,44 +87,55 @@ export class VenvManager implements EnvironmentManager { } async create(scope: CreateEnvironmentScope): Promise { - let isGlobal = scope === 'global'; - if (Array.isArray(scope) && scope.length > 1) { - isGlobal = true; - } - let uri: Uri | undefined = undefined; - if (isGlobal) { - uri = await getGlobalVenvLocation(); - } else { - uri = scope instanceof Uri ? scope : (scope as Uri[])[0]; - } + try { + this.skipWatcherRefresh = true; + let isGlobal = scope === 'global'; + if (Array.isArray(scope) && scope.length > 1) { + isGlobal = true; + } + let uri: Uri | undefined = undefined; + if (isGlobal) { + uri = await getGlobalVenvLocation(); + } else { + uri = scope instanceof Uri ? scope : (scope as Uri[])[0]; + } - if (!uri) { - return; - } + if (!uri) { + return; + } - const venvRoot: Uri = uri; - const globals = await this.baseManager.getEnvironments('global'); - const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot); - if (environment) { - this.addEnvironment(environment, true); + const venvRoot: Uri = uri; + const globals = await this.baseManager.getEnvironments('global'); + const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot); + if (environment) { + this.addEnvironment(environment, true); + } + return environment; + } finally { + this.skipWatcherRefresh = false; } - return environment; } async remove(environment: PythonEnvironment): Promise { - await removeVenv(environment, this.log); - this.updateCollection(environment); - this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.remove }]); + try { + this.skipWatcherRefresh = true; - const changedUris = this.updateFsPathToEnv(environment); + await removeVenv(environment, this.log); + this.updateCollection(environment); + this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.remove }]); - for (const uri of changedUris) { - const newEnv = await this.get(uri); - this._onDidChangeEnvironment.fire({ uri, old: environment, new: newEnv }); - } + const changedUris = this.updateFsPathToEnv(environment); + + for (const uri of changedUris) { + const newEnv = await this.get(uri); + this._onDidChangeEnvironment.fire({ uri, old: environment, new: newEnv }); + } - if (this.globalEnv?.envId.id === environment.envId.id) { - await this.set(undefined, undefined); + if (this.globalEnv?.envId.id === environment.envId.id) { + await this.set(undefined, undefined); + } + } finally { + this.skipWatcherRefresh = false; } } @@ -148,10 +160,22 @@ export class VenvManager implements EnvironmentManager { return this.internalRefresh(scope, true, VenvManagerStrings.venvRefreshing); } - private async internalRefresh(scope: RefreshEnvironmentsScope, hardRefresh: boolean, title: string): Promise { + async watcherRefresh(): Promise { + if (this.skipWatcherRefresh) { + return; + } + return this.internalRefresh(undefined, false, VenvManagerStrings.venvRefreshing); + } + + private async internalRefresh( + scope: RefreshEnvironmentsScope, + hardRefresh: boolean, + title: string, + location: ProgressLocation = ProgressLocation.Window, + ): Promise { await withProgress( { - location: ProgressLocation.Window, + location, title, }, async () => { From 6c78b2ffa8c3f43776226c0e8a7e6fbeb43f2c5d Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 10 Apr 2025 17:37:17 -0700 Subject: [PATCH 107/328] fix: ensure script casing match for activations (#287) fixes https://github.com/microsoft/vscode-python-environments/issues/282 --- src/features/common/shellDetector.ts | 4 +- src/managers/builtin/venvUtils.ts | 159 ++++++++------------- src/managers/conda/condaUtils.ts | 206 +++++++++++---------------- 3 files changed, 146 insertions(+), 223 deletions(-) diff --git a/src/features/common/shellDetector.ts b/src/features/common/shellDetector.ts index 27e3ff2..a41d8ba 100644 --- a/src/features/common/shellDetector.ts +++ b/src/features/common/shellDetector.ts @@ -139,8 +139,8 @@ function fromShellTypeApi(terminal: Terminal): string { 'wsl', 'zsh', ]; - if (terminal.state.shell && known.includes(terminal.state.shell)) { - return terminal.state.shell; + if (terminal.state.shell && known.includes(terminal.state.shell.toLowerCase())) { + return terminal.state.shell.toLowerCase(); } } catch { // If the API is not available, return unknown diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 9e4b8a2..57f7b0a 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -123,108 +123,71 @@ async function getPythonInfo(env: NativeEnvInfo): Promise const binDir = path.dirname(env.executable); - interface VenvCommand { - activate: PythonCommandRunConfiguration; - deactivate: PythonCommandRunConfiguration; - /// true if created by the builtin `venv` module and not just the `virtualenv` package. - supportsStdlib: boolean; - checkPath?: string; + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + + if (isWindows()) { + shellActivation.set('unknown', [{ executable: path.join(binDir, `activate`) }]); + shellDeactivation.set('unknown', [{ executable: path.join(binDir, `deactivate`) }]); + } else { + shellActivation.set('unknown', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('unknown', [{ executable: 'deactivate' }]); } - const venvManagers: Record = { - // Shells supported by the builtin `venv` module - ['sh']: { - activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['bash']: { - activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['gitbash']: { - activate: { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['zsh']: { - activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['ksh']: { - activate: { executable: '.', args: [path.join(binDir, `activate`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['pwsh']: { - activate: { executable: '&', args: [path.join(binDir, `activate.ps1`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - ['cmd']: { - activate: { executable: path.join(binDir, `activate.bat`) }, - deactivate: { executable: path.join(binDir, `deactivate.bat`) }, - supportsStdlib: true, - }, - // Shells supported by the `virtualenv` package - ['csh']: { - activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: false, - checkPath: path.join(binDir, `activate.csh`), - }, - ['tcsh']: { - activate: { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: false, - checkPath: path.join(binDir, `activate.csh`), - }, - ['fish']: { - activate: { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: false, - checkPath: path.join(binDir, `activate.fish`), - }, - ['xonsh']: { - activate: { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: false, - checkPath: path.join(binDir, `activate.xsh`), - }, - ['nu']: { - activate: { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, - deactivate: { executable: 'overlay', args: ['hide', 'activate'] }, - supportsStdlib: false, - checkPath: path.join(binDir, `activate.nu`), - }, - // Fallback - ['unknown']: isWindows() - ? { - activate: { executable: path.join(binDir, `activate`) }, - deactivate: { executable: path.join(binDir, `deactivate`) }, - supportsStdlib: true, - } - : { - activate: { executable: 'source', args: [path.join(binDir, `activate`)] }, - deactivate: { executable: 'deactivate' }, - supportsStdlib: true, - }, - } satisfies Record; + if (await fsapi.pathExists(path.join(binDir, 'activate'))) { + shellActivation.set('sh', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('sh', [{ executable: 'deactivate' }]); - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); + shellActivation.set('bash', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('bash', [{ executable: 'deactivate' }]); - await Promise.all( - (Object.entries(venvManagers) as [string, VenvCommand][]).map(async ([shell, mgr]) => { - if (!mgr.supportsStdlib && mgr.checkPath && !(await fsapi.pathExists(mgr.checkPath))) { - return; - } - shellActivation.set(shell, [mgr.activate]); - shellDeactivation.set(shell, [mgr.deactivate]); - }), - ); + shellActivation.set('gitbash', [ + { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, + ]); + shellDeactivation.set('gitbash', [{ executable: 'deactivate' }]); + + shellActivation.set('zsh', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('zsh', [{ executable: 'deactivate' }]); + + shellActivation.set('ksh', [{ executable: '.', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('ksh', [{ executable: 'deactivate' }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'Activate.ps1'))) { + shellActivation.set('pwsh', [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); + shellDeactivation.set('pwsh', [{ executable: 'deactivate' }]); + } else if (await fsapi.pathExists(path.join(binDir, 'activate.ps1'))) { + shellActivation.set('pwsh', [{ executable: '&', args: [path.join(binDir, `activate.ps1`)] }]); + shellDeactivation.set('pwsh', [{ executable: 'deactivate' }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'activate.bat'))) { + shellActivation.set('cmd', [{ executable: path.join(binDir, `activate.bat`) }]); + shellDeactivation.set('cmd', [{ executable: path.join(binDir, `deactivate.bat`) }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'activate.csh'))) { + shellActivation.set('csh', [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); + shellDeactivation.set('csh', [{ executable: 'deactivate' }]); + + shellActivation.set('tcsh', [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); + shellDeactivation.set('tcsh', [{ executable: 'deactivate' }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'activate.fish'))) { + shellActivation.set('fish', [{ executable: 'source', args: [path.join(binDir, `activate.fish`)] }]); + shellDeactivation.set('fish', [{ executable: 'deactivate' }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'activate.xsh'))) { + shellActivation.set('xonsh', [{ executable: 'source', args: [path.join(binDir, `activate.xsh`)] }]); + shellDeactivation.set('xonsh', [{ executable: 'deactivate' }]); + } + + if (await fsapi.pathExists(path.join(binDir, 'activate.nu'))) { + shellActivation.set('nu', [{ executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }]); + shellDeactivation.set('nu', [{ executable: 'overlay', args: ['hide', 'activate'] }]); + } return { name: name, diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 2647ac1..5c587bb 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -7,6 +7,7 @@ import { PythonCommandRunConfiguration, PythonEnvironment, PythonEnvironmentApi, + PythonEnvironmentInfo, PythonProject, } from '../../api'; import * as path from 'path'; @@ -248,6 +249,82 @@ function pathForGitBash(binPath: string): string { return isWindows() ? binPath.replace(/\\/g, '/') : binPath; } +function getNamedCondaPythonInfo( + name: string, + prefix: string, + executable: string, + version: string, + conda: string, +): PythonEnvironmentInfo { + const sv = shortVersion(version); + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', name] }]); + shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + + return { + name: name, + environmentPath: Uri.file(prefix), + displayName: `${name} (${sv})`, + shortDisplayName: `${name}:${sv}`, + displayPath: prefix, + description: undefined, + tooltip: prefix, + version: version, + sysPrefix: prefix, + execInfo: { + run: { executable: path.join(executable) }, + activatedRun: { + executable: conda, + args: ['run', '--live-stream', '--name', name, 'python'], + }, + activation: [{ executable: conda, args: ['activate', name] }], + deactivation: [{ executable: conda, args: ['deactivate'] }], + shellActivation, + shellDeactivation, + }, + group: 'Named', + }; +} + +function getPrefixesCondaPythonInfo( + prefix: string, + executable: string, + version: string, + conda: string, +): PythonEnvironmentInfo { + const sv = shortVersion(version); + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', prefix] }]); + shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + + const basename = path.basename(prefix); + return { + name: basename, + environmentPath: Uri.file(prefix), + displayName: `${basename} (${sv})`, + shortDisplayName: `${basename}:${sv}`, + displayPath: prefix, + description: undefined, + tooltip: prefix, + version: version, + sysPrefix: prefix, + execInfo: { + run: { executable: path.join(executable) }, + activatedRun: { + executable: conda, + args: ['run', '--live-stream', '--prefix', prefix, 'python'], + }, + activation: [{ executable: conda, args: ['activate', prefix] }], + deactivation: [{ executable: conda, args: ['deactivate'] }], + shellActivation, + shellDeactivation, + }, + group: 'Prefix', + }; +} + function nativeToPythonEnv( e: NativeEnvInfo, api: PythonEnvironmentApi, @@ -260,70 +337,17 @@ function nativeToPythonEnv( log.warn(`Invalid conda environment: ${JSON.stringify(e)}`); return; } - const sv = shortVersion(e.version); - if (e.name === 'base') { - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', 'base'] }]); - shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + if (e.name === 'base') { const environment = api.createPythonEnvironmentItem( - { - name: 'base', - environmentPath: Uri.file(e.prefix), - displayName: `base (${sv})`, - shortDisplayName: `base:${sv}`, - displayPath: e.name, - description: undefined, - tooltip: e.prefix, - version: e.version, - sysPrefix: e.prefix, - execInfo: { - run: { executable: e.executable }, - activatedRun: { executable: conda, args: ['run', '--live-stream', '--name', 'base', 'python'] }, - activation: [{ executable: conda, args: ['activate', 'base'] }], - deactivation: [{ executable: conda, args: ['deactivate'] }], - shellActivation, - shellDeactivation, - }, - }, + getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found base environment: ${e.prefix}`); return environment; } else if (!isPrefixOf(condaPrefixes, e.prefix)) { - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set('gitbash', [ - { executable: pathForGitBash(conda), args: ['activate', pathForGitBash(e.prefix)] }, - ]); - shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); - - const basename = path.basename(e.prefix); const environment = api.createPythonEnvironmentItem( - { - name: basename, - environmentPath: Uri.file(e.prefix), - displayName: `${basename} (${sv})`, - shortDisplayName: `${basename}:${sv}`, - displayPath: e.prefix, - description: undefined, - tooltip: e.prefix, - version: e.version, - sysPrefix: e.prefix, - execInfo: { - run: { executable: path.join(e.executable) }, - activatedRun: { - executable: conda, - args: ['run', '--live-stream', '--prefix', e.prefix, 'python'], - }, - activation: [{ executable: conda, args: ['activate', e.prefix] }], - deactivation: [{ executable: conda, args: ['deactivate'] }], - shellActivation, - shellDeactivation, - }, - group: 'Prefix', - }, + getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found prefix environment: ${e.prefix}`); @@ -331,36 +355,8 @@ function nativeToPythonEnv( } else { const basename = path.basename(e.prefix); const name = e.name ?? basename; - - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', name] }]); - shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); - const environment = api.createPythonEnvironmentItem( - { - name: name, - environmentPath: Uri.file(e.prefix), - displayName: `${name} (${sv})`, - shortDisplayName: `${name}:${sv}`, - displayPath: e.prefix, - description: undefined, - tooltip: e.prefix, - version: e.version, - sysPrefix: e.prefix, - execInfo: { - run: { executable: path.join(e.executable) }, - activatedRun: { - executable: conda, - args: ['run', '--live-stream', '--name', name, 'python'], - }, - activation: [{ executable: conda, args: ['activate', name] }], - deactivation: [{ executable: conda, args: ['deactivate'] }], - shellActivation, - shellDeactivation, - }, - group: 'Named', - }, + getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found named environment: ${e.prefix}`); @@ -536,25 +532,7 @@ async function createNamedCondaEnvironment( const version = await getVersion(envPath); const environment = api.createPythonEnvironmentItem( - { - name: envName, - environmentPath: Uri.file(envPath), - displayName: `${version} (${envName})`, - displayPath: envPath, - description: envPath, - version, - execInfo: { - activatedRun: { - executable: 'conda', - args: ['run', '--live-stream', '-n', envName, 'python'], - }, - activation: [{ executable: 'conda', args: ['activate', envName] }], - deactivation: [{ executable: 'conda', args: ['deactivate'] }], - run: { executable: path.join(envPath, bin) }, - }, - sysPrefix: envPath, - group: 'Named', - }, + getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()), manager, ); return environment; @@ -612,25 +590,7 @@ async function createPrefixCondaEnvironment( const version = await getVersion(prefix); const environment = api.createPythonEnvironmentItem( - { - name: path.basename(prefix), - environmentPath: Uri.file(prefix), - displayName: `${version} (${name})`, - displayPath: prefix, - description: prefix, - version, - execInfo: { - run: { executable: path.join(prefix, bin) }, - activatedRun: { - executable: 'conda', - args: ['run', '--live-stream', '-p', prefix, 'python'], - }, - activation: [{ executable: 'conda', args: ['activate', prefix] }], - deactivation: [{ executable: 'conda', args: ['deactivate'] }], - }, - sysPrefix: prefix, - group: 'Prefix', - }, + getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()), manager, ); return environment; From ee0a20705a5b4cc031c0449bd8a134bc5a12c418 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 10 Apr 2025 17:37:45 -0700 Subject: [PATCH 108/328] feat: Add support for Quick Create (#281) ![image](https://github.com/user-attachments/assets/022db48a-13d7-478f-87b1-5bb7763bf6fa) closes https://github.com/microsoft/vscode-python-environments/issues/273 --- examples/sample1/src/api.ts | 52 ++++++++++++- examples/sample1/src/sampleEnvManager.ts | 10 ++- src/api.ts | 49 +++++++++++- src/common/localize.ts | 4 + src/common/pickers/environments.ts | 5 +- src/common/pickers/managers.ts | 41 ++++++++-- src/features/envCommands.ts | 31 +++++--- src/features/pythonApi.ts | 12 ++- src/internal.api.ts | 20 ++++- src/managers/builtin/venvManager.ts | 58 ++++++++++++-- src/managers/builtin/venvUtils.ts | 87 +++++++++++++++++---- src/managers/conda/condaEnvManager.ts | 88 ++++++++++++++++------ src/managers/conda/condaUtils.ts | 75 ++++++++++++++++++ src/test/features/envCommands.unit.test.ts | 12 +-- 14 files changed, 466 insertions(+), 78 deletions(-) diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index 2cad951..83cba96 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -316,6 +316,18 @@ export type DidChangeEnvironmentsEventArgs = { */ export type ResolveEnvironmentContext = Uri; +export interface QuickCreateConfig { + /** + * The description of the quick create step. + */ + readonly description: string; + + /** + * The detail of the quick create step. + */ + readonly detail?: string; +} + /** * Interface representing an environment manager. */ @@ -360,12 +372,19 @@ export interface EnvironmentManager { */ readonly log?: LogOutputChannel; + /** + * The quick create details for the environment manager. Having this method also enables the quick create feature + * for the environment manager. + */ + quickCreateConfig?(): QuickCreateConfig | undefined; + /** * Creates a new Python environment within the specified scope. * @param scope - The scope within which to create the environment. + * @param options - Optional parameters for creating the Python environment. * @returns A promise that resolves to the created Python environment, or undefined if creation failed. */ - create?(scope: CreateEnvironmentScope): Promise; + create?(scope: CreateEnvironmentScope, options?: CreateEnvironmentOptions): Promise; /** * Removes the specified Python environment. @@ -705,6 +724,9 @@ export interface DidChangePythonProjectsEventArgs { removed: PythonProject[]; } +/** + * Options for package management. + */ export type PackageManagementOptions = | { /** @@ -747,6 +769,28 @@ export type PackageManagementOptions = uninstall: string[]; }; +/** + * Options for creating a Python environment. + */ +export interface CreateEnvironmentOptions { + /** + * Provides some context about quick create based on user input. + * - if true, the environment should be created without any user input or prompts. + * - if false, the environment creation can show user input or prompts. + * This also means user explicitly skipped the quick create option. + * - if undefined, the environment creation can show user input or prompts. + * You can show quick create option to the user if you support it. + */ + quickCreate?: boolean; + /** + * Packages to install in addition to the automatically picked packages as a part of creating environment. + */ + additionalPackages?: string[]; +} + +/** + * Object representing the process started using run in background API. + */ export interface PythonProcess { /** * The process ID of the Python process. @@ -807,9 +851,13 @@ export interface PythonEnvironmentManagementApi { * Create a Python environment using environment manager associated with the scope. * * @param scope Where the environment is to be created. + * @param options Optional parameters for creating the Python environment. * @returns The Python environment created. `undefined` if not created. */ - createEnvironment(scope: CreateEnvironmentScope): Promise; + createEnvironment( + scope: CreateEnvironmentScope, + options?: CreateEnvironmentOptions, + ): Promise; /** * Remove a Python environment. diff --git a/examples/sample1/src/sampleEnvManager.ts b/examples/sample1/src/sampleEnvManager.ts index 2b64b29..ee13d88 100644 --- a/examples/sample1/src/sampleEnvManager.ts +++ b/examples/sample1/src/sampleEnvManager.ts @@ -1,5 +1,6 @@ import { MarkdownString, LogOutputChannel, Event } from 'vscode'; import { + CreateEnvironmentOptions, CreateEnvironmentScope, DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -8,6 +9,7 @@ import { GetEnvironmentsScope, IconPath, PythonEnvironment, + QuickCreateConfig, RefreshEnvironmentsScope, ResolveEnvironmentContext, SetEnvironmentScope, @@ -31,7 +33,13 @@ export class SampleEnvManager implements EnvironmentManager { this.log = log; } - create?(scope: CreateEnvironmentScope): Promise { + quickCreateConfig(): QuickCreateConfig | undefined { + // Code to provide quick create configuration goes here + + throw new Error('Method not implemented.'); + } + + create?(scope: CreateEnvironmentScope, options?: CreateEnvironmentOptions): Promise { // Code to handle creating environments goes here throw new Error('Method not implemented.'); diff --git a/src/api.ts b/src/api.ts index 2cad951..81f76fa 100644 --- a/src/api.ts +++ b/src/api.ts @@ -316,6 +316,18 @@ export type DidChangeEnvironmentsEventArgs = { */ export type ResolveEnvironmentContext = Uri; +export interface QuickCreateConfig { + /** + * The description of the quick create step. + */ + readonly description: string; + + /** + * The detail of the quick create step. + */ + readonly detail?: string; +} + /** * Interface representing an environment manager. */ @@ -360,12 +372,19 @@ export interface EnvironmentManager { */ readonly log?: LogOutputChannel; + /** + * The quick create details for the environment manager. Having this method also enables the quick create feature + * for the environment manager. + */ + quickCreateConfig?(): QuickCreateConfig | undefined; + /** * Creates a new Python environment within the specified scope. * @param scope - The scope within which to create the environment. + * @param options - Optional parameters for creating the Python environment. * @returns A promise that resolves to the created Python environment, or undefined if creation failed. */ - create?(scope: CreateEnvironmentScope): Promise; + create?(scope: CreateEnvironmentScope, options?: CreateEnvironmentOptions): Promise; /** * Removes the specified Python environment. @@ -747,6 +766,28 @@ export type PackageManagementOptions = uninstall: string[]; }; +/** + * Options for creating a Python environment. + */ +export interface CreateEnvironmentOptions { + /** + * Provides some context about quick create based on user input. + * - if true, the environment should be created without any user input or prompts. + * - if false, the environment creation can show user input or prompts. + * This also means user explicitly skipped the quick create option. + * - if undefined, the environment creation can show user input or prompts. + * You can show quick create option to the user if you support it. + */ + quickCreate?: boolean; + /** + * Packages to install in addition to the automatically picked packages as a part of creating environment. + */ + additionalPackages?: string[]; +} + +/** + * Object representing the process started using run in background API. + */ export interface PythonProcess { /** * The process ID of the Python process. @@ -807,9 +848,13 @@ export interface PythonEnvironmentManagementApi { * Create a Python environment using environment manager associated with the scope. * * @param scope Where the environment is to be created. + * @param options Optional parameters for creating the Python environment. * @returns The Python environment created. `undefined` if not created. */ - createEnvironment(scope: CreateEnvironmentScope): Promise; + createEnvironment( + scope: CreateEnvironmentScope, + options?: CreateEnvironmentOptions, + ): Promise; /** * Remove a Python environment. diff --git a/src/common/localize.ts b/src/common/localize.ts index 755508c..c21e3cb 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -11,6 +11,7 @@ export namespace Common { export const viewLogs = l10n.t('View Logs'); export const yes = l10n.t('Yes'); export const no = l10n.t('No'); + export const quickCreate = l10n.t('Quick Create'); } export namespace Interpreter { @@ -134,6 +135,9 @@ export namespace CondaStrings { export const condaCreateFailed = l10n.t('Failed to create conda environment'); export const condaRemoveFailed = l10n.t('Failed to remove conda environment'); export const condaExists = l10n.t('Environment already exists'); + + export const quickCreateCondaNoEnvRoot = l10n.t('No conda environment root found'); + export const quickCreateCondaNoName = l10n.t('Could not generate a name for env'); } export namespace ProjectCreatorString { diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 5a890f1..af0afe3 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -80,7 +80,10 @@ async function createEnvironment( const manager = managers.find((m) => m.id === managerId); if (manager) { try { - const env = await manager.create(options.projects.map((p) => p.uri)); + const env = await manager.create( + options.projects.map((p) => p.uri), + undefined, + ); return env; } catch (ex) { if (ex === QuickInputButtons.Back) { diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 100f9ee..241aa72 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -4,6 +4,20 @@ import { InternalEnvironmentManager, InternalPackageManager } from '../../intern import { Common, Pickers } from '../localize'; import { showQuickPickWithButtons, showQuickPick } from '../window.apis'; +function getDescription(mgr: InternalEnvironmentManager | InternalPackageManager): string | undefined { + if (mgr.description) { + return mgr.description; + } + if (mgr.tooltip) { + const tooltip = mgr.tooltip; + if (typeof tooltip === 'string') { + return tooltip; + } + return tooltip.value; + } + return undefined; +} + export async function pickEnvironmentManager( managers: InternalEnvironmentManager[], defaultManagers?: InternalEnvironmentManager[], @@ -18,14 +32,25 @@ export async function pickEnvironmentManager( const items: (QuickPickItem | (QuickPickItem & { id: string }))[] = []; if (defaultManagers && defaultManagers.length > 0) { + items.push({ + label: Common.recommended, + kind: QuickPickItemKind.Separator, + }); + if (defaultManagers.length === 1 && defaultManagers[0].supportsQuickCreate) { + const details = defaultManagers[0].quickCreateConfig(); + if (details) { + items.push({ + label: Common.quickCreate, + description: details.description, + detail: details.detail, + id: `QuickCreate#${defaultManagers[0].id}`, + }); + } + } items.push( - { - label: Common.recommended, - kind: QuickPickItemKind.Separator, - }, ...defaultManagers.map((defaultMgr) => ({ label: defaultMgr.displayName, - description: defaultMgr.description, + description: getDescription(defaultMgr), id: defaultMgr.id, })), { @@ -39,7 +64,7 @@ export async function pickEnvironmentManager( .filter((m) => !defaultManagers?.includes(m)) .map((m) => ({ label: m.displayName, - description: m.description, + description: getDescription(m), id: m.id, })), ); @@ -71,7 +96,7 @@ export async function pickPackageManager( }, ...defaultManagers.map((defaultMgr) => ({ label: defaultMgr.displayName, - description: defaultMgr.description, + description: getDescription(defaultMgr), id: defaultMgr.id, })), { @@ -85,7 +110,7 @@ export async function pickPackageManager( .filter((m) => !defaultManagers?.includes(m)) .map((m) => ({ label: m.displayName, - description: m.description, + description: getDescription(m), id: m.id, })), ); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 6838c0a..ffc4e23 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -7,7 +7,13 @@ import { PythonProjectManager, } from '../internal.api'; import { traceError, traceInfo, traceVerbose } from '../common/logging'; -import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonProjectCreator } from '../api'; +import { + CreateEnvironmentOptions, + PythonEnvironment, + PythonEnvironmentApi, + PythonProject, + PythonProjectCreator, +} from '../api'; import * as path from 'path'; import { setEnvironmentManager, @@ -75,7 +81,7 @@ export async function createEnvironmentCommand( const manager = (context as EnvManagerTreeItem).manager; const projects = pm.getProjects(); if (projects.length === 0) { - const env = await manager.create('global'); + const env = await manager.create('global', undefined); if (env) { await em.setEnvironments('global', env); } @@ -84,7 +90,7 @@ export async function createEnvironmentCommand( const selected = await pickProjectMany(projects); if (selected) { const scope = selected.length === 0 ? 'global' : selected.map((p) => p.uri); - const env = await manager.create(scope); + const env = await manager.create(scope, undefined); if (env) { await em.setEnvironments(scope, env); } @@ -97,7 +103,7 @@ export async function createEnvironmentCommand( const manager = em.getEnvironmentManager(context as Uri); const project = pm.get(context as Uri); if (project) { - return await manager?.create(project.uri); + return await manager?.create(project.uri, undefined); } else { traceError(`No project found for ${context}`); } @@ -109,8 +115,7 @@ export async function createEnvironmentCommand( export async function createAnyEnvironmentCommand( em: EnvironmentManagers, pm: PythonProjectManager, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - options?: any, + options?: CreateEnvironmentOptions & { selectEnvironment: boolean }, ): Promise { const select = options?.selectEnvironment; const projects = pm.getProjects(); @@ -118,7 +123,7 @@ export async function createAnyEnvironmentCommand( const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); const manager = em.managers.find((m) => m.id === managerId); if (manager) { - const env = await manager.create('global'); + const env = await manager.create('global', { ...options }); if (select && env) { await manager.set(undefined, env); } @@ -137,14 +142,22 @@ export async function createAnyEnvironmentCommand( } }); - const managerId = await pickEnvironmentManager( + let managerId = await pickEnvironmentManager( em.managers.filter((m) => m.supportsCreate), defaultManagers, ); + let quickCreate = false; + if (managerId?.startsWith('QuickCreate#')) { + quickCreate = true; + managerId = managerId.replace('QuickCreate#', ''); + } const manager = em.managers.find((m) => m.id === managerId); if (manager) { - const env = await manager.create(selected.map((p) => p.uri)); + const env = await manager.create( + selected.map((p) => p.uri), + { ...options, quickCreate }, + ); if (select && env) { await em.setEnvironments( selected.map((p) => p.uri), diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 53aad43..092c818 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -28,6 +28,7 @@ import { PythonBackgroundRunOptions, PythonTerminalCreateOptions, DidChangeEnvironmentVariablesEventArgs, + CreateEnvironmentOptions, } from '../api'; import { EnvironmentManagers, @@ -116,7 +117,10 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return new PythonEnvironmentImpl(envId, info); } - async createEnvironment(scope: CreateEnvironmentScope): Promise { + async createEnvironment( + scope: CreateEnvironmentScope, + options: CreateEnvironmentOptions | undefined, + ): Promise { if (scope === 'global' || (!Array.isArray(scope) && scope instanceof Uri)) { const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope); if (!manager) { @@ -125,9 +129,9 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { if (!manager.supportsCreate) { throw new Error(`Environment manager does not support creating environments: ${manager.id}`); } - return manager.create(scope); + return manager.create(scope, options); } else if (Array.isArray(scope) && scope.length === 1 && scope[0] instanceof Uri) { - return this.createEnvironment(scope[0]); + return this.createEnvironment(scope[0], options); } else if (Array.isArray(scope) && scope.length > 0 && scope.every((s) => s instanceof Uri)) { const managers: InternalEnvironmentManager[] = []; scope.forEach((s) => { @@ -151,7 +155,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { throw new Error('No environment manager found'); } - const result = await manager.create(scope); + const result = await manager.create(scope, options); return result; } } diff --git a/src/internal.api.ts b/src/internal.api.ts index 2a45c6d..b1e3bea 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -24,6 +24,8 @@ import { ResolveEnvironmentContext, PackageManagementOptions, EnvironmentGroupInfo, + QuickCreateConfig, + CreateEnvironmentOptions, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; @@ -141,14 +143,28 @@ export class InternalEnvironmentManager implements EnvironmentManager { return this.manager.create !== undefined; } - create(scope: CreateEnvironmentScope): Promise { + create( + scope: CreateEnvironmentScope, + options: CreateEnvironmentOptions | undefined, + ): Promise { if (this.manager.create) { - return this.manager.create(scope); + return this.manager.create(scope, options); } return Promise.reject(new CreateEnvironmentNotSupported(`Create Environment not supported by: ${this.id}`)); } + public get supportsQuickCreate(): boolean { + return this.manager.quickCreateConfig !== undefined; + } + + quickCreateConfig(): QuickCreateConfig | undefined { + if (this.manager.quickCreateConfig) { + return this.manager.quickCreateConfig(); + } + throw new CreateEnvironmentNotSupported(`Quick Create Environment not supported by: ${this.id}`); + } + public get supportsRemove(): boolean { return this.manager.remove !== undefined; } diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 86860c2..03ba500 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -1,5 +1,6 @@ -import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString, ThemeIcon } from 'vscode'; +import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString, ThemeIcon, l10n } from 'vscode'; import { + CreateEnvironmentOptions, CreateEnvironmentScope, DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -11,6 +12,7 @@ import { PythonEnvironment, PythonEnvironmentApi, PythonProject, + QuickCreateConfig, RefreshEnvironmentsScope, ResolveEnvironmentContext, SetEnvironmentScope, @@ -19,9 +21,11 @@ import { clearVenvCache, createPythonVenv, findVirtualEnvironments, + getDefaultGlobalVenvLocation, getGlobalVenvLocation, getVenvForGlobal, getVenvForWorkspace, + quickCreateVenv, removeVenv, resolveVenvPythonEnvironmentPath, setVenvForGlobal, @@ -35,6 +39,7 @@ import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, sortEnvironments } from '../common/utils'; import { withProgress } from '../../common/window.apis'; import { VenvManagerStrings } from '../../common/localize'; +import { showErrorMessage } from '../../common/errors/utils'; export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -49,7 +54,7 @@ export class VenvManager implements EnvironmentManager { public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; readonly name: string; - readonly displayName?: string | undefined; + readonly displayName: string; readonly preferredPackageManagerId: string; readonly description?: string | undefined; readonly tooltip?: string | MarkdownString | undefined; @@ -86,7 +91,21 @@ export class VenvManager implements EnvironmentManager { } } - async create(scope: CreateEnvironmentScope): Promise { + quickCreateConfig(): QuickCreateConfig | undefined { + if (!this.globalEnv || !this.globalEnv.version.startsWith('3.')) { + return undefined; + } + + return { + description: l10n.t('Create a virtual environment in workspace root'), + detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', this.globalEnv.version), + }; + } + + async create( + scope: CreateEnvironmentScope, + options: CreateEnvironmentOptions | undefined, + ): Promise { try { this.skipWatcherRefresh = true; let isGlobal = scope === 'global'; @@ -95,7 +114,7 @@ export class VenvManager implements EnvironmentManager { } let uri: Uri | undefined = undefined; if (isGlobal) { - uri = await getGlobalVenvLocation(); + uri = options?.quickCreate ? await getDefaultGlobalVenvLocation() : await getGlobalVenvLocation(); } else { uri = scope instanceof Uri ? scope : (scope as Uri[])[0]; } @@ -106,7 +125,36 @@ export class VenvManager implements EnvironmentManager { const venvRoot: Uri = uri; const globals = await this.baseManager.getEnvironments('global'); - const environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot); + let environment: PythonEnvironment | undefined = undefined; + if (options?.quickCreate) { + if (this.globalEnv && this.globalEnv.version.startsWith('3.')) { + environment = await quickCreateVenv( + this.nativeFinder, + this.api, + this.log, + this, + this.globalEnv, + venvRoot, + ); + } else if (!this.globalEnv) { + this.log.error('No base python found'); + showErrorMessage(VenvManagerStrings.venvErrorNoBasePython); + throw new Error('No base python found'); + } else if (!this.globalEnv.version.startsWith('3.')) { + this.log.error('Did not find any base python 3.*'); + globals.forEach((e, i) => { + this.log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`); + }); + showErrorMessage(VenvManagerStrings.venvErrorNoPython3); + throw new Error('Did not find any base python 3.*'); + } + } else { + environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot, { + // If quickCreate is not set that means the user triggered this method from + // environment manager View, by selecting the venv manager. + showQuickAndCustomOptions: options?.quickCreate === undefined, + }); + } if (environment) { this.addEnvironment(environment, true); } diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 57f7b0a..e9e2ff6 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -244,6 +244,12 @@ export async function findVirtualEnvironments( return collection; } +export async function getDefaultGlobalVenvLocation(): Promise { + const dir = path.join(os.homedir(), '.virtualenvs'); + await fsapi.ensureDir(dir); + return Uri.file(dir); +} + function getVenvFoldersSetting(): string[] { const settings = getConfiguration('python'); return settings.get('venvFolders', []); @@ -400,39 +406,83 @@ async function createWithProgress( ); } -export async function createPythonVenv( - nativeFinder: NativePythonFinder, - api: PythonEnvironmentApi, - log: LogOutputChannel, - manager: EnvironmentManager, - basePythons: PythonEnvironment[], - venvRoot: Uri, -): Promise { +function ensureGlobalEnv(basePythons: PythonEnvironment[], log: LogOutputChannel): PythonEnvironment[] { if (basePythons.length === 0) { log.error('No base python found'); showErrorMessage(VenvManagerStrings.venvErrorNoBasePython); - return; + throw new Error('No base python found'); } const filtered = basePythons.filter((e) => e.version.startsWith('3.')); if (filtered.length === 0) { log.error('Did not find any base python 3.*'); showErrorMessage(VenvManagerStrings.venvErrorNoPython3); - basePythons.forEach((e) => { - log.error(`available base python: ${e.version}`); + basePythons.forEach((e, i) => { + log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`); }); - return; + throw new Error('Did not find any base python 3.*'); } - const sortedEnvs = sortEnvironments(filtered); + return sortEnvironments(filtered); +} + +export async function quickCreateVenv( + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + baseEnv: PythonEnvironment, + venvRoot: Uri, + additionalPackages?: string[], +): Promise { const project = api.getPythonProject(venvRoot); - const customize = await createWithCustomization(sortedEnvs[0].version); + sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); + const installables = await getProjectInstallable(api, project ? [project] : undefined); + const allPackages = []; + allPackages.push(...(installables?.flatMap((i) => i.args ?? []) ?? [])); + if (additionalPackages) { + allPackages.push(...additionalPackages); + } + return await createWithProgress( + nativeFinder, + api, + log, + manager, + baseEnv, + venvRoot, + path.join(venvRoot.fsPath, '.venv'), + { install: allPackages, uninstall: [] }, + ); +} + +export async function createPythonVenv( + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + basePythons: PythonEnvironment[], + venvRoot: Uri, + options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] }, +): Promise { + const sortedEnvs = ensureGlobalEnv(basePythons, log); + const project = api.getPythonProject(venvRoot); + + let customize: boolean | undefined = true; + if (options.showQuickAndCustomOptions) { + customize = await createWithCustomization(sortedEnvs[0].version); + } + if (customize === undefined) { return; } else if (customize === false) { sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); const installables = await getProjectInstallable(api, project ? [project] : undefined); + const allPackages = []; + allPackages.push(...(installables?.flatMap((i) => i.args ?? []) ?? [])); + if (options.additionalPackages) { + allPackages.push(...options.additionalPackages); + } return await createWithProgress( nativeFinder, api, @@ -441,7 +491,7 @@ export async function createPythonVenv( sortedEnvs[0], venvRoot, path.join(venvRoot.fsPath, '.venv'), - { install: installables?.flatMap((i) => i.args ?? []), uninstall: [] }, + { install: allPackages, uninstall: [] }, ); } else { sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); @@ -478,8 +528,13 @@ export async function createPythonVenv( { showSkipOption: true, install: [] }, project ? [project] : undefined, ); + const allPackages = []; + allPackages.push(...(packages?.install ?? []), ...(options.additionalPackages ?? [])); - return await createWithProgress(nativeFinder, api, log, manager, basePython, venvRoot, envPath, packages); + return await createWithProgress(nativeFinder, api, log, manager, basePython, venvRoot, envPath, { + install: allPackages, + uninstall: [], + }); } export async function removeVenv(environment: PythonEnvironment, log: LogOutputChannel): Promise { diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index 7cf27fd..c5b9980 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -1,6 +1,7 @@ import * as path from 'path'; -import { Disposable, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, Uri } from 'vscode'; +import { Disposable, EventEmitter, l10n, LogOutputChannel, MarkdownString, ProgressLocation, Uri } from 'vscode'; import { + CreateEnvironmentOptions, CreateEnvironmentScope, DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -12,6 +13,7 @@ import { PythonEnvironment, PythonEnvironmentApi, PythonProject, + QuickCreateConfig, RefreshEnvironmentsScope, ResolveEnvironmentContext, SetEnvironmentScope, @@ -20,8 +22,11 @@ import { clearCondaCache, createCondaEnvironment, deleteCondaEnvironment, + generateName, getCondaForGlobal, getCondaForWorkspace, + getDefaultCondaPrefix, + quickCreateConda, refreshCondaEnvs, resolveCondaPath, setCondaForGlobal, @@ -32,6 +37,7 @@ import { NativePythonFinder } from '../common/nativePythonFinder'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { withProgress } from '../../common/window.apis'; import { CondaStrings } from '../../common/localize'; +import { showErrorMessage } from '../../common/errors/utils'; export class CondaEnvManager implements EnvironmentManager, Disposable { private collection: PythonEnvironment[] = []; @@ -116,29 +122,67 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { return []; } - async create(context: CreateEnvironmentScope): Promise { + quickCreateConfig(): QuickCreateConfig | undefined { + if (!this.globalEnv) { + return undefined; + } + + return { + description: l10n.t('Create a conda virtual environment in workspace root'), + detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', this.globalEnv.version), + }; + } + + async create( + context: CreateEnvironmentScope, + options?: CreateEnvironmentOptions, + ): Promise { try { - const result = await createCondaEnvironment( - this.api, - this.log, - this, - context === 'global' ? undefined : context, - ); - if (!result) { - return undefined; + let result: PythonEnvironment | undefined; + if (options?.quickCreate) { + let envRoot: string | undefined = undefined; + let name: string | undefined = './.conda'; + if (context === 'global' || (Array.isArray(context) && context.length > 1)) { + envRoot = await getDefaultCondaPrefix(); + name = await generateName(envRoot); + } else { + const folder = this.api.getPythonProject(context instanceof Uri ? context : context[0]); + envRoot = folder?.uri.fsPath; + } + if (!envRoot) { + showErrorMessage(CondaStrings.quickCreateCondaNoEnvRoot); + return undefined; + } + if (!name) { + showErrorMessage(CondaStrings.quickCreateCondaNoName); + return undefined; + } + result = await quickCreateConda(this.api, this.log, this, envRoot, name, options?.additionalPackages); + } else { + result = await createCondaEnvironment( + this.api, + this.log, + this, + context === 'global' ? undefined : context, + ); } - this.disposablesMap.set( - result.envId.id, - new Disposable(() => { - this.collection = this.collection.filter((env) => env.envId.id !== result.envId.id); - Array.from(this.fsPathToEnv.entries()) - .filter(([, env]) => env.envId.id === result.envId.id) - .forEach(([uri]) => this.fsPathToEnv.delete(uri)); - this.disposablesMap.delete(result.envId.id); - }), - ); - this.collection.push(result); - this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: result }]); + if (result) { + this.disposablesMap.set( + result.envId.id, + new Disposable(() => { + if (result) { + this.collection = this.collection.filter((env) => env.envId.id !== result?.envId.id); + Array.from(this.fsPathToEnv.entries()) + .filter(([, env]) => env.envId.id === result?.envId.id) + .forEach(([uri]) => this.fsPathToEnv.delete(uri)); + this.disposablesMap.delete(result.envId.id); + } + }), + ); + this.collection.push(result); + this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: result }]); + } + return result; } catch (error) { this.log.error('Failed to create conda environment:', error); diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 5c587bb..ded1786 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -223,6 +223,11 @@ async function getPrefixes(): Promise { return prefixes; } +export async function getDefaultCondaPrefix(): Promise { + const prefixes = await getPrefixes(); + return prefixes.length > 0 ? prefixes[0] : path.join(os.homedir(), '.conda', 'envs'); +} + async function getVersion(root: string): Promise { const files = await fse.readdir(path.join(root, 'conda-meta')); for (let file of files) { @@ -604,6 +609,76 @@ async function createPrefixCondaEnvironment( ); } +export async function generateName(fsPath: string): Promise { + let attempts = 0; + while (attempts < 5) { + const randomStr = Math.random().toString(36).substring(2); + const name = `env_${randomStr}`; + const prefix = path.join(fsPath, name); + if (!(await fse.exists(prefix))) { + return name; + } + } + return undefined; +} + +export async function quickCreateConda( + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + fsPath: string, + name: string, + additionalPackages?: string[], +): Promise { + const prefix = path.join(fsPath, name); + + return await withProgress( + { + location: ProgressLocation.Notification, + title: `Creating conda environment: ${name}`, + }, + async () => { + try { + const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; + log.info(await runConda(['create', '--yes', '--prefix', prefix, 'python'])); + if (additionalPackages && additionalPackages.length > 0) { + log.info(await runConda(['install', '--yes', '--prefix', prefix, ...additionalPackages])); + } + const version = await getVersion(prefix); + + const environment = api.createPythonEnvironmentItem( + { + name: path.basename(prefix), + environmentPath: Uri.file(prefix), + displayName: `${version} (${name})`, + displayPath: prefix, + description: prefix, + version, + execInfo: { + run: { executable: path.join(prefix, bin) }, + activatedRun: { + executable: 'conda', + args: ['run', '--live-stream', '-p', prefix, 'python'], + }, + activation: [{ executable: 'conda', args: ['activate', prefix] }], + deactivation: [{ executable: 'conda', args: ['deactivate'] }], + }, + sysPrefix: prefix, + group: 'Prefix', + }, + manager, + ); + return environment; + } catch (e) { + log.error('Failed to create conda environment', e); + setImmediate(async () => { + await showErrorMessage(CondaStrings.condaCreateFailed, log); + }); + } + }, + ); +} + export async function deleteCondaEnvironment(environment: PythonEnvironment, log: LogOutputChannel): Promise { let args = ['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath]; return await withProgress( diff --git a/src/test/features/envCommands.unit.test.ts b/src/test/features/envCommands.unit.test.ts index 7805751..2d98022 100644 --- a/src/test/features/envCommands.unit.test.ts +++ b/src/test/features/envCommands.unit.test.ts @@ -57,7 +57,7 @@ suite('Create Any Environment Command Tests', () => { test('Create global venv (no-workspace): no-select', async () => { pm.setup((p) => p.getProjects()).returns(() => []); manager - .setup((m) => m.create('global')) + .setup((m) => m.create('global', typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); @@ -75,7 +75,7 @@ suite('Create Any Environment Command Tests', () => { test('Create global venv (no-workspace): select', async () => { pm.setup((p) => p.getProjects()).returns(() => []); manager - .setup((m) => m.create('global')) + .setup((m) => m.create('global', typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); @@ -93,7 +93,7 @@ suite('Create Any Environment Command Tests', () => { test('Create workspace venv: no-select', async () => { pm.setup((p) => p.getProjects()).returns(() => [project]); manager - .setup((m) => m.create([project.uri])) + .setup((m) => m.create([project.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); @@ -113,7 +113,7 @@ suite('Create Any Environment Command Tests', () => { test('Create workspace venv: select', async () => { pm.setup((p) => p.getProjects()).returns(() => [project]); manager - .setup((m) => m.create([project.uri])) + .setup((m) => m.create([project.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); @@ -134,7 +134,7 @@ suite('Create Any Environment Command Tests', () => { test('Create multi-workspace venv: select all', async () => { pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); manager - .setup((m) => m.create([project.uri, project2.uri, project3.uri])) + .setup((m) => m.create([project.uri, project2.uri, project3.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); @@ -157,7 +157,7 @@ suite('Create Any Environment Command Tests', () => { test('Create multi-workspace venv: select some', async () => { pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); manager - .setup((m) => m.create([project.uri, project3.uri])) + .setup((m) => m.create([project.uri, project3.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) .verifiable(typeMoq.Times.once()); From 72a74311afb4e018be6e86ef056f3b4de1a7c6ab Mon Sep 17 00:00:00 2001 From: InSync Date: Fri, 11 Apr 2025 22:28:48 +0700 Subject: [PATCH 109/328] fix: clarify that `showSkipOption` also applies to uninstallations (#288) The description seems to be a leftover from #279. --- src/api.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api.ts b/src/api.ts index 81f76fa..5dcebf7 100644 --- a/src/api.ts +++ b/src/api.ts @@ -727,12 +727,12 @@ export interface DidChangePythonProjectsEventArgs { export type PackageManagementOptions = | { /** - * Upgrade the packages if it is already installed. + * Upgrade the packages if they are already installed. */ upgrade?: boolean; /** - * Show option to skip package installation + * Show option to skip package installation or uninstallation. */ showSkipOption?: boolean; /** @@ -747,12 +747,12 @@ export type PackageManagementOptions = } | { /** - * Upgrade the packages if it is already installed. + * Upgrade the packages if they are already installed. */ upgrade?: boolean; /** - * Show option to skip package installation + * Show option to skip package installation or uninstallation. */ showSkipOption?: boolean; /** From aed950b70b4b955fb0442a70feec565ac30d6719 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 11 Apr 2025 08:29:02 -0700 Subject: [PATCH 110/328] fix: ensure 'base' conda environment is not in a group (#290) --- src/managers/conda/condaUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index ded1786..f7b9d92 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -288,7 +288,7 @@ function getNamedCondaPythonInfo( shellActivation, shellDeactivation, }, - group: 'Named', + group: name !== 'base' ? 'Named' : undefined, }; } From 2aa13610098997528764da5647fcc6f9427913fe Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 11 Apr 2025 08:29:23 -0700 Subject: [PATCH 111/328] fix: id generation for env and pkg managers (#283) Fixes https://github.com/microsoft/vscode-python-environments/issues/223 --- src/common/utils/frameUtils.ts | 39 +++++++++++++++++++++------------- src/features/envManagers.ts | 7 ++++-- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/common/utils/frameUtils.ts b/src/common/utils/frameUtils.ts index 057fc5b..479045b 100644 --- a/src/common/utils/frameUtils.ts +++ b/src/common/utils/frameUtils.ts @@ -28,9 +28,19 @@ export function getCallingExtension(): string { const extensions = allExtensions(); const otherExts = extensions.filter((ext) => !pythonExts.includes(ext.id)); const frames = getFrameData(); - const filePaths: string[] = []; - for (const frame of frames) { + const registerEnvManagerFrameIndex = frames.findIndex( + (frame) => + frame.functionName && + (frame.functionName.includes('registerEnvironmentManager') || + frame.functionName.includes('registerPackageManager')), + ); + + const relevantFrames = + registerEnvManagerFrameIndex !== -1 ? frames.slice(registerEnvManagerFrameIndex + 1) : frames; + + const filePaths: string[] = []; + for (const frame of relevantFrames) { if (!frame || !frame.filePath) { continue; } @@ -55,25 +65,24 @@ export function getCallingExtension(): string { } } - // `ms-python.vscode-python-envs` extension in Development mode - const candidates = filePaths.filter((filePath) => - otherExts.some((s) => filePath.includes(normalizePath(s.extensionPath))), - ); const envExt = getExtension(ENVS_EXTENSION_ID); - - if (!envExt) { + const pythonExt = getExtension(PYTHON_EXTENSION_ID); + if (!envExt || !pythonExt) { throw new Error('Something went wrong with feature registration'); } const envsExtPath = normalizePath(envExt.extensionPath); - if (candidates.length === 0 && filePaths.every((filePath) => filePath.startsWith(envsExtPath))) { + + if (filePaths.every((filePath) => filePath.startsWith(envsExtPath))) { return PYTHON_EXTENSION_ID; - } else if (candidates.length > 0) { - // 3rd party extension in Development mode - const candidateExt = otherExts.find((ext) => candidates[0].includes(ext.extensionPath)); - if (candidateExt) { - return candidateExt.id; + } + + for (const ext of otherExts) { + const extPath = normalizePath(ext.extensionPath); + if (filePaths.some((filePath) => filePath.startsWith(extPath))) { + return ext.id; } } - throw new Error('Unable to determine calling extension id, registration failed'); + // Fallback - we're likely being called from Python extension in conda registration + return PYTHON_EXTENSION_ID; } diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 6cfda52..cf193a9 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -261,10 +261,12 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { const manager = this.getEnvironmentManager(customScope); if (!manager) { traceError( - `No environment manager found for: ${ + `No environment manager found for scope: ${ customScope instanceof Uri ? customScope.fsPath : customScope?.environmentPath?.fsPath }`, ); + + traceError(this.managers.map((m) => m.id).join(', ')); return; } await manager.set(scope, environment); @@ -298,10 +300,11 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { const manager = this.managers.find((m) => m.id === environment.envId.managerId); if (!manager) { traceError( - `No environment manager found for: ${ + `No environment manager found for [${environment.envId.managerId}]: ${ environment.environmentPath ? environment.environmentPath.fsPath : '' }`, ); + traceError(this.managers.map((m) => m.id).join(', ')); return; } From 1351ed80d583044f86600c98999d420c520445e8 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 11 Apr 2025 11:02:52 -0700 Subject: [PATCH 112/328] Copilot tools (#280) adds support for two copilot tools: - get environment information - install packages --- package.json | 44 ++- src/extension.ts | 5 +- src/features/copilotTools.ts | 217 ++++++++++++--- src/test/copilotTools.unit.test.ts | 431 +++++++++++++++++++++-------- 4 files changed, 547 insertions(+), 150 deletions(-) diff --git a/package.json b/package.json index f552f1f..df434d4 100644 --- a/package.json +++ b/package.json @@ -491,22 +491,52 @@ ], "languageModelTools": [ { - "name": "python_get_packages", - "displayName": "Get Python Packages", - "modelDescription": "Returns the packages installed in the given Python file's environment. You should call this when you want to generate Python code to determine the users preferred packages. Also call this to determine if you need to provide installation instructions in a response.", - "toolReferenceName": "pythonGetPackages", + "name": "python_environment_tool", + "displayName": "Get Python Environment Information", + "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions.", + "toolReferenceName": "pythonGetEnvironmentInfo", "tags": [], "icon": "$(files)", + "canBeReferencedInPrompt": true, "inputSchema": { "type": "object", "properties": { - "filePath": { + "resourcePath": { "type": "string" } }, - "description": "The path to the Python file or workspace to get the installed packages for.", + "description": "The path to the Python file or workspace to get the environment information for.", "required": [ - "filePath" + "resourcePath" + ] + } + }, + { + "name": "python_install_package_tool", + "displayName": "Install Python Package", + "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", + "toolReferenceName": "pythonInstallPackage", + "tags": [], + "icon": "$(package)", + "canBeReferencedInPrompt": true, + "inputSchema": { + "type": "object", + "properties": { + "packageList": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The list of packages to install." + }, + "workspacePath": { + "type": "string", + "description": "Path to Python workspace that determines the environment for package installation." + } + }, + "required": [ + "packageList", + "workspacePath" ] } } diff --git a/src/extension.ts b/src/extension.ts index 004a983..7315370 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -53,7 +53,7 @@ import { ensureCorrectVersion } from './common/extVersion'; import { ExistingProjects } from './features/creators/existingProjects'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { registerTools } from './common/lm.apis'; -import { GetPackagesTool } from './features/copilotTools'; +import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; import { getEnvironmentForTerminal } from './features/terminal/utils'; @@ -107,7 +107,8 @@ export async function activate(context: ExtensionContext): Promise outputChannel.show()), commands.registerCommand('python-envs.refreshManager', async (item) => { await refreshManagerCommand(item); diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts index f139fec..143858f 100644 --- a/src/features/copilotTools.ts +++ b/src/features/copilotTools.ts @@ -8,26 +8,44 @@ import { PreparedToolInvocation, Uri, } from 'vscode'; -import { PythonPackageGetterApi, PythonProjectEnvironmentApi } from '../api'; +import { + PackageManagementOptions, + PythonEnvironment, + PythonEnvironmentExecutionInfo, + PythonPackageGetterApi, + PythonPackageManagementApi, + PythonProjectEnvironmentApi, +} from '../api'; import { createDeferred } from '../common/utils/deferred'; +import { EnvironmentManagers } from '../internal.api'; + +export interface IResourceReference { + resourcePath?: string; +} -export interface IGetActiveFile { - filePath?: string; +interface EnvironmentInfo { + type: string; // e.g. conda, venv, virtualenv, sys + version: string; + runCommand: string; + packages: string[] | string; //include versions too } /** - * A tool to get the list of installed Python packages in the active environment. + * A tool to get the information about the Python environment. */ -export class GetPackagesTool implements LanguageModelTool { - constructor(private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi) {} +export class GetEnvironmentInfoTool implements LanguageModelTool { + constructor( + private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi, + private readonly envManagers: EnvironmentManagers, + ) {} /** - * Invokes the tool to get the list of installed packages. + * Invokes the tool to get the information about the Python environment. * @param options - The invocation options containing the file path. * @param token - The cancellation token. - * @returns The result containing the list of installed packages or an error message. + * @returns The result containing the information about the Python environment or an error message. */ async invoke( - options: LanguageModelToolInvocationOptions, + options: LanguageModelToolInvocationOptions, token: CancellationToken, ): Promise { const deferredReturn = createDeferred(); @@ -36,55 +54,192 @@ export class GetPackagesTool implements LanguageModelTool { deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); }); - const parameters: IGetActiveFile = options.input; + const parameters: IResourceReference = options.input; - if (parameters.filePath === undefined || parameters.filePath === '') { - throw new Error('Invalid input: filePath is required'); + if (parameters.resourcePath === undefined || parameters.resourcePath === '') { + throw new Error('Invalid input: resourcePath is required'); } - const fileUri = Uri.file(parameters.filePath); + const resourcePath: Uri = Uri.parse(parameters.resourcePath); + + // environment info set to default values + const envInfo: EnvironmentInfo = { + type: 'no type found', + version: 'no version found', + packages: 'no packages found', + runCommand: 'no run command found', + }; try { - const environment = await this.api.getEnvironment(fileUri); + // environment + const environment: PythonEnvironment | undefined = await this.api.getEnvironment(resourcePath); if (!environment) { - // Check if the file is a notebook or a notebook cell to throw specific error messages. - if (fileUri.fsPath.endsWith('.ipynb') || fileUri.fsPath.includes('.ipynb#')) { - throw new Error('Unable to access Jupyter kernels for notebook cells'); - } - throw new Error('No environment found'); + throw new Error('No environment found for the provided resource path: ' + resourcePath.fsPath); } + + const execInfo: PythonEnvironmentExecutionInfo = environment.execInfo; + const executable = execInfo?.activatedRun?.executable ?? execInfo?.run.executable ?? 'python'; + const args = execInfo?.activatedRun?.args ?? execInfo?.run.args ?? []; + envInfo.runCommand = args.length > 0 ? `${executable} ${args.join(' ')}` : executable; + envInfo.version = environment.version; + + // get the environment type or manager if type is not available + try { + const managerId = environment.envId.managerId; + const manager = this.envManagers.getEnvironmentManager(managerId); + envInfo.type = manager?.name || 'cannot be determined'; + } catch { + envInfo.type = environment.envId.managerId || 'cannot be determined'; + } + + // TODO: remove refreshPackages here eventually once terminal isn't being used as a fallback await this.api.refreshPackages(environment); const installedPackages = await this.api.getPackages(environment); - - let resultMessage: string; if (!installedPackages || installedPackages.length === 0) { - resultMessage = 'No packages are installed in the current environment.'; + envInfo.packages = []; } else { - const packageNames = installedPackages - .map((pkg) => (pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name)) - .join(', '); - resultMessage = 'The packages installed in the current environment are as follows:\n' + packageNames; + envInfo.packages = installedPackages.map((pkg) => + pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name, + ); } - const textPart = new LanguageModelTextPart(resultMessage || ''); + // format and return + const textPart = BuildEnvironmentInfoContent(envInfo); deferredReturn.resolve({ content: [textPart] }); } catch (error) { - const errorMessage: string = `An error occurred while fetching packages: ${error}`; + const errorMessage: string = `An error occurred while fetching environment information: ${error}`; + const partialContent = BuildEnvironmentInfoContent(envInfo); + const combinedContent = new LanguageModelTextPart(`${errorMessage}\n\n${partialContent.value}`); + deferredReturn.resolve({ content: [combinedContent] } as LanguageModelToolResult); + } + return deferredReturn.promise; + } + /** + * Prepares the invocation of the tool. + * @param _options - The preparation options. + * @param _token - The cancellation token. + * @returns The prepared tool invocation. + */ + async prepareInvocation?( + _options: LanguageModelToolInvocationPrepareOptions, + _token: CancellationToken, + ): Promise { + const message = 'Preparing to fetch Python environment information...'; + return { + invocationMessage: message, + }; + } +} + +function BuildEnvironmentInfoContent(envInfo: EnvironmentInfo): LanguageModelTextPart { + // Create a formatted string that looks like JSON but preserves comments + let envTypeDescriptor: string = `This environment is managed by ${envInfo.type} environment manager. Use the install tool to install packages into this environment.`; + + if (envInfo.type === 'system') { + envTypeDescriptor = + 'System pythons are pythons that ship with the OS or are installed globally. These python installs may be used by the OS for running services and core functionality. Confirm with the user before installing packages into this environment, as it can lead to issues with any services on the OS.'; + } + const content = `{ + // ${JSON.stringify(envTypeDescriptor)} + "environmentType": ${JSON.stringify(envInfo.type)}, + // Python version of the environment + "pythonVersion": ${JSON.stringify(envInfo.version)}, + // Use this command to run Python script or code in the terminal. + "runCommand": ${JSON.stringify(envInfo.runCommand)}, + // Installed Python packages, each in the format or (). The version may be omitted if unknown. Returns an empty array if no packages are installed. + "packages": ${JSON.stringify(Array.isArray(envInfo.packages) ? envInfo.packages : envInfo.packages, null, 2)} +}`; + + return new LanguageModelTextPart(content); +} + +/** + * The input interface for the Install Package Tool. + */ +export interface IInstallPackageInput { + packageList: string[]; + workspacePath?: string; +} + +/** + * A tool to install Python packages in the active environment. + */ +export class InstallPackageTool implements LanguageModelTool { + constructor( + private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi, + ) {} + + /** + * Invokes the tool to install Python packages in the active environment. + * @param options - The invocation options containing the package list. + * @param token - The cancellation token. + * @returns The result containing the installation status or an error message. + */ + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const deferredReturn = createDeferred(); + token.onCancellationRequested(() => { + const errorMessage: string = `Operation cancelled by the user.`; + deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); + }); + + const parameters: IInstallPackageInput = options.input; + const workspacePath = parameters.workspacePath ? Uri.file(parameters.workspacePath) : undefined; + if (!workspacePath) { + throw new Error('Invalid input: workspacePath is required'); + } + + if (!parameters.packageList || parameters.packageList.length === 0) { + throw new Error('Invalid input: packageList is required and cannot be empty'); + } + const packageCount = parameters.packageList.length; + const packagePlurality = packageCount === 1 ? 'package' : 'packages'; + + try { + const environment = await this.api.getEnvironment(workspacePath); + if (!environment) { + // Check if the file is a notebook or a notebook cell to throw specific error messages. + if (workspacePath.fsPath.endsWith('.ipynb') || workspacePath.fsPath.includes('.ipynb#')) { + throw new Error('Unable to access Jupyter kernels for notebook cells'); + } + throw new Error('No environment found'); + } + + // Install the packages + const pkgManagementOptions: PackageManagementOptions = { + install: parameters.packageList, + }; + await this.api.managePackages(environment, pkgManagementOptions); + const resultMessage = `Successfully installed ${packagePlurality}: ${parameters.packageList.join(', ')}`; + + deferredReturn.resolve({ + content: [new LanguageModelTextPart(resultMessage)], + }); + } catch (error) { + const errorMessage = `An error occurred while installing ${packagePlurality}: ${error}`; + deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); } + return deferredReturn.promise; } /** * Prepares the invocation of the tool. - * @param _options - The preparation options. + * @param options - The preparation options. * @param _token - The cancellation token. * @returns The prepared tool invocation. */ async prepareInvocation?( - _options: LanguageModelToolInvocationPrepareOptions, + options: LanguageModelToolInvocationPrepareOptions, _token: CancellationToken, ): Promise { - const message = 'Preparing to fetch the list of installed Python packages...'; + const packageList = options.input.packageList || []; + const packageCount = packageList.length; + const packageText = packageCount === 1 ? 'package' : 'packages'; + const message = `Preparing to install Python ${packageText}: ${packageList.join(', ')}...`; + return { invocationMessage: message, }; diff --git a/src/test/copilotTools.unit.test.ts b/src/test/copilotTools.unit.test.ts index 2857fa5..03eb936 100644 --- a/src/test/copilotTools.unit.test.ts +++ b/src/test/copilotTools.unit.test.ts @@ -2,210 +2,421 @@ import * as assert from 'assert'; import * as vscode from 'vscode'; import * as sinon from 'sinon'; import * as typeMoq from 'typemoq'; -import { Package, PythonEnvironment, PythonPackageGetterApi, PythonProjectEnvironmentApi } from '../api'; +import { + Package, + PackageId, + PythonEnvironment, + PythonEnvironmentId, + PythonPackageGetterApi, + PythonPackageManagementApi, + PythonProjectEnvironmentApi, +} from '../api'; import { createDeferred } from '../common/utils/deferred'; -import { GetPackagesTool, IGetActiveFile } from '../features/copilotTools'; - -suite('GetPackagesTool Tests', () => { - let tool: GetPackagesTool; - let mockApi: typeMoq.IMock; +import { + GetEnvironmentInfoTool, + IInstallPackageInput, + InstallPackageTool, + IResourceReference, +} from '../features/copilotTools'; +import { EnvironmentManagers, InternalEnvironmentManager } from '../internal.api'; + +suite('InstallPackageTool Tests', () => { + let installPackageTool: InstallPackageTool; + let mockApi: typeMoq.IMock; let mockEnvironment: typeMoq.IMock; setup(() => { // Create mock functions - mockApi = typeMoq.Mock.ofType(); + mockApi = typeMoq.Mock.ofType< + PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi + >(); mockEnvironment = typeMoq.Mock.ofType(); // eslint-disable-next-line @typescript-eslint/no-explicit-any mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - // refresh will always return a resolved promise - mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - - // Create an instance of GetPackagesTool with the mock functions - tool = new GetPackagesTool(mockApi.object); + // Create an instance of InstallPackageTool with the mock functions + installPackageTool = new InstallPackageTool(mockApi.object); }); teardown(() => { sinon.restore(); }); - test('should throw error if filePath is undefined', async () => { - const testFile: IGetActiveFile = { - filePath: '', + test('should throw error if workspacePath is an empty string', async () => { + const testFile: IInstallPackageInput = { + workspacePath: '', + packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; const token = new vscode.CancellationTokenSource().token; - await assert.rejects(tool.invoke(options, token), { message: 'Invalid input: filePath is required' }); + await assert.rejects(installPackageTool.invoke(options, token), { + message: 'Invalid input: workspacePath is required', + }); }); test('should throw error for notebook files', async () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - const testFile: IGetActiveFile = { - filePath: 'test.ipynb', + const testFile: IInstallPackageInput = { + workspacePath: 'this/is/a/test/path.ipynb', + packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; const token = new vscode.CancellationTokenSource().token; - const result = await tool.invoke(options, token); + const result = await installPackageTool.invoke(options, token); const content = result.content as vscode.LanguageModelTextPart[]; const firstPart = content[0] as vscode.LanguageModelTextPart; - assert.strictEqual( - firstPart.value, - 'An error occurred while fetching packages: Error: Unable to access Jupyter kernels for notebook cells', - ); + assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); }); test('should throw error for notebook cells', async () => { - const testFile: IGetActiveFile = { - filePath: 'test.ipynb#123', + const testFile: IInstallPackageInput = { + workspacePath: 'this/is/a/test/path.ipynb#cell', + packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; const token = new vscode.CancellationTokenSource().token; - const result = await tool.invoke(options, token); + const result = await installPackageTool.invoke(options, token); const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; + const firstPart = content[0] as vscode.LanguageModelTextPart; - assert.strictEqual( - firstPart.value, - 'An error occurred while fetching packages: Error: Unable to access Jupyter kernels for notebook cells', - ); + assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); }); - test('should return no packages message if no packages are installed', async () => { - const testFile: IGetActiveFile = { - filePath: 'test.py', + test('should throw error if packageList passed in is empty', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: [], + }; + + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + await assert.rejects(installPackageTool.invoke(options, token), { + message: 'Invalid input: packageList is required and cannot be empty', + }); + }); + + test('should handle cancellation', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: ['package1', 'package2'], }; mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(() => { + .returns(async () => { return Promise.resolve(mockEnvironment.object); }); - mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve([])); - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = await tool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; + const tokenSource = new vscode.CancellationTokenSource(); + const token = tokenSource.token; - assert.strictEqual(firstPart.value, 'No packages are installed in the current environment.'); + const deferred = createDeferred(); + installPackageTool.invoke(options, token).then((result) => { + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + + assert.strictEqual(firstPart.value, 'Operation cancelled by the user.'); + deferred.resolve(); + }); + + tokenSource.cancel(); + await deferred.promise; }); - test('should return just packages if versions do not exist', async () => { - const testFile: IGetActiveFile = { - filePath: 'test.py', + test('should handle packages installation', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: ['package1', 'package2'], }; mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(() => { + .returns(async () => { return Promise.resolve(mockEnvironment.object); }); - const mockPackages: Package[] = [ - { - pkgId: { id: 'pkg1', managerId: 'pip', environmentId: 'env1' }, - name: 'package1', - displayName: 'package1', - }, - { - pkgId: { id: 'pkg2', managerId: 'pip', environmentId: 'env1' }, - name: 'package2', - displayName: 'package2', - }, - ]; - - mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve(mockPackages)); + mockApi + .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) + .returns(() => { + const deferred = createDeferred(); + deferred.resolve(); + return deferred.promise; + }); const options = { input: testFile, toolInvocationToken: undefined }; const token = new vscode.CancellationTokenSource().token; - const result = await tool.invoke(options, token); + + const result = await installPackageTool.invoke(options, token); const content = result.content as vscode.LanguageModelTextPart[]; const firstPart = content[0] as vscode.MarkdownString; - assert.ok( - firstPart.value.includes('The packages installed in the current environment are as follows:') && - firstPart.value.includes('package1') && - firstPart.value.includes('package2'), - ); + assert.strictEqual(firstPart.value.includes('Successfully installed packages'), true); + assert.strictEqual(firstPart.value.includes('package1'), true); + assert.strictEqual(firstPart.value.includes('package2'), true); }); - - test('should return installed packages with versions', async () => { - const testFile: IGetActiveFile = { - filePath: 'test.py', + test('should handle package installation failure', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: ['package1', 'package2'], }; mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(() => { + .returns(async () => { return Promise.resolve(mockEnvironment.object); }); - const mockPackages: Package[] = [ - { - pkgId: { id: 'pkg1', managerId: 'pip', environmentId: 'env1' }, - name: 'package1', - displayName: 'package1', - version: '1.0.0', - }, - { - pkgId: { id: 'pkg2', managerId: 'pip', environmentId: 'env1' }, - name: 'package2', - displayName: 'package2', - version: '2.0.0', - }, - ]; - - mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve(mockPackages)); + mockApi + .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) + .returns(() => { + const deferred = createDeferred(); + deferred.reject(new Error('Installation failed')); + return deferred.promise; + }); const options = { input: testFile, toolInvocationToken: undefined }; const token = new vscode.CancellationTokenSource().token; - const result = await tool.invoke(options, token); + + const result = await installPackageTool.invoke(options, token); const content = result.content as vscode.LanguageModelTextPart[]; const firstPart = content[0] as vscode.MarkdownString; - assert.ok( - firstPart.value.includes('The packages installed in the current environment are as follows:') && - firstPart.value.includes('package1 (1.0.0)') && - firstPart.value.includes('package2 (2.0.0)'), + assert.strictEqual( + firstPart.value.includes('An error occurred while installing packages'), + true, + `error message was ${firstPart.value}`, ); }); - - test('should handle cancellation', async () => { - const testFile: IGetActiveFile = { - filePath: 'test.py', + test('should handle error occurs when getting environment', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: ['package1', 'package2'], }; + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(async () => { + return Promise.reject(new Error('Unable to get environment')); + }); + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await installPackageTool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); + }); + test('correct plurality in package installation message', async () => { + const testFile: IInstallPackageInput = { + workspacePath: 'path/to/workspace', + packageList: ['package1'], + }; mockApi .setup((x) => x.getEnvironment(typeMoq.It.isAny())) .returns(async () => { return Promise.resolve(mockEnvironment.object); }); + mockApi + .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) + .returns(() => { + const deferred = createDeferred(); + deferred.resolve(); + return deferred.promise; + }); + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = await installPackageTool.invoke(options, token); + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + assert.strictEqual(firstPart.value.includes('packages'), false); + assert.strictEqual(firstPart.value.includes('package'), true); + }); +}); +suite('GetEnvironmentInfoTool Tests', () => { + let getEnvironmentInfoTool: GetEnvironmentInfoTool; + let mockApi: typeMoq.IMock; + let mockEnvironment: typeMoq.IMock; + let em: typeMoq.IMock; + let managerSys: typeMoq.IMock; + + setup(() => { + // Create mock functions + mockApi = typeMoq.Mock.ofType< + PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi + >(); + mockEnvironment = typeMoq.Mock.ofType(); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironment.setup((x: any) => x.then).returns(() => undefined); + + em = typeMoq.Mock.ofType(); + em.setup((e) => e.managers).returns(() => [managerSys.object]); + em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); + + getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object, em.object); + }); + + teardown(() => { + sinon.restore(); + }); + test('should throw error if resourcePath is an empty string', async () => { + const testFile: IResourceReference = { + resourcePath: '', + }; + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + await assert.rejects(getEnvironmentInfoTool.invoke(options, token), { + message: 'Invalid input: resourcePath is required', + }); + }); + test('should throw error if environment is not found', async () => { + const testFile: IResourceReference = { + resourcePath: 'this/is/a/test/path.ipynb', + }; + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(async () => { + return Promise.reject(new Error('Unable to get environment')); + }); + + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + const result = getEnvironmentInfoTool.invoke(options, token); + const content = (await result).content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + assert.strictEqual(firstPart.value.includes('An error occurred while fetching environment information'), true); + }); + test('should return successful with environment info', async () => { + // Create an instance of GetEnvironmentInfoTool with the mock functions + managerSys = typeMoq.Mock.ofType(); + managerSys.setup((m) => m.id).returns(() => 'ms-python.python:venv'); + managerSys.setup((m) => m.name).returns(() => 'venv'); + managerSys.setup((m) => m.displayName).returns(() => 'Test Manager'); + + em = typeMoq.Mock.ofType(); + em.setup((e) => e.managers).returns(() => [managerSys.object]); + em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); + // create mock of PythonEnvironment + const mockEnvironmentSuccess = typeMoq.Mock.ofType(); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironmentSuccess.setup((x: any) => x.then).returns(() => undefined); + mockEnvironmentSuccess.setup((x) => x.version).returns(() => '3.9.1'); + const mockEnvId = typeMoq.Mock.ofType(); + mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:venv'); + mockEnvironmentSuccess.setup((x) => x.envId).returns(() => mockEnvId.object); + mockEnvironmentSuccess + .setup((x) => x.execInfo) + .returns(() => ({ + run: { + executable: 'conda', + args: ['run', '-n', 'env_name', 'python'], + }, + })); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(async () => { + return Promise.resolve(mockEnvironmentSuccess.object); + }); mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - mockApi.setup((x) => x.getPackages(typeMoq.It.isAny())).returns(() => Promise.resolve([])); + const packageAId: PackageId = { + id: 'package1', + managerId: 'ms-python.python:venv', + environmentId: 'env_id', + }; + const packageBId: PackageId = { + id: 'package2', + managerId: 'ms-python.python:venv', + environmentId: 'env_id', + }; + const packageA: Package = { name: 'package1', displayName: 'Package 1', version: '1.0.0', pkgId: packageAId }; + const packageB: Package = { name: 'package2', displayName: 'Package 2', version: '2.0.0', pkgId: packageBId }; + mockApi + .setup((x) => x.getPackages(typeMoq.It.isAny())) + .returns(async () => { + return Promise.resolve([packageA, packageB]); + }); + + const testFile: IResourceReference = { + resourcePath: 'this/is/a/test/path.ipynb', + }; const options = { input: testFile, toolInvocationToken: undefined }; - const tokenSource = new vscode.CancellationTokenSource(); - const token = tokenSource.token; + const token = new vscode.CancellationTokenSource().token; + // run + const result = await getEnvironmentInfoTool.invoke(options, token); + // assert + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + assert.strictEqual(firstPart.value.includes('3.9.1'), true); + assert.strictEqual(firstPart.value.includes('package1 (1.0.0)'), true); + assert.strictEqual(firstPart.value.includes('package2 (2.0.0)'), true); + assert.strictEqual(firstPart.value.includes(`"conda run -n env_name python"`), true); + assert.strictEqual(firstPart.value.includes('venv'), true); + }); + test('should return successful with weird environment info', async () => { + // create mock of PythonEnvironment + const mockEnvironmentSuccess = typeMoq.Mock.ofType(); - const deferred = createDeferred(); - tool.invoke(options, token).then((result) => { - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; + // Create an instance of GetEnvironmentInfoTool with the mock functions + let managerSys = typeMoq.Mock.ofType(); + managerSys.setup((m) => m.id).returns(() => 'ms-python.python:system'); + managerSys.setup((m) => m.name).returns(() => 'system'); + managerSys.setup((m) => m.displayName).returns(() => 'Test Manager'); - assert.strictEqual(firstPart.value, 'Operation cancelled by the user.'); - deferred.resolve(); - }); + let emSys = typeMoq.Mock.ofType(); + emSys.setup((e) => e.managers).returns(() => [managerSys.object]); + emSys.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); + getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object, emSys.object); - tokenSource.cancel(); - await deferred.promise; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockEnvironmentSuccess.setup((x: any) => x.then).returns(() => undefined); + mockEnvironmentSuccess.setup((x) => x.version).returns(() => '3.12.1'); + const mockEnvId = typeMoq.Mock.ofType(); + mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:system'); + managerSys.setup((m) => m.name).returns(() => 'system'); + mockEnvironmentSuccess.setup((x) => x.envId).returns(() => mockEnvId.object); + mockEnvironmentSuccess + .setup((x) => x.execInfo) + .returns(() => ({ + run: { + executable: 'path/to/venv/bin/python', + args: [], + }, + })); + + mockApi + .setup((x) => x.getEnvironment(typeMoq.It.isAny())) + .returns(async () => { + return Promise.resolve(mockEnvironmentSuccess.object); + }); + mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); + + mockApi + .setup((x) => x.getPackages(typeMoq.It.isAny())) + .returns(async () => { + return Promise.resolve([]); + }); + + const testFile: IResourceReference = { + resourcePath: 'this/is/a/test/path.ipynb', + }; + const options = { input: testFile, toolInvocationToken: undefined }; + const token = new vscode.CancellationTokenSource().token; + // run + const result = await getEnvironmentInfoTool.invoke(options, token); + // assert + const content = result.content as vscode.LanguageModelTextPart[]; + const firstPart = content[0] as vscode.MarkdownString; + assert.strictEqual(firstPart.value.includes('3.12.1'), true); + assert.strictEqual(firstPart.value.includes('"packages": []'), true); + assert.strictEqual(firstPart.value.includes(`"path/to/venv/bin/python"`), true); + assert.strictEqual(firstPart.value.includes('system'), true); }); }); From 7989aa64172efaedb35e9f7ddd93be6f86046b13 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 11 Apr 2025 15:43:33 -0700 Subject: [PATCH 113/328] add handling for notebook-cells as inputs to API (#293) fixes https://github.com/microsoft/vscode-python-environments/issues/278 --- src/common/utils/pathUtils.ts | 19 +++++++++++++++++++ src/features/pythonApi.ts | 30 +++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index 09a3ef2..81b6152 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -1,5 +1,24 @@ +import { Uri } from 'vscode'; import { isWindows } from '../../managers/common/utils'; +export function checkUri(scope?: Uri | Uri[] | string): Uri | Uri[] | string | undefined { + if (scope instanceof Uri) { + if (scope.scheme === 'vscode-notebook-cell') { + return Uri.from({ + scheme: 'vscode-notebook', + path: scope.path, + authority: scope.authority, + }); + } + } + if (Array.isArray(scope)) { + return scope.map((item) => { + return checkUri(item) as Uri; + }); + } + return scope; +} + export function normalizePath(path: string): string { const path1 = path.replace(/\\/g, '/'); if (isWindows()) { diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 092c818..e712a4c 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -47,6 +47,7 @@ import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; import { runInBackground } from './execution/runInBackground'; import { EnvVarManager } from './execution/envVariableManager'; +import { checkUri } from '../common/utils/pathUtils'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); @@ -167,36 +168,39 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return manager.remove(environment); } async refreshEnvironments(scope: RefreshEnvironmentsScope): Promise { - if (scope === undefined) { - await Promise.all(this.envManagers.managers.map((manager) => manager.refresh(scope))); + const currentScope = checkUri(scope) as RefreshEnvironmentsScope; + + if (currentScope === undefined) { + await Promise.all(this.envManagers.managers.map((manager) => manager.refresh(currentScope))); return Promise.resolve(); } - const manager = this.envManagers.getEnvironmentManager(scope); + const manager = this.envManagers.getEnvironmentManager(currentScope); if (!manager) { - return Promise.reject(new Error(`No environment manager found for: ${scope.fsPath}`)); + return Promise.reject(new Error(`No environment manager found for: ${currentScope.fsPath}`)); } - return manager.refresh(scope); + return manager.refresh(currentScope); } async getEnvironments(scope: GetEnvironmentsScope): Promise { - if (scope === 'all' || scope === 'global') { - const promises = this.envManagers.managers.map((manager) => manager.getEnvironments(scope)); + const currentScope = checkUri(scope) as GetEnvironmentsScope; + if (currentScope === 'all' || currentScope === 'global') { + const promises = this.envManagers.managers.map((manager) => manager.getEnvironments(currentScope)); const items = await Promise.all(promises); return items.flat(); } - const manager = this.envManagers.getEnvironmentManager(scope); + const manager = this.envManagers.getEnvironmentManager(currentScope); if (!manager) { return []; } - const items = await manager.getEnvironments(scope); + const items = await manager.getEnvironments(currentScope); return items; } onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { - return this.envManagers.setEnvironment(scope, environment); + return this.envManagers.setEnvironment(checkUri(scope) as SetEnvironmentScope, environment); } async getEnvironment(scope: GetEnvironmentScope): Promise { - return this.envManagers.getEnvironment(scope); + return this.envManagers.getEnvironment(checkUri(scope) as GetEnvironmentScope); } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { @@ -267,7 +271,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } onDidChangePythonProjects: Event = this._onDidChangePythonProjects.event; getPythonProject(uri: Uri): PythonProject | undefined { - return this.projectManager.get(uri); + return this.projectManager.get(checkUri(uri) as Uri); } registerPythonProjectCreator(creator: PythonProjectCreator): Disposable { return this.projectCreators.registerPythonProjectCreator(creator); @@ -310,7 +314,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { overrides?: ({ [key: string]: string | undefined } | Uri)[], baseEnvVar?: { [key: string]: string | undefined }, ): Promise<{ [key: string]: string | undefined }> { - return this.envVarManager.getEnvironmentVariables(uri, overrides, baseEnvVar); + return this.envVarManager.getEnvironmentVariables(checkUri(uri) as Uri, overrides, baseEnvVar); } } From ea509ac2fcef628b26767ad80333970cb9d825c9 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 14 Apr 2025 08:12:17 -0700 Subject: [PATCH 114/328] fix: ensure quick create is handled when using command API (#295) --- src/features/envCommands.ts | 25 ++++++++++++++++--------- src/managers/builtin/venvManager.ts | 1 + 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index ffc4e23..f18c0a3 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -142,17 +142,24 @@ export async function createAnyEnvironmentCommand( } }); - let managerId = await pickEnvironmentManager( - em.managers.filter((m) => m.supportsCreate), - defaultManagers, - ); - let quickCreate = false; - if (managerId?.startsWith('QuickCreate#')) { - quickCreate = true; - managerId = managerId.replace('QuickCreate#', ''); + let quickCreate = options?.quickCreate ?? false; + let manager: InternalEnvironmentManager | undefined; + + if (quickCreate && defaultManagers.length === 1) { + manager = defaultManagers[0]; + } else { + let managerId = await pickEnvironmentManager( + em.managers.filter((m) => m.supportsCreate), + defaultManagers, + ); + if (managerId?.startsWith('QuickCreate#')) { + quickCreate = true; + managerId = managerId.replace('QuickCreate#', ''); + } + + manager = em.managers.find((m) => m.id === managerId); } - const manager = em.managers.find((m) => m.id === managerId); if (manager) { const env = await manager.create( selected.map((p) => p.uri), diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 03ba500..608ec46 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -135,6 +135,7 @@ export class VenvManager implements EnvironmentManager { this, this.globalEnv, venvRoot, + options?.additionalPackages, ); } else if (!this.globalEnv) { this.log.error('No base python found'); From de653f9f3943d1bce51213e99b3af1452334e7ed Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 14 Apr 2025 09:47:00 -0700 Subject: [PATCH 115/328] fix: show Manage Packages in Command Palette (#296) Fixes https://github.com/microsoft/vscode-python-environments/issues/292 --- package.json | 4 ---- src/features/envCommands.ts | 10 +++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index df434d4..69cd4ec 100644 --- a/package.json +++ b/package.json @@ -232,10 +232,6 @@ ], "menus": { "commandPalette": [ - { - "command": "python-envs.packages", - "when": "false" - }, { "command": "python-envs.refreshAllManagers", "when": "false" diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index f18c0a3..6deb121 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -467,7 +467,15 @@ export async function createTerminalCommand( api: PythonEnvironmentApi, tm: TerminalManager, ): Promise { - if (context instanceof Uri) { + if (context === undefined) { + const pw = await pickProject(api.getPythonProjects()); + if (pw) { + const env = await api.getEnvironment(pw.uri); + if (env) { + return await tm.create(env, { cwd: pw.uri }); + } + } + } else if (context instanceof Uri) { const uri = context as Uri; const env = await api.getEnvironment(uri); const pw = api.getPythonProject(uri); From e82d4b5274a39915606675e745c8b6236c962958 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:50:26 -0700 Subject: [PATCH 116/328] Add fix to support project root item in project getter (#298) --- src/features/envCommands.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 6deb121..ec30c44 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -348,6 +348,10 @@ export async function addPythonProject( return; } + if (resource instanceof ProjectPackageRootTreeItem || resource instanceof ProjectPackage) { + await addPythonProject(undefined, wm, em, pc); + } + if (resource instanceof Uri) { const uri = resource as Uri; const envManagerId = getDefaultEnvManagerSetting(wm, uri); From 6af3380b0771875f29eed25b06da40a6f3a4d2c0 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 15 Apr 2025 08:23:37 -0700 Subject: [PATCH 117/328] fix: quick Create ux tweaks and clean up (#308) --- src/api.ts | 2 +- src/common/pickers/managers.ts | 7 ++++--- src/internal.api.ts | 4 ++-- src/managers/builtin/venvManager.ts | 7 +++++-- src/managers/common/utils.ts | 1 + src/managers/conda/condaEnvManager.ts | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/api.ts b/src/api.ts index 5dcebf7..d337a8d 100644 --- a/src/api.ts +++ b/src/api.ts @@ -374,7 +374,7 @@ export interface EnvironmentManager { /** * The quick create details for the environment manager. Having this method also enables the quick create feature - * for the environment manager. + * for the environment manager. Should Implement {@link EnvironmentManager.create} to support quick create. */ quickCreateConfig?(): QuickCreateConfig | undefined; diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 241aa72..b96c0b4 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -37,13 +37,14 @@ export async function pickEnvironmentManager( kind: QuickPickItemKind.Separator, }); if (defaultManagers.length === 1 && defaultManagers[0].supportsQuickCreate) { - const details = defaultManagers[0].quickCreateConfig(); + const defaultMgr = defaultManagers[0]; + const details = defaultMgr.quickCreateConfig(); if (details) { items.push({ label: Common.quickCreate, - description: details.description, + description: `${defaultMgr.displayName} • ${details.description}`, detail: details.detail, - id: `QuickCreate#${defaultManagers[0].id}`, + id: `QuickCreate#${defaultMgr.id}`, }); } } diff --git a/src/internal.api.ts b/src/internal.api.ts index b1e3bea..1150b36 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -155,11 +155,11 @@ export class InternalEnvironmentManager implements EnvironmentManager { } public get supportsQuickCreate(): boolean { - return this.manager.quickCreateConfig !== undefined; + return this.manager.quickCreateConfig !== undefined && this.manager.create !== undefined; } quickCreateConfig(): QuickCreateConfig | undefined { - if (this.manager.quickCreateConfig) { + if (this.manager.quickCreateConfig && this.manager.create) { return this.manager.quickCreateConfig(); } throw new CreateEnvironmentNotSupported(`Quick Create Environment not supported by: ${this.id}`); diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 608ec46..441067d 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -36,7 +36,7 @@ import * as path from 'path'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; -import { getLatest, sortEnvironments } from '../common/utils'; +import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; import { withProgress } from '../../common/window.apis'; import { VenvManagerStrings } from '../../common/localize'; import { showErrorMessage } from '../../common/errors/utils'; @@ -98,7 +98,10 @@ export class VenvManager implements EnvironmentManager { return { description: l10n.t('Create a virtual environment in workspace root'), - detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', this.globalEnv.version), + detail: l10n.t( + 'Uses Python version {0} and installs workspace dependencies.', + shortVersion(this.globalEnv.version), + ), }; } diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 11bcd9c..27aa812 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -73,6 +73,7 @@ export function shortVersion(version: string): string { } return version; } + export function isGreater(a: string | undefined, b: string | undefined): boolean { if (!a && !b) { return false; diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index c5b9980..c16fa6f 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -128,7 +128,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { } return { - description: l10n.t('Create a conda virtual environment in workspace root'), + description: l10n.t('Create a conda environment'), detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', this.globalEnv.version), }; } From e0a261fd84d652ce0cdaf937908ebf45f1c452d7 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:12:06 -0700 Subject: [PATCH 118/328] update for existing project creation (#306) fixes https://github.com/microsoft/vscode-python-environments/issues/305 --- src/extension.ts | 2 +- src/features/creators/autoFindProjects.ts | 17 ++++- src/features/creators/existingProjects.ts | 77 +++++++++++++++++++++-- src/features/envCommands.ts | 7 +-- 4 files changed, 90 insertions(+), 13 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 7315370..719b266 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -88,7 +88,7 @@ export async function activate(context: ExtensionContext): Promise { const p = this.pm.get(uri); if (p) { - // If there ia already a project with the same path, skip it. - // If there is a project with the same parent path, skip it. + // Skip this project if: + // 1. There's already a project registered with exactly the same path + // 2. There's already a project registered with this project's parent directory path const np = path.normalize(p.uri.fsPath); const nf = path.normalize(uri.fsPath); const nfp = path.dirname(nf); @@ -79,11 +81,20 @@ export class AutoFindProjects implements PythonProjectCreator { }); if (filtered.length === 0) { + // No new projects found that are not already in the project manager + traceInfo('All discovered projects are already registered in the project manager'); + setImmediate(() => { + showWarningMessage('No new projects found'); + }); return; } + traceInfo(`Found ${filtered.length} new potential projects that aren't already registered`); + const projects = await pickProjects(filtered); if (!projects || projects.length === 0) { + // User cancelled the selection. + traceInfo('User cancelled project selection.'); return; } diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index 25c8b15..a3e5e22 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -1,12 +1,18 @@ import * as path from 'path'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { ProjectCreatorString } from '../../common/localize'; -import { showOpenDialog } from '../../common/window.apis'; +import { showOpenDialog, showWarningMessage } from '../../common/window.apis'; +import { PythonProjectManager } from '../../internal.api'; +import { traceInfo } from '../../common/logging'; +import { Uri, window, workspace } from 'vscode'; +import { traceLog } from '../../common/logging'; export class ExistingProjects implements PythonProjectCreator { public readonly name = 'existingProjects'; public readonly displayName = ProjectCreatorString.addExistingProjects; + constructor(private readonly pm: PythonProjectManager) {} + async create(_options?: PythonProjectCreatorOptions): Promise { const results = await showOpenDialog({ canSelectFiles: true, @@ -19,12 +25,73 @@ export class ExistingProjects implements PythonProjectCreator { }); if (!results || results.length === 0) { + // User cancelled the dialog & doesn't want to add any projects return; } - return results.map((r) => ({ - name: path.basename(r.fsPath), - uri: r, - })); + // do we have any limitations that need to be applied here? + // like selected folder not child of workspace folder? + + const filtered = results.filter((uri) => { + const p = this.pm.get(uri); + if (p) { + // Skip this project if there's already a project registered with exactly the same path + const np = path.normalize(p.uri.fsPath); + const nf = path.normalize(uri.fsPath); + return np !== nf; + } + return true; + }); + + if (filtered.length === 0) { + // No new projects found that are not already in the project manager + traceInfo('All discovered projects are already registered in the project manager'); + setImmediate(() => { + showWarningMessage('No new projects found'); + }); + return; + } + + // for all the selected files / folders, check to make sure they are in the workspace + const resultsOutsideWorkspace: Uri[] = []; + const workspaceRoots: Uri[] = workspace.workspaceFolders?.map((w) => w.uri) || []; + const resultsInWorkspace = filtered.filter((r) => { + const exists = workspaceRoots.some((w) => r.fsPath.startsWith(w.fsPath)); + if (!exists) { + traceLog(`File ${r.fsPath} is not in the workspace, ignoring it from 'add projects' list.`); + resultsOutsideWorkspace.push(r); + } + return exists; + }); + if (resultsInWorkspace.length === 0) { + // Show a single error message with option to add to workspace + const response = await window.showErrorMessage( + 'Selected items are not in the current workspace.', + 'Add to Workspace', + 'Cancel', + ); + + if (response === 'Add to Workspace') { + // Use the command palette to let user adjust which folders to add + // Add folders programmatically using workspace API + for (const r of resultsOutsideWorkspace) { + // if the user selects a file, add that file to the workspace + await // if the user selects a folder, add that folder to the workspace + await workspace.updateWorkspaceFolders( + workspace.workspaceFolders?.length || 0, // Start index + 0, // Delete count + { + uri: r, + }, + ); + } + } + return; + } else { + return resultsInWorkspace.map((uri) => ({ + name: path.basename(uri.fsPath), + uri, + })) as PythonProject[]; + } } } diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index ec30c44..fa0d9c4 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -348,10 +348,6 @@ export async function addPythonProject( return; } - if (resource instanceof ProjectPackageRootTreeItem || resource instanceof ProjectPackage) { - await addPythonProject(undefined, wm, em, pc); - } - if (resource instanceof Uri) { const uri = resource as Uri; const envManagerId = getDefaultEnvManagerSetting(wm, uri); @@ -416,6 +412,9 @@ export async function addPythonProject( } await addPythonProjectSetting(edits); return projects; + } else { + // If the context is not a Uri or ProjectItem, rerun function with undefined context + await addPythonProject(undefined, wm, em, pc); } } From e87c8b2d5f32f14460552012aa2a6d598a548e14 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 17 Apr 2025 11:35:38 -0700 Subject: [PATCH 119/328] feat: add telemetry for install/uninstall packages (#302) --- src/api.ts | 2 +- src/common/telemetry/constants.ts | 19 +++++++++++++++---- src/extension.ts | 8 ++++++-- src/internal.api.ts | 21 ++++++++++++++++++--- src/managers/builtin/pipManager.ts | 15 ++++++++++++++- src/managers/conda/condaPackageManager.ts | 2 +- 6 files changed, 55 insertions(+), 12 deletions(-) diff --git a/src/api.ts b/src/api.ts index d337a8d..924d955 100644 --- a/src/api.ts +++ b/src/api.ts @@ -596,7 +596,7 @@ export interface PackageManager { /** * Installs/Uninstall packages in the specified Python environment. * @param environment - The Python environment in which to install packages. - * @param packages - The packages to install. + * @param options - Options for managing packages. * @returns A promise that resolves when the installation is complete. */ manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise; diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index 2c2a560..bc32440 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -7,6 +7,8 @@ export enum EventNames { VENV_USING_UV = 'VENV.USING_UV', VENV_CREATION = 'VENV.CREATION', + + PACKAGE_MANAGEMENT = 'PACKAGE_MANAGEMENT', } // Map all events to their properties @@ -45,14 +47,23 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "venv.using_uv": {"owner": "karthiknadig" } */ - [EventNames.VENV_USING_UV]: never | undefined; - - /* __GDPR__ + [EventNames.VENV_USING_UV]: never | undefined /* __GDPR__ "venv.creation": { "creationType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } - */ + */; [EventNames.VENV_CREATION]: { creationType: 'quick' | 'custom'; }; + + /* __GDPR__ + "package.install": { + "managerId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, + "result": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + } + */ + [EventNames.PACKAGE_MANAGEMENT]: { + managerId: string; + result: 'success' | 'error' | 'cancelled'; + }; } diff --git a/src/extension.ts b/src/extension.ts index 719b266..9ee2ad5 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,7 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode'; import { PythonEnvironmentManagers } from './features/envManagers'; -import { registerLogger, traceInfo } from './common/logging'; +import { registerLogger, traceError, traceInfo } from './common/logging'; import { EnvManagerView } from './features/views/envManagersView'; import { addPythonProject, @@ -138,7 +138,11 @@ export async function activate(context: ExtensionContext): Promise { await handlePackageUninstall(context, envManagers); diff --git a/src/internal.api.ts b/src/internal.api.ts index 1150b36..509d48a 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -1,4 +1,4 @@ -import { Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode'; +import { CancellationError, Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode'; import { PythonEnvironment, EnvironmentManager, @@ -28,6 +28,8 @@ import { CreateEnvironmentOptions, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; +import { sendTelemetryEvent } from './common/telemetry/sender'; +import { EventNames } from './common/telemetry/constants'; export type EnvironmentManagerScope = undefined | string | Uri | PythonEnvironment; export type PackageManagerScope = undefined | string | Uri | PythonEnvironment | Package; @@ -241,8 +243,21 @@ export class InternalPackageManager implements PackageManager { return this.manager.log; } - manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { - return this.manager.manage(environment, options); + async manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { + try { + await this.manager.manage(environment, options); + sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, undefined, { managerId: this.id, result: 'success' }); + } catch (error) { + if (error instanceof CancellationError) { + sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, undefined, { + managerId: this.id, + result: 'cancelled', + }); + throw error; + } + sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, undefined, { managerId: this.id, result: 'error' }); + throw error; + } } refresh(environment: PythonEnvironment): Promise { diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index 93cf55a..d772597 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -1,4 +1,13 @@ -import { Event, EventEmitter, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, window } from 'vscode'; +import { + CancellationError, + Event, + EventEmitter, + LogOutputChannel, + MarkdownString, + ProgressLocation, + ThemeIcon, + window, +} from 'vscode'; import { DidChangePackagesEventArgs, IconPath, @@ -82,6 +91,9 @@ export class PipPackageManager implements PackageManager, Disposable { this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment, manager: this, changes }); } catch (e) { + if (e instanceof CancellationError) { + throw e; + } this.log.error('Error managing packages', e); setImmediate(async () => { const result = await window.showErrorMessage('Error managing packages', 'View Output'); @@ -89,6 +101,7 @@ export class PipPackageManager implements PackageManager, Disposable { this.log.show(); } }); + throw e; } }, ); diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index b5b1023..a49075d 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -85,7 +85,7 @@ export class CondaPackageManager implements PackageManager, Disposable { this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); } catch (e) { if (e instanceof CancellationError) { - return; + throw e; } this.log.error('Error installing packages', e); From 42aeda06704a26f1304837e8c1c4bc441c6977f6 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 17 Apr 2025 11:36:05 -0700 Subject: [PATCH 120/328] feat: telemetry for select env and package managers (#300) --- src/common/telemetry/constants.ts | 20 ++++++++++++++++++++ src/common/telemetry/helpers.ts | 28 ++++++++++++++++++++++++++++ src/extension.ts | 3 +++ 3 files changed, 51 insertions(+) create mode 100644 src/common/telemetry/helpers.ts diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index bc32440..432f7df 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -4,6 +4,8 @@ export enum EventNames { ENVIRONMENT_MANAGER_REGISTERED = 'ENVIRONMENT_MANAGER.REGISTERED', PACKAGE_MANAGER_REGISTERED = 'PACKAGE_MANAGER.REGISTERED', + ENVIRONMENT_MANAGER_SELECTED = 'ENVIRONMENT_MANAGER.SELECTED', + PACKAGE_MANAGER_SELECTED = 'PACKAGE_MANAGER.SELECTED', VENV_USING_UV = 'VENV.USING_UV', VENV_CREATION = 'VENV.CREATION', @@ -44,6 +46,24 @@ export interface IEventNamePropertyMapping { managerId: string; }; + /* __GDPR__ + "environment_manager.selected": { + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + } + */ + [EventNames.ENVIRONMENT_MANAGER_SELECTED]: { + managerId: string; + }; + + /* __GDPR__ + "package_manager.selected": { + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + } + */ + [EventNames.PACKAGE_MANAGER_SELECTED]: { + managerId: string; + }; + /* __GDPR__ "venv.using_uv": {"owner": "karthiknadig" } */ diff --git a/src/common/telemetry/helpers.ts b/src/common/telemetry/helpers.ts new file mode 100644 index 0000000..d2a43c6 --- /dev/null +++ b/src/common/telemetry/helpers.ts @@ -0,0 +1,28 @@ +import { getDefaultEnvManagerSetting, getDefaultPkgManagerSetting } from '../../features/settings/settingHelpers'; +import { PythonProjectManager } from '../../internal.api'; +import { EventNames } from './constants'; +import { sendTelemetryEvent } from './sender'; + +export function sendManagerSelectionTelemetry(pm: PythonProjectManager) { + const ems: Set = new Set(); + const ps: Set = new Set(); + pm.getProjects().forEach((project) => { + const m = getDefaultEnvManagerSetting(pm, project.uri); + if (m) { + ems.add(m); + } + + const p = getDefaultPkgManagerSetting(pm, project.uri); + if (p) { + ps.add(p); + } + }); + + ems.forEach((em) => { + sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_SELECTED, undefined, { managerId: em }); + }); + + ps.forEach((pkg) => { + sendTelemetryEvent(EventNames.PACKAGE_MANAGER_SELECTED, undefined, { managerId: pkg }); + }); +} diff --git a/src/extension.ts b/src/extension.ts index 9ee2ad5..ff73ab2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -56,6 +56,7 @@ import { registerTools } from './common/lm.apis'; import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; import { getEnvironmentForTerminal } from './features/terminal/utils'; +import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -267,8 +268,10 @@ export async function activate(context: ExtensionContext): Promise Date: Fri, 18 Apr 2025 13:06:07 -0700 Subject: [PATCH 121/328] fix: handling installables selection (#315) fixes: https://github.com/microsoft/vscode-python-environments/issues/304 fixes: https://github.com/microsoft/vscode-python-environments/issues/301 --- src/managers/builtin/pipManager.ts | 2 +- src/managers/builtin/pipUtils.ts | 43 ++++++++++++--------- src/managers/builtin/utils.ts | 61 ++++++++++++++++++------------ src/managers/builtin/venvUtils.ts | 2 + src/managers/common/pickers.ts | 18 +++++---- src/managers/conda/condaUtils.ts | 29 ++++++++------ 6 files changed, 91 insertions(+), 64 deletions(-) diff --git a/src/managers/builtin/pipManager.ts b/src/managers/builtin/pipManager.ts index d772597..da52027 100644 --- a/src/managers/builtin/pipManager.ts +++ b/src/managers/builtin/pipManager.ts @@ -63,7 +63,7 @@ export class PipPackageManager implements PackageManager, Disposable { if (toInstall.length === 0 && toUninstall.length === 0) { const projects = this.venv.getProjectsByEnvironment(environment); - const result = await getWorkspacePackagesToInstall(this.api, options, projects, environment); + const result = await getWorkspacePackagesToInstall(this.api, options, projects, environment, this.log); if (result) { toInstall = result.install; toUninstall = result.uninstall; diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index c6912ab..d20f442 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -1,7 +1,7 @@ import * as fse from 'fs-extra'; import * as path from 'path'; import * as tomljs from '@iarna/toml'; -import { LogOutputChannel, ProgressLocation, QuickInputButtons, Uri } from 'vscode'; +import { LogOutputChannel, ProgressLocation, QuickInputButtons, QuickPickItem, Uri } from 'vscode'; import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; import { PackageManagementOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; @@ -10,6 +10,7 @@ import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; import { traceInfo } from '../../common/logging'; import { Installable, mergePackages } from '../common/utils'; +import { refreshPipPackages } from './utils'; async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { try { @@ -83,7 +84,7 @@ async function selectWorkspaceOrCommon( return undefined; } - const items = []; + const items: QuickPickItem[] = []; if (installable.length > 0) { items.push({ label: PackageManagement.workspaceDependencies, @@ -102,27 +103,32 @@ async function selectWorkspaceOrCommon( items.push({ label: PackageManagement.skipPackageInstallation }); } - const selected = - items.length === 1 - ? items[0] - : await showQuickPickWithButtons(items, { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - showBackButton: true, - matchOnDescription: false, - matchOnDetail: false, - }); + let showBackButton = true; + let selected: QuickPickItem[] | QuickPickItem | undefined = undefined; + if (items.length === 1) { + selected = items[0]; + showBackButton = false; + } else { + selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); + } if (selected && !Array.isArray(selected)) { try { if (selected.label === PackageManagement.workspaceDependencies) { - const installArgs = await selectFromInstallableToInstall(installable); - return { install: installArgs ?? [], uninstall: [] }; + return await selectFromInstallableToInstall(installable, undefined, { showBackButton }); } else if (selected.label === PackageManagement.searchCommonPackages) { - return await selectFromCommonPackagesToInstall(common, installed); - } else { + return await selectFromCommonPackagesToInstall(common, installed, undefined, { showBackButton }); + } else if (selected.label === PackageManagement.skipPackageInstallation) { traceInfo('Package Installer: user selected skip package installation'); return undefined; + } else { + return undefined; } // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (ex: any) { @@ -144,12 +150,13 @@ export async function getWorkspacePackagesToInstall( options: PackageManagementOptions, project?: PythonProject[], environment?: PythonEnvironment, + log?: LogOutputChannel, ): Promise { const installable = (await getProjectInstallable(api, project)) ?? []; let common = await getCommonPackages(); let installed: string[] | undefined; if (environment) { - installed = (await api.getPackages(environment))?.map((pkg) => pkg.name); + installed = (await refreshPipPackages(environment, log, { showProgress: true }))?.map((pkg) => pkg.name); common = mergePackages(common, installed ?? []); } return selectWorkspaceOrCommon(installable, common, !!options.showSkipOption, installed ?? []); @@ -166,7 +173,7 @@ export async function getProjectInstallable( const installable: Installable[] = []; await withProgress( { - location: ProgressLocation.Window, + location: ProgressLocation.Notification, title: VenvManagerStrings.searchingDependencies, }, async (_progress, token) => { diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index 9c19e8a..b1fc9c5 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -1,4 +1,4 @@ -import { CancellationToken, l10n, LogOutputChannel, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; +import { CancellationToken, LogOutputChannel, ProgressLocation, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; import { EnvironmentManager, Package, @@ -18,7 +18,8 @@ import { showErrorMessage } from '../../common/errors/utils'; import { shortVersion, sortEnvironments } from '../common/utils'; import { SysManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; -import { parsePipList } from './pipListUtils'; +import { parsePipList, PipPackage } from './pipListUtils'; +import { withProgress } from '../../common/window.apis'; function asPackageQuickPickItem(name: string, version?: string): QuickPickItem { return { @@ -138,39 +139,49 @@ export async function refreshPythons( return sortEnvironments(collection); } -export async function refreshPackages( - environment: PythonEnvironment, - api: PythonEnvironmentApi, - manager: PackageManager, -): Promise { - if (!environment.execInfo) { - manager.log?.error(`No executable found for python: ${environment.environmentPath.fsPath}`); - showErrorMessage( - l10n.t('No executable found for python: {0}', environment.environmentPath.fsPath), - manager.log, - ); - return []; +async function refreshPipPackagesRaw(environment: PythonEnvironment, log?: LogOutputChannel): Promise { + const useUv = await isUvInstalled(); + if (useUv) { + return await runUV(['pip', 'list', '--python', environment.execInfo.run.executable], undefined, log); } + return await runPython(environment.execInfo.run.executable, ['-m', 'pip', 'list'], undefined, log); +} +export async function refreshPipPackages( + environment: PythonEnvironment, + log?: LogOutputChannel, + options?: { showProgress: boolean }, +): Promise { let data: string; try { - const useUv = await isUvInstalled(); - if (useUv) { - data = await runUV( - ['pip', 'list', '--python', environment.execInfo.run.executable], - undefined, - manager.log, + if (options?.showProgress) { + data = await withProgress( + { + location: ProgressLocation.Notification, + }, + async () => { + return await refreshPipPackagesRaw(environment, log); + }, ); } else { - data = await runPython(environment.execInfo.run.executable, ['-m', 'pip', 'list'], undefined, manager.log); + data = await refreshPipPackagesRaw(environment, log); } + + return parsePipList(data); } catch (e) { - manager.log?.error('Error refreshing packages', e); - showErrorMessage(SysManagerStrings.packageRefreshError, manager.log); - return []; + log?.error('Error refreshing packages', e); + showErrorMessage(SysManagerStrings.packageRefreshError, log); + return undefined; } +} - return parsePipList(data).map((pkg) => api.createPackageItem(pkg, environment, manager)); +export async function refreshPackages( + environment: PythonEnvironment, + api: PythonEnvironmentApi, + manager: PackageManager, +): Promise { + const data = await refreshPipPackages(environment, manager.log); + return (data ?? []).map((pkg) => api.createPackageItem(pkg, environment, manager)); } export async function managePackages( diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index e9e2ff6..6387014 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -527,6 +527,8 @@ export async function createPythonVenv( api, { showSkipOption: true, install: [] }, project ? [project] : undefined, + undefined, + log, ); const allPackages = []; allPackages.push(...(packages?.install ?? []), ...(options.additionalPackages ?? [])); diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts index beb099a..e63a0ae 100644 --- a/src/managers/common/pickers.ts +++ b/src/managers/common/pickers.ts @@ -105,12 +105,12 @@ function groupByInstalled(items: PackageQuickPickItem[], installed?: string[]): }; } -export interface CommonPackagesResult { +interface PackagesPickerResult { install: string[]; uninstall: string[]; } -function selectionsToResult(selections: string[], installed: string[]): CommonPackagesResult { +function selectionsToResult(selections: string[], installed: string[]): PackagesPickerResult { const install: string[] = selections; const uninstall: string[] = []; installed.forEach((i) => { @@ -128,7 +128,8 @@ export async function selectFromCommonPackagesToInstall( common: Installable[], installed: string[], preSelected?: PackageQuickPickItem[] | undefined, -): Promise { + options?: { showBackButton?: boolean } | undefined, +): Promise { const { installedItems, items } = groupByInstalled(common.map(installableToQuickPickItem), installed); const preSelectedItems = items.filter((i) => (preSelected ?? installedItems).some((s) => s.id === i.id)); let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined; @@ -139,7 +140,7 @@ export async function selectFromCommonPackagesToInstall( placeHolder: PackageManagement.selectPackagesToInstall, ignoreFocusOut: true, canPickMany: true, - showBackButton: true, + showBackButton: options?.showBackButton, buttons: [EDIT_ARGUMENTS_BUTTON], selected: preSelectedItems, }, @@ -232,7 +233,8 @@ function getGroupedItems(items: Installable[]): PackageQuickPickItem[] { export async function selectFromInstallableToInstall( installable: Installable[], preSelected?: PackageQuickPickItem[], -): Promise { + options?: { showBackButton?: boolean } | undefined, +): Promise { const items: PackageQuickPickItem[] = []; if (installable && installable.length > 0) { @@ -252,7 +254,7 @@ export async function selectFromInstallableToInstall( placeHolder: PackageManagement.selectPackagesToInstall, ignoreFocusOut: true, canPickMany: true, - showBackButton: true, + showBackButton: options?.showBackButton, selected: preSelectedItems, }, undefined, @@ -263,9 +265,9 @@ export async function selectFromInstallableToInstall( if (selected) { if (Array.isArray(selected)) { - return selected.flatMap((s) => s.args ?? []); + return { install: selected.flatMap((s) => s.args ?? []), uninstall: [] }; } else { - return selected.args ?? []; + return { install: selected.args ?? [], uninstall: [] }; } } return undefined; diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index f7b9d92..b662300 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -20,6 +20,7 @@ import { LogOutputChannel, ProgressLocation, QuickInputButtons, + QuickPickItem, Uri, } from 'vscode'; import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; @@ -786,7 +787,7 @@ async function selectCommonPackagesOrSkip( return undefined; } - const items = []; + const items: QuickPickItem[] = []; if (common.length > 0) { items.push({ label: PackageManagement.searchCommonPackages, @@ -798,21 +799,25 @@ async function selectCommonPackagesOrSkip( items.push({ label: PackageManagement.skipPackageInstallation }); } - const selected = - items.length === 1 - ? items[0] - : await showQuickPickWithButtons(items, { - placeHolder: Pickers.Packages.selectOption, - ignoreFocusOut: true, - showBackButton: true, - matchOnDescription: false, - matchOnDetail: false, - }); + let showBackButton = true; + let selected: QuickPickItem[] | QuickPickItem | undefined = undefined; + if (items.length === 1) { + selected = items[0]; + showBackButton = false; + } else { + selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Packages.selectOption, + ignoreFocusOut: true, + showBackButton: true, + matchOnDescription: false, + matchOnDetail: false, + }); + } if (selected && !Array.isArray(selected)) { try { if (selected.label === PackageManagement.searchCommonPackages) { - return await selectFromCommonPackagesToInstall(common, installed); + return await selectFromCommonPackagesToInstall(common, installed, undefined, { showBackButton }); } else { traceInfo('Package Installer: user selected skip package installation'); return undefined; From b5bf0184edea124e28436ab1daba603c021d11cb Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 18 Apr 2025 15:09:57 -0700 Subject: [PATCH 122/328] fix: detect terminal `pip installs` and refresh ui (#316) fixes: https://github.com/microsoft/vscode-python-environments/issues/57 --- src/managers/builtin/main.ts | 14 ++++++++++++++ src/managers/builtin/pipUtils.ts | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/managers/builtin/main.ts b/src/managers/builtin/main.ts index 7171b78..f9b588b 100644 --- a/src/managers/builtin/main.ts +++ b/src/managers/builtin/main.ts @@ -9,6 +9,8 @@ import { UvProjectCreator } from './uvProjectCreator'; import { isUvInstalled } from './helpers'; import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; import { createSimpleDebounce } from '../../common/utils/debounce'; +import { onDidEndTerminalShellExecution } from '../../common/window.apis'; +import { isPipInstallCommand } from './pipUtils'; export async function registerSystemPythonFeatures( nativeFinder: NativePythonFinder, @@ -43,6 +45,18 @@ export async function registerSystemPythonFeatures( }), ); + disposables.push( + onDidEndTerminalShellExecution(async (e) => { + const cwd = e.terminal.shellIntegration?.cwd; + if (isPipInstallCommand(e.execution.commandLine.value) && cwd) { + const env = await venvManager.get(cwd); + if (env) { + await pkgManager.refresh(env); + } + } + }), + ); + setImmediate(async () => { if (await isUvInstalled(log)) { disposables.push(api.registerPythonProjectCreator(new UvProjectCreator(api, log))); diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index d20f442..a1e2a9c 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -214,3 +214,17 @@ export async function getProjectInstallable( ); return installable; } + +export function isPipInstallCommand(command: string): boolean { + // Regex to match pip install commands, capturing variations like: + // pip install package + // python -m pip install package + // pip3 install package + // py -m pip install package + // pip install -r requirements.txt + // uv pip install package + // poetry run pip install package + // pipx run pip install package + // Any other tool that might wrap pip install + return /(?:^|\s)(?:\S+\s+)*(?:pip\d*)\s+(install|uninstall)\b/.test(command); +} From 813c1bf323bcf7ccf591b638ba6bf232dcc9198c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 21 Apr 2025 22:31:03 -0700 Subject: [PATCH 123/328] fix: show back button with create environment (#323) fixes: https://github.com/microsoft/vscode-python-environments/issues/321 The following fields are supported when using `python-envs.createAny` command: ``` /** * Default `false`. If `true` the creation provider should show back button when showing QuickPick or QuickInput. */ showBackButton?: boolean; /** * Default `true`. If `true`, the environment after creation will be selected. */ selectEnvironment?: boolean; ``` --- README.md | 40 +++++++++++++++++++++++++++------- src/common/pickers/managers.ts | 2 ++ src/features/envCommands.ts | 5 +++-- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 96750c7..6765c2c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ The Python Environments and Package Manager extension for VS Code helps you mana - ### Environment Management This extension provides an Environments view, which can be accessed via the VS Code Activity Bar, where you can manage your Python environments. Here, you can create, delete, and switch between environments, as well as install and uninstall packages within the selected environment. It also provides APIs for extension developers to contribute their own environment managers. @@ -54,19 +53,44 @@ See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/s To consume these APIs you can look at the example here: https://github.com/microsoft/vscode-python-environments/blob/main/examples/README.md +### Callable Commands + +The extension provides a set of callable commands that can be used to interact with the environment and package managers. These commands can be invoked from other extensions or from the command palette. + +#### `python-envs.createAny` + +Create a new environment using any of the available environment managers. This command will prompt the user to select the environment manager to use. Following options are available on this command: + +```typescript +{ + /** + * Default `false`. If `true` the creation provider should show back button when showing QuickPick or QuickInput. + */ + showBackButton?: boolean; + + /** + * Default `true`. If `true`, the environment after creation will be selected. + */ + selectEnvironment?: boolean; +} +``` + +usage: `await vscode.commands.executeCommand('python-envs.createAny', options);` ## Extension Dependency -This section provides an overview of how the Python extension interacts with the Python Environments extension and other tool-specific extensions. The Python Environments extension allows users to create, manage, and remove Python environments and packages. It also provides an API that other extensions can use to support environment management or consume it for running Python tools or projects. +This section provides an overview of how the Python extension interacts with the Python Environments extension and other tool-specific extensions. The Python Environments extension allows users to create, manage, and remove Python environments and packages. It also provides an API that other extensions can use to support environment management or consume it for running Python tools or projects. Tools that may rely on these APIs in their own extensions include: -- **Debuggers** (e.g., `debugpy`) -- **Linters** (e.g., Pylint, Flake8, Mypy) -- **Formatters** (e.g., Black, autopep8) -- **Language Server extensions** (e.g., Pylance, Jedi) -- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) + +- **Debuggers** (e.g., `debugpy`) +- **Linters** (e.g., Pylint, Flake8, Mypy) +- **Formatters** (e.g., Black, autopep8) +- **Language Server extensions** (e.g., Pylance, Jedi) +- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) ### API Dependency + The relationship between these extensions can be represented as follows: @@ -75,7 +99,7 @@ Users who do not need to execute code or work in **Virtual Workspaces** can use ### Trust Relationship Between Python and Python Environments Extensions -VS Code supports trust management, allowing extensions to function in either **trusted** or **untrusted** scenarios. Code execution and tools that can modify the user’s environment are typically unavailable in untrusted scenarios. +VS Code supports trust management, allowing extensions to function in either **trusted** or **untrusted** scenarios. Code execution and tools that can modify the user’s environment are typically unavailable in untrusted scenarios. The relationship is illustrated below: diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index b96c0b4..893b4b7 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -21,6 +21,7 @@ function getDescription(mgr: InternalEnvironmentManager | InternalPackageManager export async function pickEnvironmentManager( managers: InternalEnvironmentManager[], defaultManagers?: InternalEnvironmentManager[], + showBackButton?: boolean, ): Promise { if (managers.length === 0) { return; @@ -72,6 +73,7 @@ export async function pickEnvironmentManager( const item = await showQuickPickWithButtons(items, { placeHolder: Pickers.Managers.selectEnvironmentManager, ignoreFocusOut: true, + showBackButton, }); return (item as QuickPickItem & { id: string })?.id; } diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index fa0d9c4..3417a31 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -115,7 +115,7 @@ export async function createEnvironmentCommand( export async function createAnyEnvironmentCommand( em: EnvironmentManagers, pm: PythonProjectManager, - options?: CreateEnvironmentOptions & { selectEnvironment: boolean }, + options?: CreateEnvironmentOptions & { selectEnvironment?: boolean; showBackButton?: boolean }, ): Promise { const select = options?.selectEnvironment; const projects = pm.getProjects(); @@ -130,7 +130,7 @@ export async function createAnyEnvironmentCommand( return env; } } else if (projects.length > 0) { - const selected = await pickProjectMany(projects); + const selected = await pickProjectMany(projects, options?.showBackButton); if (selected && selected.length > 0) { const defaultManagers: InternalEnvironmentManager[] = []; @@ -151,6 +151,7 @@ export async function createAnyEnvironmentCommand( let managerId = await pickEnvironmentManager( em.managers.filter((m) => m.supportsCreate), defaultManagers, + options?.showBackButton, ); if (managerId?.startsWith('QuickCreate#')) { quickCreate = true; From 047eb91b14199384dd9f5091f57a867f4158022a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 22 Apr 2025 09:32:40 -0700 Subject: [PATCH 124/328] fix: ensure path input to copilot tools correctly converted to URI (#322) fixes https://github.com/microsoft/vscode-python-environments/issues/320 --- src/common/utils/pathUtils.ts | 26 ++++- src/features/copilotTools.ts | 11 ++- src/test/common/pathUtils.unit.test.ts | 131 +++++++++++++++++++++++++ src/test/copilotTools.unit.test.ts | 7 +- 4 files changed, 167 insertions(+), 8 deletions(-) create mode 100644 src/test/common/pathUtils.unit.test.ts diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index 81b6152..ade0633 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -1,3 +1,4 @@ +import * as path from 'path'; import { Uri } from 'vscode'; import { isWindows } from '../../managers/common/utils'; @@ -19,10 +20,31 @@ export function checkUri(scope?: Uri | Uri[] | string): Uri | Uri[] | string | u return scope; } -export function normalizePath(path: string): string { - const path1 = path.replace(/\\/g, '/'); +export function normalizePath(fsPath: string): string { + const path1 = fsPath.replace(/\\/g, '/'); if (isWindows()) { return path1.toLowerCase(); } return path1; } + +export function getResourceUri(resourcePath: string, root?: string): Uri | undefined { + try { + if (!resourcePath) { + return undefined; + } + + const normalizedPath = normalizePath(resourcePath); + if (normalizedPath.includes('://')) { + return Uri.parse(normalizedPath); + } + + if (!path.isAbsolute(resourcePath) && root) { + const absolutePath = path.resolve(root, resourcePath); + return Uri.file(absolutePath); + } + return Uri.file(resourcePath); + } catch (_err) { + return undefined; + } +} diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts index 143858f..c94455c 100644 --- a/src/features/copilotTools.ts +++ b/src/features/copilotTools.ts @@ -15,9 +15,11 @@ import { PythonPackageGetterApi, PythonPackageManagementApi, PythonProjectEnvironmentApi, + PythonProjectGetterApi, } from '../api'; import { createDeferred } from '../common/utils/deferred'; import { EnvironmentManagers } from '../internal.api'; +import { getResourceUri } from '../common/utils/pathUtils'; export interface IResourceReference { resourcePath?: string; @@ -35,7 +37,7 @@ interface EnvironmentInfo { */ export class GetEnvironmentInfoTool implements LanguageModelTool { constructor( - private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi, + private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonProjectGetterApi, private readonly envManagers: EnvironmentManagers, ) {} /** @@ -59,7 +61,12 @@ export class GetEnvironmentInfoTool implements LanguageModelTool 0 ? projects[0].uri.fsPath : undefined; + const resourcePath: Uri | undefined = getResourceUri(parameters.resourcePath, root); + if (!resourcePath) { + throw new Error('Invalid input: Unable to resolve resource path'); + } // environment info set to default values const envInfo: EnvironmentInfo = { diff --git a/src/test/common/pathUtils.unit.test.ts b/src/test/common/pathUtils.unit.test.ts new file mode 100644 index 0000000..3e0739d --- /dev/null +++ b/src/test/common/pathUtils.unit.test.ts @@ -0,0 +1,131 @@ +import assert from 'node:assert'; +import * as sinon from 'sinon'; +import { Uri } from 'vscode'; +import { getResourceUri, normalizePath } from '../../common/utils/pathUtils'; +import * as utils from '../../managers/common/utils'; + +suite('Path Utilities', () => { + suite('getResourceUri', () => { + const testRoot = process.cwd(); + + test('returns undefined when path is empty', () => { + const result = getResourceUri('', testRoot); + assert.strictEqual(result, undefined); + }); + + test('returns undefined when path is undefined', () => { + // @ts-ignore: Testing with undefined even though the type doesn't allow it + const result = getResourceUri(undefined, testRoot); + assert.strictEqual(result, undefined); + }); + test('creates file URI from normal file path', () => { + const testPath = '/path/to/file.txt'; + const result = getResourceUri(testPath, testRoot); + + assert.ok(result instanceof Uri); + assert.strictEqual(result?.scheme, 'file'); + assert.strictEqual(result?.path, testPath); + }); + + test('creates file URI from Windows path', function () { + if (!utils.isWindows()) { + this.skip(); + } + const testPath = 'C:\\path\\to\\file.txt'; + const result = getResourceUri(testPath, testRoot); + + assert.ok(result instanceof Uri); + assert.strictEqual(result?.scheme, 'file'); + assert.strictEqual(result?.path, '/C:/path/to/file.txt'); + }); + + test('parses existing URI correctly', () => { + const uriString = 'scheme://authority/path'; + const result = getResourceUri(uriString, testRoot); + + assert.ok(result instanceof Uri); + assert.strictEqual(result?.scheme, 'scheme'); + assert.strictEqual(result?.authority, 'authority'); + assert.strictEqual(result?.path, '/path'); + }); + + test('handles exception and returns undefined', () => { + // Create a scenario that would cause an exception + // For this test, we'll mock Uri.file to throw an error + const originalUriFile = Uri.file; + Uri.file = () => { + throw new Error('Test error'); + }; + try { + const result = getResourceUri('some-path', testRoot); + assert.strictEqual(result, undefined); + } finally { + // Restore the original function + Uri.file = originalUriFile; + } + }); + + test('handles relative paths by resolving against the provided root', () => { + const path = require('path'); + + // Use a relative path + const relativePath = './relative/path/file.txt'; + const customRoot = path.join(testRoot, 'custom/root'); + + const result = getResourceUri(relativePath, customRoot); + + assert.ok(result instanceof Uri); + assert.strictEqual(result?.scheme, 'file'); + // The resulting path should be resolved against the custom root + assert.ok( + result!.fsPath.replace(/\\/g, '/').toLowerCase().endsWith('relative/path/file.txt'), + `Expected path to end with the relative path segment, but got: ${result!.fsPath}`, + ); + + // Verify the path contains the custom root + const normalizedResult = result!.fsPath.replace(/\\/g, '/').toLowerCase(); + const normalizedRoot = customRoot.replace(/\\/g, '/').toLowerCase(); + assert.ok( + normalizedResult.includes(normalizedRoot), + `Expected path to include the custom root "${normalizedRoot}", but got: ${normalizedResult}`, + ); + }); + }); + + suite('normalizePath', () => { + let isWindowsStub: sinon.SinonStub; + + setup(() => { + isWindowsStub = sinon.stub(utils, 'isWindows'); + }); + + teardown(() => { + sinon.restore(); + }); + test('replaces backslashes with forward slashes', () => { + const testPath = 'C:\\path\\to\\file.txt'; + const result = normalizePath(testPath); + + assert.strictEqual(result.includes('\\'), false); + assert.strictEqual(result, 'C:/path/to/file.txt'); + }); + + test('converts to lowercase on Windows', () => { + isWindowsStub.returns(true); + + const testPath = 'C:/Path/To/File.txt'; + const result = normalizePath(testPath); + + assert.strictEqual(result, 'c:/path/to/file.txt'); + }); + + test('preserves case on non-Windows', () => { + isWindowsStub.returns(false); + + const testPath = 'C:/Path/To/File.txt'; + const result = normalizePath(testPath); + + assert.strictEqual(result, 'C:/Path/To/File.txt'); + }); + }); +}); diff --git a/src/test/copilotTools.unit.test.ts b/src/test/copilotTools.unit.test.ts index 03eb936..f416767 100644 --- a/src/test/copilotTools.unit.test.ts +++ b/src/test/copilotTools.unit.test.ts @@ -10,6 +10,7 @@ import { PythonPackageGetterApi, PythonPackageManagementApi, PythonProjectEnvironmentApi, + PythonProjectGetterApi, } from '../api'; import { createDeferred } from '../common/utils/deferred'; import { @@ -239,16 +240,14 @@ suite('InstallPackageTool Tests', () => { suite('GetEnvironmentInfoTool Tests', () => { let getEnvironmentInfoTool: GetEnvironmentInfoTool; - let mockApi: typeMoq.IMock; + let mockApi: typeMoq.IMock; let mockEnvironment: typeMoq.IMock; let em: typeMoq.IMock; let managerSys: typeMoq.IMock; setup(() => { // Create mock functions - mockApi = typeMoq.Mock.ofType< - PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi - >(); + mockApi = typeMoq.Mock.ofType(); mockEnvironment = typeMoq.Mock.ofType(); // eslint-disable-next-line @typescript-eslint/no-explicit-any From fd17e1d7ec250b13b7a62c04583662fbdfc3bbb4 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 23 Apr 2025 15:52:58 +1000 Subject: [PATCH 125/328] Update tool names and args (#332) --- package.json | 10 +++++----- src/extension.ts | 4 ++-- src/features/copilotTools.ts | 4 ++-- src/test/copilotTools.unit.test.ts | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 69cd4ec..0b42bb9 100644 --- a/package.json +++ b/package.json @@ -487,7 +487,7 @@ ], "languageModelTools": [ { - "name": "python_environment_tool", + "name": "python_environment", "displayName": "Get Python Environment Information", "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions.", "toolReferenceName": "pythonGetEnvironmentInfo", @@ -508,7 +508,7 @@ } }, { - "name": "python_install_package_tool", + "name": "python_install_package", "displayName": "Install Python Package", "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", "toolReferenceName": "pythonInstallPackage", @@ -525,14 +525,14 @@ }, "description": "The list of packages to install." }, - "workspacePath": { + "resourcePath": { "type": "string", - "description": "Path to Python workspace that determines the environment for package installation." + "description": "The path to the Python file or workspace to get the environment information for." } }, "required": [ "packageList", - "workspacePath" + "resourcePath" ] } } diff --git a/src/extension.ts b/src/extension.ts index ff73ab2..226e482 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -108,8 +108,8 @@ export async function activate(context: ExtensionContext): Promise outputChannel.show()), commands.registerCommand('python-envs.refreshManager', async (item) => { await refreshManagerCommand(item); diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts index c94455c..257d6a2 100644 --- a/src/features/copilotTools.ts +++ b/src/features/copilotTools.ts @@ -164,7 +164,7 @@ function BuildEnvironmentInfoContent(envInfo: EnvironmentInfo): LanguageModelTex */ export interface IInstallPackageInput { packageList: string[]; - workspacePath?: string; + resourcePath?: string; } /** @@ -192,7 +192,7 @@ export class InstallPackageTool implements LanguageModelTool { test('should throw error if workspacePath is an empty string', async () => { const testFile: IInstallPackageInput = { - workspacePath: '', + resourcePath: '', packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; @@ -61,7 +61,7 @@ suite('InstallPackageTool Tests', () => { mockEnvironment.setup((x: any) => x.then).returns(() => undefined); const testFile: IInstallPackageInput = { - workspacePath: 'this/is/a/test/path.ipynb', + resourcePath: 'this/is/a/test/path.ipynb', packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; @@ -75,7 +75,7 @@ suite('InstallPackageTool Tests', () => { test('should throw error for notebook cells', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'this/is/a/test/path.ipynb#cell', + resourcePath: 'this/is/a/test/path.ipynb#cell', packageList: ['package1', 'package2'], }; const options = { input: testFile, toolInvocationToken: undefined }; @@ -89,7 +89,7 @@ suite('InstallPackageTool Tests', () => { test('should throw error if packageList passed in is empty', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: [], }; @@ -102,7 +102,7 @@ suite('InstallPackageTool Tests', () => { test('should handle cancellation', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: ['package1', 'package2'], }; @@ -131,7 +131,7 @@ suite('InstallPackageTool Tests', () => { test('should handle packages installation', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: ['package1', 'package2'], }; @@ -162,7 +162,7 @@ suite('InstallPackageTool Tests', () => { }); test('should handle package installation failure', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: ['package1', 'package2'], }; @@ -195,7 +195,7 @@ suite('InstallPackageTool Tests', () => { }); test('should handle error occurs when getting environment', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: ['package1', 'package2'], }; mockApi @@ -213,7 +213,7 @@ suite('InstallPackageTool Tests', () => { }); test('correct plurality in package installation message', async () => { const testFile: IInstallPackageInput = { - workspacePath: 'path/to/workspace', + resourcePath: 'path/to/workspace', packageList: ['package1'], }; mockApi From 8dc90f2a580ae3ceb47792a4e7db405e6d32a2e3 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 23 Apr 2025 15:53:07 +1000 Subject: [PATCH 126/328] Include .nvmrc, commonly used in vscode & VSCode extensions (#333) --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..2a393af --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20.18.0 From cbc2b1112438b8435bb830128b74aeef0afe9a49 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 24 Apr 2025 08:53:43 -0700 Subject: [PATCH 127/328] add project quickPick (#335) --- src/api.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api.ts b/src/api.ts index 924d955..762b0dd 100644 --- a/src/api.ts +++ b/src/api.ts @@ -667,9 +667,14 @@ export interface PythonProjectCreatorOptions { name: string; /** - * Optional path that may be provided as a root for the project. + * Path provided as the root for the project. */ - uri?: Uri; + rootUri: Uri; + + /** + * Boolean indicating whether the project should be created without any user input. + */ + quickCreate?: boolean; } /** @@ -701,6 +706,11 @@ export interface PythonProjectCreator { */ readonly iconPath?: IconPath; + /** + * A flag indicating whether the project creator supports quick create where no user input is required. + */ + readonly supportsQuickCreate?: boolean; + /** * Creates a new Python project or projects. * @param options - Optional parameters for creating the Python project. From cf322e4f4aaea2f0cfd19b6ec76c2a6ba82f66fe Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 24 Apr 2025 09:50:53 -0700 Subject: [PATCH 128/328] Add startup activation (#196) Fixes https://github.com/microsoft/vscode-python-environments/issues/201 Fixes https://github.com/microsoft/vscode-python-environments/issues/200 Fixes https://github.com/microsoft/vscode-python-environments/issues/227 Fixes https://github.com/microsoft/vscode-python-environments/issues/231 --- .vscode/launch.json | 6 +- .vscode/settings.json | 10 +- .vscode/tasks.json | 11 +- package.json | 22 ++ package.nls.json | 5 + src/common/command.api.ts | 5 + src/common/commands.ts | 3 + src/common/errors/utils.ts | 11 +- src/common/localize.ts | 16 + src/common/pickers/environments.ts | 2 +- src/common/utils/pathUtils.ts | 11 +- src/common/utils/platformUtils.ts | 3 + src/common/utils/pythonPath.ts | 2 +- src/common/window.apis.ts | 39 +++ src/extension.ts | 108 +++--- src/features/common/activation.ts | 51 +-- src/features/common/shellConstants.ts | 15 + src/features/common/shellDetector.ts | 51 +-- src/features/creators/autoFindProjects.ts | 3 +- src/features/envCommands.ts | 4 +- src/features/terminal/runInTerminal.ts | 3 +- .../shellStartupActivationVariablesManager.ts | 112 ++++++ .../terminal/shellStartupSetupHandlers.ts | 69 ++++ .../terminal/shells/bash/bashConstants.ts | 3 + src/features/terminal/shells/bash/bashEnvs.ts | 96 +++++ .../terminal/shells/bash/bashStartup.ts | 299 ++++++++++++++++ .../terminal/shells/cmd/cmdConstants.ts | 2 + src/features/terminal/shells/cmd/cmdEnvs.ts | 50 +++ .../terminal/shells/cmd/cmdStartup.ts | 316 +++++++++++++++++ .../terminal/shells/common/editUtils.ts | 78 +++++ .../terminal/shells/common/shellUtils.ts | 94 +++++ .../terminal/shells/fish/fishConstants.ts | 2 + src/features/terminal/shells/fish/fishEnvs.ts | 50 +++ .../terminal/shells/fish/fishStartup.ts | 155 +++++++++ src/features/terminal/shells/providers.ts | 45 +++ .../terminal/shells/pwsh/pwshConstants.ts | 2 + src/features/terminal/shells/pwsh/pwshEnvs.ts | 51 +++ .../terminal/shells/pwsh/pwshStartup.ts | 319 +++++++++++++++++ .../terminal/shells/startupProvider.ts | 30 ++ src/features/terminal/shells/utils.ts | 15 + .../terminal/terminalActivationState.ts | 45 +-- src/features/terminal/terminalManager.ts | 230 +++++++++--- src/features/terminal/utils.ts | 41 ++- src/managers/builtin/pipUtils.ts | 3 +- src/managers/builtin/utils.ts | 4 +- src/managers/builtin/venvManager.ts | 3 +- src/managers/builtin/venvUtils.ts | 70 ++-- src/managers/common/nativePythonFinder.ts | 4 +- src/managers/common/pickers.ts | 2 +- src/managers/common/types.ts | 45 +++ src/managers/common/utils.ts | 59 +--- src/managers/conda/condaEnvManager.ts | 87 +++-- src/managers/conda/condaPackageManager.ts | 10 +- src/managers/conda/condaUtils.ts | 329 +++++++++++++++--- src/test/common/pathUtils.unit.test.ts | 2 +- .../common/shellDetector.unit.test.ts | 31 +- .../creators/autoFindProjects.unit.test.ts | 4 +- .../shells/common/editUtils.unit.test.ts | 237 +++++++++++++ .../shells/common/shellUtils.unit.test.ts | 80 +++++ 59 files changed, 3052 insertions(+), 403 deletions(-) create mode 100644 src/common/commands.ts create mode 100644 src/common/utils/platformUtils.ts create mode 100644 src/features/common/shellConstants.ts create mode 100644 src/features/terminal/shellStartupActivationVariablesManager.ts create mode 100644 src/features/terminal/shellStartupSetupHandlers.ts create mode 100644 src/features/terminal/shells/bash/bashConstants.ts create mode 100644 src/features/terminal/shells/bash/bashEnvs.ts create mode 100644 src/features/terminal/shells/bash/bashStartup.ts create mode 100644 src/features/terminal/shells/cmd/cmdConstants.ts create mode 100644 src/features/terminal/shells/cmd/cmdEnvs.ts create mode 100644 src/features/terminal/shells/cmd/cmdStartup.ts create mode 100644 src/features/terminal/shells/common/editUtils.ts create mode 100644 src/features/terminal/shells/common/shellUtils.ts create mode 100644 src/features/terminal/shells/fish/fishConstants.ts create mode 100644 src/features/terminal/shells/fish/fishEnvs.ts create mode 100644 src/features/terminal/shells/fish/fishStartup.ts create mode 100644 src/features/terminal/shells/providers.ts create mode 100644 src/features/terminal/shells/pwsh/pwshConstants.ts create mode 100644 src/features/terminal/shells/pwsh/pwshEnvs.ts create mode 100644 src/features/terminal/shells/pwsh/pwshStartup.ts create mode 100644 src/features/terminal/shells/startupProvider.ts create mode 100644 src/features/terminal/shells/utils.ts create mode 100644 src/managers/common/types.ts create mode 100644 src/test/features/terminal/shells/common/editUtils.unit.test.ts create mode 100644 src/test/features/terminal/shells/common/shellUtils.unit.test.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index 0536c79..af8e230 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,7 +11,7 @@ "request": "launch", "args": ["--extensionDevelopmentPath=${workspaceFolder}"], "outFiles": ["${workspaceFolder}/dist/**/*.js"], - "preLaunchTask": "${defaultBuildTask}" + "preLaunchTask": "npm: watch" }, { "name": "Unit Tests", @@ -30,7 +30,7 @@ "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", "skipFiles": ["/**"], "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"], - "preLaunchTask": "tasks: watch-tests" + "preLaunchTask": "npm: watch-tests" }, { "name": "Extension Tests", @@ -41,7 +41,7 @@ "--extensionTestsPath=${workspaceFolder}/out/test/" ], "outFiles": ["${workspaceFolder}/out/**/*.js", "${workspaceFolder}/dist/**/*.js"], - "preLaunchTask": "tasks: watch-tests" + "preLaunchTask": "${defaultBuildTask}" } ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 20a4c9f..1a8790c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,11 +12,17 @@ "typescript.tsc.autoDetect": "off", "editor.formatOnSave": true, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + } }, "[python]": { "editor.defaultFormatter": "charliermarsh.ruff", - "diffEditor.ignoreTrimWhitespace": false + "diffEditor.ignoreTrimWhitespace": false, + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + } }, "prettier.tabWidth": 4, "python-envs.defaultEnvManager": "ms-python.python:venv", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bdda214..1719917 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -25,13 +25,16 @@ "presentation": { "reveal": "never", "group": "watchers" - }, - "group": "build" + } }, { - "label": "tasks: watch-tests", + "label": "tasks: build", "dependsOn": ["npm: watch", "npm: watch-tests"], - "problemMatcher": [] + "problemMatcher": [], + "presentation": { + "reveal": "never", + "group": "watchers" + } }, { "type": "npm", diff --git a/package.json b/package.json index 0b42bb9..1c413ab 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,22 @@ "onExP", "preview" ] + }, + "python-envs.terminal.autoActivationType": { + "type": "string", + "markdownDescription": "%python-envs.terminal.autoActivationType.description%", + "default": "command", + "enum": [ + "command", + "shellStartup", + "off" + ], + "markdownEnumDescriptions": [ + "%python-envs.terminal.autoActivationType.command%", + "%python-envs.terminal.autoActivationType.shellStartup%", + "%python-envs.terminal.autoActivationType.off%" + ], + "scope": "machine" } } }, @@ -228,6 +244,12 @@ "title": "%python-envs.copyProjectPath.title%", "category": "Python Envs", "icon": "$(copy)" + }, + { + "command": "python-envs.terminal.revertStartupScriptChanges", + "title": "%python-envs.terminal.revertStartupScriptChanges.title%", + "category": "Python Envs", + "icon": "$(discard)" } ], "menus": { diff --git a/package.nls.json b/package.nls.json index f170c24..667663a 100644 --- a/package.nls.json +++ b/package.nls.json @@ -6,6 +6,11 @@ "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", + "python-envs.terminal.autoActivationType.description": "The type of activation to use when activating an environment in the terminal", + "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.", + "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", + "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", + "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", "python-envs.addPythonProject.title": "Add Python Project", diff --git a/src/common/command.api.ts b/src/common/command.api.ts index 3fece44..4d1e2b5 100644 --- a/src/common/command.api.ts +++ b/src/common/command.api.ts @@ -1,5 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { commands } from 'vscode'; +import { Disposable } from 'vscode-jsonrpc'; + +export function registerCommand(command: string, callback: (...args: any[]) => any, thisArg?: any): Disposable { + return commands.registerCommand(command, callback, thisArg); +} export function executeCommand(command: string, ...rest: any[]): Thenable { return commands.executeCommand(command, ...rest); diff --git a/src/common/commands.ts b/src/common/commands.ts new file mode 100644 index 0000000..2b9bd98 --- /dev/null +++ b/src/common/commands.ts @@ -0,0 +1,3 @@ +export namespace Commands { + export const viewLogs = 'python-envs.viewLogs'; +} diff --git a/src/common/errors/utils.ts b/src/common/errors/utils.ts index b7e7abd..023467b 100644 --- a/src/common/errors/utils.ts +++ b/src/common/errors/utils.ts @@ -1,6 +1,7 @@ import * as stackTrace from 'stack-trace'; -import { commands, LogOutputChannel, window } from 'vscode'; +import { commands, LogOutputChannel } from 'vscode'; import { Common } from '../localize'; +import { showErrorMessage, showWarningMessage } from '../window.apis'; export function parseStack(ex: Error) { if (ex.stack && Array.isArray(ex.stack)) { @@ -10,8 +11,8 @@ export function parseStack(ex: Error) { return stackTrace.parse.call(stackTrace, ex); } -export async function showErrorMessage(message: string, log?: LogOutputChannel) { - const result = await window.showErrorMessage(message, Common.viewLogs); +export async function showErrorMessageWithLogs(message: string, log?: LogOutputChannel) { + const result = await showErrorMessage(message, Common.viewLogs); if (result === Common.viewLogs) { if (log) { log.show(); @@ -21,8 +22,8 @@ export async function showErrorMessage(message: string, log?: LogOutputChannel) } } -export async function showWarningMessage(message: string, log?: LogOutputChannel) { - const result = await window.showWarningMessage(message, Common.viewLogs); +export async function showWarningMessageWithLogs(message: string, log?: LogOutputChannel) { + const result = await showWarningMessage(message, Common.viewLogs); if (result === Common.viewLogs) { if (log) { log.show(); diff --git a/src/common/localize.ts b/src/common/localize.ts index c21e3cb..ae509bc 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -1,4 +1,5 @@ import { l10n } from 'vscode'; +import { Commands } from './commands'; export namespace Common { export const recommended = l10n.t('Recommended'); @@ -11,7 +12,9 @@ export namespace Common { export const viewLogs = l10n.t('View Logs'); export const yes = l10n.t('Yes'); export const no = l10n.t('No'); + export const ok = l10n.t('Ok'); export const quickCreate = l10n.t('Quick Create'); + export const installPython = l10n.t('Install Python'); } export namespace Interpreter { @@ -138,6 +141,11 @@ export namespace CondaStrings { export const quickCreateCondaNoEnvRoot = l10n.t('No conda environment root found'); export const quickCreateCondaNoName = l10n.t('Could not generate a name for env'); + + export const condaMissingPython = l10n.t('No Python found in the selected conda environment'); + export const condaMissingPythonNoFix = l10n.t( + 'No Python found in the selected conda environment. Please select another environment or install Python manually.', + ); } export namespace ProjectCreatorString { @@ -156,3 +164,11 @@ export namespace EnvViewStrings { export const selectedGlobalTooltip = l10n.t('This environment is selected for non-workspace files'); export const selectedWorkspaceTooltip = l10n.t('This environment is selected for workspace files'); } + +export namespace ShellStartupActivationStrings { + export const envCollectionDescription = l10n.t('Environment variables for shell activation'); + export const revertedShellStartupScripts = l10n.t( + 'Removed shell startup profile code for Python environment activation. See [logs](command:{0})', + Commands.viewLogs, + ); +} diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index af0afe3..058e1ad 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -3,10 +3,10 @@ import { IconPath, PythonEnvironment, PythonProject } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; import { Common, Interpreter, Pickers } from '../localize'; import { showQuickPickWithButtons, showQuickPick, showOpenDialog, withProgress } from '../window.apis'; -import { isWindows } from '../../managers/common/utils'; import { traceError } from '../logging'; import { pickEnvironmentManager } from './managers'; import { handlePythonPath } from '../utils/pythonPath'; +import { isWindows } from '../utils/platformUtils'; type QuickPickIcon = | Uri diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index ade0633..205f504 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -1,6 +1,7 @@ +import * as os from 'os'; import * as path from 'path'; import { Uri } from 'vscode'; -import { isWindows } from '../../managers/common/utils'; +import { isWindows } from './platformUtils'; export function checkUri(scope?: Uri | Uri[] | string): Uri | Uri[] | string | undefined { if (scope instanceof Uri) { @@ -48,3 +49,11 @@ export function getResourceUri(resourcePath: string, root?: string): Uri | undef return undefined; } } + +export function untildify(path: string): string { + return path.replace(/^~($|\/|\\)/, `${os.homedir()}$1`); +} + +export function getUserHomeDir(): string { + return os.homedir(); +} diff --git a/src/common/utils/platformUtils.ts b/src/common/utils/platformUtils.ts new file mode 100644 index 0000000..bc11fd8 --- /dev/null +++ b/src/common/utils/platformUtils.ts @@ -0,0 +1,3 @@ +export function isWindows(): boolean { + return process.platform === 'win32'; +} diff --git a/src/common/utils/pythonPath.ts b/src/common/utils/pythonPath.ts index bdc469e..33e6f6a 100644 --- a/src/common/utils/pythonPath.ts +++ b/src/common/utils/pythonPath.ts @@ -1,9 +1,9 @@ import { Uri, Progress, CancellationToken } from 'vscode'; import { PythonEnvironment } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; -import { showErrorMessage } from '../errors/utils'; import { traceVerbose, traceError } from '../logging'; import { PYTHON_EXTENSION_ID } from '../constants'; +import { showErrorMessage } from '../window.apis'; const priorityOrder = [ `${PYTHON_EXTENSION_ID}:pyenv`, diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index 892a3a3..d01ac07 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -29,6 +29,7 @@ import { TextEditor, Uri, window, + WindowState, } from 'vscode'; import { createDeferred } from './utils/deferred'; @@ -286,6 +287,36 @@ export async function showInputBoxWithButtons( } } +export function showInformationMessage(message: string, ...items: T[]): Thenable; +export function showInformationMessage(message: string, ...items: T[]): Thenable; +export function showInformationMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable; +export function showInformationMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable { + return window.showInformationMessage(message, options, ...items); +} + +export function showErrorMessage(message: string, ...items: T[]): Thenable; +export function showErrorMessage(message: string, ...items: T[]): Thenable; +export function showErrorMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable; +export function showErrorMessage( + message: string, + options: MessageOptions, + ...items: T[] +): Thenable { + return window.showErrorMessage(message, options, ...items); +} + export function showWarningMessage(message: string, ...items: T[]): Thenable; export function showWarningMessage( message: string, @@ -317,3 +348,11 @@ export function createLogOutputChannel(name: string): LogOutputChannel { export function registerFileDecorationProvider(provider: FileDecorationProvider): Disposable { return window.registerFileDecorationProvider(provider); } + +export function onDidChangeWindowState( + listener: (e: WindowState) => any, + thisArgs?: any, + disposables?: Disposable[], +): Disposable { + return window.onDidChangeWindowState(listener, thisArgs, disposables); +} diff --git a/src/extension.ts b/src/extension.ts index 226e482..c2630f5 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,62 +1,70 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode'; -import { PythonEnvironmentManagers } from './features/envManagers'; +import { PythonEnvironment, PythonEnvironmentApi } from './api'; +import { ensureCorrectVersion } from './common/extVersion'; +import { registerTools } from './common/lm.apis'; import { registerLogger, traceError, traceInfo } from './common/logging'; -import { EnvManagerView } from './features/views/envManagersView'; +import { setPersistentState } from './common/persistentState'; +import { StopWatch } from './common/stopWatch'; +import { EventNames } from './common/telemetry/constants'; +import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; +import { sendTelemetryEvent } from './common/telemetry/sender'; +import { + activeTerminal, + createLogOutputChannel, + onDidChangeActiveTerminal, + onDidChangeActiveTextEditor, + onDidChangeTerminalShellIntegration, +} from './common/window.apis'; +import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; +import { AutoFindProjects } from './features/creators/autoFindProjects'; +import { ExistingProjects } from './features/creators/existingProjects'; +import { ProjectCreatorsImpl } from './features/creators/projectCreators'; import { addPythonProject, + copyPathToClipboard, + createAnyEnvironmentCommand, createEnvironmentCommand, createTerminalCommand, getPackageCommandOptions, + handlePackageUninstall, refreshManagerCommand, + refreshPackagesCommand, removeEnvironmentCommand, removePythonProject, + resetEnvironmentCommand, runAsTaskCommand, + runInDedicatedTerminalCommand, runInTerminalCommand, - setEnvManagerCommand, setEnvironmentCommand, + setEnvManagerCommand, setPackageManagerCommand, - resetEnvironmentCommand, - refreshPackagesCommand, - createAnyEnvironmentCommand, - runInDedicatedTerminalCommand, - handlePackageUninstall, - copyPathToClipboard, } from './features/envCommands'; -import { registerCondaFeatures } from './managers/conda/main'; -import { registerSystemPythonFeatures } from './managers/builtin/main'; +import { PythonEnvironmentManagers } from './features/envManagers'; +import { EnvVarManager, PythonEnvVariableManager } from './features/execution/envVariableManager'; import { PythonProjectManagerImpl } from './features/projectManager'; -import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { getPythonApi, setPythonApi } from './features/pythonApi'; -import { setPersistentState } from './common/persistentState'; -import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; -import { PythonEnvironment, PythonEnvironmentApi } from './api'; -import { ProjectCreatorsImpl } from './features/creators/projectCreators'; -import { ProjectView } from './features/views/projectView'; import { registerCompletionProvider } from './features/settings/settingCompletions'; -import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; -import { - activeTerminal, - createLogOutputChannel, - onDidChangeActiveTerminal, - onDidChangeActiveTextEditor, - onDidChangeTerminalShellIntegration, -} from './common/window.apis'; import { setActivateMenuButtonContext } from './features/terminal/activateMenuButton'; -import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; -import { updateViewsAndStatus } from './features/views/revealHandler'; -import { EnvVarManager, PythonEnvVariableManager } from './features/execution/envVariableManager'; -import { StopWatch } from './common/stopWatch'; -import { sendTelemetryEvent } from './common/telemetry/sender'; -import { EventNames } from './common/telemetry/constants'; -import { ensureCorrectVersion } from './common/extVersion'; -import { ExistingProjects } from './features/creators/existingProjects'; -import { AutoFindProjects } from './features/creators/autoFindProjects'; -import { registerTools } from './common/lm.apis'; -import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; +import { normalizeShellPath } from './features/terminal/shells/common/shellUtils'; +import { + clearShellProfileCache, + createShellEnvProviders, + createShellStartupProviders, +} from './features/terminal/shells/providers'; +import { ShellStartupActivationVariablesManagerImpl } from './features/terminal/shellStartupActivationVariablesManager'; +import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHandlers'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; +import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; import { getEnvironmentForTerminal } from './features/terminal/utils'; -import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; +import { EnvManagerView } from './features/views/envManagersView'; +import { ProjectView } from './features/views/projectView'; +import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; +import { updateViewsAndStatus } from './features/views/revealHandler'; +import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; +import { registerSystemPythonFeatures } from './managers/builtin/main'; +import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; +import { registerCondaFeatures } from './managers/conda/main'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -83,8 +91,19 @@ export async function activate(context: ExtensionContext): Promise(); @@ -110,6 +128,9 @@ export async function activate(context: ExtensionContext): Promise { + await cleanupStartupScripts(shellStartupProviders); + }), commands.registerCommand('python-envs.viewLogs', () => outputChannel.show()), commands.registerCommand('python-envs.refreshManager', async (item) => { await refreshManagerCommand(item); @@ -172,6 +193,7 @@ export async function activate(context: ExtensionContext): Promise { await envManagers.clearCache(undefined); + await clearShellProfileCache(shellStartupProviders); }), commands.registerCommand('python-envs.runInTerminal', (item) => { return runInTerminalCommand(item, api, terminalManager); @@ -242,7 +264,8 @@ export async function activate(context: ExtensionContext): Promise([ - ['pwsh', IS_POWERSHELL], - ['gitbash', IS_GITBASH], - ['bash', IS_BASH], - ['wsl', IS_WSL], - ['zsh', IS_ZSH], - ['ksh', IS_KSH], - ['cmd', IS_COMMAND], - ['fish', IS_FISH], - ['tcsh', IS_TCSHELL], - ['csh', IS_CSHELL], - ['nu', IS_NUSHELL], - ['xonsh', IS_XONSH], + [ShellConstants.PWSH, IS_POWERSHELL], + [ShellConstants.GITBASH, IS_GITBASH], + [ShellConstants.BASH, IS_BASH], + [ShellConstants.WSL, IS_WSL], + [ShellConstants.ZSH, IS_ZSH], + [ShellConstants.KSH, IS_KSH], + [ShellConstants.CMD, IS_COMMAND], + [ShellConstants.FISH, IS_FISH], + [ShellConstants.TCSH, IS_TCSHELL], + [ShellConstants.CSH, IS_CSHELL], + [ShellConstants.NU, IS_NUSHELL], + [ShellConstants.XONSH, IS_XONSH], ]); function identifyShellFromShellPath(shellPath: string): string { @@ -62,10 +63,10 @@ function identifyShellFromShellPath(shellPath: string): string { } function identifyShellFromTerminalName(terminal: Terminal): string { - if (terminal.name === 'sh') { + if (terminal.name === ShellConstants.SH) { // Specifically checking this because other shells have `sh` at the end of their name // We can match and return bash for this case - return 'bash'; + return ShellConstants.BASH; } return identifyShellFromShellPath(terminal.name); } @@ -124,20 +125,20 @@ function identifyShellFromSettings(): string { function fromShellTypeApi(terminal: Terminal): string { try { const known = [ - 'bash', - 'cmd', - 'csh', - 'fish', - 'gitbash', + ShellConstants.BASH, + ShellConstants.CMD, + ShellConstants.CSH, + ShellConstants.FISH, + ShellConstants.GITBASH, 'julia', - 'ksh', + ShellConstants.KSH, 'node', - 'nu', - 'pwsh', + ShellConstants.NU, + ShellConstants.PWSH, 'python', - 'sh', + ShellConstants.SH, 'wsl', - 'zsh', + ShellConstants.ZSH, ]; if (terminal.state.shell && known.includes(terminal.state.shell.toLowerCase())) { return terminal.state.shell.toLowerCase(); diff --git a/src/features/creators/autoFindProjects.ts b/src/features/creators/autoFindProjects.ts index 1ee144d..5cef489 100644 --- a/src/features/creators/autoFindProjects.ts +++ b/src/features/creators/autoFindProjects.ts @@ -1,10 +1,9 @@ import * as path from 'path'; import { Uri } from 'vscode'; -import { showQuickPickWithButtons, showWarningMessage } from '../../common/window.apis'; +import { showErrorMessage, showQuickPickWithButtons, showWarningMessage } from '../../common/window.apis'; import { ProjectCreatorString } from '../../common/localize'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { PythonProjectManager } from '../../internal.api'; -import { showErrorMessage } from '../../common/errors/utils'; import { findFiles } from '../../common/workspace.apis'; import { traceInfo } from '../../common/logging'; diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 3417a31..a00a809 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -45,8 +45,8 @@ import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { TerminalManager } from './terminal/terminalManager'; import { runInTerminal } from './terminal/runInTerminal'; import { quoteArgs } from './execution/execUtils'; -import { showErrorMessage } from '../common/errors/utils'; -import { activeTextEditor } from '../common/window.apis'; +import {} from '../common/errors/utils'; +import { activeTextEditor, showErrorMessage } from '../common/window.apis'; import { clipboardWriteText } from '../common/env.apis'; export async function refreshManagerCommand(context: unknown): Promise { diff --git a/src/features/terminal/runInTerminal.ts b/src/features/terminal/runInTerminal.ts index 8a3d918..b650b9e 100644 --- a/src/features/terminal/runInTerminal.ts +++ b/src/features/terminal/runInTerminal.ts @@ -4,6 +4,7 @@ import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createDeferred } from '../../common/utils/deferred'; import { quoteArgs } from '../execution/execUtils'; import { identifyTerminalShell } from '../common/shellDetector'; +import { ShellConstants } from '../common/shellConstants'; export async function runInTerminal( environment: PythonEnvironment, @@ -33,7 +34,7 @@ export async function runInTerminal( } else { const shellType = identifyTerminalShell(terminal); let text = quoteArgs([executable, ...allArgs]).join(' '); - if (shellType === 'pwsh' && !text.startsWith('&')) { + if (shellType === ShellConstants.PWSH && !text.startsWith('&')) { // PowerShell requires commands to be prefixed with '&' to run them. text = `& ${text}`; } diff --git a/src/features/terminal/shellStartupActivationVariablesManager.ts b/src/features/terminal/shellStartupActivationVariablesManager.ts new file mode 100644 index 0000000..428beec --- /dev/null +++ b/src/features/terminal/shellStartupActivationVariablesManager.ts @@ -0,0 +1,112 @@ +import { ConfigurationChangeEvent, Disposable, GlobalEnvironmentVariableCollection } from 'vscode'; +import { DidChangeEnvironmentEventArgs } from '../../api'; +import { ShellStartupActivationStrings } from '../../common/localize'; +import { getWorkspaceFolder, getWorkspaceFolders, onDidChangeConfiguration } from '../../common/workspace.apis'; +import { EnvironmentManagers } from '../../internal.api'; +import { ShellEnvsProvider } from './shells/startupProvider'; +import { getAutoActivationType } from './utils'; + +export interface ShellStartupActivationVariablesManager extends Disposable { + initialize(): Promise; +} + +export class ShellStartupActivationVariablesManagerImpl implements ShellStartupActivationVariablesManager { + private readonly disposables: Disposable[] = []; + constructor( + private readonly envCollection: GlobalEnvironmentVariableCollection, + private readonly shellEnvsProviders: ShellEnvsProvider[], + private readonly em: EnvironmentManagers, + ) { + this.envCollection.description = ShellStartupActivationStrings.envCollectionDescription; + this.disposables.push( + onDidChangeConfiguration(async (e: ConfigurationChangeEvent) => { + await this.handleConfigurationChange(e); + }), + this.em.onDidChangeEnvironmentFiltered(async (e: DidChangeEnvironmentEventArgs) => { + await this.handleEnvironmentChange(e); + }), + ); + } + + private async handleConfigurationChange(e: ConfigurationChangeEvent) { + if (e.affectsConfiguration('python-envs.terminal.autoActivationType')) { + const autoActType = getAutoActivationType(); + if (autoActType === 'shellStartup') { + await this.initializeInternal(); + } else { + const workspaces = getWorkspaceFolders() ?? []; + if (workspaces.length > 0) { + workspaces.forEach((workspace) => { + const collection = this.envCollection.getScoped({ workspaceFolder: workspace }); + this.shellEnvsProviders.forEach((provider) => provider.removeEnvVariables(collection)); + }); + } else { + this.shellEnvsProviders.forEach((provider) => provider.removeEnvVariables(this.envCollection)); + } + } + } + } + + private async handleEnvironmentChange(e: DidChangeEnvironmentEventArgs) { + const autoActType = getAutoActivationType(); + if (autoActType === 'shellStartup' && e.uri) { + const wf = getWorkspaceFolder(e.uri); + if (wf) { + const envVars = this.envCollection.getScoped({ workspaceFolder: wf }); + if (envVars) { + this.shellEnvsProviders.forEach((provider) => { + if (e.new) { + provider.updateEnvVariables(envVars, e.new); + } else { + provider.removeEnvVariables(envVars); + } + }); + } + } + } + } + + private async initializeInternal(): Promise { + const workspaces = getWorkspaceFolders() ?? []; + + if (workspaces.length > 0) { + const promises: Promise[] = []; + workspaces.forEach((workspace) => { + const collection = this.envCollection.getScoped({ workspaceFolder: workspace }); + promises.push( + ...this.shellEnvsProviders.map(async (provider) => { + const env = await this.em.getEnvironment(workspace.uri); + if (env) { + provider.updateEnvVariables(collection, env); + } else { + provider.removeEnvVariables(collection); + } + }), + ); + }); + await Promise.all(promises); + } else { + const env = await this.em.getEnvironment(undefined); + await Promise.all( + this.shellEnvsProviders.map(async (provider) => { + if (env) { + provider.updateEnvVariables(this.envCollection, env); + } else { + provider.removeEnvVariables(this.envCollection); + } + }), + ); + } + } + + public async initialize(): Promise { + const autoActType = getAutoActivationType(); + if (autoActType === 'shellStartup') { + await this.initializeInternal(); + } + } + + dispose() { + this.disposables.forEach((disposable) => disposable.dispose()); + } +} diff --git a/src/features/terminal/shellStartupSetupHandlers.ts b/src/features/terminal/shellStartupSetupHandlers.ts new file mode 100644 index 0000000..37e902e --- /dev/null +++ b/src/features/terminal/shellStartupSetupHandlers.ts @@ -0,0 +1,69 @@ +import { l10n, ProgressLocation } from 'vscode'; +import { executeCommand } from '../../common/command.api'; +import { Common, ShellStartupActivationStrings } from '../../common/localize'; +import { traceInfo, traceVerbose } from '../../common/logging'; +import { showErrorMessage, showInformationMessage, withProgress } from '../../common/window.apis'; +import { ShellScriptEditState, ShellStartupScriptProvider } from './shells/startupProvider'; +import { getAutoActivationType, setAutoActivationType } from './utils'; + +export async function handleSettingUpShellProfile( + providers: ShellStartupScriptProvider[], + callback: (provider: ShellStartupScriptProvider, result: boolean) => void, +): Promise { + const shells = providers.map((p) => p.shellType).join(', '); + const response = await showInformationMessage( + l10n.t( + 'To use "{0}" activation, the shell profiles need to be set up. Do you want to set it up now?', + 'shellStartup', + ), + { modal: true, detail: l10n.t('Shells: {0}', shells) }, + Common.yes, + ); + + if (response === Common.yes) { + traceVerbose(`User chose to set up shell profiles for ${shells} shells`); + const states = await withProgress( + { + location: ProgressLocation.Notification, + title: l10n.t('Setting up shell profiles for {0}', shells), + }, + async () => { + return (await Promise.all(providers.map((provider) => provider.setupScripts()))).filter( + (state) => state !== ShellScriptEditState.NotInstalled, + ); + }, + ); + if (states.every((state) => state === ShellScriptEditState.Edited)) { + setImmediate(async () => { + await showInformationMessage( + l10n.t( + 'Shell profiles have been set up successfully. Extension will use shell startup activation next time a new terminal is created.', + ), + ); + }); + providers.forEach((provider) => callback(provider, true)); + } else { + setImmediate(async () => { + const button = await showErrorMessage( + l10n.t('Failed to set up shell profiles. Please check the output panel for more details.'), + Common.viewLogs, + ); + if (button === Common.viewLogs) { + await executeCommand('python-envs.viewLogs'); + } + }); + providers.forEach((provider) => callback(provider, false)); + } + } +} + +export async function cleanupStartupScripts(allProviders: ShellStartupScriptProvider[]): Promise { + await Promise.all(allProviders.map((provider) => provider.teardownScripts())); + if (getAutoActivationType() === 'shellStartup') { + setAutoActivationType('command'); + traceInfo( + 'Setting `python-envs.terminal.autoActivationType` to `command`, after removing shell startup scripts.', + ); + } + setImmediate(async () => await showInformationMessage(ShellStartupActivationStrings.revertedShellStartupScripts)); +} diff --git a/src/features/terminal/shells/bash/bashConstants.ts b/src/features/terminal/shells/bash/bashConstants.ts new file mode 100644 index 0000000..eaaa0f5 --- /dev/null +++ b/src/features/terminal/shells/bash/bashConstants.ts @@ -0,0 +1,3 @@ +export const BASH_ENV_KEY = 'VSCODE_BASH_ACTIVATE'; +export const ZSH_ENV_KEY = 'VSCODE_ZSH_ACTIVATE'; +export const BASH_SCRIPT_VERSION = '0.1.0'; diff --git a/src/features/terminal/shells/bash/bashEnvs.ts b/src/features/terminal/shells/bash/bashEnvs.ts new file mode 100644 index 0000000..08219b4 --- /dev/null +++ b/src/features/terminal/shells/bash/bashEnvs.ts @@ -0,0 +1,96 @@ +import { EnvironmentVariableCollection } from 'vscode'; +import { PythonEnvironment } from '../../../../api'; +import { traceError } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils'; +import { ShellEnvsProvider } from '../startupProvider'; +import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants'; + +export class BashEnvsProvider implements ShellEnvsProvider { + constructor(public readonly shellType: 'bash' | 'gitbash') {} + + updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void { + try { + const bashActivation = getShellActivationCommand(this.shellType, env); + if (bashActivation) { + const command = getShellCommandAsString(this.shellType, bashActivation); + const v = collection.get(BASH_ENV_KEY); + if (v?.value === command) { + return; + } + collection.replace(BASH_ENV_KEY, command); + } else { + collection.delete(BASH_ENV_KEY); + } + } catch (err) { + traceError(`Failed to update env variables for ${this.shellType}`, err); + collection.delete(BASH_ENV_KEY); + } + } + + removeEnvVariables(envCollection: EnvironmentVariableCollection): void { + envCollection.delete(BASH_ENV_KEY); + } + + getEnvVariables(env?: PythonEnvironment): Map | undefined { + if (!env) { + return new Map([[BASH_ENV_KEY, undefined]]); + } + + try { + const bashActivation = getShellActivationCommand(this.shellType, env); + if (bashActivation) { + const command = getShellCommandAsString(this.shellType, bashActivation); + return new Map([[BASH_ENV_KEY, command]]); + } + return undefined; + } catch (err) { + traceError(`Failed to get env variables for ${this.shellType}`, err); + return undefined; + } + } +} + +export class ZshEnvsProvider implements ShellEnvsProvider { + public readonly shellType: string = ShellConstants.ZSH; + updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void { + try { + const zshActivation = getShellActivationCommand(this.shellType, env); + if (zshActivation) { + const command = getShellCommandAsString(this.shellType, zshActivation); + const v = collection.get(ZSH_ENV_KEY); + if (v?.value === command) { + return; + } + collection.replace(ZSH_ENV_KEY, command); + } else { + collection.delete(ZSH_ENV_KEY); + } + } catch (err) { + traceError('Failed to update env variables for zsh', err); + collection.delete(ZSH_ENV_KEY); + } + } + + removeEnvVariables(collection: EnvironmentVariableCollection): void { + collection.delete(ZSH_ENV_KEY); + } + + getEnvVariables(env?: PythonEnvironment): Map | undefined { + if (!env) { + return new Map([[ZSH_ENV_KEY, undefined]]); + } + + try { + const zshActivation = getShellActivationCommand(this.shellType, env); + if (zshActivation) { + const command = getShellCommandAsString(this.shellType, zshActivation); + return new Map([[ZSH_ENV_KEY, command]]); + } + return undefined; + } catch (err) { + traceError('Failed to get env variables for zsh', err); + return undefined; + } + } +} diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts new file mode 100644 index 0000000..16b029a --- /dev/null +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -0,0 +1,299 @@ +import * as fs from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; +import which from 'which'; +import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; +import { BASH_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY } from './bashConstants'; + +async function isBashLikeInstalled(): Promise { + const result = await Promise.all([which('bash', { nothrow: true }), which('sh', { nothrow: true })]); + return result.some((r) => r !== null); +} + +async function isZshInstalled(): Promise { + const result = await which('zsh', { nothrow: true }); + return result !== null; +} + +async function isGitBashInstalled(): Promise { + const gitPath = await which('git', { nothrow: true }); + if (gitPath) { + const gitBashPath = path.join(path.dirname(path.dirname(gitPath)), 'bin', 'bash.exe'); + return await fs.pathExists(gitBashPath); + } + return false; +} + +async function getBashProfiles(): Promise { + const homeDir = os.homedir(); + const profile: string = path.join(homeDir, '.bashrc'); + + return profile; +} + +async function getZshProfiles(): Promise { + const homeDir = os.homedir(); + const profile: string = path.join(homeDir, '.zshrc'); + + return profile; +} + +const regionStart = '# >>> vscode python'; +const regionEnd = '# <<< vscode python'; + +function getActivationContent(key: string): string { + const lineSep = '\n'; + return [ + `# version: ${BASH_SCRIPT_VERSION}`, + `if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`, + ` eval "$${key}" || true`, + 'fi', + ].join(lineSep); +} + +async function isStartupSetup(profile: string, key: string): Promise { + if (await fs.pathExists(profile)) { + const content = await fs.readFile(profile, 'utf8'); + return hasStartupCode(content, regionStart, regionEnd, [key]) + ? ShellSetupState.Setup + : ShellSetupState.NotSetup; + } else { + return ShellSetupState.NotSetup; + } +} + +async function setupStartup(profile: string, key: string, name: string): Promise { + const activationContent = getActivationContent(key); + + try { + if (await fs.pathExists(profile)) { + const content = await fs.readFile(profile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + traceInfo(`SHELL: ${name} profile already contains activation code at: ${profile}`); + } else { + await fs.writeFile(profile, insertStartupCode(content, regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Updated existing ${name} profile at: ${profile}\n${activationContent}`); + } + } else { + await fs.mkdirp(path.dirname(profile)); + await fs.writeFile(profile, insertStartupCode('', regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Created new ${name} profile at: ${profile}\n${activationContent}`); + } + + return true; + } catch (err) { + traceError(`SHELL: Failed to setup startup for profile at: ${profile}`, err); + return false; + } +} + +async function removeStartup(profile: string, key: string): Promise { + if (!(await fs.pathExists(profile))) { + return true; + } + + try { + const content = await fs.readFile(profile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + await fs.writeFile(profile, removeStartupCode(content, regionStart, regionEnd)); + traceInfo(`SHELL: Removed activation from profile at: ${profile}`); + } else { + traceVerbose(`Profile at ${profile} does not contain activation code`); + } + return true; + } catch (err) { + traceVerbose(`Failed to remove ${profile} startup`, err); + return false; + } +} + +export class BashStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'Bash'; + public readonly shellType: string = ShellConstants.BASH; + + private async checkShellInstalled(): Promise { + const found = await isBashLikeInstalled(); + if (!found) { + traceInfo( + '`bash` or `sh` was not found on the system', + 'If it is installed make sure it is available on `PATH`', + ); + } + return found; + } + + async isSetup(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellSetupState.NotInstalled; + } + + try { + const bashProfile = await getBashProfiles(); + return await isStartupSetup(bashProfile, BASH_ENV_KEY); + } catch (err) { + traceError('Failed to check bash startup scripts', err); + return ShellSetupState.NotSetup; + } + } + + async setupScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + + try { + const bashProfiles = await getBashProfiles(); + const result = await setupStartup(bashProfiles, BASH_ENV_KEY, this.name); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to setup bash startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + + async teardownScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + + try { + const bashProfile = await getBashProfiles(); + const result = await removeStartup(bashProfile, BASH_ENV_KEY); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to teardown bash startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + + clearCache(): Promise { + return Promise.resolve(); + } +} + +export class ZshStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'Zsh'; + public readonly shellType: string = ShellConstants.ZSH; + + private async checkShellInstalled(): Promise { + const found = await isZshInstalled(); + if (!found) { + traceInfo('`zsh` was not found on the system', 'If it is installed make sure it is available on `PATH`'); + } + return found; + } + + async isSetup(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellSetupState.NotInstalled; + } + + try { + const zshProfiles = await getZshProfiles(); + return await isStartupSetup(zshProfiles, ZSH_ENV_KEY); + } catch (err) { + traceError('Failed to check zsh startup scripts', err); + return ShellSetupState.NotSetup; + } + } + + async setupScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + try { + const zshProfiles = await getZshProfiles(); + const result = await setupStartup(zshProfiles, ZSH_ENV_KEY, this.name); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to setup zsh startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + + async teardownScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + try { + const zshProfiles = await getZshProfiles(); + const result = await removeStartup(zshProfiles, ZSH_ENV_KEY); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to teardown zsh startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + clearCache(): Promise { + return Promise.resolve(); + } +} + +export class GitBashStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'GitBash'; + public readonly shellType: string = ShellConstants.GITBASH; + + private async checkShellInstalled(): Promise { + const found = await isGitBashInstalled(); + if (!found) { + traceInfo('Git Bash was not found on the system', 'If it is installed make sure it is available on `PATH`'); + } + return found; + } + + async isSetup(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellSetupState.NotInstalled; + } + try { + const bashProfiles = await getBashProfiles(); + return await isStartupSetup(bashProfiles, BASH_ENV_KEY); + } catch (err) { + traceError('Failed to check git bash startup scripts', err); + return ShellSetupState.NotSetup; + } + } + async setupScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + + try { + const bashProfiles = await getBashProfiles(); + const result = await setupStartup(bashProfiles, BASH_ENV_KEY, this.name); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to setup git bash startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + async teardownScripts(): Promise { + const found = await this.checkShellInstalled(); + if (!found) { + return ShellScriptEditState.NotInstalled; + } + + try { + const bashProfiles = await getBashProfiles(); + const result = await removeStartup(bashProfiles, BASH_ENV_KEY); + return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to teardown git bash startup scripts', err); + return ShellScriptEditState.NotEdited; + } + } + clearCache(): Promise { + return Promise.resolve(); + } +} diff --git a/src/features/terminal/shells/cmd/cmdConstants.ts b/src/features/terminal/shells/cmd/cmdConstants.ts new file mode 100644 index 0000000..5a676eb --- /dev/null +++ b/src/features/terminal/shells/cmd/cmdConstants.ts @@ -0,0 +1,2 @@ +export const CMD_ENV_KEY = 'VSCODE_CMD_ACTIVATE'; +export const CMD_SCRIPT_VERSION = '0.1.0'; diff --git a/src/features/terminal/shells/cmd/cmdEnvs.ts b/src/features/terminal/shells/cmd/cmdEnvs.ts new file mode 100644 index 0000000..fbeef3f --- /dev/null +++ b/src/features/terminal/shells/cmd/cmdEnvs.ts @@ -0,0 +1,50 @@ +import { EnvironmentVariableCollection } from 'vscode'; +import { PythonEnvironment } from '../../../../api'; +import { traceError } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils'; +import { ShellEnvsProvider } from '../startupProvider'; +import { CMD_ENV_KEY } from './cmdConstants'; + +export class CmdEnvsProvider implements ShellEnvsProvider { + readonly shellType: string = ShellConstants.CMD; + updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void { + try { + const cmdActivation = getShellActivationCommand(this.shellType, env); + if (cmdActivation) { + const command = getShellCommandAsString(this.shellType, cmdActivation); + const v = collection.get(CMD_ENV_KEY); + if (v?.value === command) { + return; + } + collection.replace(CMD_ENV_KEY, command); + } else { + collection.delete(CMD_ENV_KEY); + } + } catch (err) { + traceError('Failed to update CMD environment variables', err); + collection.delete(CMD_ENV_KEY); + } + } + + removeEnvVariables(envCollection: EnvironmentVariableCollection): void { + envCollection.delete(CMD_ENV_KEY); + } + + getEnvVariables(env?: PythonEnvironment): Map | undefined { + if (!env) { + return new Map([[CMD_ENV_KEY, undefined]]); + } + + try { + const cmdActivation = getShellActivationCommand(this.shellType, env); + if (cmdActivation) { + return new Map([[CMD_ENV_KEY, getShellCommandAsString(this.shellType, cmdActivation)]]); + } + return undefined; + } catch (err) { + traceError('Failed to get CMD environment variables', err); + return undefined; + } + } +} diff --git a/src/features/terminal/shells/cmd/cmdStartup.ts b/src/features/terminal/shells/cmd/cmdStartup.ts new file mode 100644 index 0000000..f78d716 --- /dev/null +++ b/src/features/terminal/shells/cmd/cmdStartup.ts @@ -0,0 +1,316 @@ +import * as cp from 'child_process'; +import * as fs from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; +import { promisify } from 'util'; +import which from 'which'; +import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; +import { isWindows } from '../../../../common/utils/platformUtils'; +import { ShellConstants } from '../../../common/shellConstants'; +import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; +import { CMD_ENV_KEY, CMD_SCRIPT_VERSION } from './cmdConstants'; + +const exec = promisify(cp.exec); + +async function isCmdInstalled(): Promise { + if (!isWindows()) { + return false; + } + + if (process.env.ComSpec && (await fs.exists(process.env.ComSpec))) { + return true; + } + + try { + // Try to find cmd.exe on the system + await which('cmd.exe', { nothrow: true }); + return true; + } catch { + // This should normally not happen on Windows + return false; + } +} + +interface CmdFilePaths { + startupFile: string; + regStartupFile: string; + mainBatchFile: string; + regMainBatchFile: string; + mainName: string; + startupName: string; +} + +async function getCmdFilePaths(): Promise { + const homeDir = process.env.USERPROFILE ?? os.homedir(); + const cmdrcDir = path.join(homeDir, '.cmdrc'); + await fs.ensureDir(cmdrcDir); + + return { + mainBatchFile: path.join(cmdrcDir, 'cmd_startup.bat'), + regMainBatchFile: path.join('%USERPROFILE%', '.cmdrc', 'cmd_startup.bat'), + mainName: 'cmd_startup.bat', + startupFile: path.join(cmdrcDir, 'vscode-python.bat'), + regStartupFile: path.join('%USERPROFILE%', '.cmdrc', 'vscode-python.bat'), + startupName: 'vscode-python.bat', + }; +} + +const regionStart = ':: >>> vscode python'; +const regionEnd = ':: <<< vscode python'; + +function getActivationContent(key: string): string { + const lineSep = '\r\n'; + return [`:: version: ${CMD_SCRIPT_VERSION}`, `if defined ${key} (`, ` call %${key}%`, ')'].join(lineSep); +} + +function getHeader(): string { + const lineSep = '\r\n'; + const content = []; + content.push('@echo off'); + content.push(':: startup used in HKCU\\Software\\Microsoft\\Command Processor key AutoRun'); + content.push(''); + return content.join(lineSep); +} + +function getMainBatchFileContent(startupFile: string): string { + const lineSep = '\r\n'; + const content = []; + + content.push('if not defined VSCODE_PYTHON_AUTOACTIVATE_GUARD ('); + content.push(' set "VSCODE_PYTHON_AUTOACTIVATE_GUARD=1"'); + content.push(` if exist "${startupFile}" call "${startupFile}"`); + content.push(')'); + + return content.join(lineSep); +} + +async function checkRegistryAutoRun(mainBatchFile: string, regMainBatchFile: string): Promise { + if (!isWindows()) { + return false; + } + + try { + // Check if AutoRun is set in the registry to call our batch file + const { stdout } = await exec('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun', { + windowsHide: true, + }); + + // Check if the output contains our batch file path + return stdout.includes(regMainBatchFile) || stdout.includes(mainBatchFile); + } catch { + // If the command fails, the registry key might not exist + return false; + } +} + +async function getExistingAutoRun(): Promise { + if (!isWindows()) { + return undefined; + } + + try { + const { stdout } = await exec('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun', { + windowsHide: true, + }); + + const match = stdout.match(/AutoRun\s+REG_SZ\s+(.*)/); + if (match && match[1]) { + const content = match[1].trim(); + return content; + } + } catch { + // Key doesn't exist yet + } + + return undefined; +} + +async function setupRegistryAutoRun(mainBatchFile: string): Promise { + if (!isWindows()) { + return false; + } + + try { + // Set the registry key to call our main batch file + await exec( + `reg add "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun /t REG_SZ /d "if exist \\"${mainBatchFile}\\" call \\"${mainBatchFile}\\"" /f`, + { windowsHide: true }, + ); + + traceInfo( + `Set CMD AutoRun registry key [HKCU\\Software\\Microsoft\\Command Processor] to call: ${mainBatchFile}`, + ); + return true; + } catch (err) { + traceError('Failed to set CMD AutoRun registry key [HKCU\\Software\\Microsoft\\Command Processor]', err); + return false; + } +} + +async function isCmdStartupSetup(cmdFiles: CmdFilePaths, key: string): Promise { + const fileExists = await fs.pathExists(cmdFiles.startupFile); + let fileHasContent = false; + if (fileExists) { + const content = await fs.readFile(cmdFiles.startupFile, 'utf8'); + fileHasContent = hasStartupCode(content, regionStart, regionEnd, [key]); + } + + if (!fileHasContent) { + return ShellSetupState.NotSetup; + } + + const mainFileExists = await fs.pathExists(cmdFiles.mainBatchFile); + let mainFileHasContent = false; + if (mainFileExists) { + const mainFileContent = await fs.readFile(cmdFiles.mainBatchFile, 'utf8'); + mainFileHasContent = hasStartupCode(mainFileContent, regionStart, regionEnd, [cmdFiles.startupName]); + } + + if (!mainFileHasContent) { + return ShellSetupState.NotSetup; + } + + const registrySetup = await checkRegistryAutoRun(cmdFiles.regMainBatchFile, cmdFiles.mainBatchFile); + return registrySetup ? ShellSetupState.Setup : ShellSetupState.NotSetup; +} + +async function setupCmdStartup(cmdFiles: CmdFilePaths, key: string): Promise { + try { + const activationContent = getActivationContent(key); + + // Step 1: Create or update the activation file + if (await fs.pathExists(cmdFiles.startupFile)) { + const content = await fs.readFile(cmdFiles.startupFile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + traceInfo(`SHELL: CMD activation file at ${cmdFiles.startupFile} already contains activation code`); + } else { + await fs.writeFile( + cmdFiles.startupFile, + insertStartupCode(content, regionStart, regionEnd, activationContent), + ); + traceInfo( + `SHELL: Updated existing CMD activation file at: ${cmdFiles.startupFile}\r\n${activationContent}`, + ); + } + } else { + await fs.writeFile( + cmdFiles.startupFile, + insertStartupCode(getHeader(), regionStart, regionEnd, activationContent), + ); + traceInfo(`SHELL: Created new CMD activation file at: ${cmdFiles.startupFile}\r\n${activationContent}`); + } + + // Step 2: Get existing AutoRun content + const existingAutoRun = await getExistingAutoRun(); + + // Step 3: Create or update the main batch file + if (await fs.pathExists(cmdFiles.mainBatchFile)) { + const content = await fs.readFile(cmdFiles.mainBatchFile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [cmdFiles.startupName])) { + traceInfo(`SHELL: CMD main batch file at ${cmdFiles.mainBatchFile} already contains our startup file`); + } else { + const mainBatchContent = getMainBatchFileContent(cmdFiles.regStartupFile); + await fs.writeFile( + cmdFiles.mainBatchFile, + insertStartupCode(content, regionStart, regionEnd, mainBatchContent), + ); + traceInfo( + `SHELL: Updated existing main batch file at: ${cmdFiles.mainBatchFile}\r\n${mainBatchContent}`, + ); + } + } + + // Step 4: Setup registry AutoRun to call our main batch file + if (existingAutoRun?.includes(cmdFiles.regMainBatchFile) || existingAutoRun?.includes(cmdFiles.mainBatchFile)) { + traceInfo(`SHELL: CMD AutoRun registry key already contains our main batch file`); + } else { + const registrySetup = await setupRegistryAutoRun(cmdFiles.mainBatchFile); + return registrySetup; + } + return true; + } catch (err) { + traceVerbose(`Failed to setup CMD startup`, err); + return false; + } +} + +async function removeCmdStartup(startupFile: string, key: string): Promise { + // Note: We deliberately DO NOT remove the main batch file or registry AutoRun setting + // This allows other components to continue using the AutoRun functionality + if (await fs.pathExists(startupFile)) { + try { + const content = await fs.readFile(startupFile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + await fs.writeFile(startupFile, removeStartupCode(content, regionStart, regionEnd)); + traceInfo(`Removed activation from CMD activation file at: ${startupFile}`); + } else { + traceInfo(`CMD activation file at ${startupFile} does not contain activation code`); + } + } catch (err) { + traceVerbose(`Failed to remove CMD activation file content`, err); + return false; + } + } + return true; +} + +export class CmdStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'Command Prompt'; + public readonly shellType: string = ShellConstants.CMD; + + async isSetup(): Promise { + const isInstalled = await isCmdInstalled(); + if (!isInstalled) { + traceVerbose('CMD is not installed or not on Windows'); + return ShellSetupState.NotInstalled; + } + + try { + const cmdFiles = await getCmdFilePaths(); + const isSetup = await isCmdStartupSetup(cmdFiles, CMD_ENV_KEY); + return isSetup; + } catch (err) { + traceError('Failed to check if CMD startup is setup', err); + return ShellSetupState.NotSetup; + } + } + + async setupScripts(): Promise { + const isInstalled = await isCmdInstalled(); + if (!isInstalled) { + traceVerbose('CMD is not installed or not on Windows'); + return ShellScriptEditState.NotInstalled; + } + + try { + const cmdFiles = await getCmdFilePaths(); + const success = await setupCmdStartup(cmdFiles, CMD_ENV_KEY); + return success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to setup CMD startup', err); + return ShellScriptEditState.NotEdited; + } + } + + async teardownScripts(): Promise { + const isInstalled = await isCmdInstalled(); + if (!isInstalled) { + traceVerbose('CMD is not installed or not on Windows'); + return ShellScriptEditState.NotInstalled; + } + + try { + const { startupFile } = await getCmdFilePaths(); + const success = await removeCmdStartup(startupFile, CMD_ENV_KEY); + return success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to remove CMD startup', err); + return ShellScriptEditState.NotEdited; + } + } + + clearCache(): Promise { + return Promise.resolve(); + } +} diff --git a/src/features/terminal/shells/common/editUtils.ts b/src/features/terminal/shells/common/editUtils.ts new file mode 100644 index 0000000..ea60638 --- /dev/null +++ b/src/features/terminal/shells/common/editUtils.ts @@ -0,0 +1,78 @@ +import { isWindows } from '../../../../common/utils/platformUtils'; + +export function hasStartupCode(content: string, start: string, end: string, keys: string[]): boolean { + const normalizedContent = content.replace(/\r\n/g, '\n'); + const startIndex = normalizedContent.indexOf(start); + const endIndex = normalizedContent.indexOf(end); + if (startIndex === -1 || endIndex === -1 || startIndex >= endIndex) { + return false; + } + const contentBetween = normalizedContent.substring(startIndex + start.length, endIndex).trim(); + return contentBetween.length > 0 && keys.every((key) => contentBetween.includes(key)); +} + +function getLineEndings(content: string): string { + if (content.includes('\r\n')) { + return '\r\n'; + } else if (content.includes('\n')) { + return '\n'; + } + return isWindows() ? '\r\n' : '\n'; +} + +export function insertStartupCode(content: string, start: string, end: string, code: string): string { + let lineEnding = getLineEndings(content); + const normalizedContent = content.replace(/\r\n/g, '\n'); + + const startIndex = normalizedContent.indexOf(start); + const endIndex = normalizedContent.indexOf(end); + + let result: string; + if (startIndex !== -1 && endIndex !== -1 && startIndex < endIndex) { + result = + normalizedContent.substring(0, startIndex + start.length) + + '\n' + + code + + '\n' + + normalizedContent.substring(endIndex); + } else if (startIndex !== -1) { + result = normalizedContent.substring(0, startIndex + start.length) + '\n' + code + '\n' + end + '\n'; + } else { + result = normalizedContent + '\n' + start + '\n' + code + '\n' + end + '\n'; + } + + if (lineEnding === '\r\n') { + result = result.replace(/\n/g, '\r\n'); + } + return result; +} + +export function removeStartupCode(content: string, start: string, end: string): string { + let lineEnding = getLineEndings(content); + const normalizedContent = content.replace(/\r\n/g, '\n'); + + const startIndex = normalizedContent.indexOf(start); + const endIndex = normalizedContent.indexOf(end); + + if (startIndex !== -1 && endIndex !== -1 && startIndex < endIndex) { + const before = normalizedContent.substring(0, startIndex); + const after = normalizedContent.substring(endIndex + end.length); + + let result: string; + if (before === '') { + result = after.startsWith('\n') ? after.substring(1) : after; + } else if (after === '' || after === '\n') { + result = before.endsWith('\n') ? before.substring(0, before.length - 1) : before; + } else if (after.startsWith('\n') && before.endsWith('\n')) { + result = before + after.substring(1); + } else { + result = before + after; + } + + if (lineEnding === '\r\n') { + result = result.replace(/\n/g, '\r\n'); + } + return result; + } + return content; +} diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts new file mode 100644 index 0000000..6c1a138 --- /dev/null +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -0,0 +1,94 @@ +import { PythonCommandRunConfiguration, PythonEnvironment } from '../../../../api'; +import { isWindows } from '../../../../common/utils/platformUtils'; +import { ShellConstants } from '../../../common/shellConstants'; +import { quoteArgs } from '../../../execution/execUtils'; + +function getCommandAsString(command: PythonCommandRunConfiguration[], shell: string, delimiter: string): string { + const parts = []; + for (const cmd of command) { + const args = cmd.args ?? []; + parts.push(quoteArgs([normalizeShellPath(cmd.executable, shell), ...args]).join(' ')); + } + if (shell === ShellConstants.PWSH) { + return parts.map((p) => `(${p})`).join(` ${delimiter} `); + } + return parts.join(` ${delimiter} `); +} + +export function getShellCommandAsString(shell: string, command: PythonCommandRunConfiguration[]): string { + switch (shell) { + case ShellConstants.PWSH: + return getCommandAsString(command, shell, ';'); + case ShellConstants.NU: + return getCommandAsString(command, shell, ';'); + case ShellConstants.FISH: + return getCommandAsString(command, shell, '; and'); + case ShellConstants.BASH: + case ShellConstants.SH: + case ShellConstants.ZSH: + + case ShellConstants.CMD: + case ShellConstants.GITBASH: + default: + return getCommandAsString(command, shell, '&&'); + } +} + +export function normalizeShellPath(filePath: string, shellType?: string): string { + if (isWindows() && shellType) { + if (shellType.toLowerCase() === ShellConstants.GITBASH || shellType.toLowerCase() === 'git-bash') { + return filePath.replace(/\\/g, '/').replace(/^\/([a-zA-Z])/, '$1:'); + } + } + return filePath; +} +export function getShellActivationCommand( + shell: string, + environment: PythonEnvironment, +): PythonCommandRunConfiguration[] | undefined { + let activation: PythonCommandRunConfiguration[] | undefined; + if (environment.execInfo?.shellActivation) { + activation = environment.execInfo.shellActivation.get(shell); + if (!activation) { + activation = environment.execInfo.shellActivation.get('unknown'); + } + } + + if (!activation) { + activation = environment.execInfo?.activation; + } + + return activation; +} +export function getShellDeactivationCommand( + shell: string, + environment: PythonEnvironment, +): PythonCommandRunConfiguration[] | undefined { + let deactivation: PythonCommandRunConfiguration[] | undefined; + if (environment.execInfo?.shellDeactivation) { + deactivation = environment.execInfo.shellDeactivation.get(shell); + if (!deactivation) { + deactivation = environment.execInfo.shellDeactivation.get('unknown'); + } + } + + if (!deactivation) { + deactivation = environment.execInfo?.deactivation; + } + + return deactivation; +} + +export const PROFILE_TAG_START = '###PATH_START###'; +export const PROFILE_TAG_END = '###PATH_END###'; +export function extractProfilePath(content: string): string | undefined { + // Extract only the part between the tags + const profilePathRegex = new RegExp(`${PROFILE_TAG_START}\\r?\\n(.*?)\\r?\\n${PROFILE_TAG_END}`, 's'); + const match = content?.match(profilePathRegex); + + if (match && match[1]) { + const extractedPath = match[1].trim(); + return extractedPath; + } + return undefined; +} diff --git a/src/features/terminal/shells/fish/fishConstants.ts b/src/features/terminal/shells/fish/fishConstants.ts new file mode 100644 index 0000000..67f6e4f --- /dev/null +++ b/src/features/terminal/shells/fish/fishConstants.ts @@ -0,0 +1,2 @@ +export const FISH_ENV_KEY = 'VSCODE_FISH_ACTIVATE'; +export const FISH_SCRIPT_VERSION = '0.1.0'; diff --git a/src/features/terminal/shells/fish/fishEnvs.ts b/src/features/terminal/shells/fish/fishEnvs.ts new file mode 100644 index 0000000..665385c --- /dev/null +++ b/src/features/terminal/shells/fish/fishEnvs.ts @@ -0,0 +1,50 @@ +import { EnvironmentVariableCollection } from 'vscode'; +import { PythonEnvironment } from '../../../../api'; +import { traceError } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils'; +import { ShellEnvsProvider } from '../startupProvider'; +import { FISH_ENV_KEY } from './fishConstants'; + +export class FishEnvsProvider implements ShellEnvsProvider { + readonly shellType: string = ShellConstants.FISH; + updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void { + try { + const fishActivation = getShellActivationCommand(this.shellType, env); + if (fishActivation) { + const command = getShellCommandAsString(this.shellType, fishActivation); + const v = collection.get(FISH_ENV_KEY); + if (v?.value === command) { + return; + } + collection.replace(FISH_ENV_KEY, command); + } else { + collection.delete(FISH_ENV_KEY); + } + } catch (err) { + traceError('Failed to update Fish environment variables', err); + collection.delete(FISH_ENV_KEY); + } + } + + removeEnvVariables(envCollection: EnvironmentVariableCollection): void { + envCollection.delete(FISH_ENV_KEY); + } + + getEnvVariables(env?: PythonEnvironment): Map | undefined { + if (!env) { + return new Map([[FISH_ENV_KEY, undefined]]); + } + + try { + const fishActivation = getShellActivationCommand(this.shellType, env); + if (fishActivation) { + return new Map([[FISH_ENV_KEY, getShellCommandAsString(this.shellType, fishActivation)]]); + } + return undefined; + } catch (err) { + traceError('Failed to get Fish environment variables', err); + return undefined; + } + } +} diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts new file mode 100644 index 0000000..1d8791d --- /dev/null +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -0,0 +1,155 @@ +import * as fs from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; +import which from 'which'; + +import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; +import { FISH_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; + +async function isFishInstalled(): Promise { + try { + await which('fish'); + return true; + } catch { + traceVerbose('Fish is not installed or not found in PATH'); + return false; + } +} + +async function getFishProfile(): Promise { + const homeDir = os.homedir(); + // Fish configuration is typically at ~/.config/fish/config.fish + const profilePath = path.join(homeDir, '.config', 'fish', 'config.fish'); + traceInfo(`SHELL: fish profile found at: ${profilePath}`); + return profilePath; +} + +const regionStart = '# >>> vscode python'; +const regionEnd = '# <<< vscode python'; + +function getActivationContent(key: string): string { + const lineSep = '\n'; + return [ + `# version: ${FISH_SCRIPT_VERSION}`, + `if test "$TERM_PROGRAM" = "vscode"; and set -q ${key}`, + ` eval $${key}`, + 'end', + ].join(lineSep); +} + +async function isStartupSetup(profilePath: string, key: string): Promise { + if (await fs.pathExists(profilePath)) { + const content = await fs.readFile(profilePath, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + traceInfo(`SHELL: fish already contains activation code: ${profilePath}`); + return true; + } + } + traceInfo(`SHELL: fish does not contain activation code: ${profilePath}`); + return false; +} + +async function setupStartup(profilePath: string, key: string): Promise { + try { + const activationContent = getActivationContent(key); + await fs.mkdirp(path.dirname(profilePath)); + + if (await fs.pathExists(profilePath)) { + const content = await fs.readFile(profilePath, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + traceInfo(`SHELL: Fish profile at ${profilePath} already contains activation code`); + } else { + await fs.writeFile(profilePath, insertStartupCode(content, regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Updated existing fish profile at: ${profilePath}\n${activationContent}`); + } + } else { + await fs.writeFile(profilePath, insertStartupCode('', regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Created new fish profile at: ${profilePath}\n${activationContent}`); + } + return true; + } catch (err) { + traceVerbose(`Failed to setup fish startup`, err); + return false; + } +} + +async function removeFishStartup(profilePath: string, key: string): Promise { + if (!(await fs.pathExists(profilePath))) { + return true; + } + + try { + const content = await fs.readFile(profilePath, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + await fs.writeFile(profilePath, removeStartupCode(content, regionStart, regionEnd)); + traceInfo(`Removed activation from fish profile at: ${profilePath}`); + } + return true; + } catch (err) { + traceVerbose(`Failed to remove fish startup`, err); + return false; + } +} + +export class FishStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'Fish'; + public readonly shellType: string = ShellConstants.FISH; + + async isSetup(): Promise { + const isInstalled = await isFishInstalled(); + if (!isInstalled) { + traceVerbose('Fish is not installed'); + return ShellSetupState.NotInstalled; + } + + try { + const fishProfile = await getFishProfile(); + const isSetup = await isStartupSetup(fishProfile, FISH_ENV_KEY); + return isSetup ? ShellSetupState.Setup : ShellSetupState.NotSetup; + } catch (err) { + traceError('Failed to check if Fish startup is setup', err); + return ShellSetupState.NotSetup; + } + } + + async setupScripts(): Promise { + const isInstalled = await isFishInstalled(); + if (!isInstalled) { + traceVerbose('Fish is not installed'); + return ShellScriptEditState.NotInstalled; + } + + try { + const fishProfile = await getFishProfile(); + const success = await setupStartup(fishProfile, FISH_ENV_KEY); + return success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to setup Fish startup', err); + return ShellScriptEditState.NotEdited; + } + } + + async teardownScripts(): Promise { + const isInstalled = await isFishInstalled(); + if (!isInstalled) { + traceVerbose('Fish is not installed'); + return ShellScriptEditState.NotInstalled; + } + + try { + const fishProfile = await getFishProfile(); + const success = await removeFishStartup(fishProfile, FISH_ENV_KEY); + return success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; + } catch (err) { + traceError('Failed to remove Fish startup', err); + return ShellScriptEditState.NotEdited; + } + } + + clearCache(): Promise { + return Promise.resolve(); + } +} diff --git a/src/features/terminal/shells/providers.ts b/src/features/terminal/shells/providers.ts new file mode 100644 index 0000000..03f0128 --- /dev/null +++ b/src/features/terminal/shells/providers.ts @@ -0,0 +1,45 @@ +import { isWindows } from '../../../common/utils/platformUtils'; +import { ShellConstants } from '../../common/shellConstants'; +import { BashEnvsProvider, ZshEnvsProvider } from './bash/bashEnvs'; +import { BashStartupProvider, GitBashStartupProvider, ZshStartupProvider } from './bash/bashStartup'; +import { CmdEnvsProvider } from './cmd/cmdEnvs'; +import { CmdStartupProvider } from './cmd/cmdStartup'; +import { FishEnvsProvider } from './fish/fishEnvs'; +import { FishStartupProvider } from './fish/fishStartup'; +import { PowerShellEnvsProvider } from './pwsh/pwshEnvs'; +import { PwshStartupProvider } from './pwsh/pwshStartup'; +import { ShellEnvsProvider, ShellStartupScriptProvider } from './startupProvider'; + +export function createShellStartupProviders(): ShellStartupScriptProvider[] { + if (isWindows()) { + return [ + // PowerShell classic is the default on Windows, so it is included here explicitly. + // pwsh is the new PowerShell Core, which is cross-platform and preferred. + new PwshStartupProvider([ShellConstants.PWSH, 'powershell']), + new GitBashStartupProvider(), + new CmdStartupProvider(), + ]; + } + return [ + new PwshStartupProvider([ShellConstants.PWSH]), + new BashStartupProvider(), + new FishStartupProvider(), + new ZshStartupProvider(), + ]; +} + +export function createShellEnvProviders(): ShellEnvsProvider[] { + if (isWindows()) { + return [new PowerShellEnvsProvider(), new BashEnvsProvider(ShellConstants.GITBASH), new CmdEnvsProvider()]; + } + return [ + new PowerShellEnvsProvider(), + new BashEnvsProvider(ShellConstants.BASH), + new FishEnvsProvider(), + new ZshEnvsProvider(), + ]; +} + +export async function clearShellProfileCache(providers: ShellStartupScriptProvider[]): Promise { + await Promise.all(providers.map((provider) => provider.clearCache())); +} diff --git a/src/features/terminal/shells/pwsh/pwshConstants.ts b/src/features/terminal/shells/pwsh/pwshConstants.ts new file mode 100644 index 0000000..8d71e9d --- /dev/null +++ b/src/features/terminal/shells/pwsh/pwshConstants.ts @@ -0,0 +1,2 @@ +export const POWERSHELL_ENV_KEY = 'VSCODE_PWSH_ACTIVATE'; +export const PWSH_SCRIPT_VERSION = '0.1.0'; diff --git a/src/features/terminal/shells/pwsh/pwshEnvs.ts b/src/features/terminal/shells/pwsh/pwshEnvs.ts new file mode 100644 index 0000000..5d598b0 --- /dev/null +++ b/src/features/terminal/shells/pwsh/pwshEnvs.ts @@ -0,0 +1,51 @@ +import { EnvironmentVariableCollection } from 'vscode'; +import { PythonEnvironment } from '../../../../api'; +import { traceError } from '../../../../common/logging'; +import { ShellConstants } from '../../../common/shellConstants'; +import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils'; +import { ShellEnvsProvider } from '../startupProvider'; +import { POWERSHELL_ENV_KEY } from './pwshConstants'; + +export class PowerShellEnvsProvider implements ShellEnvsProvider { + public readonly shellType: string = ShellConstants.PWSH; + + updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void { + try { + const pwshActivation = getShellActivationCommand(this.shellType, env); + if (pwshActivation) { + const command = getShellCommandAsString(this.shellType, pwshActivation); + const v = collection.get(POWERSHELL_ENV_KEY); + if (v?.value === command) { + return; + } + collection.replace(POWERSHELL_ENV_KEY, command); + } else { + collection.delete(POWERSHELL_ENV_KEY); + } + } catch (err) { + traceError('Failed to update PowerShell environment variables', err); + collection.delete(POWERSHELL_ENV_KEY); + } + } + + removeEnvVariables(envCollection: EnvironmentVariableCollection): void { + envCollection.delete(POWERSHELL_ENV_KEY); + } + + getEnvVariables(env?: PythonEnvironment): Map | undefined { + if (!env) { + return new Map([[POWERSHELL_ENV_KEY, undefined]]); + } + + try { + const pwshActivation = getShellActivationCommand(this.shellType, env); + if (pwshActivation) { + return new Map([[POWERSHELL_ENV_KEY, getShellCommandAsString(this.shellType, pwshActivation)]]); + } + return undefined; + } catch (err) { + traceError('Failed to get PowerShell environment variables', err); + return undefined; + } + } +} diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts new file mode 100644 index 0000000..bea5e4f --- /dev/null +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -0,0 +1,319 @@ +import * as fs from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; +import which from 'which'; +import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; +import { isWindows } from '../../../../common/utils/platformUtils'; +import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; +import { runCommand } from '../utils'; + +import assert from 'assert'; +import { getGlobalPersistentState } from '../../../../common/persistentState'; +import { ShellConstants } from '../../../common/shellConstants'; +import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { extractProfilePath, PROFILE_TAG_END, PROFILE_TAG_START } from '../common/shellUtils'; +import { POWERSHELL_ENV_KEY, PWSH_SCRIPT_VERSION } from './pwshConstants'; + +const PWSH_PROFILE_PATH_CACHE_KEY = 'PWSH_PROFILE_PATH_CACHE'; +const PS5_PROFILE_PATH_CACHE_KEY = 'PS5_PROFILE_PATH_CACHE'; +let pwshProfilePath: string | undefined; +let ps5ProfilePath: string | undefined; +async function clearPwshCache(shell: 'powershell' | 'pwsh'): Promise { + const global = await getGlobalPersistentState(); + if (shell === 'powershell') { + ps5ProfilePath = undefined; + await global.clear([PS5_PROFILE_PATH_CACHE_KEY]); + } else { + pwshProfilePath = undefined; + await global.clear([PWSH_PROFILE_PATH_CACHE_KEY]); + } +} + +async function setProfilePathCache(shell: 'powershell' | 'pwsh', profilePath: string): Promise { + const global = await getGlobalPersistentState(); + if (shell === 'powershell') { + ps5ProfilePath = profilePath; + await global.set(PS5_PROFILE_PATH_CACHE_KEY, profilePath); + } else { + pwshProfilePath = profilePath; + await global.set(PWSH_PROFILE_PATH_CACHE_KEY, profilePath); + } +} + +function getProfilePathCache(shell: 'powershell' | 'pwsh'): string | undefined { + if (shell === 'powershell') { + return ps5ProfilePath; + } else { + return pwshProfilePath; + } +} + +async function isPowerShellInstalled(shell: string): Promise { + try { + await which(shell); + return true; + } catch { + traceVerbose(`${shell} is not installed`); + return false; + } +} + +async function getProfileForShell(shell: 'powershell' | 'pwsh'): Promise { + const cachedPath = getProfilePathCache(shell); + if (cachedPath) { + traceInfo(`SHELL: ${shell} profile path from cache: ${cachedPath}`); + return cachedPath; + } + + try { + const content = await runCommand( + isWindows() + ? `${shell} -Command "Write-Output '${PROFILE_TAG_START}'; Write-Output $profile; Write-Output '${PROFILE_TAG_END}'"` + : `${shell} -Command "Write-Output '${PROFILE_TAG_START}'; Write-Output \\$profile; Write-Output '${PROFILE_TAG_END}'"`, + ); + + if (content) { + const profilePath = extractProfilePath(content); + if (profilePath) { + setProfilePathCache(shell, profilePath); + traceInfo(`SHELL: ${shell} profile found at: ${profilePath}`); + return profilePath; + } + } + } catch (err) { + traceError(`${shell} failed to get profile path`, err); + } + + let profile: string; + if (isWindows()) { + if (shell === 'powershell') { + profile = path.join( + process.env.USERPROFILE || os.homedir(), + 'Documents', + 'WindowsPowerShell', + 'Microsoft.PowerShell_profile.ps1', + ); + } else { + profile = path.join( + process.env.USERPROFILE || os.homedir(), + 'Documents', + 'PowerShell', + 'Microsoft.PowerShell_profile.ps1', + ); + } + } else { + profile = path.join( + process.env.HOME || os.homedir(), + '.config', + 'powershell', + 'Microsoft.PowerShell_profile.ps1', + ); + } + traceInfo(`SHELL: ${shell} profile not found, using default path: ${profile}`); + return profile; +} + +const regionStart = '#region vscode python'; +const regionEnd = '#endregion vscode python'; +function getActivationContent(): string { + const lineSep = isWindows() ? '\r\n' : '\n'; + const activationContent = [ + `#version: ${PWSH_SCRIPT_VERSION}`, + `if (($env:TERM_PROGRAM -eq 'vscode') -and ($null -ne $env:${POWERSHELL_ENV_KEY})) {`, + ' try {', + ` Invoke-Expression $env:${POWERSHELL_ENV_KEY}`, + ' } catch {', + ` Write-Error "Failed to activate Python environment: $_" -ErrorAction Continue`, + ' }', + '}', + ].join(lineSep); + return activationContent; +} + +async function isPowerShellStartupSetup(shell: string, profile: string): Promise { + if (await fs.pathExists(profile)) { + const content = await fs.readFile(profile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [POWERSHELL_ENV_KEY])) { + traceInfo(`SHELL: ${shell} already contains activation code: ${profile}`); + return true; + } + } + traceInfo(`SHELL: ${shell} does not contain activation code: ${profile}`); + return false; +} + +async function setupPowerShellStartup(shell: string, profile: string): Promise { + const activationContent = getActivationContent(); + + try { + if (await fs.pathExists(profile)) { + const content = await fs.readFile(profile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [POWERSHELL_ENV_KEY])) { + traceInfo(`SHELL: ${shell} already contains activation code: ${profile}`); + } else { + await fs.writeFile(profile, insertStartupCode(content, regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Updated existing ${shell} profile at: ${profile}\r\n${activationContent}`); + } + } else { + await fs.mkdirp(path.dirname(profile)); + await fs.writeFile(profile, insertStartupCode('', regionStart, regionEnd, activationContent)); + traceInfo(`SHELL: Created new ${shell} profile at: ${profile}\r\n${activationContent}`); + } + return true; + } catch (err) { + traceError(`Failed to setup ${shell} startup`, err); + return false; + } +} + +async function removePowerShellStartup(shell: string, profile: string): Promise { + if (!(await fs.pathExists(profile))) { + return true; + } + + try { + const content = await fs.readFile(profile, 'utf8'); + if (hasStartupCode(content, regionStart, regionEnd, [POWERSHELL_ENV_KEY])) { + await fs.writeFile(profile, removeStartupCode(content, regionStart, regionEnd)); + traceInfo(`SHELL: Removed activation from ${shell} profile at: ${profile}`); + } else { + traceInfo(`SHELL: No activation code found in ${shell} profile at: ${profile}`); + } + return true; + } catch (err) { + traceError(`SHELL: Failed to remove startup code for ${shell} profile at: ${profile}`, err); + return false; + } +} + +type PowerShellType = 'powershell' | 'pwsh'; + +export class PwshStartupProvider implements ShellStartupScriptProvider { + public readonly name: string = 'PowerShell'; + public readonly shellType: string = ShellConstants.PWSH; + + private _isPwshInstalled: boolean | undefined; + private _isPs5Installed: boolean | undefined; + private _supportedShells: PowerShellType[]; + + constructor(supportedShells: PowerShellType[]) { + assert(supportedShells.length > 0, 'At least one PowerShell shell must be supported'); + this._supportedShells = supportedShells; + } + + private async checkInstallations(): Promise> { + const results = new Map(); + + await Promise.all( + this._supportedShells.map(async (shell) => { + if (shell === 'pwsh' && this._isPwshInstalled !== undefined) { + results.set(shell, this._isPwshInstalled); + } else if (shell === 'powershell' && this._isPs5Installed !== undefined) { + results.set(shell, this._isPs5Installed); + } else { + const isInstalled = await isPowerShellInstalled(shell); + if (shell === 'pwsh') { + this._isPwshInstalled = isInstalled; + } else { + this._isPs5Installed = isInstalled; + } + results.set(shell, isInstalled); + } + }), + ); + + return results; + } + + async isSetup(): Promise { + const installations = await this.checkInstallations(); + + if (Array.from(installations.values()).every((installed) => !installed)) { + return ShellSetupState.NotInstalled; + } + + const results: ShellSetupState[] = []; + for (const [shell, installed] of installations.entries()) { + if (!installed) { + continue; + } + + try { + const profile = await getProfileForShell(shell); + const isSetup = await isPowerShellStartupSetup(shell, profile); + results.push(isSetup ? ShellSetupState.Setup : ShellSetupState.NotSetup); + } catch (err) { + traceError(`Failed to check if ${shell} startup is setup`, err); + results.push(ShellSetupState.NotSetup); + } + } + + if (results.includes(ShellSetupState.NotSetup)) { + return ShellSetupState.NotSetup; + } + + return ShellSetupState.Setup; + } + + async setupScripts(): Promise { + const installations = await this.checkInstallations(); + + if (Array.from(installations.values()).every((installed) => !installed)) { + return ShellScriptEditState.NotInstalled; + } + + const anyEdited = []; + for (const [shell, installed] of installations.entries()) { + if (!installed) { + continue; + } + + try { + const profile = await getProfileForShell(shell); + const success = await setupPowerShellStartup(shell, profile); + anyEdited.push(success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited); + } catch (err) { + traceError(`Failed to setup ${shell} startup`, err); + } + } + return anyEdited.every((state) => state === ShellScriptEditState.Edited) + ? ShellScriptEditState.Edited + : ShellScriptEditState.NotEdited; + } + + async teardownScripts(): Promise { + const installations = await this.checkInstallations(); + + if (Array.from(installations.values()).every((installed) => !installed)) { + return ShellScriptEditState.NotInstalled; + } + + const anyEdited = []; + for (const [shell, installed] of installations.entries()) { + if (!installed) { + continue; + } + + try { + const profile = await getProfileForShell(shell); + const success = await removePowerShellStartup(shell, profile); + anyEdited.push(success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited); + } catch (err) { + traceError(`Failed to remove ${shell} startup`, err); + } + } + return anyEdited.every((state) => state === ShellScriptEditState.Edited) + ? ShellScriptEditState.Edited + : ShellScriptEditState.NotEdited; + } + + async clearCache(): Promise { + for (const shell of this._supportedShells) { + await clearPwshCache(shell); + } + + // Reset installation check cache as well + this._isPwshInstalled = undefined; + this._isPs5Installed = undefined; + } +} diff --git a/src/features/terminal/shells/startupProvider.ts b/src/features/terminal/shells/startupProvider.ts new file mode 100644 index 0000000..5d118ca --- /dev/null +++ b/src/features/terminal/shells/startupProvider.ts @@ -0,0 +1,30 @@ +import { EnvironmentVariableCollection } from 'vscode'; +import { PythonEnvironment } from '../../../api'; + +export enum ShellSetupState { + NotSetup, + Setup, + NotInstalled, +} + +export enum ShellScriptEditState { + NotEdited, + Edited, + NotInstalled, +} + +export interface ShellStartupScriptProvider { + name: string; + readonly shellType: string; + isSetup(): Promise; + setupScripts(): Promise; + teardownScripts(): Promise; + clearCache(): Promise; +} + +export interface ShellEnvsProvider { + readonly shellType: string; + updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): void; + removeEnvVariables(envVars: EnvironmentVariableCollection): void; + getEnvVariables(env?: PythonEnvironment): Map | undefined; +} diff --git a/src/features/terminal/shells/utils.ts b/src/features/terminal/shells/utils.ts new file mode 100644 index 0000000..c9c99eb --- /dev/null +++ b/src/features/terminal/shells/utils.ts @@ -0,0 +1,15 @@ +import * as cp from 'child_process'; +import { traceVerbose } from '../../../common/logging'; + +export async function runCommand(command: string): Promise { + return new Promise((resolve) => { + cp.exec(command, (err, stdout) => { + if (err) { + traceVerbose(`Error running command: ${command}`, err); + resolve(undefined); + } else { + resolve(stdout?.trim()); + } + }); + }); +} diff --git a/src/features/terminal/terminalActivationState.ts b/src/features/terminal/terminalActivationState.ts index 5ea1bc1..c022088 100644 --- a/src/features/terminal/terminalActivationState.ts +++ b/src/features/terminal/terminalActivationState.ts @@ -7,12 +7,11 @@ import { TerminalShellExecutionStartEvent, TerminalShellIntegration, } from 'vscode'; -import { PythonCommandRunConfiguration, PythonEnvironment } from '../../api'; -import { onDidEndTerminalShellExecution, onDidStartTerminalShellExecution } from '../../common/window.apis'; +import { PythonEnvironment } from '../../api'; import { traceError, traceInfo, traceVerbose } from '../../common/logging'; -import { isTaskTerminal } from './utils'; +import { onDidEndTerminalShellExecution, onDidStartTerminalShellExecution } from '../../common/window.apis'; import { getActivationCommand, getDeactivationCommand } from '../common/activation'; -import { quoteArgs } from '../execution/execUtils'; +import { isTaskTerminal } from './utils'; export interface DidChangeTerminalActivationStateEvent { terminal: Terminal; @@ -198,11 +197,7 @@ export class TerminalActivationImpl implements TerminalActivationInternal { private activateLegacy(terminal: Terminal, environment: PythonEnvironment) { const activationCommands = getActivationCommand(terminal, environment); if (activationCommands) { - for (const command of activationCommands) { - const args = command.args ?? []; - const text = quoteArgs([command.executable, ...args]).join(' '); - terminal.sendText(text); - } + terminal.sendText(activationCommands); this.activatedTerminals.set(terminal, environment); } } @@ -210,11 +205,7 @@ export class TerminalActivationImpl implements TerminalActivationInternal { private deactivateLegacy(terminal: Terminal, environment: PythonEnvironment) { const deactivationCommands = getDeactivationCommand(terminal, environment); if (deactivationCommands) { - for (const command of deactivationCommands) { - const args = command.args ?? []; - const text = quoteArgs([command.executable, ...args]).join(' '); - terminal.sendText(text); - } + terminal.sendText(deactivationCommands); this.activatedTerminals.delete(terminal); } } @@ -224,12 +215,10 @@ export class TerminalActivationImpl implements TerminalActivationInternal { terminal: Terminal, environment: PythonEnvironment, ): Promise { - const activationCommands = getActivationCommand(terminal, environment); - if (activationCommands) { + const activationCommand = getActivationCommand(terminal, environment); + if (activationCommand) { try { - for (const command of activationCommands) { - await this.executeTerminalShellCommandInternal(shellIntegration, command); - } + await this.executeTerminalShellCommandInternal(shellIntegration, activationCommand); this.activatedTerminals.set(terminal, environment); } catch { traceError('Failed to activate environment using shell integration'); @@ -244,12 +233,10 @@ export class TerminalActivationImpl implements TerminalActivationInternal { terminal: Terminal, environment: PythonEnvironment, ): Promise { - const deactivationCommands = getDeactivationCommand(terminal, environment); - if (deactivationCommands) { + const deactivationCommand = getDeactivationCommand(terminal, environment); + if (deactivationCommand) { try { - for (const command of deactivationCommands) { - await this.executeTerminalShellCommandInternal(shellIntegration, command); - } + await this.executeTerminalShellCommandInternal(shellIntegration, deactivationCommand); this.activatedTerminals.delete(terminal); } catch { traceError('Failed to deactivate environment using shell integration'); @@ -261,14 +248,14 @@ export class TerminalActivationImpl implements TerminalActivationInternal { private async executeTerminalShellCommandInternal( shellIntegration: TerminalShellIntegration, - command: PythonCommandRunConfiguration, + command: string, ): Promise { - const execution = shellIntegration.executeCommand(command.executable, command.args ?? []); + const execution = shellIntegration.executeCommand(command); const disposables: Disposable[] = []; const promise = new Promise((resolve) => { const timer = setTimeout(() => { - traceError(`Shell execution timed out: ${command.executable} ${command.args?.join(' ')}`); + traceError(`Shell execution timed out: ${command}`); resolve(); }, 2000); @@ -281,7 +268,7 @@ export class TerminalActivationImpl implements TerminalActivationInternal { }), this.onTerminalShellExecutionStart((e: TerminalShellExecutionStartEvent) => { if (e.execution === execution) { - traceVerbose(`Shell execution started: ${command.executable} ${command.args?.join(' ')}`); + traceVerbose(`Shell execution started: ${command}`); } }), ); @@ -291,7 +278,7 @@ export class TerminalActivationImpl implements TerminalActivationInternal { await promise; return true; } catch { - traceError(`Failed to execute shell command: ${command.executable} ${command.args?.join(' ')}`); + traceError(`Failed to execute shell command: ${command}`); return false; } finally { disposables.forEach((d) => d.dispose()); diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index f94d93c..69cdf61 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -1,24 +1,29 @@ -import * as path from 'path'; import * as fsapi from 'fs-extra'; -import { Disposable, EventEmitter, ProgressLocation, Terminal, Uri, TerminalOptions } from 'vscode'; +import * as path from 'path'; +import { Disposable, EventEmitter, ProgressLocation, Terminal, TerminalOptions, Uri } from 'vscode'; +import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonTerminalCreateOptions } from '../../api'; +import { traceInfo, traceVerbose } from '../../common/logging'; import { createTerminal, + onDidChangeWindowState, onDidCloseTerminal, onDidOpenTerminal, terminals, withProgress, } from '../../common/window.apis'; -import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonTerminalCreateOptions } from '../../api'; +import { getConfiguration, onDidChangeConfiguration } from '../../common/workspace.apis'; import { isActivatableEnvironment } from '../common/activation'; -import { getConfiguration } from '../../common/workspace.apis'; -import { getEnvironmentForTerminal, waitForShellIntegration } from './utils'; +import { identifyTerminalShell } from '../common/shellDetector'; +import { getPythonApi } from '../pythonApi'; +import { ShellEnvsProvider, ShellSetupState, ShellStartupScriptProvider } from './shells/startupProvider'; +import { handleSettingUpShellProfile } from './shellStartupSetupHandlers'; import { DidChangeTerminalActivationStateEvent, TerminalActivation, TerminalActivationInternal, TerminalEnvironment, } from './terminalActivationState'; -import { getPythonApi } from '../pythonApi'; +import { AutoActivationType, getAutoActivationType, getEnvironmentForTerminal, waitForShellIntegration } from './utils'; export interface TerminalCreation { create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; @@ -53,6 +58,7 @@ export interface TerminalManager export class TerminalManagerImpl implements TerminalManager { private disposables: Disposable[] = []; private skipActivationOnOpen = new Set(); + private shellSetup: Map = new Map(); private onTerminalOpenedEmitter = new EventEmitter(); private onTerminalOpened = this.onTerminalOpenedEmitter.event; @@ -63,7 +69,13 @@ export class TerminalManagerImpl implements TerminalManager { private onDidChangeTerminalActivationStateEmitter = new EventEmitter(); public onDidChangeTerminalActivationState = this.onDidChangeTerminalActivationStateEmitter.event; - constructor(private readonly ta: TerminalActivationInternal) { + private hasFocus = true; + + constructor( + private readonly ta: TerminalActivationInternal, + private readonly startupEnvProviders: ShellEnvsProvider[], + private readonly startupScriptProviders: ShellStartupScriptProvider[], + ) { this.disposables.push( this.onTerminalOpenedEmitter, this.onTerminalClosedEmitter, @@ -93,37 +105,158 @@ export class TerminalManagerImpl implements TerminalManager { this.ta.onDidChangeTerminalActivationState((e) => { this.onDidChangeTerminalActivationStateEmitter.fire(e); }), + onDidChangeConfiguration(async (e) => { + if (e.affectsConfiguration('python-envs.terminal.autoActivationType')) { + const actType = getAutoActivationType(); + if (actType === 'shellStartup') { + traceInfo(`Auto activation type changed to ${actType}`); + const shells = new Set( + terminals() + .map((t) => identifyTerminalShell(t)) + .filter((t) => t !== 'unknown'), + ); + if (shells.size > 0) { + await this.handleSetupCheck(shells); + } + } else { + traceVerbose(`Auto activation type changed to ${actType}`); + this.shellSetup.clear(); + } + } + }), + onDidChangeWindowState((e) => { + this.hasFocus = e.focused; + }), ); } + private async handleSetupCheck(shellType: string | Set): Promise { + const shellTypes = typeof shellType === 'string' ? new Set([shellType]) : shellType; + const providers = this.startupScriptProviders.filter((p) => shellTypes.has(p.shellType)); + if (providers.length > 0) { + const shellsToSetup: ShellStartupScriptProvider[] = []; + await Promise.all( + providers.map(async (p) => { + if (this.shellSetup.has(p.shellType)) { + traceVerbose(`Shell profile for ${p.shellType} already checked.`); + return; + } + traceVerbose(`Checking shell profile for ${p.shellType}.`); + const state = await p.isSetup(); + if (state === ShellSetupState.NotSetup) { + this.shellSetup.set(p.shellType, false); + shellsToSetup.push(p); + traceVerbose(`Shell profile for ${p.shellType} is not setup.`); + } else if (state === ShellSetupState.Setup) { + this.shellSetup.set(p.shellType, true); + traceVerbose(`Shell profile for ${p.shellType} is setup.`); + } else if (state === ShellSetupState.NotInstalled) { + this.shellSetup.set(p.shellType, false); + traceVerbose(`Shell profile for ${p.shellType} is not installed.`); + } + }), + ); + + if (shellsToSetup.length === 0) { + traceVerbose(`No shell profiles to setup for ${Array.from(shellTypes).join(', ')}`); + return; + } + + if (!this.hasFocus) { + traceVerbose('Window does not have focus, skipping shell profile setup'); + return; + } + + setImmediate(async () => { + // Avoid blocking this setup on user interaction. + await handleSettingUpShellProfile(shellsToSetup, (p, v) => this.shellSetup.set(p.shellType, v)); + }); + } + } + + private getShellActivationType(shellType: string): AutoActivationType | undefined { + let isSetup = this.shellSetup.get(shellType); + if (isSetup === true) { + traceVerbose(`Shell profile for ${shellType} is already setup.`); + return 'shellStartup'; + } else if (isSetup === false) { + traceVerbose(`Shell profile for ${shellType} is not set up, using command fallback.`); + return 'command'; + } + } + + private async getEffectiveActivationType(shellType: string): Promise { + const providers = this.startupScriptProviders.filter((p) => p.shellType === shellType); + if (providers.length > 0) { + traceVerbose(`Shell startup is supported for ${shellType}, using shell startup activation`); + let isSetup = this.getShellActivationType(shellType); + if (isSetup !== undefined) { + return isSetup; + } + + await this.handleSetupCheck(shellType); + + // Check again after the setup check. + return this.getShellActivationType(shellType) ?? 'command'; + } + traceInfo(`Shell startup not supported for ${shellType}, using command activation as fallback`); + return 'command'; + } + private async autoActivateOnTerminalOpen(terminal: Terminal, environment: PythonEnvironment): Promise { - const config = getConfiguration('python'); - if (!config.get('terminal.activateEnvironment', false)) { - return; + let actType = getAutoActivationType(); + const shellType = identifyTerminalShell(terminal); + if (actType === 'shellStartup') { + actType = await this.getEffectiveActivationType(shellType); } - if (isActivatableEnvironment(environment)) { - await withProgress( - { - location: ProgressLocation.Window, - title: `Activating environment: ${environment.environmentPath.fsPath}`, - }, - async () => { - await waitForShellIntegration(terminal); - await this.activate(terminal, environment); - }, + if (actType === 'command') { + if (isActivatableEnvironment(environment)) { + await withProgress( + { + location: ProgressLocation.Window, + title: `Activating environment: ${environment.environmentPath.fsPath}`, + }, + async () => { + await waitForShellIntegration(terminal); + await this.activate(terminal, environment); + }, + ); + } else { + traceVerbose(`Environment ${environment.environmentPath.fsPath} is not activatable`); + } + } else if (actType === 'off') { + traceInfo(`"python-envs.terminal.autoActivationType" is set to "${actType}", skipping auto activation`); + } else if (actType === 'shellStartup') { + traceInfo( + `"python-envs.terminal.autoActivationType" is set to "${actType}", terminal should be activated by shell startup script`, ); } } public async create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise { + const autoActType = getAutoActivationType(); + let envVars = options.env; + if (autoActType === 'shellStartup') { + const vars = await Promise.all(this.startupEnvProviders.map((p) => p.getEnvVariables(environment))); + + vars.forEach((varMap) => { + if (varMap) { + varMap.forEach((value, key) => { + envVars = { ...envVars, [key]: value }; + }); + } + }); + } + + // https://github.com/microsoft/vscode-python-environments/issues/172 // const name = options.name ?? `Python: ${environment.displayName}`; const newTerminal = createTerminal({ name: options.name, shellPath: options.shellPath, shellArgs: options.shellArgs, cwd: options.cwd, - env: options.env, + env: envVars, strictEnv: options.strictEnv, message: options.message, iconPath: options.iconPath, @@ -133,16 +266,18 @@ export class TerminalManagerImpl implements TerminalManager { isTransient: options.isTransient, }); - if (options.disableActivation) { + if (autoActType === 'command') { + if (options.disableActivation) { + this.skipActivationOnOpen.add(newTerminal); + return newTerminal; + } + + // We add it to skip activation on open to prevent double activation. + // We can activate it ourselves since we are creating it. this.skipActivationOnOpen.add(newTerminal); - return newTerminal; + await this.autoActivateOnTerminalOpen(newTerminal, environment); } - // We add it to skip activation on open to prevent double activation. - // We can activate it ourselves since we are creating it. - this.skipActivationOnOpen.add(newTerminal); - await this.autoActivateOnTerminalOpen(newTerminal, environment); - return newTerminal; } @@ -213,20 +348,37 @@ export class TerminalManagerImpl implements TerminalManager { return newTerminal; } - public async initialize(api: PythonEnvironmentApi): Promise { - const config = getConfiguration('python'); - if (config.get('terminal.activateEnvInCurrentTerminal', false)) { - await Promise.all( - terminals().map(async (t) => { - this.skipActivationOnOpen.add(t); + private async activateUsingCommand(api: PythonEnvironmentApi, t: Terminal): Promise { + this.skipActivationOnOpen.add(t); - const env = this.ta.getEnvironment(t) ?? (await getEnvironmentForTerminal(api, t)); + const env = this.ta.getEnvironment(t) ?? (await getEnvironmentForTerminal(api, t)); - if (env && isActivatableEnvironment(env)) { - await this.activate(t, env); - } - }), + if (env && isActivatableEnvironment(env)) { + await this.activate(t, env); + } + } + + public async initialize(api: PythonEnvironmentApi): Promise { + const actType = getAutoActivationType(); + if (actType === 'command') { + await Promise.all(terminals().map(async (t) => this.activateUsingCommand(api, t))); + } else if (actType === 'shellStartup') { + const shells = new Set( + terminals() + .map((t) => identifyTerminalShell(t)) + .filter((t) => t !== 'unknown'), ); + if (shells.size > 0) { + await this.handleSetupCheck(shells); + await Promise.all( + terminals().map(async (t) => { + // If the shell is not set up, we activate using command fallback. + if (this.shellSetup.get(identifyTerminalShell(t)) === false) { + await this.activateUsingCommand(api, t); + } + }), + ); + } } } diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 612fbe2..7258ac1 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -1,8 +1,8 @@ import * as path from 'path'; import { Terminal, TerminalOptions, Uri } from 'vscode'; -import { sleep } from '../../common/utils/asyncUtils'; import { PythonEnvironment, PythonProject, PythonProjectEnvironmentApi, PythonProjectGetterApi } from '../../api'; -import { getWorkspaceFolders } from '../../common/workspace.apis'; +import { sleep } from '../../common/utils/asyncUtils'; +import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.apis'; const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds @@ -89,3 +89,40 @@ export async function getEnvironmentForTerminal( return env; } + +export type AutoActivationType = 'off' | 'command' | 'shellStartup'; +export function getAutoActivationType(): AutoActivationType { + // 'startup' auto-activation means terminal is activated via shell startup scripts. + // 'command' auto-activation means terminal is activated via a command. + // 'off' means no auto-activation. + const config = getConfiguration('python-envs'); + return config.get('terminal.autoActivationType', 'command'); +} + +export async function setAutoActivationType(value: AutoActivationType): Promise { + const config = getConfiguration('python-envs'); + return await config.update('terminal.autoActivationType', value, true); +} + +export async function getAllDistinctProjectEnvironments( + api: PythonProjectGetterApi & PythonProjectEnvironmentApi, +): Promise { + const envs: PythonEnvironment[] | undefined = []; + + const projects = api.getPythonProjects(); + if (projects.length === 0) { + const env = await api.getEnvironment(undefined); + if (env) { + envs.push(env); + } + } else if (projects.length === 1) { + const env = await api.getEnvironment(projects[0].uri); + if (env) { + envs.push(env); + } + } else { + envs.push(...(await getDistinctProjectEnvs(api, projects))); + } + + return envs.length > 0 ? envs : undefined; +} diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index a1e2a9c..4fdae86 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -9,8 +9,9 @@ import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; import { traceInfo } from '../../common/logging'; -import { Installable, mergePackages } from '../common/utils'; import { refreshPipPackages } from './utils'; +import { mergePackages } from '../common/utils'; +import { Installable } from '../common/types'; async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { try { diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index b1fc9c5..a4bc81d 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -14,12 +14,12 @@ import { NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { showErrorMessage } from '../../common/errors/utils'; import { shortVersion, sortEnvironments } from '../common/utils'; import { SysManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; import { parsePipList, PipPackage } from './pipListUtils'; import { withProgress } from '../../common/window.apis'; +import { showErrorMessageWithLogs } from '../../common/errors/utils'; function asPackageQuickPickItem(name: string, version?: string): QuickPickItem { return { @@ -170,7 +170,7 @@ export async function refreshPipPackages( return parsePipList(data); } catch (e) { log?.error('Error refreshing packages', e); - showErrorMessage(SysManagerStrings.packageRefreshError, log); + showErrorMessageWithLogs(SysManagerStrings.packageRefreshError, log); return undefined; } } diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 441067d..159964e 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -37,9 +37,8 @@ import { NativePythonFinder } from '../common/nativePythonFinder'; import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; -import { withProgress } from '../../common/window.apis'; +import { showErrorMessage, withProgress } from '../../common/window.apis'; import { VenvManagerStrings } from '../../common/localize'; -import { showErrorMessage } from '../../common/errors/utils'; export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 6387014..1e0c8cb 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -18,7 +18,7 @@ import { NativePythonFinder, } from '../common/nativePythonFinder'; import { getWorkspacePersistentState } from '../../common/persistentState'; -import { isWindows, shortVersion, sortEnvironments } from '../common/utils'; +import { shortVersion, sortEnvironments } from '../common/utils'; import { getConfiguration } from '../../common/workspace.apis'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { @@ -27,13 +27,15 @@ import { showWarningMessage, showInputBox, showOpenDialog, + showErrorMessage, } from '../../common/window.apis'; -import { showErrorMessage } from '../../common/errors/utils'; import { Common, VenvManagerStrings } from '../../common/localize'; import { isUvInstalled, runUV, runPython } from './helpers'; import { getProjectInstallable, getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; +import { isWindows } from '../../common/utils/platformUtils'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; import { EventNames } from '../../common/telemetry/constants'; +import { ShellConstants } from '../../features/common/shellConstants'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -112,7 +114,7 @@ function getName(binPath: string): string { } function pathForGitBash(binPath: string): string { - return isWindows() ? binPath.replace(/\\/g, '/') : binPath; + return isWindows() ? binPath.replace(/\\/g, '/').replace(/^([a-zA-Z]):/, '/$1') : binPath; } async function getPythonInfo(env: NativeEnvInfo): Promise { @@ -135,58 +137,68 @@ async function getPythonInfo(env: NativeEnvInfo): Promise } if (await fsapi.pathExists(path.join(binDir, 'activate'))) { - shellActivation.set('sh', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set('sh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.SH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'deactivate' }]); - shellActivation.set('bash', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set('bash', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.BASH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'deactivate' }]); - shellActivation.set('gitbash', [ + shellActivation.set(ShellConstants.GITBASH, [ { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, ]); - shellDeactivation.set('gitbash', [{ executable: 'deactivate' }]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'deactivate' }]); - shellActivation.set('zsh', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set('zsh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.ZSH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'deactivate' }]); - shellActivation.set('ksh', [{ executable: '.', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set('ksh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.KSH, [{ executable: '.', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.KSH, [{ executable: 'deactivate' }]); } if (await fsapi.pathExists(path.join(binDir, 'Activate.ps1'))) { - shellActivation.set('pwsh', [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); - shellDeactivation.set('pwsh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); } else if (await fsapi.pathExists(path.join(binDir, 'activate.ps1'))) { - shellActivation.set('pwsh', [{ executable: '&', args: [path.join(binDir, `activate.ps1`)] }]); - shellDeactivation.set('pwsh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `activate.ps1`)] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); } if (await fsapi.pathExists(path.join(binDir, 'activate.bat'))) { - shellActivation.set('cmd', [{ executable: path.join(binDir, `activate.bat`) }]); - shellDeactivation.set('cmd', [{ executable: path.join(binDir, `deactivate.bat`) }]); + shellActivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `activate.bat`) }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `deactivate.bat`) }]); } if (await fsapi.pathExists(path.join(binDir, 'activate.csh'))) { - shellActivation.set('csh', [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); - shellDeactivation.set('csh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.CSH, [ + { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, + ]); + shellDeactivation.set(ShellConstants.CSH, [{ executable: 'deactivate' }]); - shellActivation.set('tcsh', [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); - shellDeactivation.set('tcsh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.FISH, [ + { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, + ]); + shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); } if (await fsapi.pathExists(path.join(binDir, 'activate.fish'))) { - shellActivation.set('fish', [{ executable: 'source', args: [path.join(binDir, `activate.fish`)] }]); - shellDeactivation.set('fish', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.FISH, [ + { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, + ]); + shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); } if (await fsapi.pathExists(path.join(binDir, 'activate.xsh'))) { - shellActivation.set('xonsh', [{ executable: 'source', args: [path.join(binDir, `activate.xsh`)] }]); - shellDeactivation.set('xonsh', [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.XONSH, [ + { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, + ]); + shellDeactivation.set(ShellConstants.XONSH, [{ executable: 'deactivate' }]); } if (await fsapi.pathExists(path.join(binDir, 'activate.nu'))) { - shellActivation.set('nu', [{ executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }]); - shellDeactivation.set('nu', [{ executable: 'overlay', args: ['hide', 'activate'] }]); + shellActivation.set(ShellConstants.NU, [ + { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, + ]); + shellDeactivation.set(ShellConstants.NU, [{ executable: 'overlay', args: ['hide', 'activate'] }]); } return { diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index 1d62080..a363041 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -4,13 +4,15 @@ import * as rpc from 'vscode-jsonrpc/node'; import * as ch from 'child_process'; import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants'; import { getExtension } from '../../common/extension.apis'; -import { getUserHomeDir, isWindows, noop, untildify } from './utils'; +import { noop } from './utils'; import { Disposable, ExtensionContext, LogOutputChannel, Uri } from 'vscode'; import { PassThrough } from 'stream'; import { PythonProjectApi } from '../../api'; import { getConfiguration } from '../../common/workspace.apis'; import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; import { traceVerbose } from '../../common/logging'; +import { isWindows } from '../../common/utils/platformUtils'; +import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; async function getNativePythonToolsPath(): Promise { const envsExt = getExtension(ENVS_EXTENSION_ID); diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts index e63a0ae..e886d60 100644 --- a/src/managers/common/pickers.ts +++ b/src/managers/common/pickers.ts @@ -2,7 +2,7 @@ import { QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickIt import { Common, PackageManagement } from '../../common/localize'; import { launchBrowser } from '../../common/env.apis'; import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from '../../common/window.apis'; -import { Installable } from './utils'; +import { Installable } from './types'; const OPEN_BROWSER_BUTTON = { iconPath: new ThemeIcon('globe'), diff --git a/src/managers/common/types.ts b/src/managers/common/types.ts new file mode 100644 index 0000000..b6e518d --- /dev/null +++ b/src/managers/common/types.ts @@ -0,0 +1,45 @@ +import { Uri } from 'vscode'; + +export interface Installable { + /** + * The name of the package, requirements, lock files, or step name. + */ + readonly name: string; + + /** + * The name of the package, requirements, pyproject.toml or any other project file, etc. + */ + readonly displayName: string; + + /** + * Arguments passed to the package manager to install the package. + * + * @example + * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. + * ['--pre', 'debugpy'] for `pip install --pre debugpy`. + * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. + */ + readonly args?: string[]; + + /** + * Installable group name, this will be used to group installable items in the UI. + * + * @example + * `Requirements` for any requirements file. + * `Packages` for any package. + */ + readonly group?: string; + + /** + * Description about the installable item. This can also be path to the requirements, + * version of the package, or any other project file path. + */ + readonly description?: string; + + /** + * External Uri to the package on pypi or docs. + * @example + * https://pypi.org/project/debugpy/ for `debugpy`. + */ + readonly uri?: Uri; +} diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 27aa812..91dd6c8 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,62 +1,5 @@ -import * as os from 'os'; import { PythonEnvironment } from '../../api'; -import { Uri } from 'vscode'; - -export interface Installable { - /** - * The name of the package, requirements, lock files, or step name. - */ - readonly name: string; - - /** - * The name of the package, requirements, pyproject.toml or any other project file, etc. - */ - readonly displayName: string; - - /** - * Arguments passed to the package manager to install the package. - * - * @example - * ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`. - * ['--pre', 'debugpy'] for `pip install --pre debugpy`. - * ['-r', 'requirements.txt'] for `pip install -r requirements.txt`. - */ - readonly args?: string[]; - - /** - * Installable group name, this will be used to group installable items in the UI. - * - * @example - * `Requirements` for any requirements file. - * `Packages` for any package. - */ - readonly group?: string; - - /** - * Description about the installable item. This can also be path to the requirements, - * version of the package, or any other project file path. - */ - readonly description?: string; - - /** - * External Uri to the package on pypi or docs. - * @example - * https://pypi.org/project/debugpy/ for `debugpy`. - */ - readonly uri?: Uri; -} - -export function isWindows(): boolean { - return process.platform === 'win32'; -} - -export function untildify(path: string): string { - return path.replace(/^~($|\/|\\)/, `${os.homedir()}$1`); -} - -export function getUserHomeDir(): string { - return os.homedir(); -} +import { Installable } from './types'; export function noop() { // do nothing diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index c16fa6f..247b9ad 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -18,7 +18,12 @@ import { ResolveEnvironmentContext, SetEnvironmentScope, } from '../../api'; +import { CondaStrings } from '../../common/localize'; +import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { showErrorMessage, withProgress } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; import { + checkForNoPythonCondaEnvironment, clearCondaCache, createCondaEnvironment, deleteCondaEnvironment, @@ -33,16 +38,10 @@ import { setCondaForWorkspace, setCondaForWorkspaces, } from './condaUtils'; -import { NativePythonFinder } from '../common/nativePythonFinder'; -import { createDeferred, Deferred } from '../../common/utils/deferred'; -import { withProgress } from '../../common/window.apis'; -import { CondaStrings } from '../../common/localize'; -import { showErrorMessage } from '../../common/errors/utils'; export class CondaEnvManager implements EnvironmentManager, Disposable { private collection: PythonEnvironment[] = []; private fsPathToEnv: Map = new Map(); - private disposablesMap: Map = new Map(); private globalEnv: PythonEnvironment | undefined; private readonly _onDidChangeEnvironment = new EventEmitter(); @@ -71,7 +70,8 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { iconPath?: IconPath; public dispose() { - this.disposablesMap.forEach((d) => d.dispose()); + this.collection = []; + this.fsPathToEnv.clear(); } private _initialized: Deferred | undefined; @@ -167,20 +167,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { ); } if (result) { - this.disposablesMap.set( - result.envId.id, - new Disposable(() => { - if (result) { - this.collection = this.collection.filter((env) => env.envId.id !== result?.envId.id); - Array.from(this.fsPathToEnv.entries()) - .filter(([, env]) => env.envId.id === result?.envId.id) - .forEach(([uri]) => this.fsPathToEnv.delete(uri)); - this.disposablesMap.delete(result.envId.id); - } - }), - ); - this.collection.push(result); - this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: result }]); + this.addEnvironment(result); } return result; @@ -190,12 +177,28 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { } } + private addEnvironment(environment: PythonEnvironment, raiseEvent: boolean = true): void { + this.collection.push(environment); + if (raiseEvent) { + this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: environment }]); + } + } + + private removeEnvironment(environment: PythonEnvironment, raiseEvent: boolean = true): void { + this.collection = this.collection.filter((env) => env.envId.id !== environment.envId.id); + Array.from(this.fsPathToEnv.entries()) + .filter(([, env]) => env.envId.id === environment.envId.id) + .forEach(([uri]) => this.fsPathToEnv.delete(uri)); + if (raiseEvent) { + this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.remove, environment }]); + } + } + async remove(context: PythonEnvironment): Promise { try { const projects = this.getProjectsForEnvironment(context); + this.removeEnvironment(context, false); await deleteCondaEnvironment(context, this.log); - this.disposablesMap.get(context.envId.id)?.dispose(); - setImmediate(() => { this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.remove, environment: context }]); projects.forEach((project) => @@ -208,9 +211,6 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { } async refresh(context: RefreshEnvironmentsScope): Promise { if (context === undefined) { - this.disposablesMap.forEach((d) => d.dispose()); - this.disposablesMap.clear(); - await withProgress( { location: ProgressLocation.Window, @@ -253,18 +253,22 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { } async set(scope: SetEnvironmentScope, environment?: PythonEnvironment | undefined): Promise { + const checkedEnv = environment + ? await checkForNoPythonCondaEnvironment(this.nativeFinder, this, environment, this.api, this.log) + : undefined; + if (scope === undefined) { - await setCondaForGlobal(environment?.environmentPath?.fsPath); + await setCondaForGlobal(checkedEnv?.environmentPath?.fsPath); } else if (scope instanceof Uri) { const folder = this.api.getPythonProject(scope); const fsPath = folder?.uri?.fsPath ?? scope.fsPath; if (fsPath) { - if (environment) { - this.fsPathToEnv.set(fsPath, environment); + if (checkedEnv) { + this.fsPathToEnv.set(fsPath, checkedEnv); } else { this.fsPathToEnv.delete(fsPath); } - await setCondaForWorkspace(fsPath, environment?.environmentPath.fsPath); + await setCondaForWorkspace(fsPath, checkedEnv?.environmentPath.fsPath); } } else if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { const projects: PythonProject[] = []; @@ -279,8 +283,8 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { const before: Map = new Map(); projects.forEach((p) => { before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); - if (environment) { - this.fsPathToEnv.set(p.uri.fsPath, environment); + if (checkedEnv) { + this.fsPathToEnv.set(p.uri.fsPath, checkedEnv); } else { this.fsPathToEnv.delete(p.uri.fsPath); } @@ -288,16 +292,29 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { await setCondaForWorkspaces( projects.map((p) => p.uri.fsPath), - environment?.environmentPath.fsPath, + checkedEnv?.environmentPath.fsPath, ); projects.forEach((p) => { const b = before.get(p.uri.fsPath); - if (b?.envId.id !== environment?.envId.id) { - this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + if (b?.envId.id !== checkedEnv?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: checkedEnv }); } }); } + + if (environment && checkedEnv && checkedEnv.envId.id !== environment.envId.id) { + this.removeEnvironment(environment, false); + this.addEnvironment(checkedEnv, false); + setImmediate(() => { + this._onDidChangeEnvironments.fire([ + { kind: EnvironmentChangeKind.remove, environment }, + { kind: EnvironmentChangeKind.add, environment: checkedEnv }, + ]); + const uri = scope ? (scope instanceof Uri ? scope : scope[0]) : undefined; + this._onDidChangeEnvironment.fire({ uri, old: environment, new: checkedEnv }); + }); + } } async resolve(context: ResolveEnvironmentContext): Promise { diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index a49075d..c012ea9 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -17,10 +17,10 @@ import { PythonEnvironment, PythonEnvironmentApi, } from '../../api'; -import { getCommonCondaPackagesToInstall, managePackages, refreshPackages } from './condaUtils'; -import { withProgress } from '../../common/window.apis'; -import { showErrorMessage } from '../../common/errors/utils'; +import { showErrorMessageWithLogs } from '../../common/errors/utils'; import { CondaStrings } from '../../common/localize'; +import { withProgress } from '../../common/window.apis'; +import { getCommonCondaPackagesToInstall, managePackages, refreshPackages } from './condaUtils'; function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { const changes: { kind: PackageChangeKind; pkg: Package }[] = []; @@ -79,7 +79,7 @@ export class CondaPackageManager implements PackageManager, Disposable { async (_progress, token) => { try { const before = this.packages.get(environment.envId.id) ?? []; - const after = await managePackages(environment, manageOptions, this.api, this, token); + const after = await managePackages(environment, manageOptions, this.api, this, token, this.log); const changes = getChanges(before, after); this.packages.set(environment.envId.id, after); this._onDidChangePackages.fire({ environment: environment, manager: this, changes }); @@ -90,7 +90,7 @@ export class CondaPackageManager implements PackageManager, Disposable { this.log.error('Error installing packages', e); setImmediate(async () => { - await showErrorMessage(CondaStrings.condaInstallError, this.log); + await showErrorMessageWithLogs(CondaStrings.condaInstallError, this.log); }); } }, diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index b662300..8977d0e 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -1,18 +1,7 @@ import * as ch from 'child_process'; -import { - EnvironmentManager, - Package, - PackageManagementOptions, - PackageManager, - PythonCommandRunConfiguration, - PythonEnvironment, - PythonEnvironmentApi, - PythonEnvironmentInfo, - PythonProject, -} from '../../api'; -import * as path from 'path'; -import * as os from 'os'; import * as fse from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; import { CancellationError, CancellationToken, @@ -21,10 +10,40 @@ import { ProgressLocation, QuickInputButtons, QuickPickItem, + ThemeIcon, Uri, } from 'vscode'; +import which from 'which'; +import { + EnvironmentManager, + Package, + PackageManagementOptions, + PackageManager, + PythonCommandRunConfiguration, + PythonEnvironment, + PythonEnvironmentApi, + PythonEnvironmentInfo, + PythonProject, +} from '../../api'; import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; +import { showErrorMessageWithLogs } from '../../common/errors/utils'; +import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/localize'; +import { traceInfo } from '../../common/logging'; +import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; +import { pickProject } from '../../common/pickers/projects'; import { createDeferred } from '../../common/utils/deferred'; +import { untildify } from '../../common/utils/pathUtils'; +import { isWindows } from '../../common/utils/platformUtils'; +import { + showErrorMessage, + showInputBox, + showQuickPick, + showQuickPickWithButtons, + withProgress, +} from '../../common/window.apis'; +import { getConfiguration } from '../../common/workspace.apis'; +import { ShellConstants } from '../../features/common/shellConstants'; +import { quoteArgs } from '../../features/execution/execUtils'; import { isNativeEnvInfo, NativeEnvInfo, @@ -32,17 +51,9 @@ import { NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { getConfiguration } from '../../common/workspace.apis'; -import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; -import which from 'which'; -import { Installable, isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils'; -import { pickProject } from '../../common/pickers/projects'; -import { CondaStrings, PackageManagement, Pickers } from '../../common/localize'; -import { showErrorMessage } from '../../common/errors/utils'; -import { showInputBox, showQuickPick, showQuickPickWithButtons, withProgress } from '../../common/window.apis'; import { selectFromCommonPackagesToInstall } from '../common/pickers'; -import { quoteArgs } from '../../features/execution/execUtils'; -import { traceInfo } from '../../common/logging'; +import { Installable } from '../common/types'; +import { shortVersion, sortEnvironments } from '../common/utils'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -124,13 +135,7 @@ async function findConda(): Promise { } } -export async function getConda(native?: NativePythonFinder): Promise { - const conda = getCondaPathSetting(); - if (conda) { - traceInfo(`Using conda from settings: ${conda}`); - return conda; - } - +async function getCondaExecutable(native?: NativePythonFinder): Promise { if (condaPath) { traceInfo(`Using conda from cache: ${condaPath}`); return untildify(condaPath); @@ -168,9 +173,22 @@ export async function getConda(native?: NativePythonFinder): Promise { throw new Error('Conda not found'); } -async function runConda(args: string[], token?: CancellationToken): Promise { - const conda = await getConda(); +export async function getConda(native?: NativePythonFinder): Promise { + const conda = getCondaPathSetting(); + if (conda) { + traceInfo(`Using conda from settings: ${conda}`); + return conda; + } + + return await getCondaExecutable(native); +} +async function _runConda( + conda: string, + args: string[], + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { const deferred = createDeferred(); args = quoteArgs(args); const proc = ch.spawn(conda, args, { shell: true }); @@ -183,10 +201,14 @@ async function runConda(args: string[], token?: CancellationToken): Promise { - stdout += data.toString('utf-8'); + const d = data.toString('utf-8'); + stdout += d; + log?.info(d.trim()); }); proc.stderr?.on('data', (data) => { - stderr += data.toString('utf-8'); + const d = data.toString('utf-8'); + stderr += d; + log?.error(d.trim()); }); proc.on('close', () => { deferred.resolve(stdout); @@ -200,6 +222,16 @@ async function runConda(args: string[], token?: CancellationToken): Promise { + const conda = await getConda(); + return await _runConda(conda, args, log, token); +} + +async function runCondaExecutable(args: string[], log?: LogOutputChannel, token?: CancellationToken): Promise { + const conda = await getCondaExecutable(undefined); + return await _runConda(conda, args, log, token); +} + // eslint-disable-next-line @typescript-eslint/no-explicit-any async function getCondaInfo(): Promise { const raw = await runConda(['info', '--envs', '--json']); @@ -252,7 +284,7 @@ function isPrefixOf(roots: string[], e: string): boolean { } function pathForGitBash(binPath: string): string { - return isWindows() ? binPath.replace(/\\/g, '/') : binPath; + return isWindows() ? binPath.replace(/\\/g, '/').replace(/^([a-zA-Z]):/, '/$1') : binPath; } function getNamedCondaPythonInfo( @@ -265,8 +297,64 @@ function getNamedCondaPythonInfo( const sv = shortVersion(version); const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); - shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', name] }]); - shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + + if (conda.includes('/') || conda.includes('\\')) { + const shActivate = path.join(path.dirname(path.dirname(conda)), 'etc', 'profile.d', 'conda.sh'); + + if (isWindows()) { + shellActivation.set(ShellConstants.GITBASH, [ + { executable: '.', args: [pathForGitBash(shActivate)] }, + { executable: 'conda', args: ['activate', name] }, + ]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); + + const cmdActivate = path.join(path.dirname(conda), 'activate.bat'); + shellActivation.set(ShellConstants.CMD, [{ executable: cmdActivate, args: [name] }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); + } else { + shellActivation.set(ShellConstants.BASH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', name] }, + ]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.SH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', name] }, + ]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.ZSH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', name] }, + ]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); + } + const psActivate = path.join(path.dirname(path.dirname(conda)), 'shell', 'condabin', 'conda-hook.ps1'); + shellActivation.set(ShellConstants.PWSH, [ + { executable: '&', args: [psActivate] }, + { executable: 'conda', args: ['activate', name] }, + ]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); + } else { + shellActivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['activate', name] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); + } return { name: name, @@ -281,11 +369,11 @@ function getNamedCondaPythonInfo( execInfo: { run: { executable: path.join(executable) }, activatedRun: { - executable: conda, + executable: 'conda', args: ['run', '--live-stream', '--name', name, 'python'], }, - activation: [{ executable: conda, args: ['activate', name] }], - deactivation: [{ executable: conda, args: ['deactivate'] }], + activation: [{ executable: 'conda', args: ['activate', name] }], + deactivation: [{ executable: 'conda', args: ['deactivate'] }], shellActivation, shellDeactivation, }, @@ -302,8 +390,64 @@ function getPrefixesCondaPythonInfo( const sv = shortVersion(version); const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); - shellActivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['activate', prefix] }]); - shellDeactivation.set('gitbash', [{ executable: pathForGitBash(conda), args: ['deactivate'] }]); + + if (conda.includes('/') || conda.includes('\\')) { + const shActivate = path.join(path.dirname(path.dirname(conda)), 'etc', 'profile.d', 'conda.sh'); + + if (isWindows()) { + shellActivation.set(ShellConstants.GITBASH, [ + { executable: '.', args: [pathForGitBash(shActivate)] }, + { executable: 'conda', args: ['activate', prefix] }, + ]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); + + const cmdActivate = path.join(path.dirname(conda), 'activate.bat'); + shellActivation.set(ShellConstants.CMD, [{ executable: cmdActivate, args: [prefix] }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); + } else { + shellActivation.set(ShellConstants.BASH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', prefix] }, + ]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.SH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', prefix] }, + ]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.ZSH, [ + { executable: '.', args: [shActivate] }, + { executable: 'conda', args: ['activate', prefix] }, + ]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); + } + const psActivate = path.join(path.dirname(path.dirname(conda)), 'shell', 'condabin', 'conda-hook.ps1'); + shellActivation.set(ShellConstants.PWSH, [ + { executable: '&', args: [psActivate] }, + { executable: 'conda', args: ['activate', prefix] }, + ]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); + } else { + shellActivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); + + shellActivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['activate', prefix] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); + } const basename = path.basename(prefix); return { @@ -331,6 +475,25 @@ function getPrefixesCondaPythonInfo( }; } +function getCondaWithoutPython(name: string, prefix: string, conda: string): PythonEnvironmentInfo { + return { + name: name, + environmentPath: Uri.file(prefix), + displayName: `${name} (no-python)`, + shortDisplayName: `${name} (no-python)`, + displayPath: prefix, + description: prefix, + tooltip: l10n.t('Conda environment without Python'), + version: 'no-python', + sysPrefix: prefix, + iconPath: new ThemeIcon('stop'), + execInfo: { + run: { executable: conda }, + }, + group: name.length > 0 ? 'Named' : 'Prefix', + }; +} + function nativeToPythonEnv( e: NativeEnvInfo, api: PythonEnvironmentApi, @@ -340,8 +503,13 @@ function nativeToPythonEnv( condaPrefixes: string[], ): PythonEnvironment | undefined { if (!(e.prefix && e.executable && e.version)) { - log.warn(`Invalid conda environment: ${JSON.stringify(e)}`); - return; + let name = e.name; + const environment = api.createPythonEnvironmentItem( + getCondaWithoutPython(name ?? '', e.prefix ?? '', conda), + manager, + ); + log.info(`Found a No-Python conda environment: ${e.executable ?? e.prefix ?? 'conda-no-python'}`); + return environment; } if (e.name === 'base') { @@ -524,7 +692,7 @@ async function createNamedCondaEnvironment( async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runConda(['create', '--yes', '--name', envName, 'python']); + const output = await runCondaExecutable(['create', '--yes', '--name', envName, 'python']); log.info(output); const prefixes = await getPrefixes(); @@ -545,7 +713,7 @@ async function createNamedCondaEnvironment( } catch (e) { log.error('Failed to create conda environment', e); setImmediate(async () => { - await showErrorMessage(CondaStrings.condaCreateFailed, log); + await showErrorMessageWithLogs(CondaStrings.condaCreateFailed, log); }); } }, @@ -591,7 +759,7 @@ async function createPrefixCondaEnvironment( async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runConda(['create', '--yes', '--prefix', prefix, 'python']); + const output = await runCondaExecutable(['create', '--yes', '--prefix', prefix, 'python']); log.info(output); const version = await getVersion(prefix); @@ -603,7 +771,7 @@ async function createPrefixCondaEnvironment( } catch (e) { log.error('Failed to create conda environment', e); setImmediate(async () => { - await showErrorMessage(CondaStrings.condaCreateFailed, log); + await showErrorMessageWithLogs(CondaStrings.condaCreateFailed, log); }); } }, @@ -641,9 +809,9 @@ export async function quickCreateConda( async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - log.info(await runConda(['create', '--yes', '--prefix', prefix, 'python'])); + await runCondaExecutable(['create', '--yes', '--prefix', prefix, 'python'], log); if (additionalPackages && additionalPackages.length > 0) { - log.info(await runConda(['install', '--yes', '--prefix', prefix, ...additionalPackages])); + await runConda(['install', '--yes', '--prefix', prefix, ...additionalPackages], log); } const version = await getVersion(prefix); @@ -673,7 +841,7 @@ export async function quickCreateConda( } catch (e) { log.error('Failed to create conda environment', e); setImmediate(async () => { - await showErrorMessage(CondaStrings.condaCreateFailed, log); + await showErrorMessageWithLogs(CondaStrings.condaCreateFailed, log); }); } }, @@ -689,11 +857,11 @@ export async function deleteCondaEnvironment(environment: PythonEnvironment, log }, async () => { try { - await runConda(args); + await runCondaExecutable(args, log); } catch (e) { log.error(`Failed to delete conda environment: ${e}`); setImmediate(async () => { - await showErrorMessage(CondaStrings.condaRemoveFailed, log); + await showErrorMessageWithLogs(CondaStrings.condaRemoveFailed, log); }); return false; } @@ -708,7 +876,7 @@ export async function refreshPackages( manager: PackageManager, ): Promise { let args = ['list', '-p', environment.environmentPath.fsPath]; - const data = await runConda(args); + const data = await runCondaExecutable(args); const content = data.split(/\r?\n/).filter((l) => !l.startsWith('#')); const packages: Package[] = []; content.forEach((l) => { @@ -736,10 +904,12 @@ export async function managePackages( api: PythonEnvironmentApi, manager: PackageManager, token: CancellationToken, + log: LogOutputChannel, ): Promise { if (options.uninstall && options.uninstall.length > 0) { - await runConda( + await runCondaExecutable( ['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...options.uninstall], + log, token, ); } @@ -749,7 +919,7 @@ export async function managePackages( args.push('--update-all'); } args.push(...options.install); - await runConda(args, token); + await runCondaExecutable(args, log, token); } return refreshPackages(environment, api, manager); } @@ -842,3 +1012,50 @@ export async function getCommonCondaPackagesToInstall( const selected = await selectCommonPackagesOrSkip(common, installed ?? [], !!options.showSkipOption); return selected; } + +async function installPython( + nativeFinder: NativePythonFinder, + manager: EnvironmentManager, + environment: PythonEnvironment, + api: PythonEnvironmentApi, + log: LogOutputChannel, +): Promise { + if (environment.sysPrefix === '') { + return undefined; + } + await runCondaExecutable(['install', '--yes', '--prefix', environment.sysPrefix, 'python'], log); + await nativeFinder.refresh(true, NativePythonEnvironmentKind.conda); + const native = await nativeFinder.resolve(environment.sysPrefix); + if (native.kind === NativePythonEnvironmentKind.conda) { + return nativeToPythonEnv(native, api, manager, log, await getConda(), await getPrefixes()); + } + return undefined; +} + +export async function checkForNoPythonCondaEnvironment( + nativeFinder: NativePythonFinder, + manager: EnvironmentManager, + environment: PythonEnvironment, + api: PythonEnvironmentApi, + log: LogOutputChannel, +): Promise { + if (environment.version === 'no-python') { + if (environment.sysPrefix === '') { + await showErrorMessage(CondaStrings.condaMissingPythonNoFix, { modal: true }); + return undefined; + } else { + const result = await showErrorMessage( + `${CondaStrings.condaMissingPython}: ${environment.displayName}`, + { + modal: true, + }, + Common.installPython, + ); + if (result === Common.installPython) { + return await installPython(nativeFinder, manager, environment, api, log); + } + return undefined; + } + } + return environment; +} diff --git a/src/test/common/pathUtils.unit.test.ts b/src/test/common/pathUtils.unit.test.ts index 3e0739d..1733e78 100644 --- a/src/test/common/pathUtils.unit.test.ts +++ b/src/test/common/pathUtils.unit.test.ts @@ -2,7 +2,7 @@ import assert from 'node:assert'; import * as sinon from 'sinon'; import { Uri } from 'vscode'; import { getResourceUri, normalizePath } from '../../common/utils/pathUtils'; -import * as utils from '../../managers/common/utils'; +import * as utils from '../../common/utils/platformUtils'; suite('Path Utilities', () => { suite('getResourceUri', () => { diff --git a/src/test/features/common/shellDetector.unit.test.ts b/src/test/features/common/shellDetector.unit.test.ts index 683a43a..16092b0 100644 --- a/src/test/features/common/shellDetector.unit.test.ts +++ b/src/test/features/common/shellDetector.unit.test.ts @@ -1,7 +1,8 @@ +import assert from 'assert'; import { Terminal } from 'vscode'; +import { isWindows } from '../../../common/utils/platformUtils'; +import { ShellConstants } from '../../../features/common/shellConstants'; import { identifyTerminalShell } from '../../../features/common/shellDetector'; -import assert from 'assert'; -import { isWindows } from '../../../managers/common/utils'; const testShellTypes: string[] = [ 'sh', @@ -73,37 +74,37 @@ function getShellPath(shellType: string): string | undefined { function expectedShellType(shellType: string): string { switch (shellType) { case 'sh': - return 'sh'; + return ShellConstants.SH; case 'bash': - return 'bash'; + return ShellConstants.BASH; case 'pwsh': case 'powershell': case 'powershellcore': - return 'pwsh'; + return ShellConstants.PWSH; case 'cmd': case 'commandPrompt': - return 'cmd'; + return ShellConstants.CMD; case 'gitbash': - return 'gitbash'; + return ShellConstants.GITBASH; case 'zsh': - return 'zsh'; + return ShellConstants.ZSH; case 'ksh': - return 'ksh'; + return ShellConstants.KSH; case 'fish': - return 'fish'; + return ShellConstants.FISH; case 'csh': case 'cshell': - return 'csh'; + return ShellConstants.CSH; case 'nu': case 'nushell': - return 'nu'; + return ShellConstants.NU; case 'tcsh': case 'tcshell': - return 'tcsh'; + return ShellConstants.TCSH; case 'xonsh': - return 'xonsh'; + return ShellConstants.XONSH; case 'wsl': - return 'wsl'; + return ShellConstants.WSL; default: return 'unknown'; } diff --git a/src/test/features/creators/autoFindProjects.unit.test.ts b/src/test/features/creators/autoFindProjects.unit.test.ts index 1c45c7b..269aaa9 100644 --- a/src/test/features/creators/autoFindProjects.unit.test.ts +++ b/src/test/features/creators/autoFindProjects.unit.test.ts @@ -2,7 +2,6 @@ import * as path from 'path'; import * as sinon from 'sinon'; import * as typmoq from 'typemoq'; import * as wapi from '../../../common/workspace.apis'; -import * as eapi from '../../../common/errors/utils'; import * as winapi from '../../../common/window.apis'; import { PythonProjectManager } from '../../../internal.api'; import { createDeferred } from '../../../common/utils/deferred'; @@ -20,8 +19,7 @@ suite('Auto Find Project tests', () => { setup(() => { findFilesStub = sinon.stub(wapi, 'findFiles'); - showErrorMessageStub = sinon.stub(eapi, 'showErrorMessage'); - + showErrorMessageStub = sinon.stub(winapi, 'showErrorMessage'); showQuickPickWithButtonsStub = sinon.stub(winapi, 'showQuickPickWithButtons'); showQuickPickWithButtonsStub.callsFake((items) => items); diff --git a/src/test/features/terminal/shells/common/editUtils.unit.test.ts b/src/test/features/terminal/shells/common/editUtils.unit.test.ts new file mode 100644 index 0000000..e228317 --- /dev/null +++ b/src/test/features/terminal/shells/common/editUtils.unit.test.ts @@ -0,0 +1,237 @@ +import * as assert from 'assert'; +import { isWindows } from '../../../../../common/utils/platformUtils'; +import { + hasStartupCode, + insertStartupCode, + removeStartupCode, +} from '../../../../../features/terminal/shells/common/editUtils'; + +suite('Shell Edit Utils', () => { + suite('hasStartupCode', () => { + test('should return false when no markers exist', () => { + const content = 'sample content without markers'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return false when only start marker exists', () => { + const content = 'content\n# START\nsome code'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return false when only end marker exists', () => { + const content = 'content\nsome code\n# END'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return false when markers are in wrong order', () => { + const content = 'content\n# END\nsome code\n# START'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return false when content between markers is empty', () => { + const content = 'content\n# START\n# END\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return false when key is not found between markers', () => { + const content = 'content\n# START\nsome other content\n# END\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, false); + }); + + test('should return true when key is found between markers', () => { + const content = 'content\n# START\nsome key content\n# END\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, true); + }); + + test('should return true when all keys are found between markers', () => { + const content = 'content\n# START\nsome key1 and key2 content\n# END\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key1', 'key2']); + assert.strictEqual(result, true); + }); + + test('should return false when not all keys are found between markers', () => { + const content = 'content\n# START\nsome key1 content\n# END\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key1', 'key2']); + assert.strictEqual(result, false); + }); + + test('should handle Windows line endings (CRLF) correctly', () => { + const content = 'content\r\n# START\r\nsome key content\r\n# END\r\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, true); + }); + + test('should handle mixed line endings correctly', () => { + const content = 'content\n# START\r\nsome key content\n# END\r\nmore content'; + const result = hasStartupCode(content, '# START', '# END', ['key']); + assert.strictEqual(result, true); + }); + }); + + suite('insertStartupCode', () => { + test('should insert code at the end when no markers exist', () => { + const content = 'existing content'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + const lineEndings = isWindows() ? '\r\n' : '\n'; + + const result = insertStartupCode(content, start, end, code); + const expected = `existing content${lineEndings}# START${lineEndings}new code${lineEndings}# END${lineEndings}`; + + assert.strictEqual(result, expected); + }); + + test('should replace code between existing markers', () => { + const content = 'before\n# START\nold code\n# END\nafter'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + + const result = insertStartupCode(content, start, end, code); + const expected = 'before\n# START\nnew code\n# END\nafter'; + + assert.strictEqual(result, expected); + }); + + test('should preserve content outside markers when replacing', () => { + const content = 'line1\nline2\n# START\nold code\n# END\nline3\nline4'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + + const result = insertStartupCode(content, start, end, code); + const expected = 'line1\nline2\n# START\nnew code\n# END\nline3\nline4'; + + assert.strictEqual(result, expected); + }); + + test('should add new code when only start marker exists', () => { + const content = 'before\n# START\nold code'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + + const result = insertStartupCode(content, start, end, code); + const expected = 'before\n# START\nnew code\n# END\n'; + + assert.strictEqual(result, expected); + }); + + test('should add new code when only end marker exists', () => { + const content = 'before\nold code\n# END\nafter'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + + const result = insertStartupCode(content, start, end, code); + const expected = 'before\nold code\n# END\nafter\n# START\nnew code\n# END\n'; + + assert.strictEqual(result, expected); + }); + + test('should handle Windows line endings (CRLF) correctly', () => { + const content = 'before\r\n# START\r\nold code\r\n# END\r\nafter'; + const start = '# START'; + const end = '# END'; + const code = 'new code'; + + const result = insertStartupCode(content, start, end, code); + const expected = 'before\r\n# START\r\nnew code\r\n# END\r\nafter'; + + assert.strictEqual(result, expected); + }); + + test('should preserve original line ending style when inserting', () => { + // Content with Windows line endings + const contentWindows = 'before\r\n# START\r\nold code\r\n# END\r\nafter'; + const resultWindows = insertStartupCode(contentWindows, '# START', '# END', 'new code'); + assert.ok(resultWindows.includes('\r\n'), 'Windows line endings should be preserved'); + + // Content with Unix line endings + const contentUnix = 'before\n# START\nold code\n# END\nafter'; + const resultUnix = insertStartupCode(contentUnix, '# START', '# END', 'new code'); + assert.ok(!resultUnix.includes('\r\n'), 'Unix line endings should be preserved'); + }); + }); + + suite('removeStartupCode', () => { + test('should return original content when no markers exist', () => { + const content = 'sample content without markers'; + const result = removeStartupCode(content, '# START', '# END'); + assert.strictEqual(result, content); + }); + + test('should return original content when only start marker exists', () => { + const content = 'content\n# START\nsome code'; + const result = removeStartupCode(content, '# START', '# END'); + assert.strictEqual(result, content); + }); + + test('should return original content when only end marker exists', () => { + const content = 'content\nsome code\n# END'; + const result = removeStartupCode(content, '# START', '# END'); + assert.strictEqual(result, content); + }); + + test('should return original content when markers are in wrong order', () => { + const content = 'content\n# END\nsome code\n# START'; + const result = removeStartupCode(content, '# START', '# END'); + assert.strictEqual(result, content); + }); + + test('should remove content between markers', () => { + const content = 'before\n# START\ncode to remove\n# END\nafter'; + const result = removeStartupCode(content, '# START', '# END'); + const expected = 'before\nafter'; + assert.strictEqual(result, expected); + }); + + test('should handle multiple lines of content between markers', () => { + const content = 'line1\nline2\n# START\nline3\nline4\nline5\n# END\nline6\nline7'; + const result = removeStartupCode(content, '# START', '# END'); + const expected = 'line1\nline2\nline6\nline7'; + assert.strictEqual(result, expected); + }); + + test('should handle markers at beginning of content', () => { + const content = '# START\ncode to remove\n# END\nafter content'; + const result = removeStartupCode(content, '# START', '# END'); + const expected = 'after content'; + assert.strictEqual(result, expected); + }); + + test('should handle markers at end of content', () => { + const content = 'before content\n# START\ncode to remove\n# END'; + const result = removeStartupCode(content, '# START', '# END'); + const expected = 'before content'; + assert.strictEqual(result, expected); + }); + + test('should handle Windows line endings (CRLF) correctly', () => { + const content = 'before\r\n# START\r\ncode to remove\r\n# END\r\nafter'; + const result = removeStartupCode(content, '# START', '# END'); + const expected = 'before\r\nafter'; + assert.strictEqual(result, expected); + }); + + test('should preserve original line ending style when removing', () => { + // Content with Windows line endings + const contentWindows = 'before\r\n# START\r\ncode to remove\r\n# END\r\nafter'; + const resultWindows = removeStartupCode(contentWindows, '# START', '# END'); + assert.ok(resultWindows.includes('\r\n'), 'Windows line endings should be preserved'); + + // Content with Unix line endings + const contentUnix = 'before\n# START\ncode to remove\n# END\nafter'; + const resultUnix = removeStartupCode(contentUnix, '# START', '# END'); + assert.ok(!resultUnix.includes('\r\n'), 'Unix line endings should be preserved'); + }); + }); +}); diff --git a/src/test/features/terminal/shells/common/shellUtils.unit.test.ts b/src/test/features/terminal/shells/common/shellUtils.unit.test.ts new file mode 100644 index 0000000..12eedfd --- /dev/null +++ b/src/test/features/terminal/shells/common/shellUtils.unit.test.ts @@ -0,0 +1,80 @@ +import * as assert from 'assert'; +import { + extractProfilePath, + PROFILE_TAG_END, + PROFILE_TAG_START, +} from '../../../../../features/terminal/shells/common/shellUtils'; + +suite('Shell Utils', () => { + suite('extractProfilePath', () => { + test('should return undefined when content is empty', () => { + const content = ''; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + + test('should return undefined when content does not have tags', () => { + const content = 'sample content without tags'; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + + test('should return undefined when only start tag exists', () => { + const content = `content\n${PROFILE_TAG_START}\nsome path`; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + + test('should return undefined when only end tag exists', () => { + const content = `content\nsome path\n${PROFILE_TAG_END}`; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + + test('should return undefined when tags are in wrong order', () => { + const content = `content\n${PROFILE_TAG_END}\nsome path\n${PROFILE_TAG_START}`; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + test('should return undefined when content between tags is empty', () => { + const content = `content\n${PROFILE_TAG_START}\n\n${PROFILE_TAG_END}\nmore content`; + const result = extractProfilePath(content); + assert.strictEqual(result, undefined); + }); + + test('should extract path when found between tags', () => { + const expectedPath = '/usr/local/bin/python'; + const content = `content\n${PROFILE_TAG_START}\n${expectedPath}\n${PROFILE_TAG_END}\nmore content`; + const result = extractProfilePath(content); + assert.strictEqual(result, expectedPath); + }); + + test('should trim whitespace from extracted path', () => { + const expectedPath = '/usr/local/bin/python'; + const content = `content\n${PROFILE_TAG_START}\n ${expectedPath} \n${PROFILE_TAG_END}\nmore content`; + const result = extractProfilePath(content); + assert.strictEqual(result, expectedPath); + }); + + test('should handle Windows-style line endings', () => { + const expectedPath = 'C:\\Python\\python.exe'; + const content = `content\r\n${PROFILE_TAG_START}\r\n${expectedPath}\r\n${PROFILE_TAG_END}\r\nmore content`; + const result = extractProfilePath(content); + assert.strictEqual(result, expectedPath); + }); + + test('should extract path with special characters', () => { + const expectedPath = '/path with spaces/and (parentheses)/python'; + const content = `${PROFILE_TAG_START}\n${expectedPath}\n${PROFILE_TAG_END}`; + const result = extractProfilePath(content); + assert.strictEqual(result, expectedPath); + }); + + test('should extract multiline content correctly', () => { + const expectedPath = 'line1\nline2\nline3'; + const content = `${PROFILE_TAG_START}\n${expectedPath}\n${PROFILE_TAG_END}`; + const result = extractProfilePath(content); + assert.strictEqual(result, expectedPath); + }); + }); +}); From dd655e0e14a419e1e791c4baf7dd55a11e959bdb Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 24 Apr 2025 15:01:49 -0700 Subject: [PATCH 129/328] update return type of project create (#334) update the API surface to change return type of the project creator --- src/api.ts | 16 ++++++++++------ src/features/creators/existingProjects.ts | 4 +++- src/features/envCommands.ts | 11 ++++++++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/api.ts b/src/api.ts index 762b0dd..ec63a15 100644 --- a/src/api.ts +++ b/src/api.ts @@ -707,16 +707,20 @@ export interface PythonProjectCreator { readonly iconPath?: IconPath; /** - * A flag indicating whether the project creator supports quick create where no user input is required. + * Creates a new Python project(s) or, if files are not a project, returns Uri(s) to the created files. + * Anything that needs its own python environment constitutes a project. + * @param options Optional parameters for creating the Python project. + * @returns A promise that resolves to one of the following: + * - PythonProject or PythonProject[]: when a single or multiple projects are created. + * - Uri or Uri[]: when files are created that do not constitute a project. + * - undefined: if project creation fails. */ - readonly supportsQuickCreate?: boolean; + create(options?: PythonProjectCreatorOptions): Promise; /** - * Creates a new Python project or projects. - * @param options - Optional parameters for creating the Python project. - * @returns A promise that resolves to a Python project, an array of Python projects, or undefined. + * A flag indicating whether the project creator supports quick create where no user input is required. */ - create(options?: PythonProjectCreatorOptions): Promise; + readonly supportsQuickCreate?: boolean; } /** diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index a3e5e22..9aa38c5 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -13,7 +13,9 @@ export class ExistingProjects implements PythonProjectCreator { constructor(private readonly pm: PythonProjectManager) {} - async create(_options?: PythonProjectCreatorOptions): Promise { + async create( + _options?: PythonProjectCreatorOptions, + ): Promise { const results = await showOpenDialog({ canSelectFiles: true, canSelectFolders: true, diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index a00a809..ab83ece 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -368,7 +368,7 @@ export async function addPythonProject( return; } - let results: PythonProject | PythonProject[] | undefined; + let results: PythonProject | PythonProject[] | Uri | Uri[] | undefined; try { results = await creator.create(); if (results === undefined) { @@ -381,6 +381,15 @@ export async function addPythonProject( throw ex; } + if ( + results instanceof Uri || + (Array.isArray(results) && results.length > 0 && results.every((r) => r instanceof Uri)) + ) { + // the results are Uris, which means they aren't projects and shouldn't be added + return; + } + results = results as PythonProject | PythonProject[]; + if (!Array.isArray(results)) { results = [results]; } From a73f6e95b3f204b8ae7b315f8429d11c9a1d523c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 25 Apr 2025 11:27:50 -0700 Subject: [PATCH 130/328] fix: detect if extension is installed and activated for selected env/package manager (#314) --- src/api.ts | 4 +- src/common/localize.ts | 4 + src/common/workbenchCommands.ts | 12 ++ src/extension.ts | 2 + src/features/common/managerReady.ts | 228 ++++++++++++++++++++++++++++ src/features/envManagers.ts | 8 +- src/features/pythonApi.ts | 34 ++++- 7 files changed, 281 insertions(+), 11 deletions(-) create mode 100644 src/common/workbenchCommands.ts create mode 100644 src/features/common/managerReady.ts diff --git a/src/api.ts b/src/api.ts index ec63a15..cb17ec7 100644 --- a/src/api.ts +++ b/src/api.ts @@ -333,7 +333,7 @@ export interface QuickCreateConfig { */ export interface EnvironmentManager { /** - * The name of the environment manager. + * The name of the environment manager. Allowed characters (a-z, A-Z, 0-9, -, _). */ readonly name: string; @@ -564,7 +564,7 @@ export interface DidChangePackagesEventArgs { */ export interface PackageManager { /** - * The name of the package manager. + * The name of the package manager. Allowed characters (a-z, A-Z, 0-9, -, _). */ name: string; diff --git a/src/common/localize.ts b/src/common/localize.ts index ae509bc..04313f2 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -17,6 +17,10 @@ export namespace Common { export const installPython = l10n.t('Install Python'); } +export namespace WorkbenchStrings { + export const installExtension = l10n.t('Install Extension'); +} + export namespace Interpreter { export const statusBarSelect = l10n.t('Select Interpreter'); export const browsePath = l10n.t('Browse...'); diff --git a/src/common/workbenchCommands.ts b/src/common/workbenchCommands.ts new file mode 100644 index 0000000..0efe870 --- /dev/null +++ b/src/common/workbenchCommands.ts @@ -0,0 +1,12 @@ +import { commands, Uri } from 'vscode'; + +export async function installExtension( + extensionId: Uri | string, + options?: { + installOnlyNewlyAddedFromExtensionPackVSIX?: boolean; + installPreReleaseVersion?: boolean; + donotSync?: boolean; + }, +): Promise { + await commands.executeCommand('workbench.extensions.installExtension', extensionId, options); +} diff --git a/src/extension.ts b/src/extension.ts index c2630f5..099bdcd 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,6 +16,7 @@ import { onDidChangeActiveTextEditor, onDidChangeTerminalShellIntegration, } from './common/window.apis'; +import { createManagerReady } from './features/common/managerReady'; import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; @@ -88,6 +89,7 @@ export async function activate(context: ExtensionContext): Promise; + waitForEnvManagerId(managerIds: string[]): Promise; + waitForAllEnvManagers(): Promise; + waitForPkgManager(uris?: Uri[]): Promise; + waitForPkgManagerId(managerIds: string[]): Promise; +} + +function getExtensionId(managerId: string): string | undefined { + // format : + const regex = /^(.*):([a-zA-Z0-9-_]*)$/; + const parts = regex.exec(managerId); + return parts ? parts[1] : undefined; +} + +class ManagerReadyImpl implements ManagerReady { + private readonly envManagers: Map> = new Map(); + private readonly pkgManagers: Map> = new Map(); + private readonly checked: Set = new Set(); + private readonly disposables: Disposable[] = []; + + constructor(em: EnvironmentManagers, private readonly pm: PythonProjectManager) { + this.disposables.push( + em.onDidChangeEnvironmentManager((e) => { + if (this.envManagers.has(e.manager.id)) { + this.envManagers.get(e.manager.id)?.resolve(); + } else { + const deferred = createDeferred(); + this.envManagers.set(e.manager.id, deferred); + deferred.resolve(); + } + }), + em.onDidChangePackageManager((e) => { + if (this.pkgManagers.has(e.manager.id)) { + this.pkgManagers.get(e.manager.id)?.resolve(); + } else { + const deferred = createDeferred(); + this.pkgManagers.set(e.manager.id, deferred); + deferred.resolve(); + } + }), + ); + } + + private checkExtension(managerId: string) { + const installed = allExtensions().some((ext) => managerId.startsWith(`${ext.id}:`)); + if (this.checked.has(managerId)) { + return; + } + this.checked.add(managerId); + const extId = getExtensionId(managerId); + if (extId) { + setImmediate(async () => { + if (installed) { + const ext = getExtension(extId); + if (ext && !ext.isActive) { + traceInfo(`Extension for manager ${managerId} is not active: Activating...`); + try { + await ext.activate(); + traceInfo(`Extension for manager ${managerId} is now active.`); + } catch (err) { + traceError(`Failed to activate extension ${extId}, required for: ${managerId}`, err); + } + } + } else { + traceError(`Extension for manager ${managerId} is not installed.`); + const result = await showErrorMessage( + l10n.t(`Do you want to install extension {0} to enable {1} support.`, extId, managerId), + WorkbenchStrings.installExtension, + ); + if (result === WorkbenchStrings.installExtension) { + traceInfo(`Installing extension: ${extId}`); + try { + await installExtension(extId); + traceInfo(`Extension ${extId} installed.`); + } catch (err) { + traceError(`Failed to install extension: ${extId}`, err); + } + + try { + const ext = getExtension(extId); + if (ext && !ext.isActive) { + traceInfo(`Extension for manager ${managerId} is not active: Activating...`); + await ext.activate(); + } + } catch (err) { + traceError(`Failed to activate extension ${extId}, required for: ${managerId}`, err); + } + } + } + }); + } else { + showErrorMessage(l10n.t(`Extension for {0} is not installed or enabled for this workspace.`, managerId)); + } + } + + public dispose(): void { + this.disposables.forEach((d) => d.dispose()); + this.envManagers.clear(); + this.pkgManagers.clear(); + } + + private _waitForEnvManager(managerId: string): Promise { + if (this.envManagers.has(managerId)) { + return this.envManagers.get(managerId)!.promise; + } + const deferred = createDeferred(); + this.envManagers.set(managerId, deferred); + return deferred.promise; + } + + public async waitForEnvManager(uris?: Uri[]): Promise { + const ids: Set = new Set(); + if (uris) { + uris.forEach((uri) => { + const m = getDefaultEnvManagerSetting(this.pm, uri); + if (!ids.has(m)) { + ids.add(m); + } + }); + } else { + const m = getDefaultEnvManagerSetting(this.pm, undefined); + if (m) { + ids.add(m); + } + } + + await this.waitForEnvManagerId(Array.from(ids)); + } + + public async waitForEnvManagerId(managerIds: string[]): Promise { + managerIds.forEach((managerId) => this.checkExtension(managerId)); + await Promise.all(managerIds.map((managerId) => this._waitForEnvManager(managerId))); + } + + public async waitForAllEnvManagers(): Promise { + const ids: Set = new Set(); + this.pm.getProjects().forEach((project) => { + const m = getDefaultEnvManagerSetting(this.pm, project.uri); + if (m && !ids.has(m)) { + ids.add(m); + } + }); + + const m = getDefaultEnvManagerSetting(this.pm, undefined); + if (m) { + ids.add(m); + } + await this.waitForEnvManagerId(Array.from(ids)); + } + + private _waitForPkgManager(managerId: string): Promise { + if (this.pkgManagers.has(managerId)) { + return this.pkgManagers.get(managerId)!.promise; + } + const deferred = createDeferred(); + this.pkgManagers.set(managerId, deferred); + return deferred.promise; + } + + public async waitForPkgManager(uris?: Uri[]): Promise { + const ids: Set = new Set(); + + if (uris) { + uris.forEach((uri) => { + const m = getDefaultPkgManagerSetting(this.pm, uri); + if (!ids.has(m)) { + ids.add(m); + } + }); + } else { + const m = getDefaultPkgManagerSetting(this.pm, undefined); + if (m) { + ids.add(m); + } + } + + await this.waitForPkgManagerId(Array.from(ids)); + } + public async waitForPkgManagerId(managerIds: string[]): Promise { + managerIds.forEach((managerId) => this.checkExtension(managerId)); + await Promise.all(managerIds.map((managerId) => this._waitForPkgManager(managerId))); + } +} + +let _deferred = createDeferred(); +export function createManagerReady(em: EnvironmentManagers, pm: PythonProjectManager, disposables: Disposable[]) { + if (!_deferred.completed) { + const mr = new ManagerReadyImpl(em, pm); + disposables.push(mr); + _deferred.resolve(mr); + } +} + +export async function waitForEnvManager(uris?: Uri[]): Promise { + const mr = await _deferred.promise; + return mr.waitForEnvManager(uris); +} + +export async function waitForEnvManagerId(managerIds: string[]): Promise { + const mr = await _deferred.promise; + return mr.waitForEnvManagerId(managerIds); +} + +export async function waitForAllEnvManagers(): Promise { + const mr = await _deferred.promise; + return mr.waitForAllEnvManagers(); +} + +export async function waitForPkgManager(uris?: Uri[]): Promise { + const mr = await _deferred.promise; + return mr.waitForPkgManager(uris); +} + +export async function waitForPkgManagerId(managerIds: string[]): Promise { + const mr = await _deferred.promise; + return mr.waitForPkgManagerId(managerIds); +} diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index cf193a9..7908efc 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -10,7 +10,7 @@ import { PythonProject, SetEnvironmentScope, } from '../api'; -import { traceError } from '../common/logging'; +import { traceError, traceVerbose } from '../common/logging'; import { EditAllManagerSettings, getDefaultEnvManagerSetting, @@ -39,7 +39,11 @@ import { sendTelemetryEvent } from '../common/telemetry/sender'; import { EventNames } from '../common/telemetry/constants'; function generateId(name: string): string { - return `${getCallingExtension()}:${name}`; + const newName = name.toLowerCase().replace(/[^a-zA-Z0-9-_]/g, '_'); + if (name !== newName) { + traceVerbose(`Environment manager name "${name}" was normalized to "${newName}"`); + } + return `${getCallingExtension()}:${newName}`; } export class PythonEnvironmentManagers implements EnvironmentManagers { diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index e712a4c..9f3f295 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -48,6 +48,7 @@ import { runInTerminal } from './terminal/runInTerminal'; import { runInBackground } from './execution/runInBackground'; import { EnvVarManager } from './execution/envVariableManager'; import { checkUri } from '../common/utils/pathUtils'; +import { waitForAllEnvManagers, waitForEnvManager, waitForEnvManagerId } from './common/managerReady'; class PythonEnvironmentApiImpl implements PythonEnvironmentApi { private readonly _onDidChangeEnvironments = new EventEmitter(); @@ -123,6 +124,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { options: CreateEnvironmentOptions | undefined, ): Promise { if (scope === 'global' || (!Array.isArray(scope) && scope instanceof Uri)) { + await waitForEnvManager(scope === 'global' ? undefined : [scope]); const manager = this.envManagers.getEnvironmentManager(scope === 'global' ? undefined : scope); if (!manager) { throw new Error('No environment manager found'); @@ -134,6 +136,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } else if (Array.isArray(scope) && scope.length === 1 && scope[0] instanceof Uri) { return this.createEnvironment(scope[0], options); } else if (Array.isArray(scope) && scope.length > 0 && scope.every((s) => s instanceof Uri)) { + await waitForEnvManager(scope); const managers: InternalEnvironmentManager[] = []; scope.forEach((s) => { const manager = this.envManagers.getEnvironmentManager(s); @@ -160,7 +163,8 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return result; } } - removeEnvironment(environment: PythonEnvironment): Promise { + async removeEnvironment(environment: PythonEnvironment): Promise { + await waitForEnvManagerId([environment.envId.managerId]); const manager = this.envManagers.getEnvironmentManager(environment); if (!manager) { return Promise.reject(new Error('No environment manager found')); @@ -171,9 +175,12 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { const currentScope = checkUri(scope) as RefreshEnvironmentsScope; if (currentScope === undefined) { + await waitForAllEnvManagers(); await Promise.all(this.envManagers.managers.map((manager) => manager.refresh(currentScope))); return Promise.resolve(); } + + await waitForEnvManager([currentScope]); const manager = this.envManagers.getEnvironmentManager(currentScope); if (!manager) { return Promise.reject(new Error(`No environment manager found for: ${currentScope.fsPath}`)); @@ -183,10 +190,13 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { async getEnvironments(scope: GetEnvironmentsScope): Promise { const currentScope = checkUri(scope) as GetEnvironmentsScope; if (currentScope === 'all' || currentScope === 'global') { + await waitForAllEnvManagers(); const promises = this.envManagers.managers.map((manager) => manager.getEnvironments(currentScope)); const items = await Promise.all(promises); return items.flat(); } + + await waitForEnvManager([currentScope]); const manager = this.envManagers.getEnvironmentManager(currentScope); if (!manager) { return []; @@ -196,14 +206,21 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { return items; } onDidChangeEnvironments: Event = this._onDidChangeEnvironments.event; - setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { - return this.envManagers.setEnvironment(checkUri(scope) as SetEnvironmentScope, environment); + async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + const currentScope = checkUri(scope) as SetEnvironmentScope; + await waitForEnvManager( + currentScope ? (currentScope instanceof Uri ? [currentScope] : currentScope) : undefined, + ); + return this.envManagers.setEnvironment(currentScope, environment); } async getEnvironment(scope: GetEnvironmentScope): Promise { - return this.envManagers.getEnvironment(checkUri(scope) as GetEnvironmentScope); + const currentScope = checkUri(scope) as GetEnvironmentScope; + await waitForEnvManager(currentScope ? [currentScope] : undefined); + return this.envManagers.getEnvironment(currentScope); } onDidChangeEnvironment: Event = this._onDidChangeEnvironment.event; async resolveEnvironment(context: ResolveEnvironmentContext): Promise { + await waitForAllEnvManagers(); const projects = this.projectManager.getProjects(); const projectEnvManagers: InternalEnvironmentManager[] = []; projects.forEach((p) => { @@ -224,21 +241,24 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { } return new Disposable(() => disposables.forEach((d) => d.dispose())); } - managePackages(context: PythonEnvironment, options: PackageManagementOptions): Promise { + async managePackages(context: PythonEnvironment, options: PackageManagementOptions): Promise { + await waitForEnvManagerId([context.envId.managerId]); const manager = this.envManagers.getPackageManager(context); if (!manager) { return Promise.reject(new Error('No package manager found')); } return manager.manage(context, options); } - refreshPackages(context: PythonEnvironment): Promise { + async refreshPackages(context: PythonEnvironment): Promise { + await waitForEnvManagerId([context.envId.managerId]); const manager = this.envManagers.getPackageManager(context); if (!manager) { return Promise.reject(new Error('No package manager found')); } return manager.refresh(context); } - getPackages(context: PythonEnvironment): Promise { + async getPackages(context: PythonEnvironment): Promise { + await waitForEnvManagerId([context.envId.managerId]); const manager = this.envManagers.getPackageManager(context); if (!manager) { return Promise.resolve(undefined); From bf13c2798f81dc4096e36af2c1325a2fa2e329b3 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 25 Apr 2025 11:36:14 -0700 Subject: [PATCH 131/328] chore: refactoring and cleanup (#337) --- src/api.ts | 10 ++--- src/common/localize.ts | 3 +- .../shellStartupActivationVariablesManager.ts | 23 +++++------ .../terminal/shellStartupSetupHandlers.ts | 12 +++--- src/features/terminal/terminalManager.ts | 40 ++++++++++++------- src/features/terminal/utils.ts | 3 ++ 6 files changed, 52 insertions(+), 39 deletions(-) diff --git a/src/api.ts b/src/api.ts index cb17ec7..707d641 100644 --- a/src/api.ts +++ b/src/api.ts @@ -2,16 +2,16 @@ // Licensed under the MIT License. import { - Uri, Disposable, - MarkdownString, Event, + FileChangeType, LogOutputChannel, - ThemeIcon, - Terminal, + MarkdownString, TaskExecution, + Terminal, TerminalOptions, - FileChangeType, + ThemeIcon, + Uri, } from 'vscode'; /** diff --git a/src/common/localize.ts b/src/common/localize.ts index 04313f2..6c86eb9 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -169,10 +169,11 @@ export namespace EnvViewStrings { export const selectedWorkspaceTooltip = l10n.t('This environment is selected for workspace files'); } -export namespace ShellStartupActivationStrings { +export namespace ActivationStrings { export const envCollectionDescription = l10n.t('Environment variables for shell activation'); export const revertedShellStartupScripts = l10n.t( 'Removed shell startup profile code for Python environment activation. See [logs](command:{0})', Commands.viewLogs, ); + export const activatingEnvironment = l10n.t('Activating environment'); } diff --git a/src/features/terminal/shellStartupActivationVariablesManager.ts b/src/features/terminal/shellStartupActivationVariablesManager.ts index 428beec..3ea63a0 100644 --- a/src/features/terminal/shellStartupActivationVariablesManager.ts +++ b/src/features/terminal/shellStartupActivationVariablesManager.ts @@ -1,10 +1,9 @@ import { ConfigurationChangeEvent, Disposable, GlobalEnvironmentVariableCollection } from 'vscode'; -import { DidChangeEnvironmentEventArgs } from '../../api'; -import { ShellStartupActivationStrings } from '../../common/localize'; +import { DidChangeEnvironmentEventArgs, PythonProjectEnvironmentApi } from '../../api'; +import { ActivationStrings } from '../../common/localize'; import { getWorkspaceFolder, getWorkspaceFolders, onDidChangeConfiguration } from '../../common/workspace.apis'; -import { EnvironmentManagers } from '../../internal.api'; import { ShellEnvsProvider } from './shells/startupProvider'; -import { getAutoActivationType } from './utils'; +import { ACT_TYPE_SHELL, getAutoActivationType } from './utils'; export interface ShellStartupActivationVariablesManager extends Disposable { initialize(): Promise; @@ -15,14 +14,14 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA constructor( private readonly envCollection: GlobalEnvironmentVariableCollection, private readonly shellEnvsProviders: ShellEnvsProvider[], - private readonly em: EnvironmentManagers, + private readonly api: PythonProjectEnvironmentApi, ) { - this.envCollection.description = ShellStartupActivationStrings.envCollectionDescription; + this.envCollection.description = ActivationStrings.envCollectionDescription; this.disposables.push( onDidChangeConfiguration(async (e: ConfigurationChangeEvent) => { await this.handleConfigurationChange(e); }), - this.em.onDidChangeEnvironmentFiltered(async (e: DidChangeEnvironmentEventArgs) => { + this.api.onDidChangeEnvironment(async (e: DidChangeEnvironmentEventArgs) => { await this.handleEnvironmentChange(e); }), ); @@ -31,7 +30,7 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA private async handleConfigurationChange(e: ConfigurationChangeEvent) { if (e.affectsConfiguration('python-envs.terminal.autoActivationType')) { const autoActType = getAutoActivationType(); - if (autoActType === 'shellStartup') { + if (autoActType === ACT_TYPE_SHELL) { await this.initializeInternal(); } else { const workspaces = getWorkspaceFolders() ?? []; @@ -49,7 +48,7 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA private async handleEnvironmentChange(e: DidChangeEnvironmentEventArgs) { const autoActType = getAutoActivationType(); - if (autoActType === 'shellStartup' && e.uri) { + if (autoActType === ACT_TYPE_SHELL && e.uri) { const wf = getWorkspaceFolder(e.uri); if (wf) { const envVars = this.envCollection.getScoped({ workspaceFolder: wf }); @@ -75,7 +74,7 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA const collection = this.envCollection.getScoped({ workspaceFolder: workspace }); promises.push( ...this.shellEnvsProviders.map(async (provider) => { - const env = await this.em.getEnvironment(workspace.uri); + const env = await this.api.getEnvironment(workspace.uri); if (env) { provider.updateEnvVariables(collection, env); } else { @@ -86,7 +85,7 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA }); await Promise.all(promises); } else { - const env = await this.em.getEnvironment(undefined); + const env = await this.api.getEnvironment(undefined); await Promise.all( this.shellEnvsProviders.map(async (provider) => { if (env) { @@ -101,7 +100,7 @@ export class ShellStartupActivationVariablesManagerImpl implements ShellStartupA public async initialize(): Promise { const autoActType = getAutoActivationType(); - if (autoActType === 'shellStartup') { + if (autoActType === ACT_TYPE_SHELL) { await this.initializeInternal(); } } diff --git a/src/features/terminal/shellStartupSetupHandlers.ts b/src/features/terminal/shellStartupSetupHandlers.ts index 37e902e..94f8a23 100644 --- a/src/features/terminal/shellStartupSetupHandlers.ts +++ b/src/features/terminal/shellStartupSetupHandlers.ts @@ -1,10 +1,10 @@ import { l10n, ProgressLocation } from 'vscode'; import { executeCommand } from '../../common/command.api'; -import { Common, ShellStartupActivationStrings } from '../../common/localize'; +import { ActivationStrings, Common } from '../../common/localize'; import { traceInfo, traceVerbose } from '../../common/logging'; import { showErrorMessage, showInformationMessage, withProgress } from '../../common/window.apis'; import { ShellScriptEditState, ShellStartupScriptProvider } from './shells/startupProvider'; -import { getAutoActivationType, setAutoActivationType } from './utils'; +import { ACT_TYPE_COMMAND, ACT_TYPE_SHELL, getAutoActivationType, setAutoActivationType } from './utils'; export async function handleSettingUpShellProfile( providers: ShellStartupScriptProvider[], @@ -14,7 +14,7 @@ export async function handleSettingUpShellProfile( const response = await showInformationMessage( l10n.t( 'To use "{0}" activation, the shell profiles need to be set up. Do you want to set it up now?', - 'shellStartup', + ACT_TYPE_SHELL, ), { modal: true, detail: l10n.t('Shells: {0}', shells) }, Common.yes, @@ -59,11 +59,11 @@ export async function handleSettingUpShellProfile( export async function cleanupStartupScripts(allProviders: ShellStartupScriptProvider[]): Promise { await Promise.all(allProviders.map((provider) => provider.teardownScripts())); - if (getAutoActivationType() === 'shellStartup') { - setAutoActivationType('command'); + if (getAutoActivationType() === ACT_TYPE_SHELL) { + setAutoActivationType(ACT_TYPE_COMMAND); traceInfo( 'Setting `python-envs.terminal.autoActivationType` to `command`, after removing shell startup scripts.', ); } - setImmediate(async () => await showInformationMessage(ShellStartupActivationStrings.revertedShellStartupScripts)); + setImmediate(async () => await showInformationMessage(ActivationStrings.revertedShellStartupScripts)); } diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 69cdf61..bb91264 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -2,6 +2,7 @@ import * as fsapi from 'fs-extra'; import * as path from 'path'; import { Disposable, EventEmitter, ProgressLocation, Terminal, TerminalOptions, Uri } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonTerminalCreateOptions } from '../../api'; +import { ActivationStrings } from '../../common/localize'; import { traceInfo, traceVerbose } from '../../common/logging'; import { createTerminal, @@ -23,7 +24,15 @@ import { TerminalActivationInternal, TerminalEnvironment, } from './terminalActivationState'; -import { AutoActivationType, getAutoActivationType, getEnvironmentForTerminal, waitForShellIntegration } from './utils'; +import { + ACT_TYPE_COMMAND, + ACT_TYPE_OFF, + ACT_TYPE_SHELL, + AutoActivationType, + getAutoActivationType, + getEnvironmentForTerminal, + waitForShellIntegration, +} from './utils'; export interface TerminalCreation { create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise; @@ -108,7 +117,7 @@ export class TerminalManagerImpl implements TerminalManager { onDidChangeConfiguration(async (e) => { if (e.affectsConfiguration('python-envs.terminal.autoActivationType')) { const actType = getAutoActivationType(); - if (actType === 'shellStartup') { + if (actType === ACT_TYPE_SHELL) { traceInfo(`Auto activation type changed to ${actType}`); const shells = new Set( terminals() @@ -178,10 +187,10 @@ export class TerminalManagerImpl implements TerminalManager { let isSetup = this.shellSetup.get(shellType); if (isSetup === true) { traceVerbose(`Shell profile for ${shellType} is already setup.`); - return 'shellStartup'; + return ACT_TYPE_SHELL; } else if (isSetup === false) { traceVerbose(`Shell profile for ${shellType} is not set up, using command fallback.`); - return 'command'; + return ACT_TYPE_COMMAND; } } @@ -197,25 +206,25 @@ export class TerminalManagerImpl implements TerminalManager { await this.handleSetupCheck(shellType); // Check again after the setup check. - return this.getShellActivationType(shellType) ?? 'command'; + return this.getShellActivationType(shellType) ?? ACT_TYPE_COMMAND; } traceInfo(`Shell startup not supported for ${shellType}, using command activation as fallback`); - return 'command'; + return ACT_TYPE_COMMAND; } private async autoActivateOnTerminalOpen(terminal: Terminal, environment: PythonEnvironment): Promise { let actType = getAutoActivationType(); const shellType = identifyTerminalShell(terminal); - if (actType === 'shellStartup') { + if (actType === ACT_TYPE_SHELL) { actType = await this.getEffectiveActivationType(shellType); } - if (actType === 'command') { + if (actType === ACT_TYPE_COMMAND) { if (isActivatableEnvironment(environment)) { await withProgress( { location: ProgressLocation.Window, - title: `Activating environment: ${environment.environmentPath.fsPath}`, + title: `${ActivationStrings.activatingEnvironment}: ${environment.environmentPath.fsPath}`, }, async () => { await waitForShellIntegration(terminal); @@ -225,9 +234,9 @@ export class TerminalManagerImpl implements TerminalManager { } else { traceVerbose(`Environment ${environment.environmentPath.fsPath} is not activatable`); } - } else if (actType === 'off') { + } else if (actType === ACT_TYPE_OFF) { traceInfo(`"python-envs.terminal.autoActivationType" is set to "${actType}", skipping auto activation`); - } else if (actType === 'shellStartup') { + } else if (actType === ACT_TYPE_SHELL) { traceInfo( `"python-envs.terminal.autoActivationType" is set to "${actType}", terminal should be activated by shell startup script`, ); @@ -237,7 +246,7 @@ export class TerminalManagerImpl implements TerminalManager { public async create(environment: PythonEnvironment, options: PythonTerminalCreateOptions): Promise { const autoActType = getAutoActivationType(); let envVars = options.env; - if (autoActType === 'shellStartup') { + if (autoActType === ACT_TYPE_SHELL) { const vars = await Promise.all(this.startupEnvProviders.map((p) => p.getEnvVariables(environment))); vars.forEach((varMap) => { @@ -249,6 +258,7 @@ export class TerminalManagerImpl implements TerminalManager { }); } + // Uncomment the code line below after the issue is resolved: // https://github.com/microsoft/vscode-python-environments/issues/172 // const name = options.name ?? `Python: ${environment.displayName}`; const newTerminal = createTerminal({ @@ -266,7 +276,7 @@ export class TerminalManagerImpl implements TerminalManager { isTransient: options.isTransient, }); - if (autoActType === 'command') { + if (autoActType === ACT_TYPE_COMMAND) { if (options.disableActivation) { this.skipActivationOnOpen.add(newTerminal); return newTerminal; @@ -360,9 +370,9 @@ export class TerminalManagerImpl implements TerminalManager { public async initialize(api: PythonEnvironmentApi): Promise { const actType = getAutoActivationType(); - if (actType === 'command') { + if (actType === ACT_TYPE_COMMAND) { await Promise.all(terminals().map(async (t) => this.activateUsingCommand(api, t))); - } else if (actType === 'shellStartup') { + } else if (actType === ACT_TYPE_SHELL) { const shells = new Set( terminals() .map((t) => identifyTerminalShell(t)) diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 7258ac1..1a17c54 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -90,6 +90,9 @@ export async function getEnvironmentForTerminal( return env; } +export const ACT_TYPE_SHELL = 'shellStartup'; +export const ACT_TYPE_COMMAND = 'command'; +export const ACT_TYPE_OFF = 'off'; export type AutoActivationType = 'off' | 'command' | 'shellStartup'; export function getAutoActivationType(): AutoActivationType { // 'startup' auto-activation means terminal is activated via shell startup scripts. From 2c25532ba68cb503d1450491f6b9b73ad1515eb6 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 25 Apr 2025 11:56:46 -0700 Subject: [PATCH 132/328] fix: inconsistent shell name display (#339) Standardize the display names of various shell providers to use lowercase for consistency. Fixes https://github.com/microsoft/vscode-python-environments/issues/230 --- src/features/terminal/shells/bash/bashStartup.ts | 6 +++--- src/features/terminal/shells/fish/fishStartup.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 16b029a..dcea460 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -111,7 +111,7 @@ async function removeStartup(profile: string, key: string): Promise { } export class BashStartupProvider implements ShellStartupScriptProvider { - public readonly name: string = 'Bash'; + public readonly name: string = 'bash'; public readonly shellType: string = ShellConstants.BASH; private async checkShellInstalled(): Promise { @@ -178,7 +178,7 @@ export class BashStartupProvider implements ShellStartupScriptProvider { } export class ZshStartupProvider implements ShellStartupScriptProvider { - public readonly name: string = 'Zsh'; + public readonly name: string = 'zsh'; public readonly shellType: string = ShellConstants.ZSH; private async checkShellInstalled(): Promise { @@ -239,7 +239,7 @@ export class ZshStartupProvider implements ShellStartupScriptProvider { } export class GitBashStartupProvider implements ShellStartupScriptProvider { - public readonly name: string = 'GitBash'; + public readonly name: string = 'Git bash'; public readonly shellType: string = ShellConstants.GITBASH; private async checkShellInstalled(): Promise { diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 1d8791d..6cacbaf 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -95,7 +95,7 @@ async function removeFishStartup(profilePath: string, key: string): Promise { From 295e55fa793eba0e229e5d3818c3be970ce67dca Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 25 Apr 2025 11:58:16 -0700 Subject: [PATCH 133/328] switch new project add to create method (#336) - renamed `addPythonProject` in src/features/envCommands.ts to `addPythonProjectCommand` (as it is only a command entry point) - moved responsibility so ProjectCreators are responsible for adding their created projects to the ProjectManager list - updated `addPythonProjectCommand` so it calls the selected ProjectCreator create method OR (if the resource param already a ProjectItem) just add it to the ProjectManager list --- src/extension.ts | 4 +- src/features/creators/autoFindProjects.ts | 11 +- src/features/creators/existingProjects.ts | 5 +- src/features/envCommands.ts | 174 ++++++++-------------- src/features/projectManager.ts | 20 ++- src/internal.api.ts | 2 +- 6 files changed, 98 insertions(+), 118 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 099bdcd..b59b233 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -22,7 +22,7 @@ import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; import { ProjectCreatorsImpl } from './features/creators/projectCreators'; import { - addPythonProject, + addPythonProjectCommand, copyPathToClipboard, createAnyEnvironmentCommand, createEnvironmentCommand, @@ -187,7 +187,7 @@ export async function activate(context: ExtensionContext): Promise { - await addPythonProject(resource, projectManager, envManagers, projectCreators); + await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators); }), commands.registerCommand('python-envs.removePythonProject', async (item) => { await resetEnvironmentCommand(item, envManagers, projectManager); diff --git a/src/features/creators/autoFindProjects.ts b/src/features/creators/autoFindProjects.ts index 5cef489..3c7fd82 100644 --- a/src/features/creators/autoFindProjects.ts +++ b/src/features/creators/autoFindProjects.ts @@ -90,16 +90,19 @@ export class AutoFindProjects implements PythonProjectCreator { traceInfo(`Found ${filtered.length} new potential projects that aren't already registered`); - const projects = await pickProjects(filtered); - if (!projects || projects.length === 0) { + const projectUris = await pickProjects(filtered); + if (!projectUris || projectUris.length === 0) { // User cancelled the selection. traceInfo('User cancelled project selection.'); return; } - return projects.map((uri) => ({ + const projects = projectUris.map((uri) => ({ name: path.basename(uri.fsPath), uri, - })); + })) as PythonProject[]; + // Add the projects to the project manager + this.pm.add(projects); + return projects; } } diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index 9aa38c5..b30df92 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -90,10 +90,13 @@ export class ExistingProjects implements PythonProjectCreator { } return; } else { - return resultsInWorkspace.map((uri) => ({ + const projects = resultsInWorkspace.map((uri) => ({ name: path.basename(uri.fsPath), uri, })) as PythonProject[]; + // Add the projects to the project manager + this.pm.add(projects); + return projects; } } } diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index ab83ece..9ec9d7b 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,53 +1,43 @@ import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode'; -import { - EnvironmentManagers, - InternalEnvironmentManager, - InternalPackageManager, - ProjectCreators, - PythonProjectManager, -} from '../internal.api'; -import { traceError, traceInfo, traceVerbose } from '../common/logging'; import { CreateEnvironmentOptions, PythonEnvironment, PythonEnvironmentApi, - PythonProject, PythonProjectCreator, + PythonProjectCreatorOptions, } from '../api'; -import * as path from 'path'; +import { traceError, traceInfo, traceVerbose } from '../common/logging'; import { - setEnvironmentManager, - setPackageManager, - addPythonProjectSetting, - removePythonProjectSetting, - getDefaultEnvManagerSetting, - getDefaultPkgManagerSetting, - EditProjectSettings, -} from './settings/settingHelpers'; - -import { getAbsolutePath } from '../common/utils/fileNameUtils'; + EnvironmentManagers, + InternalEnvironmentManager, + InternalPackageManager, + ProjectCreators, + PythonProjectManager, +} from '../internal.api'; +import { removePythonProjectSetting, setEnvironmentManager, setPackageManager } from './settings/settingHelpers'; + +import { clipboardWriteText } from '../common/env.apis'; +import {} from '../common/errors/utils'; +import { pickEnvironment } from '../common/pickers/environments'; +import { pickCreator, pickEnvironmentManager, pickPackageManager } from '../common/pickers/managers'; +import { pickProject, pickProjectMany } from '../common/pickers/projects'; +import { activeTextEditor, showErrorMessage } from '../common/window.apis'; +import { quoteArgs } from './execution/execUtils'; import { runAsTask } from './execution/runAsTask'; +import { runInTerminal } from './terminal/runInTerminal'; +import { TerminalManager } from './terminal/terminalManager'; import { EnvManagerTreeItem, - PackageRootTreeItem, - PythonEnvTreeItem, - ProjectItem, - ProjectEnvironment, - ProjectPackageRootTreeItem, - GlobalProjectItem, EnvTreeItemKind, + GlobalProjectItem, + PackageRootTreeItem, PackageTreeItem, + ProjectEnvironment, + ProjectItem, ProjectPackage, + ProjectPackageRootTreeItem, + PythonEnvTreeItem, } from './views/treeViewItems'; -import { pickEnvironment } from '../common/pickers/environments'; -import { pickEnvironmentManager, pickPackageManager, pickCreator } from '../common/pickers/managers'; -import { pickProject, pickProjectMany } from '../common/pickers/projects'; -import { TerminalManager } from './terminal/terminalManager'; -import { runInTerminal } from './terminal/runInTerminal'; -import { quoteArgs } from './execution/execUtils'; -import {} from '../common/errors/utils'; -import { activeTextEditor, showErrorMessage } from '../common/window.apis'; -import { clipboardWriteText } from '../common/env.apis'; export async function refreshManagerCommand(context: unknown): Promise { if (context instanceof EnvManagerTreeItem) { @@ -338,93 +328,61 @@ export async function setPackageManagerCommand(em: EnvironmentManagers, wm: Pyth } } -export async function addPythonProject( +/** + * Creates a new Python project using a selected PythonProjectCreator. + * + * This function calls create on the selected creator and handles the creation process. Will return + * without doing anything if the resource is a ProjectItem, as the project is already created. + * + * @param resource - The resource to use for project creation (can be a Uri(s), ProjectItem(s), or undefined). + * @param wm - The PythonProjectManager instance for managing projects. + * @param em - The EnvironmentManagers instance for managing environments. + * @param pc - The ProjectCreators instance for accessing available project creators. + * @returns A promise that resolves when the project has been created, or void if cancelled or invalid. + */ +export async function addPythonProjectCommand( resource: unknown, wm: PythonProjectManager, em: EnvironmentManagers, pc: ProjectCreators, -): Promise { +): Promise { if (wm.getProjects().length === 0) { showErrorMessage('Please open a folder/project before adding a workspace'); return; } - - if (resource instanceof Uri) { - const uri = resource as Uri; - const envManagerId = getDefaultEnvManagerSetting(wm, uri); - const pkgManagerId = getDefaultPkgManagerSetting( - wm, - uri, - em.getEnvironmentManager(envManagerId)?.preferredPackageManagerId, - ); - const pw = wm.create(path.basename(uri.fsPath), uri); - await addPythonProjectSetting([{ project: pw, envManager: envManagerId, packageManager: pkgManagerId }]); - return pw; - } - - if (resource === undefined || resource instanceof ProjectItem) { - const creator: PythonProjectCreator | undefined = await pickCreator(pc.getProjectCreators()); - if (!creator) { + if (resource instanceof Array) { + for (const r of resource) { + await addPythonProjectCommand(r, wm, em, pc); return; } + } + if (resource instanceof ProjectItem) { + // If the context is a ProjectItem, project is already created. Just add it to the package manager project list. + wm.add(resource.project); + return; + } + let options: PythonProjectCreatorOptions | undefined; - let results: PythonProject | PythonProject[] | Uri | Uri[] | undefined; - try { - results = await creator.create(); - if (results === undefined) { - return; - } - } catch (ex) { - if (ex === QuickInputButtons.Back) { - return addPythonProject(resource, wm, em, pc); - } - throw ex; - } - - if ( - results instanceof Uri || - (Array.isArray(results) && results.length > 0 && results.every((r) => r instanceof Uri)) - ) { - // the results are Uris, which means they aren't projects and shouldn't be added - return; - } - results = results as PythonProject | PythonProject[]; - - if (!Array.isArray(results)) { - results = [results]; - } - - if (Array.isArray(results)) { - if (results.length === 0) { - return; - } - } - - const projects: PythonProject[] = []; - const edits: EditProjectSettings[] = []; + if (resource instanceof Uri) { + // Use resource as the URI for the project if it is a URI. + options = { + name: resource.fsPath, + rootUri: resource, + }; + } - for (const result of results) { - const uri = await getAbsolutePath(result.uri.fsPath); - if (!uri) { - traceError(`Path does not belong to any opened workspace: ${result.uri.fsPath}`); - continue; - } + const creator: PythonProjectCreator | undefined = await pickCreator(pc.getProjectCreators()); + if (!creator) { + return; + } - const envManagerId = getDefaultEnvManagerSetting(wm, uri); - const pkgManagerId = getDefaultPkgManagerSetting( - wm, - uri, - em.getEnvironmentManager(envManagerId)?.preferredPackageManagerId, - ); - const pw = wm.create(path.basename(uri.fsPath), uri); - projects.push(pw); - edits.push({ project: pw, envManager: envManagerId, packageManager: pkgManagerId }); + try { + await creator.create(options); + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return addPythonProjectCommand(resource, wm, em, pc); } - await addPythonProjectSetting(edits); - return projects; - } else { - // If the context is not a Uri or ProjectItem, rerun function with undefined context - await addPythonProject(undefined, wm, em, pc); + throw ex; } } diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 0316f4f..095be20 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -9,6 +9,12 @@ import { onDidChangeWorkspaceFolders, } from '../common/workspace.apis'; import { createSimpleDebounce } from '../common/utils/debounce'; +import { + addPythonProjectSetting, + EditProjectSettings, + getDefaultEnvManagerSetting, + getDefaultPkgManagerSetting, +} from './settings/settingHelpers'; type ProjectArray = PythonProject[]; @@ -92,14 +98,24 @@ export class PythonProjectManagerImpl implements PythonProjectManager { return new PythonProjectsImpl(name, uri, options); } - add(projects: PythonProject | ProjectArray): void { + async add(projects: PythonProject | ProjectArray): Promise { const _projects = Array.isArray(projects) ? projects : [projects]; if (_projects.length === 0) { return; } + const edits: EditProjectSettings[] = []; + + const envManagerId = getDefaultEnvManagerSetting(this); + const pkgManagerId = getDefaultPkgManagerSetting(this); - _projects.forEach((w) => this._projects.set(w.uri.toString(), w)); + _projects.forEach((w) => { + edits.push({ project: w, envManager: envManagerId, packageManager: pkgManagerId }); + return this._projects.set(w.uri.toString(), w); + }); this._onDidChangeProjects.fire(Array.from(this._projects.values())); + + // handle bulk edits to avoid multiple calls to the setting + await addPythonProjectSetting(edits); } remove(projects: PythonProject | ProjectArray): void { diff --git a/src/internal.api.ts b/src/internal.api.ts index 509d48a..668fe3f 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -284,7 +284,7 @@ export interface PythonProjectManager extends Disposable { uri: Uri, options?: { description?: string; tooltip?: string | MarkdownString; iconPath?: IconPath }, ): PythonProject; - add(pyWorkspace: PythonProject | PythonProject[]): void; + add(pyWorkspace: PythonProject | PythonProject[]): Promise; remove(pyWorkspace: PythonProject | PythonProject[]): void; getProjects(uris?: Uri[]): ReadonlyArray; get(uri: Uri): PythonProject | undefined; From faddd132bacaf645af4e7cb12eafb8c077ed1739 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:07:26 -0700 Subject: [PATCH 134/328] Get Notebook Uri from Cell Logic Fix (#312) --- src/common/utils/pathUtils.ts | 56 ++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index 205f504..4a70f38 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -1,26 +1,62 @@ import * as os from 'os'; import * as path from 'path'; -import { Uri } from 'vscode'; +import { NotebookCell, NotebookDocument, Uri, workspace } from 'vscode'; import { isWindows } from './platformUtils'; export function checkUri(scope?: Uri | Uri[] | string): Uri | Uri[] | string | undefined { - if (scope instanceof Uri) { - if (scope.scheme === 'vscode-notebook-cell') { - return Uri.from({ - scheme: 'vscode-notebook', - path: scope.path, - authority: scope.authority, - }); - } + if (!scope) { + return undefined; } + if (Array.isArray(scope)) { + // if the scope is an array, all items must be Uri, check each item return scope.map((item) => { - return checkUri(item) as Uri; + const s = checkUri(item); + if (s instanceof Uri) { + return s; + } + throw new Error('Invalid entry, expected Uri.'); }); } + + if (scope instanceof Uri) { + if (scope.scheme === 'vscode-notebook-cell') { + const matchingDoc = workspace.notebookDocuments.find((doc) => findCell(scope, doc)); + // If we find a matching notebook document, return the Uri of the cell. + return matchingDoc ? matchingDoc.uri : scope; + } + } return scope; } +/** + * Find a notebook document by cell Uri. + */ +export function findCell(cellUri: Uri, notebook: NotebookDocument): NotebookCell | undefined { + // Fragment is not unique to a notebook, hence ensure we compare the path as well. + return notebook.getCells().find((cell) => { + return isEqual(cell.document.uri, cellUri); + }); +} +function isEqual(uri1: Uri | undefined, uri2: Uri | undefined): boolean { + if (uri1 === uri2) { + return true; + } + if (!uri1 || !uri2) { + return false; + } + return getComparisonKey(uri1) === getComparisonKey(uri2); +} + +function getComparisonKey(uri: Uri): string { + return uri + .with({ + path: isWindows() ? uri.path.toLowerCase() : uri.path, + fragment: undefined, + }) + .toString(); +} + export function normalizePath(fsPath: string): string { const path1 = fsPath.replace(/\\/g, '/'); if (isWindows()) { From 7719e43b3a92d9290b99e37785ff21c77f14c491 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 29 Apr 2025 06:39:51 -0700 Subject: [PATCH 135/328] ignore setting updates on default project selection (#360) fixes https://github.com/microsoft/vscode-python-environments/issues/355 regression occurred since now settings edits were made for every project add where only project settings that differ from the default need to be added to the settings --- src/features/projectManager.ts | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 095be20..9b9ebce 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -1,14 +1,15 @@ -import { Uri, EventEmitter, MarkdownString, Disposable } from 'vscode'; -import { IconPath, PythonProject } from '../api'; import * as path from 'path'; -import { PythonProjectManager, PythonProjectSettings, PythonProjectsImpl } from '../internal.api'; +import { Disposable, EventEmitter, MarkdownString, Uri, workspace } from 'vscode'; +import { IconPath, PythonProject } from '../api'; +import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../common/constants'; +import { createSimpleDebounce } from '../common/utils/debounce'; import { getConfiguration, getWorkspaceFolders, onDidChangeConfiguration, onDidChangeWorkspaceFolders, } from '../common/workspace.apis'; -import { createSimpleDebounce } from '../common/utils/debounce'; +import { PythonProjectManager, PythonProjectSettings, PythonProjectsImpl } from '../internal.api'; import { addPythonProjectSetting, EditProjectSettings, @@ -108,14 +109,22 @@ export class PythonProjectManagerImpl implements PythonProjectManager { const envManagerId = getDefaultEnvManagerSetting(this); const pkgManagerId = getDefaultPkgManagerSetting(this); + const globalConfig = workspace.getConfiguration('python-envs', undefined); + const defaultEnvManager = globalConfig.get('defaultEnvManager', DEFAULT_ENV_MANAGER_ID); + const defaultPkgManager = globalConfig.get('defaultPackageManager', DEFAULT_PACKAGE_MANAGER_ID); + _projects.forEach((w) => { - edits.push({ project: w, envManager: envManagerId, packageManager: pkgManagerId }); + // if the package manager and env manager are not the default ones, then add them to the edits + if (envManagerId !== defaultEnvManager || pkgManagerId !== defaultPkgManager) { + edits.push({ project: w, envManager: envManagerId, packageManager: pkgManagerId }); + } return this._projects.set(w.uri.toString(), w); }); this._onDidChangeProjects.fire(Array.from(this._projects.values())); - // handle bulk edits to avoid multiple calls to the setting - await addPythonProjectSetting(edits); + if (edits.length > 0) { + await addPythonProjectSetting(edits); + } } remove(projects: PythonProject | ProjectArray): void { From 35c74b758636a8962248cdf99bd6d69eb757f120 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 29 Apr 2025 09:33:52 -0700 Subject: [PATCH 136/328] fix: bugs where env deletion or creation are not recorded (#362) --- src/extension.ts | 14 ++++++++------ src/features/views/projectView.ts | 20 ++++++++++---------- src/managers/builtin/venvManager.ts | 18 +++++++++--------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index b59b233..78f1a8e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -95,17 +95,13 @@ export async function activate(context: ExtensionContext): Promise(); + const shellStartupVarsMgr = new ShellStartupActivationVariablesManagerImpl( + context.environmentVariableCollection, + shellEnvsProviders, + api, + ); context.subscriptions.push( + shellStartupVarsMgr, registerCompletionProvider(envManagers), registerTools('python_environment', new GetEnvironmentInfoTool(api, envManagers)), registerTools('python_install_package', new InstallPackageTool(api)), diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index 28fb653..8205d78 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -10,22 +10,22 @@ import { window, } from 'vscode'; import { PythonEnvironment } from '../../api'; +import { ProjectViews } from '../../common/localize'; +import { createSimpleDebounce } from '../../common/utils/debounce'; +import { onDidChangeConfiguration } from '../../common/workspace.apis'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; import { - ProjectTreeItem, - ProjectItem, - ProjectEnvironment, - ProjectPackageRootTreeItem, - ProjectTreeItemKind, + GlobalProjectItem, NoProjectEnvironment, + ProjectEnvironment, ProjectEnvironmentInfo, + ProjectItem, ProjectPackage, ProjectPackageRootInfoTreeItem, - GlobalProjectItem, + ProjectPackageRootTreeItem, + ProjectTreeItem, + ProjectTreeItemKind, } from './treeViewItems'; -import { onDidChangeConfiguration } from '../../common/workspace.apis'; -import { createSimpleDebounce } from '../../common/utils/debounce'; -import { ProjectViews } from '../../common/localize'; export class ProjectView implements TreeDataProvider { private treeView: TreeView; @@ -171,7 +171,7 @@ export class ProjectView implements TreeDataProvider { ]; } - const environment = await manager?.get(uri); + const environment = await this.envManagers.getEnvironment(uri); if (!environment) { return [ new NoProjectEnvironment( diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 159964e..a7e8aa5 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -1,4 +1,5 @@ -import { ProgressLocation, Uri, LogOutputChannel, EventEmitter, MarkdownString, ThemeIcon, l10n } from 'vscode'; +import * as path from 'path'; +import { EventEmitter, l10n, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode'; import { CreateEnvironmentOptions, CreateEnvironmentScope, @@ -17,6 +18,12 @@ import { ResolveEnvironmentContext, SetEnvironmentScope, } from '../../api'; +import { PYTHON_EXTENSION_ID } from '../../common/constants'; +import { VenvManagerStrings } from '../../common/localize'; +import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { showErrorMessage, withProgress } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; import { clearVenvCache, createPythonVenv, @@ -32,13 +39,6 @@ import { setVenvForWorkspace, setVenvForWorkspaces, } from './venvUtils'; -import * as path from 'path'; -import { NativePythonFinder } from '../common/nativePythonFinder'; -import { PYTHON_EXTENSION_ID } from '../../common/constants'; -import { createDeferred, Deferred } from '../../common/utils/deferred'; -import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; -import { showErrorMessage, withProgress } from '../../common/window.apis'; -import { VenvManagerStrings } from '../../common/localize'; export class VenvManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -215,7 +215,7 @@ export class VenvManager implements EnvironmentManager { if (this.skipWatcherRefresh) { return; } - return this.internalRefresh(undefined, false, VenvManagerStrings.venvRefreshing); + return this.internalRefresh(undefined, true, VenvManagerStrings.venvRefreshing); } private async internalRefresh( From 044b7b5807ecd0cad937f0c17b1b6214eab8ebd0 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 29 Apr 2025 12:55:42 -0700 Subject: [PATCH 137/328] edits to get environment tool descriptions (#364) fixes https://github.com/microsoft/vscode-python-environments/issues/345 fixes https://github.com/microsoft/vscode-python-environments/issues/352 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c413ab..3ea830e 100644 --- a/package.json +++ b/package.json @@ -510,8 +510,9 @@ "languageModelTools": [ { "name": "python_environment", + "userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.", "displayName": "Get Python Environment Information", - "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions.", + "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions. Use this tool to determine the correct command for executing Python code in this workspace.", "toolReferenceName": "pythonGetEnvironmentInfo", "tags": [], "icon": "$(files)", From cfae8076c3cfb19799272dbe7c7587e0b781efc1 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Wed, 30 Apr 2025 09:18:46 -0500 Subject: [PATCH 138/328] Update readme based on most recent updates (#368) --- README.md | 115 ++++++++++++++------ images/environment-managers-quick-start.png | Bin 0 -> 147715 bytes 2 files changed, 81 insertions(+), 34 deletions(-) create mode 100644 images/environment-managers-quick-start.png diff --git a/README.md b/README.md index 6765c2c..68f814f 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,103 @@ -# Python Environments and Package Manager (experimental) +# Python Environments (experimental) ## Overview -The Python Environments and Package Manager extension for VS Code helps you manage Python environments and packages using your preferred environment manager backed by its extensible APIs. This extension provides unique support to specify environments for specific files or whole Python folders or projects, including multi-root & mono-repos scenarios. +The Python Environments extension for VS Code helps you manage Python environments and packages using your preferred environment manager, backed by its extensible APIs. This extension provides unique support for specifying environments for specific files, entire Python folders, or projects, including multi-root and mono-repo scenarios. The core feature set includes: -> Note: This extension is in preview and its APIs and features are subject to change as the project continues to evolve. +- 🌐 Create, delete, and manage environments +- 📦 Install and uninstall packages within the selected environment +- ✅ Create activated terminals +- 🖌️ Add and create new Python projects -> Important: This extension currently requires the pre-release version of the Python extension (ms-python.python) to operate (version 2024.23.2025010901 or later). +> **Note:** This extension is in preview, and its APIs and features are subject to change as the project evolves. + +> **Important:** This extension requires version `2024.23`, or later, of the Python extension (`ms-python.python`). ## Features - +The "Python Projects" fold shows you all of the projects that are currently in your workspace and their selected environments. From this view you can add more files or folders as projects, select a new environment for your project, and manage your selected environments. + +The "Environment Managers" fold shows you all of the environment managers that are available on your machine with all related environments nested below. From this view, you can create new environments, delete old environments, and manage packages. + + width=734 height=413> ### Environment Management -This extension provides an Environments view, which can be accessed via the VS Code Activity Bar, where you can manage your Python environments. Here, you can create, delete, and switch between environments, as well as install and uninstall packages within the selected environment. It also provides APIs for extension developers to contribute their own environment managers. +The Python Environments panel provides an interface to create, delete and manage environments. + + width=734 height=413> + +To simplify the environment creation process, you can use "Quick Create" to automatically create a new virtual environment using: -By default, the extension uses the `venv` environment manager. This default manager determines how environments are created, managed, and where packages are installed. However, users can change the default by setting the `python-envs.defaultEnvManager` to a different environment manager. The following environment managers are supported out of the box: +- Your default environment manager (e.g., `venv`) +- The latest Python version +- Workspace dependencies -| Id | name | Description | +For more control, you can create a custom environment where you can specify Python version, environment name, packages to be installed, and more! + +The following environment managers are supported out of the box: + +| Id | Name | Description | | ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ms-python.python:venv | `venv` | The default environment manager. It is a built-in environment manager provided by the Python standard library. | | ms-python.python:system | System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | | ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | -The environment manager is responsible for specifying which package manager will be used by default to install and manage Python packages within the environment. This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. +Environment managers are responsible for specifying which package manager will be used by default to install and manage Python packages within the environment (`venv` uses `pip` by default). This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. ### Package Management -This extension provides a package view for you to manage, install and uninstall you Python packages in any particular environment. This extension provides APIs for extension developers to contribute package managers. +The extension also provides an interface to install and uninstall Python packages, and provides APIs for extension developers to contribute package managers of their choice. -The extension uses `pip` as the default package manager. You can change this by setting the `python-envs.defaultPackageManager` setting to a different package manager. The following are package managers supported out of the box: +The extension uses `pip` as the default package manager, but you can use the package manager of your choice using the `python-envs.defaultPackageManager` setting. The following are package managers supported out of the box: -| Id | name | Description | +| Id | Name | Description| | ---------------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | | ms-python.python:conda | `conda` | The [conda](https://conda.org) package manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | +### Project Management + +A "Python Project" is any file or folder that contains runnable Python code and needs its own environment. With the Python Environments extension, you can add files and folders as projects in your workspace and assign individual environments to them allowing you to run various projects more seamlessly. + +Projects can be added via the Python Environments pane or in the File Explorer by right-clicking on the folder/file and selecting the "Add as Python Project" menu item. + +There are a couple of ways that you can add a Python Project from the Python Environments panel: + +| Name | Description | +| ----- | ---------- | +| Add Existing | Allows you to add an existing folder from the file explorer. | +| Auto find | Searches for folders that contain `pyproject.toml` or `setup.py` files | + +## Command Reference + +| Name | Description | +| -------- | ------------- | +| Python: Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | +| Python: Manage Packages | Install and uninstall packages in a given Python environment. | +| Python: Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | +| Python: Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | +| Python: Run as Task | Runs Python module as a task. | + ## Settings Reference | Setting (python-envs.) | Default | Description | | --------------------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | -| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | +| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | +| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | | pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | -| terminal.showActivateButton | `false` | [experimental] Show a button in the terminal to activate/deactivate the current environment for the terminal. This button is only shown if the active terminal is associated with a project that has an activatable environment. | +| terminal.showActivateButton | `false` | (experimental) Show a button in the terminal to activate/deactivate the current environment for the terminal. This button is only shown if the active terminal is associated with a project that has an activatable environment. | +| python-envs.terminal.autoActivationType | `command` | Specifies how the extension can activate an environment in a terminal. Utilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated. This setting applies only when terminals are created, so you will need to restart your terminals for it to take effect. To revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.| + +## Extensibility -## API Reference (proposed) +The Python Environments extension was built to provide a cohesive and user friendly experience with `venv` as the default. However, the extension is built with extensibility in mind so that any environment manager could build an extension using the supported APIs to plug-in and provide a seamless and incorporated experience for their users in VS Code. + +### API Reference (proposed) See [api.ts](https://github.com/microsoft/vscode-python-environments/blob/main/src/api.ts) for the full list of Extension APIs. -To consume these APIs you can look at the example here: -https://github.com/microsoft/vscode-python-environments/blob/main/examples/README.md +To consume these APIs you can look at the example here: [API Consumption Examples](https://github.com/microsoft/vscode-python-environments/blob/main/examples/README.md) ### Callable Commands @@ -77,23 +123,24 @@ Create a new environment using any of the available environment managers. This c usage: `await vscode.commands.executeCommand('python-envs.createAny', options);` + ## Extension Dependency This section provides an overview of how the Python extension interacts with the Python Environments extension and other tool-specific extensions. The Python Environments extension allows users to create, manage, and remove Python environments and packages. It also provides an API that other extensions can use to support environment management or consume it for running Python tools or projects. Tools that may rely on these APIs in their own extensions include: -- **Debuggers** (e.g., `debugpy`) -- **Linters** (e.g., Pylint, Flake8, Mypy) -- **Formatters** (e.g., Black, autopep8) -- **Language Server extensions** (e.g., Pylance, Jedi) -- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) +- **Debuggers** (e.g., `debugpy`) +- **Linters** (e.g., Pylint, Flake8, Mypy) +- **Formatters** (e.g., Black, autopep8) +- **Language Server extensions** (e.g., Pylance, Jedi) +- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) ### API Dependency The relationship between these extensions can be represented as follows: - + width=734 height=413> Users who do not need to execute code or work in **Virtual Workspaces** can use the Python extension to access language features like hover, completion, and go-to definition. However, executing code (e.g., running a debugger, linter, or formatter), creating/modifying environments, or managing packages requires the Python Environments extension to enable these functionalities. @@ -103,7 +150,7 @@ VS Code supports trust management, allowing extensions to function in either **t The relationship is illustrated below: - + width=734 height=413> In **trusted mode**, the Python Environments extension supports tasks like managing environments, installing/removing packages, and running tools. In **untrusted mode**, functionality is limited to language features, ensuring a secure and restricted environment. @@ -111,7 +158,7 @@ In **trusted mode**, the Python Environments extension supports tasks like manag This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. +the rights to use your contribution. For details, visit . When you submit a pull request, a CLA bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions @@ -123,17 +170,17 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio ## Questions, issues, feature requests, and contributions -- If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). -- If you come across a problem with the extension, please [file an issue](https://github.com/microsoft/vscode-python). -- Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) for more details. -- Any and all feedback is appreciated and welcome! - - If someone has already [filed an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue. - - Otherwise please start a [new discussion](https://github.com/microsoft/vscode-python/discussions/categories/ideas). -- If you're interested in the development of the extension, you can read about our [development process](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md#development-process). +- If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). +- If you come across a problem with the extension, please [file an issue](https://github.com/microsoft/vscode-python). +- Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) for more details. +- Any and all feedback is appreciated and welcome! + - If someone has already [filed an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue. + - Otherwise please start a [new discussion](https://github.com/microsoft/vscode-python/discussions/categories/ideas). +- If you're interested in the development of the extension, you can read about our [development process](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md#development-process). ## Data and telemetry -The Microsoft Python Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.enableTelemetry` setting which you can learn more about at https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting. +The Microsoft Python Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.enableTelemetry` setting which you can learn more about at . ## Trademarks diff --git a/images/environment-managers-quick-start.png b/images/environment-managers-quick-start.png new file mode 100644 index 0000000000000000000000000000000000000000..c36f1f390e00b9c5be5eef782a3c8950b7f8cf11 GIT binary patch literal 147715 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�nY0! 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 GUidF-qwL=R literal 0 HcmV?d00001 From 586508c391cd867b4353694e6806e8d389aae38d Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 30 Apr 2025 10:29:13 -0700 Subject: [PATCH 139/328] fix: quick create does not show up when there only one provider (#372) Fixes https://github.com/microsoft/vscode-python/issues/25022 --- src/common/pickers/managers.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 893b4b7..409b402 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -2,7 +2,7 @@ import { QuickPickItem, QuickPickItemKind } from 'vscode'; import { PythonProjectCreator } from '../../api'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { Common, Pickers } from '../localize'; -import { showQuickPickWithButtons, showQuickPick } from '../window.apis'; +import { showQuickPick, showQuickPickWithButtons } from '../window.apis'; function getDescription(mgr: InternalEnvironmentManager | InternalPackageManager): string | undefined { if (mgr.description) { @@ -27,7 +27,8 @@ export async function pickEnvironmentManager( return; } - if (managers.length === 1) { + if (managers.length === 1 && !managers[0].supportsQuickCreate) { + // If there's only one manager and it doesn't support quick create, return its ID directly. return managers[0].id; } From d749b8068d867b9a433e874c47e63db18e8452c1 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 30 Apr 2025 15:19:06 -0700 Subject: [PATCH 140/328] fix project view bugs (#373) fixes http://github.com/microsoft/vscode-python-environments/issues/371 also fixes issue where newly added projects with `autoFind` and `existing` do not contain a project description and ie look different in the projects UI --- src/features/creators/autoFindProjects.ts | 16 +++++++--------- src/features/creators/existingProjects.ts | 14 ++++++-------- src/features/projectManager.ts | 17 ++++++++++++----- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/features/creators/autoFindProjects.ts b/src/features/creators/autoFindProjects.ts index 3c7fd82..d0e27be 100644 --- a/src/features/creators/autoFindProjects.ts +++ b/src/features/creators/autoFindProjects.ts @@ -1,11 +1,11 @@ import * as path from 'path'; import { Uri } from 'vscode'; -import { showErrorMessage, showQuickPickWithButtons, showWarningMessage } from '../../common/window.apis'; -import { ProjectCreatorString } from '../../common/localize'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; -import { PythonProjectManager } from '../../internal.api'; -import { findFiles } from '../../common/workspace.apis'; +import { ProjectCreatorString } from '../../common/localize'; import { traceInfo } from '../../common/logging'; +import { showErrorMessage, showQuickPickWithButtons, showWarningMessage } from '../../common/window.apis'; +import { findFiles } from '../../common/workspace.apis'; +import { PythonProjectManager, PythonProjectsImpl } from '../../internal.api'; function getUniqueUri(uris: Uri[]): { label: string; @@ -96,11 +96,9 @@ export class AutoFindProjects implements PythonProjectCreator { traceInfo('User cancelled project selection.'); return; } - - const projects = projectUris.map((uri) => ({ - name: path.basename(uri.fsPath), - uri, - })) as PythonProject[]; + const projects = projectUris.map( + (uri) => new PythonProjectsImpl(path.basename(uri.fsPath), uri), + ) as PythonProject[]; // Add the projects to the project manager this.pm.add(projects); return projects; diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index b30df92..e54808d 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -1,11 +1,10 @@ import * as path from 'path'; +import { Uri, window, workspace } from 'vscode'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { ProjectCreatorString } from '../../common/localize'; +import { traceInfo, traceLog } from '../../common/logging'; import { showOpenDialog, showWarningMessage } from '../../common/window.apis'; -import { PythonProjectManager } from '../../internal.api'; -import { traceInfo } from '../../common/logging'; -import { Uri, window, workspace } from 'vscode'; -import { traceLog } from '../../common/logging'; +import { PythonProjectManager, PythonProjectsImpl } from '../../internal.api'; export class ExistingProjects implements PythonProjectCreator { public readonly name = 'existingProjects'; @@ -90,10 +89,9 @@ export class ExistingProjects implements PythonProjectCreator { } return; } else { - const projects = resultsInWorkspace.map((uri) => ({ - name: path.basename(uri.fsPath), - uri, - })) as PythonProject[]; + const projects = resultsInWorkspace.map( + (uri) => new PythonProjectsImpl(path.basename(uri.fsPath), uri), + ) as PythonProject[]; // Add the projects to the project manager this.pm.add(projects); return projects; diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 9b9ebce..58b477a 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -113,12 +113,19 @@ export class PythonProjectManagerImpl implements PythonProjectManager { const defaultEnvManager = globalConfig.get('defaultEnvManager', DEFAULT_ENV_MANAGER_ID); const defaultPkgManager = globalConfig.get('defaultPackageManager', DEFAULT_PACKAGE_MANAGER_ID); - _projects.forEach((w) => { - // if the package manager and env manager are not the default ones, then add them to the edits - if (envManagerId !== defaultEnvManager || pkgManagerId !== defaultPkgManager) { - edits.push({ project: w, envManager: envManagerId, packageManager: pkgManagerId }); + _projects.forEach((currProject) => { + const workspaces = getWorkspaceFolders() ?? []; + const isRoot = workspaces.some((w) => w.uri.toString() === currProject.uri.toString()); + if (isRoot) { + // for root projects, add setting if not default + if (envManagerId !== defaultEnvManager || pkgManagerId !== defaultPkgManager) { + edits.push({ project: currProject, envManager: envManagerId, packageManager: pkgManagerId }); + } + } else { + // for non-root projects, always add setting + edits.push({ project: currProject, envManager: envManagerId, packageManager: pkgManagerId }); } - return this._projects.set(w.uri.toString(), w); + return this._projects.set(currProject.uri.toString(), currProject); }); this._onDidChangeProjects.fire(Array.from(this._projects.values())); From eface530db7bf29e089dccb4fc9ee1107de7501f Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Thu, 1 May 2025 09:52:37 -0500 Subject: [PATCH 141/328] Expanding setting description for auto activate (#365) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- package.nls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nls.json b/package.nls.json index 667663a..a0c0a64 100644 --- a/package.nls.json +++ b/package.nls.json @@ -6,7 +6,7 @@ "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", - "python-envs.terminal.autoActivationType.description": "The type of activation to use when activating an environment in the terminal", + "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.", "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.", "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", From 9800738b7d9504c4507501454406f6841a619167 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Thu, 1 May 2025 12:25:56 -0500 Subject: [PATCH 142/328] Reformatting links to media (#374) --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 68f814f..d2406fc 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,12 @@ The "Python Projects" fold shows you all of the projects that are currently in y The "Environment Managers" fold shows you all of the environment managers that are available on your machine with all related environments nested below. From this view, you can create new environments, delete old environments, and manage packages. - width=734 height=413> - + ### Environment Management The Python Environments panel provides an interface to create, delete and manage environments. - width=734 height=413> + To simplify the environment creation process, you can use "Quick Create" to automatically create a new virtual environment using: @@ -140,7 +139,7 @@ Tools that may rely on these APIs in their own extensions include: The relationship between these extensions can be represented as follows: - width=734 height=413> + Users who do not need to execute code or work in **Virtual Workspaces** can use the Python extension to access language features like hover, completion, and go-to definition. However, executing code (e.g., running a debugger, linter, or formatter), creating/modifying environments, or managing packages requires the Python Environments extension to enable these functionalities. @@ -150,7 +149,7 @@ VS Code supports trust management, allowing extensions to function in either **t The relationship is illustrated below: - width=734 height=413> + In **trusted mode**, the Python Environments extension supports tasks like managing environments, installing/removing packages, and running tools. In **untrusted mode**, functionality is limited to language features, ensuring a secure and restricted environment. From 5655f27a6f641ead7a920fdd5f03ed07167f7a6d Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Mon, 5 May 2025 12:45:08 -0500 Subject: [PATCH 143/328] Update README.md (#382) Fixing spacing for header rendering --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d2406fc..5b179e5 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ The "Python Projects" fold shows you all of the projects that are currently in y The "Environment Managers" fold shows you all of the environment managers that are available on your machine with all related environments nested below. From this view, you can create new environments, delete old environments, and manage packages. + ### Environment Management The Python Environments panel provides an interface to create, delete and manage environments. From 4f6864206b9a1f60d636f1172a9768c86588c1d8 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 5 May 2025 14:02:34 -0700 Subject: [PATCH 144/328] fix: resolve on filesystem trigger does not use correct `activate` (#384) fixes: https://github.com/microsoft/vscode-python-environments/issues/383 The fix is to trigger FS event on `activate` file creation. This makes sure that we have the right files available for the environment. --- src/managers/builtin/main.ts | 16 ++++---- src/managers/builtin/venvUtils.ts | 68 +++++++++++++++---------------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/managers/builtin/main.ts b/src/managers/builtin/main.ts index f9b588b..dcad7d9 100644 --- a/src/managers/builtin/main.ts +++ b/src/managers/builtin/main.ts @@ -1,16 +1,16 @@ import { Disposable, LogOutputChannel } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; -import { SysPythonManager } from './sysPythonManager'; -import { PipPackageManager } from './pipManager'; -import { VenvManager } from './venvManager'; +import { createSimpleDebounce } from '../../common/utils/debounce'; +import { onDidEndTerminalShellExecution } from '../../common/window.apis'; +import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { UvProjectCreator } from './uvProjectCreator'; import { isUvInstalled } from './helpers'; -import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; -import { createSimpleDebounce } from '../../common/utils/debounce'; -import { onDidEndTerminalShellExecution } from '../../common/window.apis'; +import { PipPackageManager } from './pipManager'; import { isPipInstallCommand } from './pipUtils'; +import { SysPythonManager } from './sysPythonManager'; +import { UvProjectCreator } from './uvProjectCreator'; +import { VenvManager } from './venvManager'; export async function registerSystemPythonFeatures( nativeFinder: NativePythonFinder, @@ -31,7 +31,7 @@ export async function registerSystemPythonFeatures( const venvDebouncedRefresh = createSimpleDebounce(500, () => { venvManager.watcherRefresh(); }); - const watcher = createFileSystemWatcher('{**/pyenv.cfg,**/bin/python,**/python.exe}', false, true, false); + const watcher = createFileSystemWatcher('{**/activate}', false, true, false); disposables.push( watcher, watcher.onDidCreate(() => { diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 1e0c8cb..8ee7edd 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -1,3 +1,6 @@ +import * as fsapi from 'fs-extra'; +import * as os from 'os'; +import * as path from 'path'; import { l10n, LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; import { EnvironmentManager, @@ -6,36 +9,33 @@ import { PythonEnvironmentApi, PythonEnvironmentInfo, } from '../../api'; -import * as path from 'path'; -import * as os from 'os'; -import * as fsapi from 'fs-extra'; -import { resolveSystemPythonEnvironmentPath } from './utils'; import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { Common, VenvManagerStrings } from '../../common/localize'; +import { getWorkspacePersistentState } from '../../common/persistentState'; +import { pickEnvironmentFrom } from '../../common/pickers/environments'; +import { EventNames } from '../../common/telemetry/constants'; +import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { isWindows } from '../../common/utils/platformUtils'; +import { + showErrorMessage, + showInputBox, + showOpenDialog, + showQuickPick, + showWarningMessage, + withProgress, +} from '../../common/window.apis'; +import { getConfiguration } from '../../common/workspace.apis'; +import { ShellConstants } from '../../features/common/shellConstants'; import { isNativeEnvInfo, NativeEnvInfo, NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { getWorkspacePersistentState } from '../../common/persistentState'; import { shortVersion, sortEnvironments } from '../common/utils'; -import { getConfiguration } from '../../common/workspace.apis'; -import { pickEnvironmentFrom } from '../../common/pickers/environments'; -import { - showQuickPick, - withProgress, - showWarningMessage, - showInputBox, - showOpenDialog, - showErrorMessage, -} from '../../common/window.apis'; -import { Common, VenvManagerStrings } from '../../common/localize'; -import { isUvInstalled, runUV, runPython } from './helpers'; +import { isUvInstalled, runPython, runUV } from './helpers'; import { getProjectInstallable, getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; -import { isWindows } from '../../common/utils/platformUtils'; -import { sendTelemetryEvent } from '../../common/telemetry/sender'; -import { EventNames } from '../../common/telemetry/constants'; -import { ShellConstants } from '../../features/common/shellConstants'; +import { resolveSystemPythonEnvironmentPath } from './utils'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -136,24 +136,22 @@ async function getPythonInfo(env: NativeEnvInfo): Promise shellDeactivation.set('unknown', [{ executable: 'deactivate' }]); } - if (await fsapi.pathExists(path.join(binDir, 'activate'))) { - shellActivation.set(ShellConstants.SH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.SH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'deactivate' }]); - shellActivation.set(ShellConstants.BASH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.BASH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'deactivate' }]); - shellActivation.set(ShellConstants.GITBASH, [ - { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, - ]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.GITBASH, [ + { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, + ]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'deactivate' }]); - shellActivation.set(ShellConstants.ZSH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'deactivate' }]); + shellActivation.set(ShellConstants.ZSH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'deactivate' }]); - shellActivation.set(ShellConstants.KSH, [{ executable: '.', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.KSH, [{ executable: 'deactivate' }]); - } + shellActivation.set(ShellConstants.KSH, [{ executable: '.', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.KSH, [{ executable: 'deactivate' }]); if (await fsapi.pathExists(path.join(binDir, 'Activate.ps1'))) { shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); From 4345a4249f310cf9503dc66389041ddccbf7c8a2 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 6 May 2025 09:55:31 -0700 Subject: [PATCH 145/328] fix: multi-root workspace env selection (partial fix) (#375) --- package.json | 2 +- src/common/workspace.apis.ts | 4 ++++ src/features/projectManager.ts | 19 +++++++++++++++---- src/features/settings/settingHelpers.ts | 20 +++++++++++++++++--- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3ea830e..f6f2791 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "type": "array", "default": [], "description": "%python-envs.pythonProjects.description%", - "scope": "window", + "scope": "resource", "items": { "type": "object", "properties": { diff --git a/src/common/workspace.apis.ts b/src/common/workspace.apis.ts index e5d8daa..213c0b8 100644 --- a/src/common/workspace.apis.ts +++ b/src/common/workspace.apis.ts @@ -22,6 +22,10 @@ export function getWorkspaceFolders(): readonly WorkspaceFolder[] | undefined { return workspace.workspaceFolders; } +export function getWorkspaceFile(): Uri | undefined { + return workspace.workspaceFile; +} + export function getConfiguration(section?: string, scope?: ConfigurationScope | null): WorkspaceConfiguration { return workspace.getConfiguration(section, scope); } diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 58b477a..61a0463 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -52,10 +52,16 @@ export class PythonProjectManagerImpl implements PythonProjectManager { for (const w of workspaces) { const config = getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); - newProjects.push(new PythonProjectsImpl(w.name, w.uri)); + + if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) { + newProjects.push(new PythonProjectsImpl(w.name, w.uri)); + } + for (const o of overrides) { const uri = Uri.file(path.resolve(w.uri.fsPath, o.path)); - newProjects.push(new PythonProjectsImpl(o.path, uri)); + if (!newProjects.some((p) => p.uri.toString() === uri.toString())) { + newProjects.push(new PythonProjectsImpl(o.path, uri)); + } } } return newProjects; @@ -69,10 +75,15 @@ export class PythonProjectManagerImpl implements PythonProjectManager { for (const w of workspaces) { const config = getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); - newProjects.push(new PythonProjectsImpl(w.name, w.uri)); + + if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) { + newProjects.push(new PythonProjectsImpl(w.name, w.uri)); + } for (const o of overrides) { const uri = Uri.file(path.resolve(w.uri.fsPath, o.path)); - newProjects.push(new PythonProjectsImpl(o.path, uri)); + if (!newProjects.some((p) => p.uri.toString() === uri.toString())) { + newProjects.push(new PythonProjectsImpl(o.path, uri)); + } } } diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index e796583..d44ab77 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -7,10 +7,11 @@ import { WorkspaceConfiguration, WorkspaceFolder, } from 'vscode'; -import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; -import { traceError, traceInfo } from '../../common/logging'; import { PythonProject } from '../../api'; import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants'; +import { traceError, traceInfo } from '../../common/logging'; +import { getWorkspaceFile } from '../../common/workspace.apis'; +import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; function getSettings( wm: PythonProjectManager, @@ -105,6 +106,7 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr } }); + const workspaceFile = getWorkspaceFile(); const promises: Thenable[] = []; workspaces.forEach((es, w) => { @@ -116,6 +118,12 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr if (index >= 0) { overrides[index].envManager = e.envManager; overrides[index].packageManager = e.packageManager; + } else if (workspaceFile) { + overrides.push({ + path: path.relative(w.uri.fsPath, pwPath).replace(/\\/g, '/'), + envManager: e.envManager, + packageManager: e.packageManager, + }); } else { if (config.get('defaultEnvManager') !== e.envManager) { promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Workspace)); @@ -127,7 +135,13 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr } } }); - promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace)); + promises.push( + config.update( + 'pythonProjects', + overrides, + workspaceFile ? ConfigurationTarget.WorkspaceFolder : ConfigurationTarget.Workspace, + ), + ); }); const config = workspace.getConfiguration('python-envs', undefined); From 7e2173418ca3ca1dc7d4414856cad047404ff2cb Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 8 May 2025 07:21:14 -0700 Subject: [PATCH 146/328] updates to project manager docs and comments (#387) added a doc explaining how the project technical design works add comments and docstrings for clarity --- docs/projects-api-reference.md | 75 ++++++++++++++++++++++++++++++++++ src/features/projectManager.ts | 48 ++++++++++++++-------- 2 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 docs/projects-api-reference.md diff --git a/docs/projects-api-reference.md b/docs/projects-api-reference.md new file mode 100644 index 0000000..85531f4 --- /dev/null +++ b/docs/projects-api-reference.md @@ -0,0 +1,75 @@ +# Python Projects API Reference + +## Modifying Projects +This is how the projects API is designed with the different parts of the project flow. Here `getPythonProjects` is used as an example function but behavior will mirror other getter and setter functions exposed in the API. + +1. **API Call:** Extensions can calls `getPythonProjects` on [`PythonEnvironmentApi`](../src/api.ts). +2. **API Implementation:** [`PythonEnvironmentApiImpl`](../src/features/pythonApi.ts) delegates to its internal project manager. +3. **Internal API:** The project manager is typed as [`PythonProjectManager`](../src/internal.api.ts). +4. **Concrete Implementation:** [`PythonProjectManagerImpl`](../src/features/projectManager.ts) implements the actual logic. +5. **Data Model:** Returns an array of [`PythonProject`](../src/api.ts) objects. + +## Project Creators +This is how creating projects work with the API as it uses a method of registering +external or internal project creators and maintaining project states internally in +just this extension. + +- **Project Creators:** Any extension can implement and register a project creator by conforming to the [`PythonProjectCreator`](../src/api.ts) interface. Each creator provides a `create` method that returns one or more new projects (or their URIs). The create method is responsible for add the new projects to the project manager. +- **Registration:** Project creators are registered with the API, making them discoverable and usable by the extension or other consumers. +- **Integration:** Once a project is created, it is added to the internal project manager (`PythonProjectManagerImpl` in [`src/features/projectManager.ts`](../src/features/projectManager.ts)), which updates the set of known projects and persists settings if necessary. + +### What an Extension Must Do + +1. **Implement the Creator Interface:** + - Create a class that implements the [`PythonProjectCreator`](../src/api.ts) interface. + - Provide a unique `name`, a user-friendly `displayName`, and a `create` method that returns one or more `PythonProject` objects or URIs. + +2. **Register the Creator:** + - Register the creator with the main API (usually via a registration method exposed by this extension’s API surface). + - This makes the creator discoverable and usable by the extension and other consumers. + +3. **Add Projects Directly:** + - If your creator directly creates `PythonProject` objects, you MUST call the internal project manager’s `add` method during your create function to add projects as ones in the workspace. + + +### Responsibilities Table + +| Step | External Extension’s Responsibility | Internal Python-Envs-Ext Responsibility | +| ------------------------------------------ | :---------------------------------: | :-------------------------------------: | +| Implement `PythonProjectCreator` interface | ☑️ | | +| Register the creator | ☑️ | | +| Provide `create` method | ☑️ | | +| Add projects to project manager | ☑️ | | +| Update project settings | | ☑️ | +| Track and list creators | | ☑️ | +| Invoke creator and handle results | | ☑️ | + + +### Example Implementation: [`ExistingProjects`](../src/features/creators/existingProjects.ts) + +The [`ExistingProjects`](../src/features/creators/existingProjects.ts) class is an example of a project creator. It allows users to select files or folders from the workspace and creates new `PythonProject` instances for them. After creation, these projects are added to the internal project manager: + +create function implementation abbreviated: +```typescript +async create( + _options?: PythonProjectCreatorOptions, + ): Promise { +const projects = resultsInWorkspace.map( + (uri) => new PythonProjectsImpl(path.basename(uri.fsPath), uri), + ) as PythonProject[]; +this.pm.add(projects); +return projects; + } +``` + +creator registration (usually on extension activation): +``` + projectCreators.registerPythonProjectCreator(new ExistingProjects(projectManager)), + +``` + +- **Implements:** [`PythonProjectCreator`](../src/api.ts) +- **Adds projects to:** `PythonProjectManager` (see below) + + + diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 61a0463..632707d 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -24,6 +24,8 @@ export class PythonProjectManagerImpl implements PythonProjectManager { private _projects = new Map(); private readonly _onDidChangeProjects = new EventEmitter(); public readonly onDidChangeProjects = this._onDidChangeProjects.event; + + // Debounce the updateProjects method to avoid excessive update calls private readonly updateDebounce = createSimpleDebounce(100, () => this.updateProjects()); initialize(): void { @@ -46,6 +48,11 @@ export class PythonProjectManagerImpl implements PythonProjectManager { ); } + /** + * + * Gathers the projects which are configured in settings and all workspace roots. + * @returns An array of PythonProject objects representing the initial projects. + */ private getInitialProjects(): ProjectArray { const newProjects: ProjectArray = []; const workspaces = getWorkspaceFolders() ?? []; @@ -53,10 +60,12 @@ export class PythonProjectManagerImpl implements PythonProjectManager { const config = getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); + // Add the workspace root as a project if not already present if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) { newProjects.push(new PythonProjectsImpl(w.name, w.uri)); } + // For each override, resolve its path and add as a project if not already present for (const o of overrides) { const uri = Uri.file(path.resolve(w.uri.fsPath, o.path)); if (!newProjects.some((p) => p.uri.toString() === uri.toString())) { @@ -67,31 +76,22 @@ export class PythonProjectManagerImpl implements PythonProjectManager { return newProjects; } + /** + * Get initial projects from the workspace(s) config settings + * then updates the internal _projects map to reflect the current state and + * fires the onDidChangeProjects event if there are any changes. + */ private updateProjects(): void { - const workspaces = getWorkspaceFolders() ?? []; + const newProjects: ProjectArray = this.getInitialProjects(); const existingProjects = Array.from(this._projects.values()); - const newProjects: ProjectArray = []; - - for (const w of workspaces) { - const config = getConfiguration('python-envs', w.uri); - const overrides = config.get('pythonProjects', []); - - if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) { - newProjects.push(new PythonProjectsImpl(w.name, w.uri)); - } - for (const o of overrides) { - const uri = Uri.file(path.resolve(w.uri.fsPath, o.path)); - if (!newProjects.some((p) => p.uri.toString() === uri.toString())) { - newProjects.push(new PythonProjectsImpl(o.path, uri)); - } - } - } + // Remove projects that are no longer in the workspace settings const projectsToRemove = existingProjects.filter( (w) => !newProjects.find((n) => n.uri.toString() === w.uri.toString()), ); projectsToRemove.forEach((w) => this._projects.delete(w.uri.toString())); + // Add new projects that are in the workspace settings but not in the existing projects const projectsToAdd = newProjects.filter( (n) => !existingProjects.find((w) => w.uri.toString() === n.uri.toString()), ); @@ -136,6 +136,7 @@ export class PythonProjectManagerImpl implements PythonProjectManager { // for non-root projects, always add setting edits.push({ project: currProject, envManager: envManagerId, packageManager: pkgManagerId }); } + // handles adding the project to this._projects map return this._projects.set(currProject.uri.toString(), currProject); }); this._onDidChangeProjects.fire(Array.from(this._projects.values())); @@ -156,6 +157,7 @@ export class PythonProjectManagerImpl implements PythonProjectManager { } getProjects(uris?: Uri[]): ReadonlyArray { + console.log('getProjects', uris); if (uris === undefined) { return Array.from(this._projects.values()); } else { @@ -178,6 +180,11 @@ export class PythonProjectManagerImpl implements PythonProjectManager { return pythonProject; } + /** + * Finds the single project that matches the given URI if it exists. + * @param uri The URI of the project to find. + * @returns The project with the given URI, or undefined if not found. + */ private findProjectByUri(uri: Uri): PythonProject | undefined { const _projects = Array.from(this._projects.values()).sort((a, b) => b.uri.fsPath.length - a.uri.fsPath.length); @@ -191,6 +198,13 @@ export class PythonProjectManagerImpl implements PythonProjectManager { return undefined; } + /** + * Checks if a given file or folder path (normalizedUriPath) + * is the same as, or is inside, a project path + * @normalizedProjectPath Project path to check against. + * @normalizedUriPath File or folder path to check. + * @returns true if the file or folder path is the same as or inside the project path, false otherwise. + */ private isUriMatching(normalizedUriPath: string, normalizedProjectPath: string): boolean { if (normalizedProjectPath === normalizedUriPath) { return true; From f32c2af217abea66afdc5495b5aa5e200f4aea11 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 12 May 2025 11:46:41 -0700 Subject: [PATCH 147/328] fix: bad install step when attempting editable install (#402) For https://github.com/microsoft/vscode-python-environments/issues/369 --- src/managers/builtin/pipUtils.ts | 20 ++--- src/managers/builtin/utils.ts | 55 +++++++++++-- .../managers/builtin/installArgs.unit.test.ts | 81 +++++++++++++++++++ 3 files changed, 140 insertions(+), 16 deletions(-) create mode 100644 src/test/managers/builtin/installArgs.unit.test.ts diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 4fdae86..ef3ef88 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -1,17 +1,17 @@ +import * as tomljs from '@iarna/toml'; import * as fse from 'fs-extra'; import * as path from 'path'; -import * as tomljs from '@iarna/toml'; import { LogOutputChannel, ProgressLocation, QuickInputButtons, QuickPickItem, Uri } from 'vscode'; -import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; -import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; import { PackageManagementOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; -import { findFiles } from '../../common/workspace.apis'; import { EXTENSION_ROOT_DIR } from '../../common/constants'; -import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; +import { PackageManagement, Pickers, VenvManagerStrings } from '../../common/localize'; import { traceInfo } from '../../common/logging'; -import { refreshPipPackages } from './utils'; -import { mergePackages } from '../common/utils'; +import { showQuickPickWithButtons, withProgress } from '../../common/window.apis'; +import { findFiles } from '../../common/workspace.apis'; +import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; import { Installable } from '../common/types'; +import { mergePackages } from '../common/utils'; +import { refreshPipPackages } from './utils'; async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise { try { @@ -29,6 +29,7 @@ function isPipInstallableToml(toml: tomljs.JsonMap): boolean { function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] { const extras: Installable[] = []; + const projectDir = path.dirname(tomlPath.fsPath); if (isPipInstallableToml(toml)) { const name = path.basename(tomlPath.fsPath); @@ -37,7 +38,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] displayName: name, description: VenvManagerStrings.installEditable, group: 'TOML', - args: ['-e', path.dirname(tomlPath.fsPath)], + args: ['-e', projectDir], uri: tomlPath, }); } @@ -49,7 +50,8 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[] name: key, displayName: key, group: 'TOML', - args: ['-e', `.[${key}]`], + // Use a single -e argument with the extras specified as part of the path + args: ['-e', `${projectDir}[${key}]`], uri: tomlPath, }); } diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index a4bc81d..e22300a 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -8,6 +8,9 @@ import { PythonEnvironmentApi, PythonEnvironmentInfo, } from '../../api'; +import { showErrorMessageWithLogs } from '../../common/errors/utils'; +import { SysManagerStrings } from '../../common/localize'; +import { withProgress } from '../../common/window.apis'; import { isNativeEnvInfo, NativeEnvInfo, @@ -15,11 +18,8 @@ import { NativePythonFinder, } from '../common/nativePythonFinder'; import { shortVersion, sortEnvironments } from '../common/utils'; -import { SysManagerStrings } from '../../common/localize'; -import { isUvInstalled, runUV, runPython } from './helpers'; +import { isUvInstalled, runPython, runUV } from './helpers'; import { parsePipList, PipPackage } from './pipListUtils'; -import { withProgress } from '../../common/window.apis'; -import { showErrorMessageWithLogs } from '../../common/errors/utils'; function asPackageQuickPickItem(name: string, version?: string): QuickPickItem { return { @@ -222,9 +222,11 @@ export async function managePackages( installArgs.push('--upgrade'); } if (options.install && options.install.length > 0) { + const processedInstallArgs = processEditableInstallArgs(options.install); + if (useUv) { await runUV( - [...installArgs, '--python', environment.execInfo.run.executable, ...options.install], + [...installArgs, '--python', environment.execInfo.run.executable, ...processedInstallArgs], undefined, manager.log, token, @@ -232,7 +234,7 @@ export async function managePackages( } else { await runPython( environment.execInfo.run.executable, - ['-m', ...installArgs, ...options.install], + ['-m', ...installArgs, ...processedInstallArgs], undefined, manager.log, token, @@ -240,7 +242,46 @@ export async function managePackages( } } - return refreshPackages(environment, api, manager); + return await refreshPackages(environment, api, manager); +} + +/** + * Process pip install arguments to correctly handle editable installs with extras + * This function will combine consecutive -e arguments that represent the same package with extras + */ +export function processEditableInstallArgs(args: string[]): string[] { + const processedArgs: string[] = []; + let i = 0; + + while (i < args.length) { + if (args[i] === '-e') { + const packagePath = args[i + 1]; + if (!packagePath) { + processedArgs.push(args[i]); + i++; + continue; + } + + if (i + 2 < args.length && args[i + 2] === '-e' && i + 3 < args.length) { + const nextArg = args[i + 3]; + + if (nextArg.startsWith('.[') && nextArg.includes(']')) { + const combinedPath = packagePath + nextArg.substring(1); + processedArgs.push('-e', combinedPath); + i += 4; + continue; + } + } + + processedArgs.push(args[i], packagePath); + i += 2; + } else { + processedArgs.push(args[i]); + i++; + } + } + + return processedArgs; } export async function resolveSystemPythonEnvironmentPath( diff --git a/src/test/managers/builtin/installArgs.unit.test.ts b/src/test/managers/builtin/installArgs.unit.test.ts new file mode 100644 index 0000000..7a0ddb1 --- /dev/null +++ b/src/test/managers/builtin/installArgs.unit.test.ts @@ -0,0 +1,81 @@ +import assert from 'assert'; +import { processEditableInstallArgs } from '../../../managers/builtin/utils'; + +suite('Process Editable Install Arguments Tests', () => { + test('should handle empty args array', () => { + const result = processEditableInstallArgs([]); + assert.deepStrictEqual(result, [], 'Should return empty array for empty input'); + }); + + test('should pass through non-editable install args unchanged', () => { + const args = ['numpy', 'pandas==2.0.0', '--user']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, args, 'Should return regular args unchanged'); + }); + + test('should pass through single -e argument unchanged', () => { + const args = ['-e', 'c:/path/to/package']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, args, 'Should return single -e arg unchanged'); + }); + + test('should pass through multiple unrelated -e arguments unchanged', () => { + const args = ['-e', 'c:/path/to/package1', '-e', 'c:/path/to/package2']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, args, 'Should return multiple unrelated -e args unchanged'); + }); + + test('should combine -e with extras correctly', () => { + const args = ['-e', 'c:/path/to/package', '-e', '.[testing]']; + const expected = ['-e', 'c:/path/to/package[testing]']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should combine -e with extras correctly'); + }); + + test('should handle multiple editable installs with extras correctly', () => { + const args = ['-e', 'c:/path/to/package1', '-e', '.[testing]', '-e', 'c:/path/to/package2', '-e', '.[dev]']; + const expected = ['-e', 'c:/path/to/package1[testing]', '-e', 'c:/path/to/package2[dev]']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should handle multiple editable installs with extras'); + }); + + test('should handle mixed regular and editable installs correctly', () => { + const args = ['numpy', '-e', 'c:/path/to/package', '-e', '.[testing]', 'pandas==2.0.0']; + const expected = ['numpy', '-e', 'c:/path/to/package[testing]', 'pandas==2.0.0']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should handle mixed regular and editable installs'); + }); + + test('should handle incomplete -e arguments gracefully', () => { + const args = ['-e']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, ['-e'], 'Should handle incomplete -e arguments'); + }); + + test('should not combine -e args when second is not an extras specification', () => { + const args = ['-e', 'c:/path/to/package1', '-e', 'c:/path/to/package2']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, args, 'Should not combine when second -e arg is not an extras spec'); + }); + + test('should handle extras with multiple requirements', () => { + const args = ['-e', 'c:/path/to/package', '-e', '.[testing,dev]']; + const expected = ['-e', 'c:/path/to/package[testing,dev]']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should handle extras with multiple requirements'); + }); + + test('should handle Windows-style paths correctly', () => { + const args = ['-e', 'C:\\path\\to\\package', '-e', '.[testing]']; + const expected = ['-e', 'C:\\path\\to\\package[testing]']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should handle Windows paths correctly'); + }); + + test('should handle editable installs followed by other args', () => { + const args = ['-e', 'c:/path/to/package', '-e', '.[testing]', '--no-deps']; + const expected = ['-e', 'c:/path/to/package[testing]', '--no-deps']; + const result = processEditableInstallArgs(args); + assert.deepStrictEqual(result, expected, 'Should handle editable installs followed by other args'); + }); +}); From 676705a16b35ba60931290f135b500e36037d556 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 14 May 2025 06:12:23 -0700 Subject: [PATCH 148/328] bug fixes autoFindProjects (#405) fixes https://github.com/microsoft/vscode-python-environments/issues/398 --- src/features/creators/autoFindProjects.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/features/creators/autoFindProjects.ts b/src/features/creators/autoFindProjects.ts index d0e27be..cb1258e 100644 --- a/src/features/creators/autoFindProjects.ts +++ b/src/features/creators/autoFindProjects.ts @@ -54,10 +54,12 @@ export class AutoFindProjects implements PythonProjectCreator { public readonly displayName = ProjectCreatorString.autoFindProjects; public readonly description = ProjectCreatorString.autoFindProjectsDescription; + supportsQuickCreate = true; + constructor(private readonly pm: PythonProjectManager) {} async create(_options?: PythonProjectCreatorOptions): Promise { - const files = await findFiles('**/{pyproject.toml,setup.py}'); + const files = await findFiles('**/{pyproject.toml,setup.py}', '**/.venv/**'); if (!files || files.length === 0) { setImmediate(() => { showErrorMessage('No projects found'); From 786768f9b88c7444f4ab2f39ffcf18c139f85096 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 15 May 2025 07:11:30 +1000 Subject: [PATCH 149/328] Updates to display rich and localized tool messages (#407) --- package.json | 11 ++++++--- src/features/copilotTools.ts | 47 ++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f6f2791..e43a8a6 100644 --- a/package.json +++ b/package.json @@ -514,7 +514,9 @@ "displayName": "Get Python Environment Information", "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions. Use this tool to determine the correct command for executing Python code in this workspace.", "toolReferenceName": "pythonGetEnvironmentInfo", - "tags": [], + "tags": [ + "ms-python.python" + ], "icon": "$(files)", "canBeReferencedInPrompt": true, "inputSchema": { @@ -533,9 +535,12 @@ { "name": "python_install_package", "displayName": "Install Python Package", + "userDescription": "Installs Python packages in the given workspace", "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", "toolReferenceName": "pythonInstallPackage", - "tags": [], + "tags": [ + "ms-python.python" + ], "icon": "$(package)", "canBeReferencedInPrompt": true, "inputSchema": { @@ -607,4 +612,4 @@ "vscode-jsonrpc": "^9.0.0-next.5", "which": "^4.0.0" } -} +} \ No newline at end of file diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts index 257d6a2..fc0891d 100644 --- a/src/features/copilotTools.ts +++ b/src/features/copilotTools.ts @@ -1,5 +1,6 @@ import { CancellationToken, + l10n, LanguageModelTextPart, LanguageModelTool, LanguageModelToolInvocationOptions, @@ -130,9 +131,8 @@ export class GetEnvironmentInfoTool implements LanguageModelTool, _token: CancellationToken, ): Promise { - const message = 'Preparing to fetch Python environment information...'; return { - invocationMessage: message, + invocationMessage: l10n.t('Fetching Python environment information'), }; } } @@ -242,13 +242,46 @@ export class InstallPackageTool implements LanguageModelTool, _token: CancellationToken, ): Promise { - const packageList = options.input.packageList || []; - const packageCount = packageList.length; - const packageText = packageCount === 1 ? 'package' : 'packages'; - const message = `Preparing to install Python ${packageText}: ${packageList.join(', ')}...`; + const workspacePath = options.input.resourcePath ? Uri.file(options.input.resourcePath) : undefined; + + const packageCount = options.input.packageList.length; + let envName = ''; + try { + const environment = await this.api.getEnvironment(workspacePath); + envName = environment?.displayName || ''; + } catch { + // + } + + let title = ''; + let invocationMessage = ''; + const message = + packageCount === 1 + ? '' + : l10n.t(`The following packages will be installed: {0}`, options.input.packageList.sort().join(', ')); + if (envName) { + title = + packageCount === 1 + ? l10n.t(`Install {0} in {1}?`, options.input.packageList[0], envName) + : l10n.t(`Install packages in {0}?`, envName); + invocationMessage = + packageCount === 1 + ? l10n.t(`Installing {0} in {1}`, options.input.packageList[0], envName) + : l10n.t(`Installing packages {0} in {1}`, options.input.packageList.sort().join(', '), envName); + } else { + title = + options.input.packageList.length === 1 + ? l10n.t(`Install Python package '{0}'?`, options.input.packageList[0]) + : l10n.t(`Install Python packages?`); + invocationMessage = + packageCount === 1 + ? l10n.t(`Installing Python package '{0}'`, options.input.packageList[0]) + : l10n.t(`Installing Python packages: {0}`, options.input.packageList.sort().join(', ')); + } return { - invocationMessage: message, + confirmationMessages: { title, message }, + invocationMessage, }; } } From 0b01aa5fb7db120d40ddb7bc3a4840a463ceb225 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 15 May 2025 12:21:12 +1000 Subject: [PATCH 150/328] Fixes to getting conda packages and localize tool message (#416) --- package.json | 4 ++-- package.nls.json | 6 ++++-- src/managers/conda/condaUtils.ts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e43a8a6..333b56c 100644 --- a/package.json +++ b/package.json @@ -510,7 +510,7 @@ "languageModelTools": [ { "name": "python_environment", - "userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.", + "userDescription": "%python.languageModelTools.python_environment.userDescription%", "displayName": "Get Python Environment Information", "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions. Use this tool to determine the correct command for executing Python code in this workspace.", "toolReferenceName": "pythonGetEnvironmentInfo", @@ -535,7 +535,7 @@ { "name": "python_install_package", "displayName": "Install Python Package", - "userDescription": "Installs Python packages in the given workspace", + "userDescription": "%python.languageModelTools.python_install_package.userDescription%", "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", "toolReferenceName": "pythonInstallPackage", "tags": [ diff --git a/package.nls.json b/package.nls.json index a0c0a64..a0ab1f6 100644 --- a/package.nls.json +++ b/package.nls.json @@ -33,5 +33,7 @@ "python-envs.runAsTask.title": "Run as Task", "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", - "python-envs.uninstallPackage.title": "Uninstall Package" -} + "python-envs.uninstallPackage.title": "Uninstall Package", + "python.languageModelTools.python_environment.userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.", + "python.languageModelTools.python_install_package.userDescription": "Installs Python packages in the given workspace." +} \ No newline at end of file diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 8977d0e..ed3e3ac 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -881,7 +881,7 @@ export async function refreshPackages( const packages: Package[] = []; content.forEach((l) => { const parts = l.split(' ').filter((p) => p.length > 0); - if (parts.length === 3) { + if (parts.length >= 3) { const pkg = api.createPackageItem( { name: parts[0], From 24518093aa8ac2e50840d1d0efb3079386beb21d Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 15 May 2025 16:05:11 +1000 Subject: [PATCH 151/328] Remove unwanted messages (#419) --- src/features/copilotTools.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts index fc0891d..a04a5f4 100644 --- a/src/features/copilotTools.ts +++ b/src/features/copilotTools.ts @@ -139,12 +139,8 @@ export class GetEnvironmentInfoTool implements LanguageModelTool Date: Fri, 16 May 2025 08:18:16 -0700 Subject: [PATCH 152/328] add workspace attribute to project setting (#404) fixes https://github.com/microsoft/vscode-python-environments/issues/400 --- src/features/projectManager.ts | 16 +++++++++++++++- src/features/settings/settingHelpers.ts | 16 ++++++++++++++-- src/internal.api.ts | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 632707d..526d9a2 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -67,7 +67,21 @@ export class PythonProjectManagerImpl implements PythonProjectManager { // For each override, resolve its path and add as a project if not already present for (const o of overrides) { - const uri = Uri.file(path.resolve(w.uri.fsPath, o.path)); + let uriFromWorkspace: Uri | undefined = undefined; + // if override has a workspace property, resolve the path relative to that workspace + if (o.workspace) { + // + const workspaceFolder = workspaces.find((ws) => ws.name === o.workspace); + if (workspaceFolder) { + if (workspaceFolder.uri.toString() !== w.uri.toString()) { + continue; // skip if the workspace is not the same as the current workspace + } + uriFromWorkspace = Uri.file(path.resolve(workspaceFolder.uri.fsPath, o.path)); + } + } + const uri = uriFromWorkspace ? uriFromWorkspace : Uri.file(path.resolve(w.uri.fsPath, o.path)); + + // Check if the project already exists in the newProjects array if (!newProjects.some((p) => p.uri.toString() === uri.toString())) { newProjects.push(new PythonProjectsImpl(o.path, uri)); } diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index d44ab77..79ff887 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -10,7 +10,7 @@ import { import { PythonProject } from '../../api'; import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants'; import { traceError, traceInfo } from '../../common/logging'; -import { getWorkspaceFile } from '../../common/workspace.apis'; +import { getWorkspaceFile, getWorkspaceFolders } from '../../common/workspace.apis'; import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; function getSettings( @@ -284,6 +284,7 @@ export interface EditProjectSettings { project: PythonProject; envManager?: string; packageManager?: string; + workspace?: string; } export async function addPythonProjectSetting(edits: EditProjectSettings[]): Promise { @@ -306,13 +307,23 @@ export async function addPythonProjectSetting(edits: EditProjectSettings[]): Pro traceError(`Unable to find workspace for ${e.project.uri.fsPath}`); }); + const isMultiroot = (getWorkspaceFolders() ?? []).length > 1; + const promises: Thenable[] = []; workspaces.forEach((es, w) => { const config = workspace.getConfiguration('python-envs', w.uri); const overrides = config.get('pythonProjects', []); es.forEach((e) => { + if (isMultiroot) { + } const pwPath = path.normalize(e.project.uri.fsPath); - const index = overrides.findIndex((s) => path.resolve(w.uri.fsPath, s.path) === pwPath); + const index = overrides.findIndex((s) => { + if (s.workspace) { + // If the workspace is set, check workspace and path in existing overrides + return s.workspace === w.name && path.resolve(w.uri.fsPath, s.path) === pwPath; + } + return path.resolve(w.uri.fsPath, s.path) === pwPath; + }); if (index >= 0) { overrides[index].envManager = e.envManager ?? envManager; overrides[index].packageManager = e.packageManager ?? pkgManager; @@ -321,6 +332,7 @@ export async function addPythonProjectSetting(edits: EditProjectSettings[]): Pro path: path.relative(w.uri.fsPath, pwPath).replace(/\\/g, '/'), envManager, packageManager: pkgManager, + workspace: isMultiroot ? w.name : undefined, }); } }); diff --git a/src/internal.api.ts b/src/internal.api.ts index 668fe3f..6aad61b 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -295,6 +295,7 @@ export interface PythonProjectSettings { path: string; envManager: string; packageManager: string; + workspace?: string; } export class PythonEnvironmentImpl implements PythonEnvironment { From 105dd3db37866d6f4be59ef77c78f887c37f9c79 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 16 May 2025 08:30:52 -0700 Subject: [PATCH 153/328] feat: add `pyenv` support (#409) --- src/common/localize.ts | 6 + src/extension.ts | 2 + src/managers/builtin/venvUtils.ts | 6 +- src/managers/common/utils.ts | 5 + src/managers/conda/condaEnvManager.ts | 5 +- src/managers/conda/condaUtils.ts | 9 +- src/managers/pyenv/main.ts | 23 ++ src/managers/pyenv/pyenvManager.ts | 331 ++++++++++++++++++++++++++ src/managers/pyenv/pyenvUtils.ts | 272 +++++++++++++++++++++ 9 files changed, 645 insertions(+), 14 deletions(-) create mode 100644 src/managers/pyenv/main.ts create mode 100644 src/managers/pyenv/pyenvManager.ts create mode 100644 src/managers/pyenv/pyenvUtils.ts diff --git a/src/common/localize.ts b/src/common/localize.ts index 6c86eb9..a1d5291 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -152,6 +152,12 @@ export namespace CondaStrings { ); } +export namespace PyenvStrings { + export const pyenvManager = l10n.t('Manages Pyenv Python versions'); + export const pyenvDiscovering = l10n.t('Discovering Pyenv Python versions'); + export const pyenvRefreshing = l10n.t('Refreshing Pyenv Python versions'); +} + export namespace ProjectCreatorString { export const addExistingProjects = l10n.t('Add Existing Projects'); export const autoFindProjects = l10n.t('Auto Find Projects'); diff --git a/src/extension.ts b/src/extension.ts index 78f1a8e..dd64ec8 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -66,6 +66,7 @@ import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './in import { registerSystemPythonFeatures } from './managers/builtin/main'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; import { registerCondaFeatures } from './managers/conda/main'; +import { registerPyenvFeatures } from './managers/pyenv/main'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -294,6 +295,7 @@ export async function activate(context: ExtensionContext): Promise { if (env.executable && env.version && env.prefix) { const venvName = env.name ?? getName(env.executable); diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 91dd6c8..4833ded 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,4 +1,5 @@ import { PythonEnvironment } from '../../api'; +import { isWindows } from '../../common/utils/platformUtils'; import { Installable } from './types'; export function noop() { @@ -82,3 +83,7 @@ export function mergePackages(common: Installable[], installed: string[]): Insta .concat(notInCommon.map((pkg) => ({ name: pkg, displayName: pkg }))) .sort((a, b) => a.name.localeCompare(b.name)); } + +export function pathForGitBash(binPath: string): string { + return isWindows() ? binPath.replace(/\\/g, '/').replace(/^([a-zA-Z]):/, '/$1') : binPath; +} diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index 247b9ad..229ad4b 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -58,14 +58,13 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { this.name = 'conda'; this.displayName = 'Conda'; this.preferredPackageManagerId = 'ms-python.python:conda'; - this.description = undefined; this.tooltip = new MarkdownString(CondaStrings.condaManager, true); } name: string; displayName: string; - preferredPackageManagerId: string = 'ms-python.python:conda'; - description: string | undefined; + preferredPackageManagerId: string; + description?: string; tooltip: string | MarkdownString; iconPath?: IconPath; diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index ed3e3ac..69ee0a7 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -53,21 +53,22 @@ import { } from '../common/nativePythonFinder'; import { selectFromCommonPackagesToInstall } from '../common/pickers'; import { Installable } from '../common/types'; -import { shortVersion, sortEnvironments } from '../common/utils'; +import { pathForGitBash, shortVersion, sortEnvironments } from '../common/utils'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; export const CONDA_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:conda:WORKSPACE_SELECTED`; export const CONDA_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:conda:GLOBAL_SELECTED`; +let condaPath: string | undefined; export async function clearCondaCache(): Promise { const state = await getWorkspacePersistentState(); await state.clear([CONDA_PATH_KEY, CONDA_WORKSPACE_KEY, CONDA_GLOBAL_KEY]); const global = await getGlobalPersistentState(); await global.clear([CONDA_PREFIXES_KEY]); + condaPath = undefined; } -let condaPath: string | undefined; async function setConda(conda: string): Promise { condaPath = conda; const state = await getWorkspacePersistentState(); @@ -283,10 +284,6 @@ function isPrefixOf(roots: string[], e: string): boolean { return false; } -function pathForGitBash(binPath: string): string { - return isWindows() ? binPath.replace(/\\/g, '/').replace(/^([a-zA-Z]):/, '/$1') : binPath; -} - function getNamedCondaPythonInfo( name: string, prefix: string, diff --git a/src/managers/pyenv/main.ts b/src/managers/pyenv/main.ts new file mode 100644 index 0000000..3560346 --- /dev/null +++ b/src/managers/pyenv/main.ts @@ -0,0 +1,23 @@ +import { Disposable } from 'vscode'; +import { PythonEnvironmentApi } from '../../api'; +import { traceInfo } from '../../common/logging'; +import { getPythonApi } from '../../features/pythonApi'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { PyEnvManager } from './pyenvManager'; +import { getPyenv } from './pyenvUtils'; + +export async function registerPyenvFeatures( + nativeFinder: NativePythonFinder, + disposables: Disposable[], +): Promise { + const api: PythonEnvironmentApi = await getPythonApi(); + + try { + await getPyenv(nativeFinder); + + const mgr = new PyEnvManager(nativeFinder, api); + disposables.push(mgr, api.registerEnvironmentManager(mgr)); + } catch (ex) { + traceInfo('Pyenv not found, turning off pyenv features.', ex); + } +} diff --git a/src/managers/pyenv/pyenvManager.ts b/src/managers/pyenv/pyenvManager.ts new file mode 100644 index 0000000..a70c1b6 --- /dev/null +++ b/src/managers/pyenv/pyenvManager.ts @@ -0,0 +1,331 @@ +import * as path from 'path'; +import { Disposable, EventEmitter, MarkdownString, ProgressLocation, Uri } from 'vscode'; +import { + DidChangeEnvironmentEventArgs, + DidChangeEnvironmentsEventArgs, + EnvironmentChangeKind, + EnvironmentManager, + GetEnvironmentScope, + GetEnvironmentsScope, + IconPath, + PythonEnvironment, + PythonEnvironmentApi, + PythonProject, + RefreshEnvironmentsScope, + ResolveEnvironmentContext, + SetEnvironmentScope, +} from '../../api'; +import { PyenvStrings } from '../../common/localize'; +import { traceError, traceInfo } from '../../common/logging'; +import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { withProgress } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { getLatest } from '../common/utils'; +import { + clearPyenvCache, + getPyenvForGlobal, + getPyenvForWorkspace, + PYENV_VERSIONS, + refreshPyenv, + resolvePyenvPath, + setPyenvForGlobal, + setPyenvForWorkspace, + setPyenvForWorkspaces, +} from './pyenvUtils'; + +export class PyEnvManager implements EnvironmentManager, Disposable { + private collection: PythonEnvironment[] = []; + private fsPathToEnv: Map = new Map(); + private globalEnv: PythonEnvironment | undefined; + + private readonly _onDidChangeEnvironment = new EventEmitter(); + public readonly onDidChangeEnvironment = this._onDidChangeEnvironment.event; + + private readonly _onDidChangeEnvironments = new EventEmitter(); + public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; + + constructor(private readonly nativeFinder: NativePythonFinder, private readonly api: PythonEnvironmentApi) { + this.name = 'pyenv'; + this.displayName = 'PyEnv'; + this.preferredPackageManagerId = 'ms-python.python:pip'; + this.tooltip = new MarkdownString(PyenvStrings.pyenvManager, true); + } + + name: string; + displayName: string; + preferredPackageManagerId: string; + description?: string; + tooltip: string | MarkdownString; + iconPath?: IconPath; + + public dispose() { + this.collection = []; + this.fsPathToEnv.clear(); + } + + private _initialized: Deferred | undefined; + async initialize(): Promise { + if (this._initialized) { + return this._initialized.promise; + } + + this._initialized = createDeferred(); + + await withProgress( + { + location: ProgressLocation.Window, + title: PyenvStrings.pyenvDiscovering, + }, + async () => { + this.collection = await refreshPyenv(false, this.nativeFinder, this.api, this); + await this.loadEnvMap(); + + this._onDidChangeEnvironments.fire( + this.collection.map((e) => ({ environment: e, kind: EnvironmentChangeKind.add })), + ); + }, + ); + this._initialized.resolve(); + } + + async getEnvironments(scope: GetEnvironmentsScope): Promise { + await this.initialize(); + + if (scope === 'all') { + return Array.from(this.collection); + } + + if (scope === 'global') { + return this.collection.filter((env) => { + env.group === PYENV_VERSIONS; + }); + } + + if (scope instanceof Uri) { + const env = this.fromEnvMap(scope); + if (env) { + return [env]; + } + } + + return []; + } + + async refresh(context: RefreshEnvironmentsScope): Promise { + if (context === undefined) { + await withProgress( + { + location: ProgressLocation.Window, + title: PyenvStrings.pyenvRefreshing, + }, + async () => { + traceInfo('Refreshing Pyenv Environments'); + const discard = this.collection.map((c) => c); + this.collection = await refreshPyenv(true, this.nativeFinder, this.api, this); + + await this.loadEnvMap(); + + const args = [ + ...discard.map((env) => ({ kind: EnvironmentChangeKind.remove, environment: env })), + ...this.collection.map((env) => ({ kind: EnvironmentChangeKind.add, environment: env })), + ]; + + this._onDidChangeEnvironments.fire(args); + }, + ); + } + } + + async get(scope: GetEnvironmentScope): Promise { + await this.initialize(); + if (scope instanceof Uri) { + let env = this.fsPathToEnv.get(scope.fsPath); + if (env) { + return env; + } + const project = this.api.getPythonProject(scope); + if (project) { + env = this.fsPathToEnv.get(project.uri.fsPath); + if (env) { + return env; + } + } + } + + return this.globalEnv; + } + async set(scope: SetEnvironmentScope, environment?: PythonEnvironment | undefined): Promise { + if (scope === undefined) { + await setPyenvForGlobal(environment?.environmentPath?.fsPath); + } else if (scope instanceof Uri) { + const folder = this.api.getPythonProject(scope); + const fsPath = folder?.uri?.fsPath ?? scope.fsPath; + if (fsPath) { + if (environment) { + this.fsPathToEnv.set(fsPath, environment); + } else { + this.fsPathToEnv.delete(fsPath); + } + await setPyenvForWorkspace(fsPath, environment?.environmentPath?.fsPath); + } + } else if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setPyenvForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath?.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); + } + } + + async resolve(context: ResolveEnvironmentContext): Promise { + await this.initialize(); + + if (context instanceof Uri) { + const env = await resolvePyenvPath(context.fsPath, this.nativeFinder, this.api, this); + if (env) { + const _collectionEnv = this.findEnvironmentByPath(env.environmentPath.fsPath); + if (_collectionEnv) { + return _collectionEnv; + } + + this.collection.push(env); + this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: env }]); + + return env; + } + + return undefined; + } + } + + async clearCache(): Promise { + await clearPyenvCache(); + } + + private async loadEnvMap() { + this.globalEnv = undefined; + this.fsPathToEnv.clear(); + + // Try to find a global environment + const fsPath = await getPyenvForGlobal(); + + if (fsPath) { + this.globalEnv = this.findEnvironmentByPath(fsPath); + + // If the environment is not found, resolve the fsPath. Could be portable conda. + if (!this.globalEnv) { + this.globalEnv = await resolvePyenvPath(fsPath, this.nativeFinder, this.api, this); + + // If the environment is resolved, add it to the collection + if (this.globalEnv) { + this.collection.push(this.globalEnv); + } + } + } + + if (!this.globalEnv) { + this.globalEnv = getLatest(this.collection.filter((e) => e.group === PYENV_VERSIONS)); + } + + // Find any pyenv environments that might be associated with the current projects + // These are environments whose parent dirs are project dirs. + const pathSorted = this.collection + .filter((e) => this.api.getPythonProject(e.environmentPath)) + .sort((a, b) => { + if (a.environmentPath.fsPath !== b.environmentPath.fsPath) { + return a.environmentPath.fsPath.length - b.environmentPath.fsPath.length; + } + return a.environmentPath.fsPath.localeCompare(b.environmentPath.fsPath); + }); + + // Try to find workspace environments + const paths = this.api.getPythonProjects().map((p) => p.uri.fsPath); + for (const p of paths) { + const env = await getPyenvForWorkspace(p); + + if (env) { + const found = this.findEnvironmentByPath(env); + + if (found) { + this.fsPathToEnv.set(p, found); + } else { + // If not found, resolve the pyenv path. Could be portable pyenv. + const resolved = await resolvePyenvPath(env, this.nativeFinder, this.api, this); + + if (resolved) { + // If resolved add it to the collection + this.fsPathToEnv.set(p, resolved); + this.collection.push(resolved); + } else { + traceError(`Failed to resolve pyenv environment: ${env}`); + } + } + } else { + // If there is not an environment already assigned by user to this project + // then see if there is one in the collection + if (pathSorted.length === 1) { + this.fsPathToEnv.set(p, pathSorted[0]); + } else { + // If there is more than one environment then we need to check if the project + // is a subfolder of one of the environments + const found = pathSorted.find((e) => { + const t = this.api.getPythonProject(e.environmentPath)?.uri.fsPath; + return t && path.normalize(t) === p; + }); + if (found) { + this.fsPathToEnv.set(p, found); + } + } + } + } + } + + private fromEnvMap(uri: Uri): PythonEnvironment | undefined { + // Find environment directly using the URI mapping + const env = this.fsPathToEnv.get(uri.fsPath); + if (env) { + return env; + } + + // Find environment using the Python project for the Uri + const project = this.api.getPythonProject(uri); + if (project) { + return this.fsPathToEnv.get(project.uri.fsPath); + } + + return undefined; + } + + private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined { + const normalized = path.normalize(fsPath); + return this.collection.find((e) => { + const n = path.normalize(e.environmentPath.fsPath); + return n === normalized || path.dirname(n) === normalized || path.dirname(path.dirname(n)) === normalized; + }); + } +} diff --git a/src/managers/pyenv/pyenvUtils.ts b/src/managers/pyenv/pyenvUtils.ts new file mode 100644 index 0000000..4a2e32a --- /dev/null +++ b/src/managers/pyenv/pyenvUtils.ts @@ -0,0 +1,272 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { Uri } from 'vscode'; +import which from 'which'; +import { + EnvironmentManager, + PythonCommandRunConfiguration, + PythonEnvironment, + PythonEnvironmentApi, + PythonEnvironmentInfo, +} from '../../api'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { traceError, traceInfo } from '../../common/logging'; +import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; +import { getUserHomeDir, normalizePath, untildify } from '../../common/utils/pathUtils'; +import { isWindows } from '../../common/utils/platformUtils'; +import { + isNativeEnvInfo, + NativeEnvInfo, + NativeEnvManagerInfo, + NativePythonEnvironmentKind, + NativePythonFinder, +} from '../common/nativePythonFinder'; +import { shortVersion, sortEnvironments } from '../common/utils'; + +async function findPyenv(): Promise { + try { + return await which('pyenv'); + } catch { + return undefined; + } +} + +export const PYENV_ENVIRONMENTS = 'Environments'; +export const PYENV_VERSIONS = 'Versions'; + +export const PYENV_PATH_KEY = `${ENVS_EXTENSION_ID}:pyenv:PYENV_PATH`; +export const PYENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:pyenv:WORKSPACE_SELECTED`; +export const PYENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:pyenv:GLOBAL_SELECTED`; + +let pyenvPath: string | undefined; +export async function clearPyenvCache(): Promise { + const state = await getWorkspacePersistentState(); + await state.clear([PYENV_WORKSPACE_KEY, PYENV_GLOBAL_KEY]); + const global = await getGlobalPersistentState(); + await global.clear([PYENV_PATH_KEY]); +} + +async function setPyenv(pyenv: string): Promise { + pyenvPath = pyenv; + const state = await getWorkspacePersistentState(); + await state.set(PYENV_PATH_KEY, pyenv); +} + +export async function getPyenvForGlobal(): Promise { + const state = await getWorkspacePersistentState(); + return await state.get(PYENV_GLOBAL_KEY); +} + +export async function setPyenvForGlobal(pyenvPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + await state.set(PYENV_GLOBAL_KEY, pyenvPath); +} + +export async function getPyenvForWorkspace(fsPath: string): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } | undefined = await state.get(PYENV_WORKSPACE_KEY); + if (data) { + try { + return data[fsPath]; + } catch { + return undefined; + } + } + return undefined; +} + +export async function setPyenvForWorkspace(fsPath: string, envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(PYENV_WORKSPACE_KEY)) ?? {}; + if (envPath) { + data[fsPath] = envPath; + } else { + delete data[fsPath]; + } + await state.set(PYENV_WORKSPACE_KEY, data); +} + +export async function setPyenvForWorkspaces(fsPath: string[], envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(PYENV_WORKSPACE_KEY)) ?? {}; + fsPath.forEach((s) => { + if (envPath) { + data[s] = envPath; + } else { + delete data[s]; + } + }); + await state.set(PYENV_WORKSPACE_KEY, data); +} + +export async function getPyenv(native?: NativePythonFinder): Promise { + if (pyenvPath) { + return pyenvPath; + } + + const state = await getWorkspacePersistentState(); + pyenvPath = await state.get(PYENV_PATH_KEY); + if (pyenvPath) { + traceInfo(`Using pyenv from persistent state: ${pyenvPath}`); + return untildify(pyenvPath); + } + + const pyenvBin = isWindows() ? 'pyenv.exe' : 'pyenv'; + const pyenvRoot = process.env.PYENV_ROOT; + if (pyenvRoot) { + const pyenvPath = path.join(pyenvRoot, 'bin', pyenvBin); + if (await fs.exists(pyenvPath)) { + return pyenvPath; + } + } + + const home = getUserHomeDir(); + if (home) { + const pyenvPath = path.join(home, '.pyenv', 'bin', pyenvBin); + if (await fs.exists(pyenvPath)) { + return pyenvPath; + } + + if (isWindows()) { + const pyenvPathWin = path.join(home, '.pyenv', 'pyenv-win', 'bin', pyenvBin); + if (await fs.exists(pyenvPathWin)) { + return pyenvPathWin; + } + } + } + + pyenvPath = await findPyenv(); + if (pyenvPath) { + return pyenvPath; + } + + if (native) { + const data = await native.refresh(false); + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'pyenv'); + if (managers.length > 0) { + pyenvPath = managers[0].executable; + traceInfo(`Using pyenv from native finder: ${pyenvPath}`); + await state.set(PYENV_PATH_KEY, pyenvPath); + return pyenvPath; + } + } + + return undefined; +} + +function nativeToPythonEnv( + info: NativeEnvInfo, + api: PythonEnvironmentApi, + manager: EnvironmentManager, + pyenv: string, +): PythonEnvironment | undefined { + if (!(info.prefix && info.executable && info.version)) { + traceError(`Incomplete pyenv environment info: ${JSON.stringify(info)}`); + return undefined; + } + + const versionsPath = normalizePath(path.join(path.dirname(path.dirname(pyenv)), 'versions')); + const envsPaths = normalizePath(path.join(path.dirname(versionsPath), 'envs')); + let group = undefined; + const normPrefix = normalizePath(info.prefix); + if (normPrefix.startsWith(versionsPath)) { + group = PYENV_VERSIONS; + } else if (normPrefix.startsWith(envsPaths)) { + group = PYENV_ENVIRONMENTS; + } + + const sv = shortVersion(info.version); + const name = info.name || info.displayName || path.basename(info.prefix); + const displayName = info.displayName || `pyenv (${sv}}`; + + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + + shellActivation.set('unknown', [{ executable: 'pyenv', args: ['shell', name] }]); + shellDeactivation.set('unknown', [{ executable: 'pyenv', args: ['shell', '--unset'] }]); + + const environment: PythonEnvironmentInfo = { + name: name, + displayName: displayName, + shortDisplayName: displayName, + displayPath: info.prefix, + version: info.version, + environmentPath: Uri.file(info.prefix), + description: undefined, + tooltip: info.prefix, + execInfo: { + run: { executable: info.executable }, + shellActivation, + shellDeactivation, + }, + sysPrefix: info.prefix, + group: group, + }; + + return api.createPythonEnvironmentItem(environment, manager); +} + +export async function refreshPyenv( + hardRefresh: boolean, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + traceInfo('Refreshing pyenv environments'); + const data = await nativeFinder.refresh(hardRefresh); + + let pyenv = await getPyenv(); + + if (pyenv === undefined) { + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'pyenv'); + pyenv = managers[0].executable; + await setPyenv(pyenv); + } + + const envs = data + .filter((e) => isNativeEnvInfo(e)) + .map((e) => e as NativeEnvInfo) + .filter((e) => e.kind === NativePythonEnvironmentKind.pyenv); + + const collection: PythonEnvironment[] = []; + + envs.forEach((e) => { + if (pyenv) { + const environment = nativeToPythonEnv(e, api, manager, pyenv); + if (environment) { + collection.push(environment); + } + } + }); + + return sortEnvironments(collection); +} + +export async function resolvePyenvPath( + fsPath: string, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + try { + const e = await nativeFinder.resolve(fsPath); + if (e.kind !== NativePythonEnvironmentKind.pyenv) { + return undefined; + } + const pyenv = await getPyenv(nativeFinder); + if (!pyenv) { + traceError('Pyenv not found while resolving environment'); + return undefined; + } + + return nativeToPythonEnv(e, api, manager, pyenv); + } catch { + return undefined; + } +} From d1c1b745c2aff2c20231d59b62e9738881af95e5 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 20 May 2025 07:49:32 -0700 Subject: [PATCH 154/328] Create project branch (#424) branch including create package work. **All PRs inside this branch have already been individually approved.** --- package.json | 6 + package.nls.json | 1 + src/common/constants.ts | 2 + src/common/pickers/managers.ts | 90 +++++++- src/extension.ts | 12 +- src/features/creators/creationHelpers.ts | 199 ++++++++++++++++++ src/features/creators/newPackageProject.ts | 165 +++++++++++++++ src/features/creators/newScriptProject.ts | 17 ++ .../package-copilot-instructions.md | 10 + .../newPackageTemplate/dev-requirements.txt | 4 + .../package_name/__init__.py | 0 .../package_name/__main__.py | 9 + .../newPackageTemplate/pyproject.toml | 21 ++ .../tests/test_package_name.py | 1 + src/managers/builtin/main.ts | 8 - src/managers/builtin/uvProjectCreator.ts | 122 ----------- 16 files changed, 528 insertions(+), 139 deletions(-) create mode 100644 src/features/creators/creationHelpers.ts create mode 100644 src/features/creators/newPackageProject.ts create mode 100644 src/features/creators/newScriptProject.ts create mode 100644 src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md create mode 100644 src/features/creators/templates/newPackageTemplate/dev-requirements.txt create mode 100644 src/features/creators/templates/newPackageTemplate/package_name/__init__.py create mode 100644 src/features/creators/templates/newPackageTemplate/package_name/__main__.py create mode 100644 src/features/creators/templates/newPackageTemplate/pyproject.toml create mode 100644 src/features/creators/templates/newPackageTemplate/tests/test_package_name.py delete mode 100644 src/managers/builtin/uvProjectCreator.ts diff --git a/package.json b/package.json index 333b56c..edb050a 100644 --- a/package.json +++ b/package.json @@ -209,6 +209,12 @@ "category": "Python Envs", "icon": "$(terminal)" }, + { + "command": "python-envs.createNewProjectFromTemplate", + "title": "%python-envs.createNewProjectFromTemplate.title%", + "category": "Python Envs", + "icon": "$(play)" + }, { "command": "python-envs.runAsTask", "title": "%python-envs.runAsTask.title%", diff --git a/package.nls.json b/package.nls.json index a0ab1f6..ba7f1c4 100644 --- a/package.nls.json +++ b/package.nls.json @@ -31,6 +31,7 @@ "python-envs.runInTerminal.title": "Run in Terminal", "python-envs.createTerminal.title": "Create Python Terminal", "python-envs.runAsTask.title": "Run as Task", + "python-envs.createNewProjectFromTemplate.title": "Create New Project from Template", "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", "python-envs.uninstallPackage.title": "Uninstall Package", diff --git a/src/common/constants.ts b/src/common/constants.ts index 2af994e..bed6d95 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -25,3 +25,5 @@ export const KNOWN_FILES = [ ]; export const KNOWN_TEMPLATE_ENDINGS = ['.j2', '.jinja2']; + +export const NEW_PROJECT_TEMPLATES_FOLDER = path.join(EXTENSION_ROOT_DIR, 'src', 'features', 'creators', 'templates'); diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 409b402..49b9a99 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -1,8 +1,8 @@ -import { QuickPickItem, QuickPickItemKind } from 'vscode'; +import { commands, QuickInputButtons, QuickPickItem, QuickPickItemKind } from 'vscode'; import { PythonProjectCreator } from '../../api'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { Common, Pickers } from '../localize'; -import { showQuickPick, showQuickPickWithButtons } from '../window.apis'; +import { showQuickPickWithButtons } from '../window.apis'; function getDescription(mgr: InternalEnvironmentManager | InternalPackageManager): string | undefined { if (mgr.description) { @@ -134,14 +134,88 @@ export async function pickCreator(creators: PythonProjectCreator[]): Promise ({ + // First level menu + const autoFindCreator = creators.find((c) => c.name === 'autoProjects'); + const existingProjectsCreator = creators.find((c) => c.name === 'existingProjects'); + + const items: QuickPickItem[] = [ + { + label: 'Auto Find', + description: autoFindCreator?.description ?? 'Automatically find Python projects', + }, + { + label: 'Select Existing', + description: existingProjectsCreator?.description ?? 'Select existing Python projects', + }, + { + label: 'Create New', + description: 'Create a Python project from a template', + }, + ]; + + const selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Managers.selectProjectCreator, + ignoreFocusOut: true, + }); + + if (!selected) { + return undefined; + } + + // Return appropriate creator based on selection + // Handle case where selected could be an array (should not happen, but for type safety) + const selectedItem = Array.isArray(selected) ? selected[0] : selected; + if (!selectedItem) { + return undefined; + } + switch (selectedItem.label) { + case 'Auto Find': + return autoFindCreator; + case 'Select Existing': + return existingProjectsCreator; + case 'Create New': + return newProjectSelection(creators); + } + + return undefined; +} + +export async function newProjectSelection(creators: PythonProjectCreator[]): Promise { + const otherCreators = creators.filter((c) => c.name !== 'autoProjects' && c.name !== 'existingProjects'); + + // Show second level menu for other creators + if (otherCreators.length === 0) { + return undefined; + } + const newItems: (QuickPickItem & { c: PythonProjectCreator })[] = otherCreators.map((c) => ({ label: c.displayName ?? c.name, description: c.description, c: c, })); - const selected = await showQuickPick(items, { - placeHolder: Pickers.Managers.selectProjectCreator, - ignoreFocusOut: true, - }); - return (selected as { c: PythonProjectCreator })?.c; + try { + const newSelected = await showQuickPickWithButtons(newItems, { + placeHolder: 'Select project type for new project', + ignoreFocusOut: true, + showBackButton: true, + }); + + if (!newSelected) { + // User cancelled the picker + return undefined; + } + // Handle back button + // eslint-disable-next-line @typescript-eslint/no-explicit-any + if ((newSelected as any)?.kind === -1 || (newSelected as any)?.back === true) { + // User pressed the back button, re-show the first menu + return pickCreator(creators); + } + + // Handle case where newSelected could be an array (should not happen, but for type safety) + const selectedCreator = Array.isArray(newSelected) ? newSelected[0] : newSelected; + return selectedCreator?.c; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + await commands.executeCommand('python-envs.addPythonProject'); + } + } } diff --git a/src/extension.ts b/src/extension.ts index dd64ec8..4fcb836 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,10 +1,10 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode'; - import { PythonEnvironment, PythonEnvironmentApi } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerTools } from './common/lm.apis'; import { registerLogger, traceError, traceInfo } from './common/logging'; import { setPersistentState } from './common/persistentState'; +import { newProjectSelection } from './common/pickers/managers'; import { StopWatch } from './common/stopWatch'; import { EventNames } from './common/telemetry/constants'; import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; @@ -20,6 +20,8 @@ import { createManagerReady } from './features/common/managerReady'; import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; +import { NewPackageProject } from './features/creators/newPackageProject'; +import { NewScriptProject } from './features/creators/newScriptProject'; import { ProjectCreatorsImpl } from './features/creators/projectCreators'; import { addPythonProjectCommand, @@ -109,6 +111,8 @@ export async function activate(context: ExtensionContext): Promise { + const selected = await newProjectSelection(projectCreators.getProjectCreators()); + if (selected) { + await selected.create(); + } + }), terminalActivation.onDidChangeTerminalActivationState(async (e) => { await setActivateMenuButtonContext(e.terminal, e.environment, e.activated); }), diff --git a/src/features/creators/creationHelpers.ts b/src/features/creators/creationHelpers.ts new file mode 100644 index 0000000..bdc9578 --- /dev/null +++ b/src/features/creators/creationHelpers.ts @@ -0,0 +1,199 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { extensions, l10n, QuickInputButtons, Uri, window } from 'vscode'; +import { CreateEnvironmentOptions } from '../../api'; +import { traceError, traceVerbose } from '../../common/logging'; +import { showQuickPickWithButtons } from '../../common/window.apis'; +import { EnvironmentManagers, InternalEnvironmentManager } from '../../internal.api'; + +/** + * Prompts the user to choose whether to create a new virtual environment (venv) for a project, with a clearer return and early exit. + * @returns {Promise} Resolves to true if 'Yes' is selected, false if 'No', or undefined if cancelled. + */ +export async function promptForVenv(callback: () => void): Promise { + try { + const venvChoice = await showQuickPickWithButtons([{ label: l10n.t('Yes') }, { label: l10n.t('No') }], { + placeHolder: l10n.t('Would you like to create a new virtual environment for this project?'), + ignoreFocusOut: true, + showBackButton: true, + }); + if (!venvChoice) { + return undefined; + } + if (Array.isArray(venvChoice)) { + // Should not happen for single selection, but handle just in case + return venvChoice.some((item) => item.label === 'Yes'); + } + return venvChoice.label === 'Yes'; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + callback(); + } + } +} + +/** + * Checks if the GitHub Copilot extension is installed in the current VS Code environment. + * @returns {boolean} True if Copilot is installed, false otherwise. + */ +export function isCopilotInstalled(): boolean { + return !!extensions.getExtension('GitHub.copilot'); +} + +/** + * Prompts the user to choose whether to create a Copilot instructions file, only if Copilot is installed. + * @returns {Promise} Resolves to true if 'Yes' is selected, false if 'No', or undefined if cancelled or Copilot is not installed. + */ +export async function promptForCopilotInstructions(): Promise { + if (!isCopilotInstalled()) { + return undefined; + } + const copilotChoice = await showQuickPickWithButtons([{ label: 'Yes' }, { label: 'No' }], { + placeHolder: 'Would you like to create a Copilot instructions file?', + ignoreFocusOut: true, + showBackButton: true, + }); + if (!copilotChoice) { + return undefined; + } + if (Array.isArray(copilotChoice)) { + // Should not happen for single selection, but handle just in case + return copilotChoice.some((item) => item.label === 'Yes'); + } + return copilotChoice.label === 'Yes'; +} + +/** + * Quickly creates a new Python virtual environment (venv) in the specified destination folder using the available environment managers. + * Attempts to use the venv manager if available, otherwise falls back to any manager that supports environment creation. + * @param envManagers - The collection of available environment managers. + * @param destFolder - The absolute path to the destination folder where the environment should be created. + * @returns {Promise} Resolves when the environment is created or an error is shown. + */ +export async function quickCreateNewVenv(envManagers: EnvironmentManagers, destFolder: string) { + // get the environment manager for venv, should always exist + const envManager: InternalEnvironmentManager | undefined = envManagers.managers.find( + (m) => m.id === 'ms-python.python:venv', + ); + const destinationUri = Uri.parse(destFolder); + if (envManager?.supportsQuickCreate) { + // with quickCreate enabled, user will not be prompted when creating the environment + const options: CreateEnvironmentOptions = { quickCreate: false }; + if (envManager.supportsQuickCreate) { + options.quickCreate = true; + } + const pyEnv = await envManager.create(destinationUri, options); + // TODO: do I need to update to say this is the env for the file? Like set it? + if (!pyEnv) { + // comes back as undefined if this doesn't work + window.showErrorMessage(`Failed to create virtual environment, please create it manually.`); + } else { + traceVerbose(`Created venv at: ${pyEnv?.environmentPath}`); + } + } else { + window.showErrorMessage(`Failed to quick create virtual environment, please create it manually.`); + } +} + +/** + * Recursively replaces all occurrences of a string in file and folder names, as well as file contents, within a directory tree. + * @param dir - The root directory to start the replacement from. + * @param searchValue - The string to search for in names and contents. + * @param replaceValue - The string to replace with. + * @returns {Promise} Resolves when all replacements are complete. + */ +export async function replaceInFilesAndNames(dir: string, searchValue: string, replaceValue: string) { + const entries = await fs.readdir(dir, { withFileTypes: true }); + for (const entry of entries) { + let entryName = entry.name; + let fullPath = path.join(dir, entryName); + let newFullPath = fullPath; + // If the file or folder name contains searchValue, rename it + if (entryName.includes(searchValue)) { + const newName = entryName.replace(new RegExp(searchValue, 'g'), replaceValue); + newFullPath = path.join(dir, newName); + await fs.rename(fullPath, newFullPath); + entryName = newName; + } + if (entry.isDirectory()) { + await replaceInFilesAndNames(newFullPath, searchValue, replaceValue); + } else { + let content = await fs.readFile(newFullPath, 'utf8'); + if (content.includes(searchValue)) { + content = content.replace(new RegExp(searchValue, 'g'), replaceValue); + await fs.writeFile(newFullPath, content, 'utf8'); + } + } + } +} + +/** + * Ensures the .github/copilot-instructions.md file exists at the given root, creating or appending as needed. + * @param destinationRootPath - The root directory where the .github folder should exist. + * @param instructionsText - The text to write or append to the copilot-instructions.md file. + */ +export async function manageCopilotInstructionsFile( + destinationRootPath: string, + packageName: string, + instructionsFilePath: string, +) { + const instructionsText = `\n \n` + (await fs.readFile(instructionsFilePath, 'utf-8')); + const githubFolderPath = path.join(destinationRootPath, '.github'); + const customInstructionsPath = path.join(githubFolderPath, 'copilot-instructions.md'); + if (!(await fs.pathExists(githubFolderPath))) { + // make the .github folder if it doesn't exist + await fs.mkdir(githubFolderPath); + } + const customInstructions = await fs.pathExists(customInstructionsPath); + if (customInstructions) { + // Append to the existing file + await fs.appendFile(customInstructionsPath, instructionsText.replace(//g, packageName)); + } else { + // Create the file if it doesn't exist + await fs.writeFile(customInstructionsPath, instructionsText.replace(//g, packageName)); + } +} + +/** + * Appends a configuration object to the configurations array in a launch.json file. + * @param launchJsonPath - The absolute path to the launch.json file. + * @param projectLaunchConfig - The stringified JSON config to append. + */ +async function appendToJsonConfigs(launchJsonPath: string, projectLaunchConfig: string) { + let content = await fs.readFile(launchJsonPath, 'utf8'); + const json = JSON.parse(content); + // If it's a VS Code launch config, append to configurations array + if (json && Array.isArray(json.configurations)) { + const configObj = JSON.parse(projectLaunchConfig); + json.configurations.push(configObj); + await fs.writeFile(launchJsonPath, JSON.stringify(json, null, 4), 'utf8'); + } else { + traceError('Failed to add Project Launch Config to launch.json.'); + return; + } +} + +/** + * Updates the launch.json file in the .vscode folder to include the provided project launch configuration. + * @param destinationRootPath - The root directory where the .vscode folder should exist. + * @param projectLaunchConfig - The stringified JSON config to append. + */ +export async function manageLaunchJsonFile(destinationRootPath: string, projectLaunchConfig: string) { + const vscodeFolderPath = path.join(destinationRootPath, '.vscode'); + const launchJsonPath = path.join(vscodeFolderPath, 'launch.json'); + if (!(await fs.pathExists(vscodeFolderPath))) { + await fs.mkdir(vscodeFolderPath); + } + const launchJsonExists = await fs.pathExists(launchJsonPath); + if (launchJsonExists) { + // Try to parse and append to existing launch.json + await appendToJsonConfigs(launchJsonPath, projectLaunchConfig); + } else { + // Create a new launch.json with the provided config + const launchJson = { + version: '0.2.0', + configurations: [JSON.parse(projectLaunchConfig)], + }; + await fs.writeFile(launchJsonPath, JSON.stringify(launchJson, null, 4), 'utf8'); + } +} diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts new file mode 100644 index 0000000..361c4ab --- /dev/null +++ b/src/features/creators/newPackageProject.ts @@ -0,0 +1,165 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspace } from 'vscode'; +import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; +import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; +import { showInputBoxWithButtons } from '../../common/window.apis'; +import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; +import { + isCopilotInstalled, + manageCopilotInstructionsFile, + manageLaunchJsonFile, + promptForVenv, + quickCreateNewVenv, + replaceInFilesAndNames, +} from './creationHelpers'; + +export class NewPackageProject implements PythonProjectCreator { + public readonly name = l10n.t('newPackage'); + public readonly displayName = l10n.t('Package'); + public readonly description = l10n.t('Creates a package folder in your current workspace'); + public readonly tooltip = new MarkdownString(l10n.t('Create a new Python package')); + + constructor( + private readonly envManagers: EnvironmentManagers, + private readonly projectManager: PythonProjectManager, + ) {} + + async create(options?: PythonProjectCreatorOptions): Promise { + let packageName = options?.name; + let createVenv: boolean | undefined; + let createCopilotInstructions: boolean | undefined; + if (options?.quickCreate === true) { + // If quickCreate is true, we should not prompt for any input + if (!packageName) { + throw new Error('Package name is required in quickCreate mode.'); + } + createVenv = true; + createCopilotInstructions = true; + } else { + //Prompt as quickCreate is false + if (!packageName) { + try { + packageName = await showInputBoxWithButtons({ + prompt: l10n.t('What is the name of the package? (e.g. my_package)'), + ignoreFocusOut: true, + showBackButton: true, + validateInput: (value) => { + // following PyPI (PEP 508) rules for package names + if (!/^([a-z_]|[a-z0-9_][a-z0-9._-]*[a-z0-9_])$/i.test(value)) { + return l10n.t( + 'Invalid package name. Use only letters, numbers, underscores, hyphens, or periods. Must start and end with a letter or number.', + ); + } + if (/^[-._0-9]$/i.test(value)) { + return l10n.t('Single-character package names cannot be a number, hyphen, or period.'); + } + return null; + }, + }); + } catch (ex) { + if (ex === QuickInputButtons.Back) { + await commands.executeCommand('python-envs.createNewProjectFromTemplate'); + } + } + if (!packageName) { + return undefined; + } + // Use helper to prompt for virtual environment creation + const callback = () => { + return this.create(options); + }; + createVenv = await promptForVenv(callback); + if (createVenv === undefined) { + return undefined; + } + if (isCopilotInstalled()) { + createCopilotInstructions = true; + } + } + + // 1. Copy template folder + const newPackageTemplateFolder = path.join(NEW_PROJECT_TEMPLATES_FOLDER, 'newPackageTemplate'); + if (!(await fs.pathExists(newPackageTemplateFolder))) { + window.showErrorMessage(l10n.t('Template folder does not exist, aborting creation.')); + return undefined; + } + + // Check if the destination folder is provided, otherwise use the first workspace folder + let destRoot = options?.rootUri.fsPath; + if (!destRoot) { + const workspaceFolders = workspace.workspaceFolders; + if (!workspaceFolders || workspaceFolders.length === 0) { + window.showErrorMessage(l10n.t('No workspace folder is open or provided, aborting creation.')); + return undefined; + } + destRoot = workspaceFolders[0].uri.fsPath; + } + + // Check if the destination folder already exists + const projectDestinationFolder = path.join(destRoot, `${packageName}_project`); + if (await fs.pathExists(projectDestinationFolder)) { + window.showErrorMessage( + l10n.t( + 'A project folder by that name already exists, aborting creation. Please retry with a unique package name given your workspace.', + ), + ); + return undefined; + } + await fs.copy(newPackageTemplateFolder, projectDestinationFolder); + + // 2. Replace 'package_name' in all files and file/folder names using a helper + await replaceInFilesAndNames(projectDestinationFolder, 'package_name', packageName); + + // 4. Create virtual environment if requested + let createdPackage: PythonProject | undefined; + if (createVenv) { + createdPackage = { + name: packageName, + uri: Uri.file(projectDestinationFolder), + }; + + // add package to list of packages before creating the venv + this.projectManager.add(createdPackage); + await quickCreateNewVenv(this.envManagers, projectDestinationFolder); + } + + // 5. Get the Python environment for the destination folder + // could be either the one created in an early step or an existing one + const pythonEnvironment = await this.envManagers.getEnvironment(Uri.parse(projectDestinationFolder)); + + if (!pythonEnvironment) { + window.showErrorMessage(l10n.t('Python environment not found.')); + return undefined; + } + + // add custom github copilot instructions + if (createCopilotInstructions) { + const packageInstructionsPath = path.join( + NEW_PROJECT_TEMPLATES_FOLDER, + 'copilot-instructions-text', + 'package-copilot-instructions.md', + ); + await manageCopilotInstructionsFile(destRoot, packageName, packageInstructionsPath); + } + + // update launch.json file with config for the package + const launchJsonConfig = { + name: `Python Package: ${packageName}`, + type: 'debugpy', + request: 'launch', + module: packageName, + }; + await manageLaunchJsonFile(destRoot, JSON.stringify(launchJsonConfig)); + + if (createdPackage) { + // return package if created (ie when venv is created) + return createdPackage; + } else { + // otherwise its not a package and just a folder + return Uri.file(projectDestinationFolder); + } + } + return undefined; + } +} diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts new file mode 100644 index 0000000..4b94333 --- /dev/null +++ b/src/features/creators/newScriptProject.ts @@ -0,0 +1,17 @@ +import { MarkdownString, window } from 'vscode'; +import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; + +export class NewScriptProject implements PythonProjectCreator { + public readonly name = 'newScript'; + public readonly displayName = 'Project'; + public readonly description = 'Create a new Python project'; + public readonly tooltip = new MarkdownString('Create a new Python project'); + + constructor() {} + + async create(_options?: PythonProjectCreatorOptions): Promise { + // show notification that the script creation was selected than return undefined + window.showInformationMessage('Creating a new Python project...'); + return undefined; + } +} diff --git a/src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md b/src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md new file mode 100644 index 0000000..0451ed4 --- /dev/null +++ b/src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md @@ -0,0 +1,10 @@ +# Copilot Instructions for + +- The package `` is a Python Project located in the folder `-folder`. +- You need to call the `Get Python Environment Information` tool on the `` path to get the Python executable details. +- Substitute the Python executable you get from the `Get Python Environment Information` tool anywhere you see `` in these instructions. + - Run command for ``: ` -m ` + - Command to run tests for ``: ` -m pytest /tests` +- To run an editable install for the package ``, use the `Install Python Package` tool with the `-folder` path and arguments `['-e', '.']`. +- In the workspace `launch.json` file, configurations related to this package have the prefix ``. +- The package `` has a defined `pyproject.toml` file that you should use and keep up to date. diff --git a/src/features/creators/templates/newPackageTemplate/dev-requirements.txt b/src/features/creators/templates/newPackageTemplate/dev-requirements.txt new file mode 100644 index 0000000..c16a051 --- /dev/null +++ b/src/features/creators/templates/newPackageTemplate/dev-requirements.txt @@ -0,0 +1,4 @@ +pytest +setuptools +wheel +# TODO: update the necessary requirements to develop this package \ No newline at end of file diff --git a/src/features/creators/templates/newPackageTemplate/package_name/__init__.py b/src/features/creators/templates/newPackageTemplate/package_name/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/features/creators/templates/newPackageTemplate/package_name/__main__.py b/src/features/creators/templates/newPackageTemplate/package_name/__main__.py new file mode 100644 index 0000000..50e55f0 --- /dev/null +++ b/src/features/creators/templates/newPackageTemplate/package_name/__main__.py @@ -0,0 +1,9 @@ +# TODO: Update the main function to your needs or remove it. + + +def main() -> None: + print("Start coding in Python today!") + + +if __name__ == "__main__": + main() diff --git a/src/features/creators/templates/newPackageTemplate/pyproject.toml b/src/features/creators/templates/newPackageTemplate/pyproject.toml new file mode 100644 index 0000000..57b7bbd --- /dev/null +++ b/src/features/creators/templates/newPackageTemplate/pyproject.toml @@ -0,0 +1,21 @@ +[project] +name = "package_name" +version = "1.0.0" +description = "" #TODO: Add a short description of your package +authors = [{name = "Your Name", email = "your@email.com"}] #TODO: Add your name and email +requires-python = ">=3.9" +dynamic = ["optional-dependencies"] + +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[tool.setuptools.dynamic] +optional-dependencies = {dev = {file = ["dev-requirements.txt"]}} # add packages for development in the dev-requirements.txt file + +[project.scripts] +# TODO: add your CLI entry points here + + + + diff --git a/src/features/creators/templates/newPackageTemplate/tests/test_package_name.py b/src/features/creators/templates/newPackageTemplate/tests/test_package_name.py new file mode 100644 index 0000000..b622f4e --- /dev/null +++ b/src/features/creators/templates/newPackageTemplate/tests/test_package_name.py @@ -0,0 +1 @@ +# TODO: Write tests for your package using pytest diff --git a/src/managers/builtin/main.ts b/src/managers/builtin/main.ts index dcad7d9..029636c 100644 --- a/src/managers/builtin/main.ts +++ b/src/managers/builtin/main.ts @@ -5,11 +5,9 @@ import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { isUvInstalled } from './helpers'; import { PipPackageManager } from './pipManager'; import { isPipInstallCommand } from './pipUtils'; import { SysPythonManager } from './sysPythonManager'; -import { UvProjectCreator } from './uvProjectCreator'; import { VenvManager } from './venvManager'; export async function registerSystemPythonFeatures( @@ -56,10 +54,4 @@ export async function registerSystemPythonFeatures( } }), ); - - setImmediate(async () => { - if (await isUvInstalled(log)) { - disposables.push(api.registerPythonProjectCreator(new UvProjectCreator(api, log))); - } - }); } diff --git a/src/managers/builtin/uvProjectCreator.ts b/src/managers/builtin/uvProjectCreator.ts deleted file mode 100644 index 759b3d1..0000000 --- a/src/managers/builtin/uvProjectCreator.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { LogOutputChannel, MarkdownString, ProgressLocation, window } from 'vscode'; -import { - IconPath, - PythonEnvironmentApi, - PythonProject, - PythonProjectCreator, - PythonProjectCreatorOptions, -} from '../../api'; -import { runUV } from './helpers'; -import { pickProject } from '../../common/pickers/projects'; - -export class UvProjectCreator implements PythonProjectCreator { - constructor(private readonly api: PythonEnvironmentApi, private log: LogOutputChannel) { - this.name = 'uv'; - this.displayName = 'UV Init'; - this.description = 'Initialize a Python project using UV'; - this.tooltip = new MarkdownString('Initialize a Python Project using `uv init`'); - } - - readonly name: string; - readonly displayName?: string; - readonly description?: string; - readonly tooltip?: string | MarkdownString; - readonly iconPath?: IconPath; - - public async create(_option?: PythonProjectCreatorOptions): Promise { - const projectName = await window.showInputBox({ - prompt: 'Enter the name of the project', - value: 'myproject', - ignoreFocusOut: true, - }); - - if (!projectName) { - return; - } - - const projectPath = await pickProject(this.api.getPythonProjects()); - - if (!projectPath) { - return; - } - - const projectType = ( - await window.showQuickPick( - [ - { label: 'Library', description: 'Create a Python library project', detail: '--lib' }, - { label: 'Application', description: 'Create a Python application project', detail: '--app' }, - ], - { - placeHolder: 'Select the type of project to create', - ignoreFocusOut: true, - }, - ) - )?.detail; - - if (!projectType) { - return; - } - - // --package Set up the project to be built as a Python package - // --no-package Do not set up the project to be built as a Python package - // --no-readme Do not create a `README.md` file - // --no-pin-python Do not create a `.python-version` file for the project - // --no-workspace Avoid discovering a workspace and create a standalone project - const projectOptions = - ( - await window.showQuickPick( - [ - { - label: 'Package', - description: 'Set up the project to be built as a Python package', - detail: '--package', - }, - { - label: 'No Package', - description: 'Do not set up the project to be built as a Python package', - detail: '--no-package', - }, - { label: 'No Readme', description: 'Do not create a `README.md` file', detail: '--no-readme' }, - { - label: 'No Pin Python', - description: 'Do not create a `.python-version` file for the project', - detail: '--no-pin-python', - }, - { - label: 'No Workspace', - description: 'Avoid discovering a workspace and create a standalone project', - detail: '--no-workspace', - }, - ], - { - placeHolder: 'Select the options for the project', - ignoreFocusOut: true, - canPickMany: true, - }, - ) - )?.map((item) => item.detail) ?? []; - try { - await window.withProgress( - { - location: ProgressLocation.Notification, - title: 'Creating project', - }, - async () => { - await runUV( - ['init', projectType, '--name', projectName, ...projectOptions, projectPath.uri.fsPath], - undefined, - this.log, - ); - }, - ); - } catch { - const result = await window.showErrorMessage('Failed to create project', 'View Output'); - if (result === 'View Output') { - this.log.show(); - } - return; - } - - return undefined; - } -} From 8b6a3b9fa15115a0ae9d36a37977786036cc130e Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 20 May 2025 07:57:49 -0700 Subject: [PATCH 155/328] Improve shell startup documentation and logic (#403) Enhance the shell startup process by refining the command handling and updating the documentation for better clarity. Adjustments ensure proper execution in specific environments. --- README.md | 192 ++++++++++++++---- .../terminal/shells/cmd/cmdStartup.ts | 8 +- .../terminal/shells/common/shellUtils.ts | 3 + 3 files changed, 161 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 5b179e5..adb9a1d 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ ## Overview -The Python Environments extension for VS Code helps you manage Python environments and packages using your preferred environment manager, backed by its extensible APIs. This extension provides unique support for specifying environments for specific files, entire Python folders, or projects, including multi-root and mono-repo scenarios. The core feature set includes: +The Python Environments extension for VS Code helps you manage Python environments and packages using your preferred environment manager, backed by its extensible APIs. This extension provides unique support for specifying environments for specific files, entire Python folders, or projects, including multi-root and mono-repo scenarios. The core feature set includes: -- 🌐 Create, delete, and manage environments -- 📦 Install and uninstall packages within the selected environment -- ✅ Create activated terminals -- 🖌️ Add and create new Python projects +- 🌐 Create, delete, and manage environments +- 📦 Install and uninstall packages within the selected environment +- ✅ Create activated terminals +- 🖌️ Add and create new Python projects > **Note:** This extension is in preview, and its APIs and features are subject to change as the project evolves. @@ -29,9 +29,9 @@ The Python Environments panel provides an interface to create, delete and manage To simplify the environment creation process, you can use "Quick Create" to automatically create a new virtual environment using: -- Your default environment manager (e.g., `venv`) -- The latest Python version -- Workspace dependencies +- Your default environment manager (e.g., `venv`) +- The latest Python version +- Workspace dependencies For more control, you can create a custom environment where you can specify Python version, environment name, packages to be installed, and more! @@ -51,7 +51,7 @@ The extension also provides an interface to install and uninstall Python package The extension uses `pip` as the default package manager, but you can use the package manager of your choice using the `python-envs.defaultPackageManager` setting. The following are package managers supported out of the box: -| Id | Name | Description| +| Id | Name | Description | | ---------------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | | ms-python.python:conda | `conda` | The [conda](https://conda.org) package manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | @@ -64,30 +64,30 @@ Projects can be added via the Python Environments pane or in the File Explorer b There are a couple of ways that you can add a Python Project from the Python Environments panel: -| Name | Description | -| ----- | ---------- | -| Add Existing | Allows you to add an existing folder from the file explorer. | -| Auto find | Searches for folders that contain `pyproject.toml` or `setup.py` files | +| Name | Description | +| ------------ | ---------------------------------------------------------------------- | +| Add Existing | Allows you to add an existing folder from the file explorer. | +| Auto find | Searches for folders that contain `pyproject.toml` or `setup.py` files | ## Command Reference -| Name | Description | -| -------- | ------------- | -| Python: Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | -| Python: Manage Packages | Install and uninstall packages in a given Python environment. | -| Python: Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | -| Python: Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | -| Python: Run as Task | Runs Python module as a task. | +| Name | Description | +| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| Python: Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | +| Python: Manage Packages | Install and uninstall packages in a given Python environment. | +| Python: Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | +| Python: Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | +| Python: Run as Task | Runs Python module as a task. | ## Settings Reference -| Setting (python-envs.) | Default | Description | -| --------------------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | -| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | -| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | -| terminal.showActivateButton | `false` | (experimental) Show a button in the terminal to activate/deactivate the current environment for the terminal. This button is only shown if the active terminal is associated with a project that has an activatable environment. | -| python-envs.terminal.autoActivationType | `command` | Specifies how the extension can activate an environment in a terminal. Utilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated. This setting applies only when terminals are created, so you will need to restart your terminals for it to take effect. To revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.| +| Setting (python-envs.) | Default | Description | +| --------------------------------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| defaultEnvManager | `"ms-python.python:venv"` | The default environment manager used for creating and managing environments. | +| defaultPackageManager | `"ms-python.python:pip"` | The default package manager to use for installing and managing packages. This is often dictated by the default environment manager but can be customized. | +| pythonProjects | `[]` | A list of Python workspaces, specified by the path, in which you can set particular environment and package managers. You can set information for a workspace as `[{"path": "/path/to/workspace", "envManager": "ms-python.python:venv", "packageManager": "ms-python.python:pip"]}`. | +| terminal.showActivateButton | `false` | (experimental) Show a button in the terminal to activate/deactivate the current environment for the terminal. This button is only shown if the active terminal is associated with a project that has an activatable environment. | +| python-envs.terminal.autoActivationType | `command` | Specifies how the extension can activate an environment in a terminal. Utilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated. This setting applies only when terminals are created, so you will need to restart your terminals for it to take effect. To revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`. | ## Extensibility @@ -118,11 +118,125 @@ Create a new environment using any of the available environment managers. This c * Default `true`. If `true`, the environment after creation will be selected. */ selectEnvironment?: boolean; + + /** + * Provides some context about quick create based on user input. + * - if true, the environment should be created without any user input or prompts. + * - if false, the environment creation can show user input or prompts. + * This also means user explicitly skipped the quick create option. + * - if undefined, the environment creation can show user input or prompts. + * You can show quick create option to the user if you support it. + */ + quickCreate?: boolean; + /** + * Packages to install in addition to the automatically picked packages as a part of creating environment. + */ + additionalPackages?: string[]; } ``` usage: `await vscode.commands.executeCommand('python-envs.createAny', options);` +# Experimental Features + +## Shell Startup Activation + +The Python Environments extension supports shell startup activation for environments. This feature allows you to automatically activate a Python environment when you open a terminal in VS Code. The activation is done by modifying the shell's startup script, which is supported for the following shells: + +- **Bash**: `~/.bashrc` +- **Zsh**: `~/.zshrc` +- **Fish**: `~/.config/fish/config.fish` +- **PowerShell**: + - (Mac/Linux):`~/.config/powershell/profile.ps1` + - (Windows): `~\Documents\PowerShell\Microsoft.PowerShell_profile.ps1` +- **CMD**: `~/.cmdrc/cmd_startup.bat` + +### CMD + +1. Add or update `HKCU\\Software\\Microsoft\\Command Processor` `AutoRun` string value to use a command script. +2. A command script is added to `%USERPROFILE%\.cmdrc\cmd_startup.bat` +3. A script named `vscode-python.bat` is added to `%USERPROFILE%\.cmdrc` and called from `cmd_startup.bat` + +contents of `cmd_startup.bat` + +```bat +:: >>> vscode python +if "%TERM_PROGRAM%"=="vscode" ( + if not defined VSCODE_PYTHON_AUTOACTIVATE_GUARD ( + set "VSCODE_PYTHON_AUTOACTIVATE_GUARD=1" + if exist "%USERPROFILE%\.cmdrc\vscode-python.bat" call "%USERPROFILE%\.cmdrc\vscode-python.bat" + ) +) +:: <<< vscode python +``` + +contents of `vscode-python.bat` + +```bat +:: >>> vscode python +:: version: 0.1.0 +if defined VSCODE_CMD_ACTIVATE ( + call %VSCODE_CMD_ACTIVATE% +) +:: <<< vscode python +``` + +### Powershell/pwsh + +1. Runs `powershell -Command $profile` to get the profile location +2. If it does not exist creates it. +3. Adds following code to the shell profile script: + +```powershell +#region vscode python +if ($null -ne $env:VSCODE_PWSH_ACTIVATE) { + Invoke-Expression $env:VSCODE_PWSH_ACTIVATE +} +#endregion vscode python + +``` + +### sh/bash/gitbash + +1. Adds or creates `~/.bashrc` +2. Updates it with following code: + +```bash +# >>> vscode python +# version: 0.1.0 +if [ -n "$VSCODE_BASH_ACTIVATE" ] && [ "$TERM_PROGRAM" = "vscode" ]; then + eval "$VSCODE_BASH_ACTIVATE" || true +fi +# <<< vscode python +``` + +### zsh + +1. Adds or creates `~/.zshrc` +2. Updates it with following code: + +```zsh +# >>> vscode python +# version: 0.1.0 +if [ -n "$VSCODE_BASH_ACTIVATE" ] && [ "$TERM_PROGRAM" = "vscode" ]; then + eval "$VSCODE_BASH_ACTIVATE" || true +fi +# <<< vscode python +``` + +### fish + +1. Adds or creates `~/.config/fish/config.fish` +2. Updates it with following code: + +```fish +# >>> vscode python +# version: 0.1.0 +if test "$TERM_PROGRAM" = "vscode"; and set -q VSCODE_FISH_ACTIVATE + eval $VSCODE_FISH_ACTIVATE +end +# <<< vscode python +``` ## Extension Dependency @@ -130,11 +244,11 @@ This section provides an overview of how the Python extension interacts with the Tools that may rely on these APIs in their own extensions include: -- **Debuggers** (e.g., `debugpy`) -- **Linters** (e.g., Pylint, Flake8, Mypy) -- **Formatters** (e.g., Black, autopep8) -- **Language Server extensions** (e.g., Pylance, Jedi) -- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) +- **Debuggers** (e.g., `debugpy`) +- **Linters** (e.g., Pylint, Flake8, Mypy) +- **Formatters** (e.g., Black, autopep8) +- **Language Server extensions** (e.g., Pylance, Jedi) +- **Environment and Package Manager extensions** (e.g., Pixi, Conda, Hatch) ### API Dependency @@ -170,13 +284,13 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio ## Questions, issues, feature requests, and contributions -- If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). -- If you come across a problem with the extension, please [file an issue](https://github.com/microsoft/vscode-python). -- Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) for more details. -- Any and all feedback is appreciated and welcome! - - If someone has already [filed an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue. - - Otherwise please start a [new discussion](https://github.com/microsoft/vscode-python/discussions/categories/ideas). -- If you're interested in the development of the extension, you can read about our [development process](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md#development-process). +- If you have a question about how to accomplish something with the extension, please [ask on our Discussions page](https://github.com/microsoft/vscode-python/discussions/categories/q-a). +- If you come across a problem with the extension, please [file an issue](https://github.com/microsoft/vscode-python). +- Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) for more details. +- Any and all feedback is appreciated and welcome! + - If someone has already [filed an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue. + - Otherwise please start a [new discussion](https://github.com/microsoft/vscode-python/discussions/categories/ideas). +- If you're interested in the development of the extension, you can read about our [development process](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md#development-process). ## Data and telemetry diff --git a/src/features/terminal/shells/cmd/cmdStartup.ts b/src/features/terminal/shells/cmd/cmdStartup.ts index f78d716..aacfbda 100644 --- a/src/features/terminal/shells/cmd/cmdStartup.ts +++ b/src/features/terminal/shells/cmd/cmdStartup.ts @@ -77,9 +77,11 @@ function getMainBatchFileContent(startupFile: string): string { const lineSep = '\r\n'; const content = []; - content.push('if not defined VSCODE_PYTHON_AUTOACTIVATE_GUARD ('); - content.push(' set "VSCODE_PYTHON_AUTOACTIVATE_GUARD=1"'); - content.push(` if exist "${startupFile}" call "${startupFile}"`); + content.push('if "%TERM_PROGRAM%"=="vscode" ('); + content.push(' if not defined VSCODE_PYTHON_AUTOACTIVATE_GUARD ('); + content.push(' set "VSCODE_PYTHON_AUTOACTIVATE_GUARD=1"'); + content.push(` if exist "${startupFile}" call "${startupFile}"`); + content.push(' )'); content.push(')'); return content.join(lineSep); diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 6c1a138..38567c6 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -10,6 +10,9 @@ function getCommandAsString(command: PythonCommandRunConfiguration[], shell: str parts.push(quoteArgs([normalizeShellPath(cmd.executable, shell), ...args]).join(' ')); } if (shell === ShellConstants.PWSH) { + if (parts.length === 1) { + return parts[0]; + } return parts.map((p) => `(${p})`).join(` ${delimiter} `); } return parts.join(` ${delimiter} `); From fe1c916ec106b470cfe24b1f6db9c166f33a6527 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 20 May 2025 13:11:29 -0700 Subject: [PATCH 156/328] create project with 723 style script (#428) fixes https://github.com/microsoft/vscode-python-environments/issues/393 --- src/features/creators/creationHelpers.ts | 64 +++++----- src/features/creators/newPackageProject.ts | 4 +- src/features/creators/newScriptProject.ts | 117 ++++++++++++++++-- .../script-copilot-instructions.md | 9 ++ .../templates/new723ScriptTemplate/script.py | 16 +++ 5 files changed, 171 insertions(+), 39 deletions(-) create mode 100644 src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md create mode 100644 src/features/creators/templates/new723ScriptTemplate/script.py diff --git a/src/features/creators/creationHelpers.ts b/src/features/creators/creationHelpers.ts index bdc9578..066423c 100644 --- a/src/features/creators/creationHelpers.ts +++ b/src/features/creators/creationHelpers.ts @@ -96,61 +96,65 @@ export async function quickCreateNewVenv(envManagers: EnvironmentManagers, destF } /** - * Recursively replaces all occurrences of a string in file and folder names, as well as file contents, within a directory tree. - * @param dir - The root directory to start the replacement from. + * Replaces all occurrences of a string in file and folder names, as well as file contents, within a directory tree or a single file. + * @param targetPath - The root directory or file path to start the replacement from. * @param searchValue - The string to search for in names and contents. * @param replaceValue - The string to replace with. * @returns {Promise} Resolves when all replacements are complete. */ -export async function replaceInFilesAndNames(dir: string, searchValue: string, replaceValue: string) { - const entries = await fs.readdir(dir, { withFileTypes: true }); - for (const entry of entries) { - let entryName = entry.name; - let fullPath = path.join(dir, entryName); - let newFullPath = fullPath; - // If the file or folder name contains searchValue, rename it - if (entryName.includes(searchValue)) { - const newName = entryName.replace(new RegExp(searchValue, 'g'), replaceValue); - newFullPath = path.join(dir, newName); - await fs.rename(fullPath, newFullPath); - entryName = newName; - } - if (entry.isDirectory()) { - await replaceInFilesAndNames(newFullPath, searchValue, replaceValue); - } else { - let content = await fs.readFile(newFullPath, 'utf8'); - if (content.includes(searchValue)) { - content = content.replace(new RegExp(searchValue, 'g'), replaceValue); - await fs.writeFile(newFullPath, content, 'utf8'); +export async function replaceInFilesAndNames(targetPath: string, searchValue: string, replaceValue: string) { + const stat = await fs.stat(targetPath); + + if (stat.isDirectory()) { + const entries = await fs.readdir(targetPath, { withFileTypes: true }); + for (const entry of entries) { + let entryName = entry.name; + let fullPath = path.join(targetPath, entryName); + let newFullPath = fullPath; + // If the file or folder name contains searchValue, rename it + if (entryName.includes(searchValue)) { + const newName = entryName.replace(new RegExp(searchValue, 'g'), replaceValue); + newFullPath = path.join(targetPath, newName); + await fs.rename(fullPath, newFullPath); + entryName = newName; } + await replaceInFilesAndNames(newFullPath, searchValue, replaceValue); + } + } else if (stat.isFile()) { + let content = await fs.readFile(targetPath, 'utf8'); + if (content.includes(searchValue)) { + content = content.replace(new RegExp(searchValue, 'g'), replaceValue); + await fs.writeFile(targetPath, content, 'utf8'); } } } /** * Ensures the .github/copilot-instructions.md file exists at the given root, creating or appending as needed. + * Performs multiple find-and-replace operations as specified by the replacements array. * @param destinationRootPath - The root directory where the .github folder should exist. - * @param instructionsText - The text to write or append to the copilot-instructions.md file. + * @param instructionsFilePath - The path to the instructions template file. + * @param replacements - An array of tuples [{ text_to_find_and_replace, text_to_replace_it_with }] */ export async function manageCopilotInstructionsFile( destinationRootPath: string, - packageName: string, instructionsFilePath: string, + replacements: Array<{ searchValue: string; replaceValue: string }>, ) { - const instructionsText = `\n \n` + (await fs.readFile(instructionsFilePath, 'utf-8')); + let instructionsText = `\n\n` + (await fs.readFile(instructionsFilePath, 'utf-8')); + for (const { searchValue: text_to_find_and_replace, replaceValue: text_to_replace_it_with } of replacements) { + instructionsText = instructionsText.replace(new RegExp(text_to_find_and_replace, 'g'), text_to_replace_it_with); + } const githubFolderPath = path.join(destinationRootPath, '.github'); const customInstructionsPath = path.join(githubFolderPath, 'copilot-instructions.md'); if (!(await fs.pathExists(githubFolderPath))) { - // make the .github folder if it doesn't exist await fs.mkdir(githubFolderPath); } const customInstructions = await fs.pathExists(customInstructionsPath); if (customInstructions) { - // Append to the existing file - await fs.appendFile(customInstructionsPath, instructionsText.replace(//g, packageName)); + await fs.appendFile(customInstructionsPath, instructionsText); } else { - // Create the file if it doesn't exist - await fs.writeFile(customInstructionsPath, instructionsText.replace(//g, packageName)); + await fs.writeFile(customInstructionsPath, instructionsText); } } diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts index 361c4ab..28c3d5b 100644 --- a/src/features/creators/newPackageProject.ts +++ b/src/features/creators/newPackageProject.ts @@ -140,7 +140,9 @@ export class NewPackageProject implements PythonProjectCreator { 'copilot-instructions-text', 'package-copilot-instructions.md', ); - await manageCopilotInstructionsFile(destRoot, packageName, packageInstructionsPath); + await manageCopilotInstructionsFile(destRoot, packageInstructionsPath, [ + { searchValue: '', replaceValue: packageName }, + ]); } // update launch.json file with config for the package diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts index 4b94333..e3d7556 100644 --- a/src/features/creators/newScriptProject.ts +++ b/src/features/creators/newScriptProject.ts @@ -1,17 +1,118 @@ -import { MarkdownString, window } from 'vscode'; +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspace } from 'vscode'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; +import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; +import { showInputBoxWithButtons } from '../../common/window.apis'; +import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNames } from './creationHelpers'; export class NewScriptProject implements PythonProjectCreator { - public readonly name = 'newScript'; - public readonly displayName = 'Project'; - public readonly description = 'Create a new Python project'; - public readonly tooltip = new MarkdownString('Create a new Python project'); + public readonly name = l10n.t('newScript'); + public readonly displayName = l10n.t('Script'); + public readonly description = l10n.t('Creates a new script folder in your current workspace with PEP 723 support'); + public readonly tooltip = new MarkdownString(l10n.t('Create a new Python script')); constructor() {} - async create(_options?: PythonProjectCreatorOptions): Promise { - // show notification that the script creation was selected than return undefined - window.showInformationMessage('Creating a new Python project...'); + async create(options?: PythonProjectCreatorOptions): Promise { + // quick create (needs name, will always create venv and copilot instructions) + // not quick create + // ask for script file name + // ask if they want venv + let scriptFileName = options?.name; + let createCopilotInstructions: boolean | undefined; + if (options?.quickCreate === true) { + // If quickCreate is true, we should not prompt for any input + if (!scriptFileName) { + throw new Error('Script file name is required in quickCreate mode.'); + } + createCopilotInstructions = true; + } else { + //Prompt as quickCreate is false + if (!scriptFileName) { + try { + scriptFileName = await showInputBoxWithButtons({ + prompt: l10n.t('What is the name of the script? (e.g. my_script.py)'), + ignoreFocusOut: true, + showBackButton: true, + validateInput: (value) => { + // Ensure the filename ends with .py and follows valid naming conventions + if (!value.endsWith('.py')) { + return l10n.t('Script name must end with ".py".'); + } + const baseName = value.replace(/\.py$/, ''); + // following PyPI (PEP 508) rules for package names + if (!/^([a-z_]|[a-z0-9_][a-z0-9._-]*[a-z0-9_])$/i.test(baseName)) { + return l10n.t( + 'Invalid script name. Use only letters, numbers, underscores, hyphens, or periods. Must start and end with a letter or number.', + ); + } + if (/^[-._0-9]$/i.test(baseName)) { + return l10n.t('Single-character script names cannot be a number, hyphen, or period.'); + } + return null; + }, + }); + } catch (ex) { + if (ex === QuickInputButtons.Back) { + await commands.executeCommand('python-envs.createNewProjectFromTemplate'); + } + } + if (!scriptFileName) { + return undefined; + } + if (isCopilotInstalled()) { + createCopilotInstructions = true; + } + } + + // 1. Copy template folder + const newScriptTemplateFile = path.join(NEW_PROJECT_TEMPLATES_FOLDER, 'new723ScriptTemplate', 'script.py'); + if (!(await fs.pathExists(newScriptTemplateFile))) { + window.showErrorMessage(l10n.t('Template file does not exist, aborting creation.')); + return undefined; + } + + // Check if the destination folder is provided, otherwise use the first workspace folder + let destRoot = options?.rootUri.fsPath; + if (!destRoot) { + const workspaceFolders = workspace.workspaceFolders; + if (!workspaceFolders || workspaceFolders.length === 0) { + window.showErrorMessage(l10n.t('No workspace folder is open or provided, aborting creation.')); + return undefined; + } + destRoot = workspaceFolders[0].uri.fsPath; + } + + // Check if the destination folder already exists + const scriptDestination = path.join(destRoot, scriptFileName); + if (await fs.pathExists(scriptDestination)) { + window.showErrorMessage( + l10n.t( + 'A script file by that name already exists, aborting creation. Please retry with a unique script name given your workspace.', + ), + ); + return undefined; + } + await fs.copy(newScriptTemplateFile, scriptDestination); + + // 2. Replace 'script_name' in the file using a helper (just script name remove .py) + await replaceInFilesAndNames(scriptDestination, 'script_name', scriptFileName.replace(/\.py$/, '')); + + // 3. add custom github copilot instructions + if (createCopilotInstructions) { + const packageInstructionsPath = path.join( + NEW_PROJECT_TEMPLATES_FOLDER, + 'copilot-instructions-text', + 'script-copilot-instructions.md', + ); + await manageCopilotInstructionsFile(destRoot, packageInstructionsPath, [ + { searchValue: '', replaceValue: scriptFileName }, + ]); + } + + return Uri.file(scriptDestination); + } return undefined; } } diff --git a/src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md b/src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md new file mode 100644 index 0000000..01bd826 --- /dev/null +++ b/src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md @@ -0,0 +1,9 @@ +# Copilot Instructions for + +- The script `` is a Python python project within the workspace. +- It has inline script metadata (as proposed by PEP 723) that defines the script name, required python version, and dependencies. +- If imports which require a specific Python version or dependencies are added, keep the inline script metadata up to date. +- You need to call the `Get Python Environment Information` tool on the `` path to get the Python executable details. +- Substitute the Python executable you get from the `Get Python Environment Information` tool anywhere you see `` in these instructions. + - Run command for ``: ` ` + - Script can be easily debugged from the Integrated Terminal when activated with the command `debugpy ` after the necessary environment is activated. diff --git a/src/features/creators/templates/new723ScriptTemplate/script.py b/src/features/creators/templates/new723ScriptTemplate/script.py new file mode 100644 index 0000000..1c57fc6 --- /dev/null +++ b/src/features/creators/templates/new723ScriptTemplate/script.py @@ -0,0 +1,16 @@ +# /// script_name +# requires-python = ">=X.XX" TODO: Update this to the minimum Python version you want to support +# dependencies = [ +# TODO: Add any dependencies your script requires +# ] +# /// + +# TODO: Update the main function to your needs or remove it. + + +def main() -> None: + print("Start coding in Python today!") + + +if __name__ == "__main__": + main() From c0ac283263ea046486251870d1016933221877b8 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 20 May 2025 16:59:09 -0700 Subject: [PATCH 157/328] remove duplicate exec in dropdown selector (#433) fixes https://github.com/microsoft/vscode-python-environments/issues/413 image --- src/managers/builtin/sysPythonManager.ts | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/managers/builtin/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts index 14895a3..2f830b5 100644 --- a/src/managers/builtin/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -15,19 +15,19 @@ import { ResolveEnvironmentContext, SetEnvironmentScope, } from '../../api'; -import { refreshPythons, resolveSystemPythonEnvironmentPath } from './utils'; -import { NativePythonFinder } from '../common/nativePythonFinder'; +import { SysManagerStrings } from '../../common/localize'; import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { NativePythonFinder } from '../common/nativePythonFinder'; import { getLatest } from '../common/utils'; -import { SysManagerStrings } from '../../common/localize'; import { - setSystemEnvForWorkspace, - setSystemEnvForGlobal, clearSystemEnvCache, getSystemEnvForGlobal, getSystemEnvForWorkspace, + setSystemEnvForGlobal, + setSystemEnvForWorkspace, setSystemEnvForWorkspaces, } from './cache'; +import { refreshPythons, resolveSystemPythonEnvironmentPath } from './utils'; export class SysPythonManager implements EnvironmentManager { private collection: PythonEnvironment[] = []; @@ -86,6 +86,7 @@ export class SysPythonManager implements EnvironmentManager { async () => { const discard = this.collection.map((c) => c); + // hit here is fine... this.collection = await refreshPythons(hardRefresh, this.nativeFinder, this.api, this.log, this); await this.loadEnvMap(); @@ -198,13 +199,20 @@ export class SysPythonManager implements EnvironmentManager { // This environment is unknown. Resolve it. const resolved = await resolveSystemPythonEnvironmentPath(context.fsPath, this.nativeFinder, this.api, this); if (resolved) { + // HERE IT GOT TOO MANY // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. // For all other env types we need to ensure that the environment is of the type managed by the manager. // But System is a exception, this is the last resort for resolving. So we don't need to check. // We will just add it and treat it as a non-activatable environment. - this.collection.push(resolved); + const exists = this.collection.some( + (e) => e.environmentPath.toString() === resolved.environmentPath.toString(), + ); + if (!exists) { + // only add it if it is not already in the collection to avoid duplicates + this.collection.push(resolved); + } this._onDidChangeEnvironments.fire([{ environment: resolved, kind: EnvironmentChangeKind.add }]); } @@ -216,7 +224,7 @@ export class SysPythonManager implements EnvironmentManager { } private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined { - const normalized = path.normalize(fsPath); + const normalized = path.normalize(fsPath); // /opt/homebrew/bin/python3.12 return this.collection.find((e) => { const n = path.normalize(e.environmentPath.fsPath); return n === normalized || path.dirname(n) === normalized || path.dirname(path.dirname(n)) === normalized; From a32a1024aa23e5de8835c9a53ea1c220c4c9e016 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 20 May 2025 17:01:28 -0700 Subject: [PATCH 158/328] fixes for add pkg manually (#439) fixes https://github.com/microsoft/vscode-python-environments/issues/329 --- src/managers/common/pickers.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/managers/common/pickers.ts b/src/managers/common/pickers.ts index e886d60..50a8269 100644 --- a/src/managers/common/pickers.ts +++ b/src/managers/common/pickers.ts @@ -1,6 +1,6 @@ import { QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; -import { Common, PackageManagement } from '../../common/localize'; import { launchBrowser } from '../../common/env.apis'; +import { Common, PackageManagement } from '../../common/localize'; import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from '../../common/window.apis'; import { Installable } from './types'; @@ -15,7 +15,7 @@ const OPEN_EDITOR_BUTTON = { }; const EDIT_ARGUMENTS_BUTTON = { - iconPath: new ThemeIcon('pencil'), + iconPath: new ThemeIcon('add'), tooltip: PackageManagement.editArguments, }; @@ -169,11 +169,12 @@ export async function selectFromCommonPackagesToInstall( if (selected && Array.isArray(selected)) { if (selected.find((s) => s.label === PackageManagement.enterPackageNames)) { const filtered = selected.filter((s) => s.label !== PackageManagement.enterPackageNames); - const filler = filtered.map((s) => s.id).join(' '); try { - const selections = await enterPackageManually(filler); + const selections = await enterPackageManually(); if (selections) { - return selectionsToResult(selections, installed); + const selectedResult: PackagesPickerResult = selectionsToResult(selections, installed); + // only return the install part, since this button is only for adding to existing selection + return { install: selectedResult.install, uninstall: [] }; } return undefined; } catch (ex) { From f3583e115896d699d64d416c4d247c6572d0cc3f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 21 May 2025 13:43:30 -0700 Subject: [PATCH 159/328] remove un-intended comment (#442) left a comment and forgot to remove this before --- src/managers/builtin/sysPythonManager.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/managers/builtin/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts index 2f830b5..505d940 100644 --- a/src/managers/builtin/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -199,7 +199,6 @@ export class SysPythonManager implements EnvironmentManager { // This environment is unknown. Resolve it. const resolved = await resolveSystemPythonEnvironmentPath(context.fsPath, this.nativeFinder, this.api, this); if (resolved) { - // HERE IT GOT TOO MANY // This is just like finding a new environment or creating a new one. // Add it to collection, and trigger the added event. From aa379584f7b3862d7925351e69008737f561b28f Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 22 May 2025 09:26:19 -0700 Subject: [PATCH 160/328] fix: for `pyenv` spinning forever and crashes (#444) Fixes #437 Fixes #427 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: karthiknadig <3840081+karthiknadig@users.noreply.github.com> --- src/managers/pyenv/main.ts | 12 ++++++++---- src/managers/pyenv/pyenvUtils.ts | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/managers/pyenv/main.ts b/src/managers/pyenv/main.ts index 3560346..0dd1cba 100644 --- a/src/managers/pyenv/main.ts +++ b/src/managers/pyenv/main.ts @@ -13,10 +13,14 @@ export async function registerPyenvFeatures( const api: PythonEnvironmentApi = await getPythonApi(); try { - await getPyenv(nativeFinder); - - const mgr = new PyEnvManager(nativeFinder, api); - disposables.push(mgr, api.registerEnvironmentManager(mgr)); + const pyenv = await getPyenv(nativeFinder); + + if (pyenv) { + const mgr = new PyEnvManager(nativeFinder, api); + disposables.push(mgr, api.registerEnvironmentManager(mgr)); + } else { + traceInfo('Pyenv not found, turning off pyenv features.'); + } } catch (ex) { traceInfo('Pyenv not found, turning off pyenv features.', ex); } diff --git a/src/managers/pyenv/pyenvUtils.ts b/src/managers/pyenv/pyenvUtils.ts index 4a2e32a..6b9d506 100644 --- a/src/managers/pyenv/pyenvUtils.ts +++ b/src/managers/pyenv/pyenvUtils.ts @@ -225,8 +225,11 @@ export async function refreshPyenv( .filter((e) => !isNativeEnvInfo(e)) .map((e) => e as NativeEnvManagerInfo) .filter((e) => e.tool.toLowerCase() === 'pyenv'); - pyenv = managers[0].executable; - await setPyenv(pyenv); + + if (managers.length > 0) { + pyenv = managers[0].executable; + await setPyenv(pyenv); + } } const envs = data From a26df66a6d398e7978017f458e9c3ee12e177b1e Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 09:28:17 -0700 Subject: [PATCH 161/328] Hide "Add Python Project" context menu for already selected projects & Rename button (#432) edited by @eleanorjboyd for clarity ## Problem Currently, when right-clicking on a folder or file that is already added as a Python project, the "Add Python Project" context menu item is still shown. This can be confusing to users as they might think they need to add the project again, or that the project wasn't properly added the first time. ## To Test - When user right-clicks on a file/folder not yet added as a Python project: "Add as Python Project" is shown - When user right-clicks on a file/folder already added as a Python project: The menu item is hidden This change improves the user experience by reducing confusion and providing clearer contextual actions. Fixes #272 and #327 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 4 ++-- package.nls.json | 4 ++-- src/extension.ts | 17 ++++++++++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index edb050a..0fb33db 100644 --- a/package.json +++ b/package.json @@ -457,12 +457,12 @@ { "command": "python-envs.addPythonProject", "group": "inline", - "when": "explorerViewletVisible && explorerResourceIsFolder" + "when": "explorerViewletVisible && explorerResourceIsFolder && !python-envs:isExistingProject" }, { "command": "python-envs.addPythonProject", "group": "inline", - "when": "explorerViewletVisible && resourceExtname == .py" + "when": "explorerViewletVisible && resourceExtname == .py && !python-envs:isExistingProject" } ], "editor/title/run": [ diff --git a/package.nls.json b/package.nls.json index ba7f1c4..6c27a3f 100644 --- a/package.nls.json +++ b/package.nls.json @@ -13,7 +13,7 @@ "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", - "python-envs.addPythonProject.title": "Add Python Project", + "python-envs.addPythonProject.title": "Add as Python Project", "python-envs.removePythonProject.title": "Remove Python Project", "python-envs.copyEnvPath.title": "Copy Environment Path", "python-envs.copyProjectPath.title": "Copy Project Path", @@ -37,4 +37,4 @@ "python-envs.uninstallPackage.title": "Uninstall Package", "python.languageModelTools.python_environment.userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.", "python.languageModelTools.python_install_package.userDescription": "Installs Python packages in the given workspace." -} \ No newline at end of file +} diff --git a/src/extension.ts b/src/extension.ts index 4fcb836..189455d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,4 +1,4 @@ -import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode'; +import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerTools } from './common/lm.apis'; @@ -13,7 +13,6 @@ import { activeTerminal, createLogOutputChannel, onDidChangeActiveTerminal, - onDidChangeActiveTextEditor, onDidChangeTerminalShellIntegration, } from './common/window.apis'; import { createManagerReady } from './features/common/managerReady'; @@ -88,6 +87,14 @@ export async function activate(context: ExtensionContext): Promise { + if (!uri) { + return false; + } + return projectManager.get(uri) !== undefined; + }; + const envVarManager: EnvVarManager = new PythonEnvVariableManager(projectManager); context.subscriptions.push(envVarManager); @@ -194,6 +201,10 @@ export async function activate(context: ExtensionContext): Promise { + // Set context to show/hide menu item depending on whether the resource is already a Python project + if (resource instanceof Uri) { + commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource)); + } await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators); }), commands.registerCommand('python-envs.removePythonProject', async (item) => { @@ -254,7 +265,7 @@ export async function activate(context: ExtensionContext): Promise { + window.onDidChangeActiveTextEditor(async () => { updateViewsAndStatus(statusBar, workspaceView, managerView, api); }), envManagers.onDidChangeEnvironment(async () => { From c71b58fd104cb6c4bf25da56afbbad964d3eafc3 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 09:28:24 -0700 Subject: [PATCH 162/328] Fix Add Python Project via context menu to directly add file/folder (#431) ## Issue When right-clicking on a folder or file in the file explorer and selecting "Add Python Project", the extension shows a quick pick menu (Auto Find, Select Existing, Create New) instead of directly adding the selected folder/file to the Python Projects view. This prevents users from easily adding a single file directly. ## Testing Verified that: - Right-clicking on a folder and selecting "Add Python Project" directly adds that folder - Right-clicking on a Python file and selecting "Add Python Project" directly adds that file - Using the "Add Python Project" button in the Python Projects view still shows the quick pick UI Fixes #385. (edit by @eleanorjboyd so it's useful / relevant) --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/features/creators/existingProjects.ts | 32 +++++++++++++++-------- src/features/envCommands.ts | 21 +++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index e54808d..1bb6ff0 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -15,17 +15,27 @@ export class ExistingProjects implements PythonProjectCreator { async create( _options?: PythonProjectCreatorOptions, ): Promise { - const results = await showOpenDialog({ - canSelectFiles: true, - canSelectFolders: true, - canSelectMany: true, - filters: { - python: ['py'], - }, - title: ProjectCreatorString.selectFilesOrFolders, - }); + let existingAddUri: Uri[] | undefined; + if (_options?.rootUri) { + // If rootUri is provided, do not prompt + existingAddUri = [_options.rootUri]; + } else if (_options?.quickCreate) { + // If quickCreate is true & no rootUri is provided, we should not prompt for any input + throw new Error('Root URI is required in quickCreate mode.'); + } else { + // Prompt the user to select files or folders + existingAddUri = await showOpenDialog({ + canSelectFiles: true, + canSelectFolders: true, + canSelectMany: true, + filters: { + python: ['py'], + }, + title: ProjectCreatorString.selectFilesOrFolders, + }); + } - if (!results || results.length === 0) { + if (!existingAddUri || existingAddUri.length === 0) { // User cancelled the dialog & doesn't want to add any projects return; } @@ -33,7 +43,7 @@ export class ExistingProjects implements PythonProjectCreator { // do we have any limitations that need to be applied here? // like selected folder not child of workspace folder? - const filtered = results.filter((uri) => { + const filtered = existingAddUri.filter((uri) => { const p = this.pm.get(uri); if (p) { // Skip this project if there's already a project registered with exactly the same path diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 9ec9d7b..e8912c0 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -369,8 +369,29 @@ export async function addPythonProjectCommand( name: resource.fsPath, rootUri: resource, }; + + // When a URI is provided (right-click in explorer), directly use the existingProjects creator + const existingProjectsCreator = pc.getProjectCreators().find((c) => c.name === 'existingProjects'); + if (existingProjectsCreator) { + try { + if (existingProjectsCreator.supportsQuickCreate) { + options = { + ...options, + quickCreate: true, + }; + } + await existingProjectsCreator.create(options); + return; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return addPythonProjectCommand(resource, wm, em, pc); + } + throw ex; + } + } } + // If not a URI or existingProjectsCreator not found, fall back to picker const creator: PythonProjectCreator | undefined = await pickCreator(pc.getProjectCreators()); if (!creator) { return; From bee06aaf7eeea62801eccefdb5c9b313813631e8 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 17:13:05 +0000 Subject: [PATCH 163/328] Add notification when re-selecting the same workspace environment (#441) fixes https://github.com/microsoft/vscode-python-environments/issues/58 ## Problem When a user selects "Set As Workspace Environment" for an environment that's already selected as the workspace environment, there's no feedback provided to the user. This can be confusing, as it appears that nothing happens when clicking the button. ## Solution This PR adds feedback to users when they attempt to select an environment that's already set as the workspace environment: 1. When a user has one folder/project open and tries to set the same environment that's already selected 2. The user will now see an information message: "This environment is already selected for the workspace." but its more verbose Fixes #58 and refined by @eleanorjboyd --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/features/envCommands.ts | 43 +++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index e8912c0..37e0720 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -3,6 +3,7 @@ import { CreateEnvironmentOptions, PythonEnvironment, PythonEnvironmentApi, + PythonProject, PythonProjectCreator, PythonProjectCreatorOptions, } from '../api'; @@ -21,7 +22,7 @@ import {} from '../common/errors/utils'; import { pickEnvironment } from '../common/pickers/environments'; import { pickCreator, pickEnvironmentManager, pickPackageManager } from '../common/pickers/managers'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; -import { activeTextEditor, showErrorMessage } from '../common/window.apis'; +import { activeTextEditor, showErrorMessage, showInformationMessage } from '../common/window.apis'; import { quoteArgs } from './execution/execUtils'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; @@ -212,8 +213,8 @@ export async function setEnvironmentCommand( if (projects.length > 0) { const selected = await pickProjectMany(projects); if (selected && selected.length > 0) { - const uris = selected.map((p) => p.uri); - await em.setEnvironments(uris, view.environment); + // Check if the selected environment is already the current one for each project + await setEnvironmentForProjects(selected, context.environment, em); } } else { await em.setEnvironments('global', view.environment); @@ -271,13 +272,47 @@ export async function setEnvironmentCommand( }); if (selected) { - await em.setEnvironments(uris, selected); + // Use the same logic for checking already set environments + await setEnvironmentForProjects(projects, selected, em); } } else { traceError(`Invalid context for setting environment command: ${context}`); showErrorMessage('Invalid context for setting environment'); } } +/** + * Sets the environment for the given projects, showing a warning for those already set. + * @param selectedProjects Array of PythonProject selected by user + * @param environment The environment to set for the projects + * @param em The EnvironmentManagers instance + */ +async function setEnvironmentForProjects( + selectedProjects: PythonProject[], + environment: PythonEnvironment, + em: EnvironmentManagers, +) { + let alreadySet: PythonProject[] = []; + for (const p of selectedProjects) { + const currentEnv = await em.getEnvironment(p.uri); + if (currentEnv?.envId.id === environment.envId.id) { + alreadySet.push(p); + } + } + if (alreadySet.length > 0) { + const env = alreadySet.length > 1 ? 'environments' : 'environment'; + showInformationMessage( + `"${environment.name}" is already selected as the ${env} for: ${alreadySet + .map((p) => `"${p.name}"`) + .join(', ')}`, + ); + } + const toSet: PythonProject[] = selectedProjects.filter((p) => !alreadySet.includes(p)); + const uris = toSet.map((p) => p.uri); + if (uris.length === 0) { + return; + } + await em.setEnvironments(uris, environment); +} export async function resetEnvironmentCommand( context: unknown, From 4ab83a7e3ad81ea8dad7bf890942c77b0a28f7cb Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 17:13:22 +0000 Subject: [PATCH 164/328] Update environment selection tooltips from "Workspace" to "Project" (#434) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR updates the language in the environment selection tooltips to align with terminology used elsewhere in the extension. ## Changes: - Changed "Set Workspace Environment" to "Set Project Environment" in the command title - Changed "Set As Workspace environment" to "Set As Project environment" in the command title - Updated tooltip text from "This environment is selected for workspace files" to "This environment is selected for project files" These changes ensure consistency in the UI language, where "Project" is the preferred term according to the extension's documentation and UI. Fixes #328. > [!WARNING] > >

> Firewall rules blocked me from connecting to one or more addresses > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `cdn.fwupd.org` > - Triggering command: `/usr/bin/fwupdmgr refresh ` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to my [firewall allow list](https://gh.io/copilot/firewall-config) > >
--- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.nls.json | 4 ++-- src/common/localize.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.nls.json b/package.nls.json index 6c27a3f..e16c8d9 100644 --- a/package.nls.json +++ b/package.nls.json @@ -19,8 +19,8 @@ "python-envs.copyProjectPath.title": "Copy Project Path", "python-envs.create.title": "Create Environment", "python-envs.createAny.title": "Create Environment", - "python-envs.set.title": "Set Workspace Environment", - "python-envs.setEnv.title": "Set As Workspace Environment", + "python-envs.set.title": "Set Project Environment", + "python-envs.setEnv.title": "Set As Project Environment", "python-envs.reset.title": "Reset to Default", "python-envs.remove.title": "Delete Environment", "python-envs.refreshAllManagers.title": "Refresh All Environment Managers", diff --git a/src/common/localize.ts b/src/common/localize.ts index a1d5291..e8d0aa6 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -172,7 +172,7 @@ export namespace ProjectCreatorString { export namespace EnvViewStrings { export const selectedGlobalTooltip = l10n.t('This environment is selected for non-workspace files'); - export const selectedWorkspaceTooltip = l10n.t('This environment is selected for workspace files'); + export const selectedWorkspaceTooltip = l10n.t('This environment is selected for project files'); } export namespace ActivationStrings { From 7f43c3de4243265a68907732a011ef4b4adab26a Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 17:13:28 +0000 Subject: [PATCH 165/328] Move packages to top level under each environment (#435) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem Currently, in the Python Projects sidebar view, packages are nested under an extra "Packages" dropdown under each environment, creating an unnecessary level of nesting: ![Before](https://github.com/user-attachments/assets/3a533a5a-e503-4499-9966-cfc0bebd5837) ## Changes This PR removes the intermediate "Packages" dropdown and shows packages directly under each environment: - Modified `ProjectView.getChildren()` to skip the PackageRoot level - Updated `ProjectPackage` constructor to accept a `ProjectEnvironment` parent - Updated package refresh logic to work with the new structure - Updated command handlers in `envCommands.ts` to handle the modified package structure - Updated menu condition in `package.json` to attach refresh command to environment nodes After this change, users can access installed packages with just one expansion from the environment level, which improves the user experience by reducing clicks and making the structure more intuitive. Fixes #330. --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Co-authored-by: karthiknadig <3840081+karthiknadig@users.noreply.github.com> --- package.json | 4 +- src/extension.ts | 2 +- src/features/envCommands.ts | 33 ++++++++++------ src/features/views/envManagersView.ts | 55 +++++++++------------------ src/features/views/projectView.ts | 47 +++++++++++------------ src/features/views/treeViewItems.ts | 51 ++++--------------------- 6 files changed, 71 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 0fb33db..9ecd7a3 100644 --- a/package.json +++ b/package.json @@ -361,7 +361,7 @@ { "command": "python-envs.refreshPackages", "group": "inline", - "when": "view == env-managers && viewItem == python-package-root" + "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" }, { "command": "python-envs.packages", @@ -395,7 +395,7 @@ { "command": "python-envs.refreshPackages", "group": "inline", - "when": "view == python-projects && viewItem == python-package-root" + "when": "view == python-projects && viewItem == python-env" }, { "command": "python-envs.removePythonProject", diff --git a/src/extension.ts b/src/extension.ts index 189455d..aee425e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -155,7 +155,7 @@ export async function activate(context: ExtensionContext): Promise m.refresh(undefined))); }), commands.registerCommand('python-envs.refreshPackages', async (item) => { - await refreshPackagesCommand(item); + await refreshPackagesCommand(item, envManagers); }), commands.registerCommand('python-envs.create', async (item) => { return await createEnvironmentCommand(item, envManagers, projectManager); diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 37e0720..2a6e3b1 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -31,12 +31,10 @@ import { EnvManagerTreeItem, EnvTreeItemKind, GlobalProjectItem, - PackageRootTreeItem, PackageTreeItem, ProjectEnvironment, ProjectItem, ProjectPackage, - ProjectPackageRootTreeItem, PythonEnvTreeItem, } from './views/treeViewItems'; @@ -49,15 +47,25 @@ export async function refreshManagerCommand(context: unknown): Promise { } } -export async function refreshPackagesCommand(context: unknown) { - if (context instanceof ProjectPackageRootTreeItem) { - const view = context as ProjectPackageRootTreeItem; - const manager = view.manager; - await manager.refresh(view.environment); - } else if (context instanceof PackageRootTreeItem) { - const view = context as PackageRootTreeItem; - const manager = view.manager; - await manager.refresh(view.environment); +export async function refreshPackagesCommand(context: unknown, managers?: EnvironmentManagers): Promise { + if (context instanceof ProjectEnvironment) { + const view = context as ProjectEnvironment; + if (managers) { + const pkgManager = managers.getPackageManager(view.parent.project.uri); + if (pkgManager) { + await pkgManager.refresh(view.environment); + } + } + } else if (context instanceof PythonEnvTreeItem) { + const view = context as PythonEnvTreeItem; + const envManager = + view.parent.kind === EnvTreeItemKind.environmentGroup + ? view.parent.parent.manager + : view.parent.manager; + const pkgManager = managers?.getPackageManager(envManager.preferredPackageManagerId); + if (pkgManager) { + await pkgManager.refresh(view.environment); + } } else { traceVerbose(`Invalid context for refresh command: ${context}`); } @@ -193,7 +201,8 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir export async function handlePackageUninstall(context: unknown, em: EnvironmentManagers) { if (context instanceof PackageTreeItem || context instanceof ProjectPackage) { const moduleName = context.pkg.name; - const environment = context.parent.environment; + const environment = + context instanceof ProjectPackage ? context.parent.environment : context.parent.environment; const packageManager = em.getPackageManager(environment); await packageManager?.manage(environment, { uninstall: [moduleName], install: [] }); return; diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index 5a131fc..c418fed 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -13,12 +13,10 @@ import { EnvTreeItem, EnvManagerTreeItem, PythonEnvTreeItem, - PackageRootTreeItem, PackageTreeItem, EnvTreeItemKind, NoPythonEnvTreeItem, EnvInfoTreeItem, - PackageRootInfoTreeItem, PythonGroupEnvTreeItem, } from './treeViewItems'; import { createSimpleDebounce } from '../../common/utils/debounce'; @@ -31,7 +29,6 @@ export class EnvManagerView implements TreeDataProvider, Disposable >(); private revealMap = new Map(); private managerViews = new Map(); - private packageRoots = new Map(); private selected: Map = new Map(); private disposables: Disposable[] = []; @@ -42,7 +39,6 @@ export class EnvManagerView implements TreeDataProvider, Disposable this.disposables.push( new Disposable(() => { - this.packageRoots.clear(); this.revealMap.clear(); this.managerViews.clear(); this.selected.clear(); @@ -165,32 +161,18 @@ export class EnvManagerView implements TreeDataProvider, Disposable const views: EnvTreeItem[] = []; if (pkgManager) { - const item = new PackageRootTreeItem(parent, pkgManager, environment); - this.packageRoots.set(environment.envId.id, item); - views.push(item); + const packages = await pkgManager.getPackages(environment); + if (packages && packages.length > 0) { + views.push(...packages.map((p) => new PackageTreeItem(p, parent, pkgManager))); + } else { + views.push(new EnvInfoTreeItem(parent, ProjectViews.noPackages)); + } } else { views.push(new EnvInfoTreeItem(parent, ProjectViews.noPackageManager)); } return views; } - - if (element.kind === EnvTreeItemKind.packageRoot) { - const root = element as PackageRootTreeItem; - const manager = root.manager; - const environment = root.environment; - - let packages = await manager.getPackages(environment); - const views: EnvTreeItem[] = []; - - if (packages) { - views.push(...packages.map((p) => new PackageTreeItem(p, root, manager))); - } else { - views.push(new PackageRootInfoTreeItem(root, ProjectViews.noPackages)); - } - - return views; - } } getParent(element: EnvTreeItem): ProviderResult { @@ -219,35 +201,32 @@ export class EnvManagerView implements TreeDataProvider, Disposable } private onDidChangePackages(args: InternalDidChangePackagesEventArgs) { - const pkgRoot = this.packageRoots.get(args.environment.envId.id); - if (pkgRoot) { - this.fireDataChanged(pkgRoot); + const view = Array.from(this.revealMap.values()).find( + (v) => v.environment.envId.id === args.environment.envId.id + ); + if (view) { + this.fireDataChanged(view); } } - private onDidChangePackageManager(args: DidChangePackageManagerEventArgs) { - const roots = Array.from(this.packageRoots.values()).filter((r) => r.manager.id === args.manager.id); - this.fireDataChanged(roots); + private onDidChangePackageManager(_args: DidChangePackageManagerEventArgs) { + // Since we removed the packageRoots level, just refresh all environments + // This is a simplified approach that isn't as targeted but ensures packages get refreshed + this.fireDataChanged(undefined); } public environmentChanged(e: DidChangeEnvironmentEventArgs) { const views = []; if (e.old) { this.selected.delete(e.old.envId.id); - let view: EnvTreeItem | undefined = this.packageRoots.get(e.old.envId.id); - if (!view) { - view = this.managerViews.get(e.old.envId.managerId); - } + const view: EnvTreeItem | undefined = this.revealMap.get(e.old.envId.id); if (view) { views.push(view); } } if (e.new) { this.selected.set(e.new.envId.id, e.uri === undefined ? 'global' : e.uri.fsPath); - let view: EnvTreeItem | undefined = this.packageRoots.get(e.new.envId.id); - if (!view) { - view = this.managerViews.get(e.new.envId.managerId); - } + const view: EnvTreeItem | undefined = this.revealMap.get(e.new.envId.id); if (view && !views.includes(view)) { views.push(view); } diff --git a/src/features/views/projectView.ts b/src/features/views/projectView.ts index 8205d78..2c405a0 100644 --- a/src/features/views/projectView.ts +++ b/src/features/views/projectView.ts @@ -21,8 +21,6 @@ import { ProjectEnvironmentInfo, ProjectItem, ProjectPackage, - ProjectPackageRootInfoTreeItem, - ProjectPackageRootTreeItem, ProjectTreeItem, ProjectTreeItemKind, } from './treeViewItems'; @@ -34,7 +32,7 @@ export class ProjectView implements TreeDataProvider { >(); private projectViews: Map = new Map(); private revealMap: Map = new Map(); - private packageRoots: Map = new Map(); + private packageRoots: Map = new Map(); private disposables: Disposable[] = []; private debouncedUpdateProject = createSimpleDebounce(500, () => this.updateProject()); public constructor(private envManagers: EnvironmentManagers, private projectManager: PythonProjectManager) { @@ -83,7 +81,8 @@ export class ProjectView implements TreeDataProvider { private updatePackagesForEnvironment(e: PythonEnvironment): void { const views: ProjectTreeItem[] = []; - this.packageRoots.forEach((v) => { + // Look for environments matching this environment ID and refresh them + this.revealMap.forEach((v) => { if (v.environment.envId.id === e.envId.id) { views.push(v); } @@ -125,8 +124,16 @@ export class ProjectView implements TreeDataProvider { return element.treeItem; } + /** + * Returns the children of a given element in the project tree view: + * If param is undefined, return root project items + * If param is a project, returns its environments. + * If param is an environment, returns its packages. + * @param element The tree item for which to get children. + */ async getChildren(element?: ProjectTreeItem | undefined): Promise { if (element === undefined) { + // Return the root items this.projectViews.clear(); const views: ProjectTreeItem[] = []; const projects = this.projectManager.getProjects(); @@ -187,38 +194,30 @@ export class ProjectView implements TreeDataProvider { } if (element.kind === ProjectTreeItemKind.environment) { + // Return packages directly under the environment + const environmentItem = element as ProjectEnvironment; const parent = environmentItem.parent; const uri = parent.id === 'global' ? undefined : parent.project.uri; const pkgManager = this.envManagers.getPackageManager(uri); const environment = environmentItem.environment; - const views: ProjectTreeItem[] = []; + if (!pkgManager) { + return [new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackageManager)]; + } - if (pkgManager) { - const item = new ProjectPackageRootTreeItem(environmentItem, pkgManager, environment); - this.packageRoots.set(uri ? uri.fsPath : 'global', item); - views.push(item); - } else { - views.push(new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackageManager)); + let packages = await pkgManager.getPackages(environment); + if (!packages) { + return [new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackages)]; } - return views; - } - if (element.kind === ProjectTreeItemKind.packageRoot) { - const root = element as ProjectPackageRootTreeItem; - const manager = root.manager; - const environment = root.environment; - let packages = await manager.getPackages(environment); - const views: ProjectTreeItem[] = []; + // Store the reference for refreshing packages + this.packageRoots.set(uri ? uri.fsPath : 'global', environmentItem); - if (packages) { - return packages.map((p) => new ProjectPackage(root, p, manager)); - } else { - views.push(new ProjectPackageRootInfoTreeItem(root, ProjectViews.noPackages)); - } + return packages.map((p) => new ProjectPackage(environmentItem, p, pkgManager)); } + //return nothing if the element is not a project, environment, or undefined return undefined; } getParent(element: ProjectTreeItem): ProviderResult { diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 8a966aa..6b83a9e 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -11,8 +11,6 @@ export enum EnvTreeItemKind { environmentGroup = 'python-env-group', noEnvironment = 'python-no-env', package = 'python-package', - packageRoot = 'python-package-root', - packageRootInfo = 'python-package-root-info', managerInfo = 'python-env-manager-info', environmentInfo = 'python-env-info', packageInfo = 'python-package-info', @@ -128,28 +126,12 @@ export class NoPythonEnvTreeItem implements EnvTreeItem { } } -export class PackageRootTreeItem implements EnvTreeItem { - public readonly kind = EnvTreeItemKind.packageRoot; - public readonly treeItem: TreeItem; - constructor( - public readonly parent: PythonEnvTreeItem, - public readonly manager: InternalPackageManager, - public readonly environment: PythonEnvironment, - ) { - const item = new TreeItem('Packages', TreeItemCollapsibleState.Collapsed); - item.contextValue = 'python-package-root'; - item.description = manager.displayName; - item.tooltip = 'Packages installed in this environment'; - this.treeItem = item; - } -} - export class PackageTreeItem implements EnvTreeItem { public readonly kind = EnvTreeItemKind.package; public readonly treeItem: TreeItem; constructor( public readonly pkg: Package, - public readonly parent: PackageRootTreeItem, + public readonly parent: PythonEnvTreeItem, public readonly manager: InternalPackageManager, ) { const item = new TreeItem(pkg.displayName); @@ -183,10 +165,10 @@ export class EnvInfoTreeItem implements EnvTreeItem { } export class PackageRootInfoTreeItem implements EnvTreeItem { - public readonly kind = EnvTreeItemKind.packageRootInfo; + public readonly kind = EnvTreeItemKind.packageInfo; public readonly treeItem: TreeItem; constructor( - public readonly parent: PackageRootTreeItem, + public readonly parent: PythonEnvTreeItem, name: string, description?: string, tooltip?: string | MarkdownString, @@ -209,7 +191,6 @@ export enum ProjectTreeItemKind { none = 'project-no-environment', environmentInfo = 'environment-info', package = 'project-package', - packageRoot = 'project-package-root', packageRootInfo = 'project-package-root-info', } @@ -307,24 +288,6 @@ export class NoProjectEnvironment implements ProjectTreeItem { } } -export class ProjectPackageRootTreeItem implements ProjectTreeItem { - public readonly kind = ProjectTreeItemKind.packageRoot; - public readonly id: string; - public readonly treeItem: TreeItem; - constructor( - public readonly parent: ProjectEnvironment, - public readonly manager: InternalPackageManager, - public readonly environment: PythonEnvironment, - ) { - const item = new TreeItem('Packages', TreeItemCollapsibleState.Collapsed); - this.id = `${this.parent.id}>>>packages`; - item.contextValue = 'python-package-root'; - item.description = manager.displayName; - item.tooltip = 'Packages installed in this environment'; - this.treeItem = item; - } -} - export class NoPackagesEnvironment implements ProjectTreeItem { public readonly kind = ProjectTreeItemKind.none; public readonly id: string; @@ -382,7 +345,7 @@ export class ProjectPackage implements ProjectTreeItem { public readonly id: string; public readonly treeItem: TreeItem; constructor( - public readonly parent: ProjectPackageRootTreeItem, + public readonly parent: ProjectEnvironment, public readonly pkg: Package, public readonly manager: InternalPackageManager, ) { @@ -395,7 +358,7 @@ export class ProjectPackage implements ProjectTreeItem { this.treeItem = item; } - static getId(projectEnv: ProjectPackageRootTreeItem, pkg: Package): string { + static getId(projectEnv: ProjectEnvironment, pkg: Package): string { return `${projectEnv.id}>>>${pkg.pkgId}`; } } @@ -405,7 +368,7 @@ export class ProjectPackageRootInfoTreeItem implements ProjectTreeItem { public readonly id: string; public readonly treeItem: TreeItem; constructor( - public readonly parent: ProjectPackageRootTreeItem, + public readonly parent: ProjectEnvironment, name: string, description?: string, tooltip?: string | MarkdownString, @@ -421,7 +384,7 @@ export class ProjectPackageRootInfoTreeItem implements ProjectTreeItem { this.treeItem.iconPath = iconPath; this.treeItem.command = command; } - static getId(projectEnv: ProjectPackageRootTreeItem, name: string): string { + static getId(projectEnv: ProjectEnvironment, name: string): string { return `${projectEnv.id}>>>${name}`; } } From 280b042076124d775fbf9090871c8265f1519904 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Fri, 23 May 2025 09:18:31 -0500 Subject: [PATCH 166/328] Add shell startup revert command (#446) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index adb9a1d..62999fb 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,8 @@ The Python Environments extension supports shell startup activation for environm - (Windows): `~\Documents\PowerShell\Microsoft.PowerShell_profile.ps1` - **CMD**: `~/.cmdrc/cmd_startup.bat` +If at any time you would like to revert the changes made to the shell's script, you can do so by running `Python Envs: Revert Shell Startup Script Changes` via the Command Palette. + ### CMD 1. Add or update `HKCU\\Software\\Microsoft\\Command Processor` `AutoRun` string value to use a command script. From f1958123f321267f415a99a17b9e265f98a7652f Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 27 May 2025 14:54:33 -0700 Subject: [PATCH 167/328] Poetry support (#445) closes https://github.com/microsoft/vscode-python-environments/issues/377 --- src/common/localize.ts | 6 + src/extension.ts | 2 + src/managers/common/utils.ts | 25 ++ src/managers/poetry/main.ts | 53 +++ src/managers/poetry/poetryManager.ts | 333 ++++++++++++++++ src/managers/poetry/poetryPackageManager.ts | 303 ++++++++++++++ src/managers/poetry/poetryUtils.ts | 418 ++++++++++++++++++++ 7 files changed, 1140 insertions(+) create mode 100644 src/managers/poetry/main.ts create mode 100644 src/managers/poetry/poetryManager.ts create mode 100644 src/managers/poetry/poetryPackageManager.ts create mode 100644 src/managers/poetry/poetryUtils.ts diff --git a/src/common/localize.ts b/src/common/localize.ts index e8d0aa6..1b250a1 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -158,6 +158,12 @@ export namespace PyenvStrings { export const pyenvRefreshing = l10n.t('Refreshing Pyenv Python versions'); } +export namespace PoetryStrings { + export const poetryManager = l10n.t('Manages Poetry environments'); + export const poetryDiscovering = l10n.t('Discovering Poetry environments'); + export const poetryRefreshing = l10n.t('Refreshing Poetry environments'); +} + export namespace ProjectCreatorString { export const addExistingProjects = l10n.t('Add Existing Projects'); export const autoFindProjects = l10n.t('Auto Find Projects'); diff --git a/src/extension.ts b/src/extension.ts index aee425e..ee7eb3a 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -67,6 +67,7 @@ import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './in import { registerSystemPythonFeatures } from './managers/builtin/main'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; import { registerCondaFeatures } from './managers/conda/main'; +import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; export async function activate(context: ExtensionContext): Promise { @@ -317,6 +318,7 @@ export async function activate(context: ExtensionContext): Promise version2 + */ +export function compareVersions(version1: string, version2: string): number { + const v1Parts = version1.split('.').map(Number); + const v2Parts = version2.split('.').map(Number); + + for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) { + const v1Part = v1Parts[i] || 0; + const v2Part = v2Parts[i] || 0; + + if (v1Part > v2Part) { + return 1; + } + if (v1Part < v2Part) { + return -1; + } + } + + return 0; +} diff --git a/src/managers/poetry/main.ts b/src/managers/poetry/main.ts new file mode 100644 index 0000000..3b168b4 --- /dev/null +++ b/src/managers/poetry/main.ts @@ -0,0 +1,53 @@ +import { Disposable, l10n, LogOutputChannel } from 'vscode'; +import { PythonEnvironmentApi } from '../../api'; +import { traceInfo } from '../../common/logging'; +import { showErrorMessage } from '../../common/window.apis'; +import { getPythonApi } from '../../features/pythonApi'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { compareVersions } from '../common/utils'; +import { PoetryManager } from './poetryManager'; +import { PoetryPackageManager } from './poetryPackageManager'; +import { getPoetry, getPoetryVersion, isPoetryShellPluginInstalled } from './poetryUtils'; + +export async function registerPoetryFeatures( + nativeFinder: NativePythonFinder, + disposables: Disposable[], + outputChannel: LogOutputChannel, +): Promise { + const api: PythonEnvironmentApi = await getPythonApi(); + + try { + const poetryPath = await getPoetry(nativeFinder); + let shellSupported = true; + if (poetryPath) { + const version = await getPoetryVersion(poetryPath); + if (!version) { + showErrorMessage(l10n.t('Poetry version could not be determined.')); + return; + } + if (version && compareVersions(version, '2.0.0') >= 0) { + shellSupported = await isPoetryShellPluginInstalled(poetryPath); + if (!shellSupported) { + showErrorMessage( + l10n.t( + 'Poetry 2.0.0+ detected. The `shell` command is not available by default. Please install the shell plugin to enable shell activation. See [here](https://python-poetry.org/docs/managing-environments/#activating-the-environment), shell [plugin](https://github.com/python-poetry/poetry-plugin-shell)', + ), + ); + return; + } + } + } + + const envManager = new PoetryManager(nativeFinder, api); + const pkgManager = new PoetryPackageManager(api, outputChannel, envManager); + + disposables.push( + envManager, + pkgManager, + api.registerEnvironmentManager(envManager), + api.registerPackageManager(pkgManager), + ); + } catch (ex) { + traceInfo('Poetry not found, turning off poetry features.', ex); + } +} diff --git a/src/managers/poetry/poetryManager.ts b/src/managers/poetry/poetryManager.ts new file mode 100644 index 0000000..cf023f2 --- /dev/null +++ b/src/managers/poetry/poetryManager.ts @@ -0,0 +1,333 @@ +import * as path from 'path'; +import { Disposable, EventEmitter, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode'; +import { + DidChangeEnvironmentEventArgs, + DidChangeEnvironmentsEventArgs, + EnvironmentChangeKind, + EnvironmentManager, + GetEnvironmentScope, + GetEnvironmentsScope, + IconPath, + PythonEnvironment, + PythonEnvironmentApi, + PythonProject, + RefreshEnvironmentsScope, + ResolveEnvironmentContext, + SetEnvironmentScope, +} from '../../api'; +import { PoetryStrings } from '../../common/localize'; +import { traceError, traceInfo } from '../../common/logging'; +import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { withProgress } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { getLatest } from '../common/utils'; +import { + clearPoetryCache, + getPoetryForGlobal, + getPoetryForWorkspace, + POETRY_GLOBAL, + refreshPoetry, + resolvePoetryPath, + setPoetryForGlobal, + setPoetryForWorkspace, + setPoetryForWorkspaces, +} from './poetryUtils'; + +export class PoetryManager implements EnvironmentManager, Disposable { + private collection: PythonEnvironment[] = []; + private fsPathToEnv: Map = new Map(); + private globalEnv: PythonEnvironment | undefined; + + private readonly _onDidChangeEnvironment = new EventEmitter(); + public readonly onDidChangeEnvironment = this._onDidChangeEnvironment.event; + + private readonly _onDidChangeEnvironments = new EventEmitter(); + public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; + + constructor(private readonly nativeFinder: NativePythonFinder, private readonly api: PythonEnvironmentApi) { + this.name = 'poetry'; + this.displayName = 'Poetry'; + this.preferredPackageManagerId = 'ms-python.python:poetry'; + this.tooltip = new MarkdownString(PoetryStrings.poetryManager, true); + this.iconPath = new ThemeIcon('python'); + } + + name: string; + displayName: string; + preferredPackageManagerId: string; + description?: string; + tooltip: string | MarkdownString; + iconPath?: IconPath; + + public dispose() { + this.collection = []; + this.fsPathToEnv.clear(); + } + + private _initialized: Deferred | undefined; + async initialize(): Promise { + if (this._initialized) { + return this._initialized.promise; + } + + this._initialized = createDeferred(); + + await withProgress( + { + location: ProgressLocation.Window, + title: PoetryStrings.poetryDiscovering, + }, + async () => { + this.collection = await refreshPoetry(false, this.nativeFinder, this.api, this); + await this.loadEnvMap(); + + this._onDidChangeEnvironments.fire( + this.collection.map((e) => ({ environment: e, kind: EnvironmentChangeKind.add })), + ); + }, + ); + this._initialized.resolve(); + } + + async getEnvironments(scope: GetEnvironmentsScope): Promise { + await this.initialize(); + + if (scope === 'all') { + return Array.from(this.collection); + } + + if (scope === 'global') { + return this.collection.filter((env) => { + return env.group === POETRY_GLOBAL; + }); + } + + if (scope instanceof Uri) { + const env = this.fromEnvMap(scope); + if (env) { + return [env]; + } + } + + return []; + } + + async refresh(context: RefreshEnvironmentsScope): Promise { + if (context === undefined) { + await withProgress( + { + location: ProgressLocation.Window, + title: PoetryStrings.poetryRefreshing, + }, + async () => { + traceInfo('Refreshing Poetry Environments'); + const discard = this.collection.map((c) => c); + this.collection = await refreshPoetry(true, this.nativeFinder, this.api, this); + + await this.loadEnvMap(); + + const args = [ + ...discard.map((env) => ({ kind: EnvironmentChangeKind.remove, environment: env })), + ...this.collection.map((env) => ({ kind: EnvironmentChangeKind.add, environment: env })), + ]; + + this._onDidChangeEnvironments.fire(args); + }, + ); + } + } + + async get(scope: GetEnvironmentScope): Promise { + await this.initialize(); + if (scope instanceof Uri) { + let env = this.fsPathToEnv.get(scope.fsPath); + if (env) { + return env; + } + const project = this.api.getPythonProject(scope); + if (project) { + env = this.fsPathToEnv.get(project.uri.fsPath); + if (env) { + return env; + } + } + } + + return this.globalEnv; + } + + async set(scope: SetEnvironmentScope, environment?: PythonEnvironment | undefined): Promise { + if (scope === undefined) { + await setPoetryForGlobal(environment?.environmentPath?.fsPath); + } else if (scope instanceof Uri) { + const folder = this.api.getPythonProject(scope); + const fsPath = folder?.uri?.fsPath ?? scope.fsPath; + if (fsPath) { + if (environment) { + this.fsPathToEnv.set(fsPath, environment); + } else { + this.fsPathToEnv.delete(fsPath); + } + await setPoetryForWorkspace(fsPath, environment?.environmentPath?.fsPath); + } + } else if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setPoetryForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath?.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); + } + } + + async resolve(context: ResolveEnvironmentContext): Promise { + await this.initialize(); + + if (context instanceof Uri) { + const env = await resolvePoetryPath(context.fsPath, this.nativeFinder, this.api, this); + if (env) { + const _collectionEnv = this.findEnvironmentByPath(env.environmentPath.fsPath); + if (_collectionEnv) { + return _collectionEnv; + } + + this.collection.push(env); + this._onDidChangeEnvironments.fire([{ kind: EnvironmentChangeKind.add, environment: env }]); + + return env; + } + + return undefined; + } + } + + async clearCache(): Promise { + await clearPoetryCache(); + } + + private async loadEnvMap() { + this.globalEnv = undefined; + this.fsPathToEnv.clear(); + + // Try to find a global environment + const fsPath = await getPoetryForGlobal(); + + if (fsPath) { + this.globalEnv = this.findEnvironmentByPath(fsPath); + + // If the environment is not found, resolve the fsPath + if (!this.globalEnv) { + this.globalEnv = await resolvePoetryPath(fsPath, this.nativeFinder, this.api, this); + + // If the environment is resolved, add it to the collection + if (this.globalEnv) { + this.collection.push(this.globalEnv); + } + } + } + + if (!this.globalEnv) { + this.globalEnv = getLatest(this.collection.filter((e) => e.group === POETRY_GLOBAL)); + } + + // Find any poetry environments that might be associated with the current projects + // Poetry typically has a pyproject.toml file in the project root + const pathSorted = this.collection + .filter((e) => this.api.getPythonProject(e.environmentPath)) + .sort((a, b) => { + if (a.environmentPath.fsPath !== b.environmentPath.fsPath) { + return a.environmentPath.fsPath.length - b.environmentPath.fsPath.length; + } + return a.environmentPath.fsPath.localeCompare(b.environmentPath.fsPath); + }); + + // Try to find workspace environments + const paths = this.api.getPythonProjects().map((p) => p.uri.fsPath); + for (const p of paths) { + const env = await getPoetryForWorkspace(p); + + if (env) { + const found = this.findEnvironmentByPath(env); + + if (found) { + this.fsPathToEnv.set(p, found); + } else { + // If not found, resolve the poetry path + const resolved = await resolvePoetryPath(env, this.nativeFinder, this.api, this); + + if (resolved) { + // If resolved add it to the collection + this.fsPathToEnv.set(p, resolved); + this.collection.push(resolved); + } else { + traceError(`Failed to resolve poetry environment: ${env}`); + } + } + } else { + // If there is not an environment already assigned by user to this project + // then see if there is one in the collection + if (pathSorted.length === 1) { + this.fsPathToEnv.set(p, pathSorted[0]); + } else { + // If there is more than one environment then we need to check if the project + // is a subfolder of one of the environments + const found = pathSorted.find((e) => { + const t = this.api.getPythonProject(e.environmentPath)?.uri.fsPath; + return t && path.normalize(t) === p; + }); + if (found) { + this.fsPathToEnv.set(p, found); + } + } + } + } + } + + private fromEnvMap(uri: Uri): PythonEnvironment | undefined { + // Find environment directly using the URI mapping + const env = this.fsPathToEnv.get(uri.fsPath); + if (env) { + return env; + } + + // Find environment using the Python project for the Uri + const project = this.api.getPythonProject(uri); + if (project) { + return this.fsPathToEnv.get(project.uri.fsPath); + } + + return undefined; + } + + private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined { + const normalized = path.normalize(fsPath); + return this.collection.find((e) => { + const n = path.normalize(e.environmentPath.fsPath); + return n === normalized || path.dirname(n) === normalized || path.dirname(path.dirname(n)) === normalized; + }); + } +} diff --git a/src/managers/poetry/poetryPackageManager.ts b/src/managers/poetry/poetryPackageManager.ts new file mode 100644 index 0000000..d3379e9 --- /dev/null +++ b/src/managers/poetry/poetryPackageManager.ts @@ -0,0 +1,303 @@ +import * as ch from 'child_process'; +import * as fsapi from 'fs-extra'; +import * as path from 'path'; +import { + CancellationError, + CancellationToken, + Event, + EventEmitter, + LogOutputChannel, + MarkdownString, + ProgressLocation, + ThemeIcon, +} from 'vscode'; +import { Disposable } from 'vscode-jsonrpc'; +import { + DidChangePackagesEventArgs, + IconPath, + Package, + PackageChangeKind, + PackageManagementOptions, + PackageManager, + PythonEnvironment, + PythonEnvironmentApi, +} from '../../api'; +import { showErrorMessage, showInputBox, withProgress } from '../../common/window.apis'; +import { PoetryManager } from './poetryManager'; +import { getPoetry } from './poetryUtils'; + +function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] { + const changes: { kind: PackageChangeKind; pkg: Package }[] = []; + before.forEach((pkg) => { + changes.push({ kind: PackageChangeKind.remove, pkg }); + }); + after.forEach((pkg) => { + changes.push({ kind: PackageChangeKind.add, pkg }); + }); + return changes; +} + +export class PoetryPackageManager implements PackageManager, Disposable { + private readonly _onDidChangePackages = new EventEmitter(); + onDidChangePackages: Event = this._onDidChangePackages.event; + + private packages: Map = new Map(); + + constructor( + private readonly api: PythonEnvironmentApi, + public readonly log: LogOutputChannel, + _poetry: PoetryManager, + ) { + this.name = 'poetry'; + this.displayName = 'Poetry'; + this.description = 'This package manager for Python uses Poetry for package management.'; + this.tooltip = new MarkdownString('This package manager for Python uses `poetry` for package management.'); + this.iconPath = new ThemeIcon('package'); + } + readonly name: string; + readonly displayName?: string; + readonly description?: string; + readonly tooltip?: string | MarkdownString; + readonly iconPath?: IconPath; + + async manage(environment: PythonEnvironment, options: PackageManagementOptions): Promise { + let toInstall: string[] = [...(options.install ?? [])]; + let toUninstall: string[] = [...(options.uninstall ?? [])]; + + if (toInstall.length === 0 && toUninstall.length === 0) { + // Show package input UI if no packages are specified + const installInput = await showInputBox({ + prompt: 'Enter packages to install (comma separated)', + placeHolder: 'e.g., requests, pytest, black', + }); + + if (installInput) { + toInstall = installInput + .split(',') + .map((p) => p.trim()) + .filter((p) => p.length > 0); + } + + if (toInstall.length === 0) { + return; + } + } + + await withProgress( + { + location: ProgressLocation.Notification, + title: 'Managing packages with Poetry', + cancellable: true, + }, + async (_progress, token) => { + try { + const before = this.packages.get(environment.envId.id) ?? []; + const after = await this.managePackages( + environment, + { install: toInstall, uninstall: toUninstall }, + token, + ); + const changes = getChanges(before, after); + this.packages.set(environment.envId.id, after); + this._onDidChangePackages.fire({ environment, manager: this, changes }); + } catch (e) { + if (e instanceof CancellationError) { + throw e; + } + this.log.error('Error managing packages with Poetry', e); + setImmediate(async () => { + const result = await showErrorMessage('Error managing packages with Poetry', 'View Output'); + if (result === 'View Output') { + this.log.show(); + } + }); + throw e; + } + }, + ); + } + + async refresh(environment: PythonEnvironment): Promise { + await withProgress( + { + location: ProgressLocation.Window, + title: 'Refreshing Poetry packages', + }, + async () => { + try { + const before = this.packages.get(environment.envId.id) ?? []; + const after = await this.refreshPackages(environment); + const changes = getChanges(before, after); + this.packages.set(environment.envId.id, after); + if (changes.length > 0) { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + } + } catch (error) { + this.log.error(`Failed to refresh packages: ${error}`); + // Show error to user but don't break the UI + setImmediate(async () => { + const result = await showErrorMessage('Error refreshing Poetry packages', 'View Output'); + if (result === 'View Output') { + this.log.show(); + } + }); + } + }, + ); + } + + async getPackages(environment: PythonEnvironment): Promise { + if (!this.packages.has(environment.envId.id)) { + await this.refresh(environment); + } + return this.packages.get(environment.envId.id); + } + + dispose(): void { + this._onDidChangePackages.dispose(); + this.packages.clear(); + } + + private async managePackages( + environment: PythonEnvironment, + options: { install?: string[]; uninstall?: string[] }, + token?: CancellationToken, + ): Promise { + // Handle uninstalls first + if (options.uninstall && options.uninstall.length > 0) { + try { + const args = ['remove', ...options.uninstall]; + this.log.info(`Running: poetry ${args.join(' ')}`); + const result = await runPoetry(args, undefined, this.log, token); + this.log.info(result); + } catch (err) { + this.log.error(`Error removing packages with Poetry: ${err}`); + throw err; + } + } + + // Handle installs + if (options.install && options.install.length > 0) { + try { + const args = ['add', ...options.install]; + this.log.info(`Running: poetry ${args.join(' ')}`); + const result = await runPoetry(args, undefined, this.log, token); + this.log.info(result); + } catch (err) { + this.log.error(`Error adding packages with Poetry: ${err}`); + throw err; + } + } + + // Refresh the packages list after changes + return this.refreshPackages(environment); + } + + private async refreshPackages(environment: PythonEnvironment): Promise { + let cwd = process.cwd(); + const projects = this.api.getPythonProjects(); + if (projects.length === 1) { + const stat = await fsapi.stat(projects[0].uri.fsPath); + if (stat.isDirectory()) { + cwd = projects[0].uri.fsPath; + } else { + cwd = path.dirname(projects[0].uri.fsPath); + } + } else if (projects.length > 1) { + const dirs = new Set(); + await Promise.all( + projects.map(async (project) => { + const e = await this.api.getEnvironment(project.uri); + if (e?.envId.id === environment.envId.id) { + const stat = await fsapi.stat(projects[0].uri.fsPath); + const dir = stat.isDirectory() ? projects[0].uri.fsPath : path.dirname(projects[0].uri.fsPath); + if (dirs.has(dir)) { + dirs.add(dir); + } + } + }), + ); + if (dirs.size > 0) { + // ensure we have the deepest directory node picked + cwd = Array.from(dirs.values()).sort((a, b) => (a.length - b.length) * -1)[0]; + } + } + + const poetryPackages: { name: string; version: string; displayName: string; description: string }[] = []; + + try { + this.log.info(`Running: ${await getPoetry()} show --no-ansi`); + const result = await runPoetry(['show', '--no-ansi'], cwd, this.log); + + // Parse poetry show output + // Format: name version description + const lines = result.split('\n'); + for (const line of lines) { + // Updated regex to properly handle lines with the format: + // "package (!) version description" + const match = line.match(/^(\S+)(?:\s+\([!]\))?\s+(\S+)\s+(.*)/); + if (match) { + const [, name, version, description] = match; + poetryPackages.push({ + name, + version, + displayName: name, + description: `${version} - ${description?.trim() || ''}`, + }); + } + } + } catch (err) { + this.log.error(`Error refreshing packages with Poetry: ${err}`); + // Return empty array instead of throwing to avoid breaking the UI + return []; + } + + // Convert to Package objects using the API + return poetryPackages.map((pkg) => this.api.createPackageItem(pkg, environment, this)); + } +} + +export async function runPoetry( + args: string[], + cwd?: string, + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { + const poetry = await getPoetry(); + if (!poetry) { + throw new Error('Poetry executable not found'); + } + + log?.info(`Running: ${poetry} ${args.join(' ')}`); + + return new Promise((resolve, reject) => { + const proc = ch.spawn(poetry, args, { cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); + let builder = ''; + proc.stdout?.on('data', (data) => { + const s = data.toString('utf-8'); + builder += s; + log?.append(`poetry: ${s}`); + }); + proc.stderr?.on('data', (data) => { + const s = data.toString('utf-8'); + builder += s; + log?.append(`poetry: ${s}`); + }); + proc.on('close', () => { + resolve(builder); + }); + proc.on('error', (error) => { + log?.error(`Error executing poetry command: ${error}`); + reject(error); + }); + proc.on('exit', (code) => { + if (code !== 0) { + reject(new Error(`Failed to run poetry ${args.join(' ')}`)); + } + }); + }); +} diff --git a/src/managers/poetry/poetryUtils.ts b/src/managers/poetry/poetryUtils.ts new file mode 100644 index 0000000..a37a15e --- /dev/null +++ b/src/managers/poetry/poetryUtils.ts @@ -0,0 +1,418 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { Uri } from 'vscode'; +import which from 'which'; +import { + EnvironmentManager, + PythonCommandRunConfiguration, + PythonEnvironment, + PythonEnvironmentApi, + PythonEnvironmentInfo, +} from '../../api'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { traceError, traceInfo } from '../../common/logging'; +import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; +import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; +import { isWindows } from '../../common/utils/platformUtils'; +import { ShellConstants } from '../../features/common/shellConstants'; +import { + isNativeEnvInfo, + NativeEnvInfo, + NativeEnvManagerInfo, + NativePythonEnvironmentKind, + NativePythonFinder, +} from '../common/nativePythonFinder'; +import { shortVersion, sortEnvironments } from '../common/utils'; + +async function findPoetry(): Promise { + try { + return await which('poetry'); + } catch { + return undefined; + } +} + +export const POETRY_GLOBAL = 'Global'; + +export const POETRY_PATH_KEY = `${ENVS_EXTENSION_ID}:poetry:POETRY_PATH`; +export const POETRY_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:poetry:WORKSPACE_SELECTED`; +export const POETRY_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:poetry:GLOBAL_SELECTED`; +export const POETRY_VIRTUALENVS_PATH_KEY = `${ENVS_EXTENSION_ID}:poetry:VIRTUALENVS_PATH`; + +let poetryPath: string | undefined; +let poetryVirtualenvsPath: string | undefined; + +export async function clearPoetryCache(): Promise { + // Clear workspace-specific settings + const state = await getWorkspacePersistentState(); + await state.clear([POETRY_WORKSPACE_KEY]); + + // Clear global settings + const global = await getGlobalPersistentState(); + await global.clear([POETRY_PATH_KEY, POETRY_GLOBAL_KEY, POETRY_VIRTUALENVS_PATH_KEY]); + + // Reset in-memory cache + poetryPath = undefined; + poetryVirtualenvsPath = undefined; +} + +async function setPoetry(poetry: string): Promise { + poetryPath = poetry; + const global = await getGlobalPersistentState(); + await global.set(POETRY_PATH_KEY, poetry); + + // Also get and cache the virtualenvs path + await getPoetryVirtualenvsPath(poetry); +} + +export async function getPoetryForGlobal(): Promise { + const global = await getGlobalPersistentState(); + return await global.get(POETRY_GLOBAL_KEY); +} + +export async function setPoetryForGlobal(poetryPath: string | undefined): Promise { + const global = await getGlobalPersistentState(); + await global.set(POETRY_GLOBAL_KEY, poetryPath); +} + +export async function getPoetryForWorkspace(fsPath: string): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } | undefined = await state.get(POETRY_WORKSPACE_KEY); + if (data) { + try { + return data[fsPath]; + } catch { + return undefined; + } + } + return undefined; +} + +export async function setPoetryForWorkspace(fsPath: string, envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(POETRY_WORKSPACE_KEY)) ?? {}; + if (envPath) { + data[fsPath] = envPath; + } else { + delete data[fsPath]; + } + await state.set(POETRY_WORKSPACE_KEY, data); +} + +export async function setPoetryForWorkspaces(fsPath: string[], envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(POETRY_WORKSPACE_KEY)) ?? {}; + fsPath.forEach((s) => { + if (envPath) { + data[s] = envPath; + } else { + delete data[s]; + } + }); + await state.set(POETRY_WORKSPACE_KEY, data); +} + +export async function getPoetry(native?: NativePythonFinder): Promise { + if (poetryPath) { + return poetryPath; + } + + const global = await getGlobalPersistentState(); + poetryPath = await global.get(POETRY_PATH_KEY); + if (poetryPath) { + traceInfo(`Using poetry from persistent state: ${poetryPath}`); + // Also retrieve the virtualenvs path if we haven't already + if (!poetryVirtualenvsPath) { + getPoetryVirtualenvsPath(untildify(poetryPath)).catch((e) => + traceError(`Error getting Poetry virtualenvs path: ${e}`), + ); + } + return untildify(poetryPath); + } + + // Check in standard PATH locations + poetryPath = await findPoetry(); + if (poetryPath) { + await setPoetry(poetryPath); + return poetryPath; + } + + // Check for user-installed poetry + const home = getUserHomeDir(); + if (home) { + const poetryUserInstall = path.join( + home, + isWindows() ? 'AppData\\Roaming\\Python\\Scripts\\poetry.exe' : '.local/bin/poetry', + ); + if (await fs.exists(poetryUserInstall)) { + poetryPath = poetryUserInstall; + await setPoetry(poetryPath); + return poetryPath; + } + } + + if (native) { + const data = await native.refresh(false); + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'poetry'); + if (managers.length > 0) { + poetryPath = managers[0].executable; + traceInfo(`Using poetry from native finder: ${poetryPath}`); + await setPoetry(poetryPath); + return poetryPath; + } + } + + return undefined; +} + +export async function getPoetryVirtualenvsPath(poetryExe?: string): Promise { + if (poetryVirtualenvsPath) { + return poetryVirtualenvsPath; + } + + // Check if we have it in persistent state + const global = await getGlobalPersistentState(); + poetryVirtualenvsPath = await global.get(POETRY_VIRTUALENVS_PATH_KEY); + if (poetryVirtualenvsPath) { + return untildify(poetryVirtualenvsPath); + } + + // Try to get it from poetry config + const poetry = poetryExe || (await getPoetry()); + if (poetry) { + try { + const { stdout } = await exec(`"${poetry}" config virtualenvs.path`); + if (stdout) { + const venvPath = stdout.trim(); + // Poetry might return the path with placeholders like {cache-dir} + // If it doesn't start with / or C:\ etc., assume it's using default + if (!path.isAbsolute(venvPath) || venvPath.includes('{')) { + const home = getUserHomeDir(); + if (home) { + poetryVirtualenvsPath = path.join(home, '.cache', 'pypoetry', 'virtualenvs'); + } + } else { + poetryVirtualenvsPath = venvPath; + } + + if (poetryVirtualenvsPath) { + await global.set(POETRY_VIRTUALENVS_PATH_KEY, poetryVirtualenvsPath); + return poetryVirtualenvsPath; + } + } + } catch (e) { + traceError(`Error getting Poetry virtualenvs path: ${e}`); + } + } + + // Fallback to default location + const home = getUserHomeDir(); + if (home) { + poetryVirtualenvsPath = path.join(home, '.cache', 'pypoetry', 'virtualenvs'); + await global.set(POETRY_VIRTUALENVS_PATH_KEY, poetryVirtualenvsPath); + return poetryVirtualenvsPath; + } + + return undefined; +} + +// These are now exported for use in main.ts or environment manager logic +import * as cp from 'child_process'; +import { promisify } from 'util'; + +const exec = promisify(cp.exec); + +export async function getPoetryVersion(poetry: string): Promise { + try { + const { stdout } = await exec(`"${poetry}" --version`); + // Handle both formats: + // Old: "Poetry version 1.5.1" + // New: "Poetry (version 2.1.3)" + const match = stdout.match(/Poetry (?:version|[\(\s]+version[\s\)]+)([0-9]+\.[0-9]+\.[0-9]+)/i); + return match ? match[1] : undefined; + } catch { + return undefined; + } +} + +export async function isPoetryShellPluginInstalled(poetry: string): Promise { + try { + const { stdout } = await exec(`"${poetry}" self show plugins`); + // Look for a line like: " - poetry-plugin-shell (1.0.1) Poetry plugin to run subshell..." + return /\s+-\s+poetry-plugin-shell\s+\(\d+\.\d+\.\d+\)/.test(stdout); + } catch { + return false; + } +} + +function createShellActivation( + poetry: string, + _prefix: string, +): Map | undefined { + const shellActivation: Map = new Map(); + + shellActivation.set(ShellConstants.BASH, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set(ShellConstants.ZSH, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set(ShellConstants.SH, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set(ShellConstants.GITBASH, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set(ShellConstants.FISH, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set(ShellConstants.PWSH, [{ executable: poetry, args: ['shell'] }]); + if (isWindows()) { + shellActivation.set(ShellConstants.CMD, [{ executable: poetry, args: ['shell'] }]); + } + shellActivation.set(ShellConstants.NU, [{ executable: poetry, args: ['shell'] }]); + shellActivation.set('unknown', [{ executable: poetry, args: ['shell'] }]); + return shellActivation; +} + +function createShellDeactivation(): Map { + const shellDeactivation: Map = new Map(); + + // Poetry doesn't have a standard deactivation command like venv does + // The best approach is to exit the shell or start a new one + shellDeactivation.set('unknown', [{ executable: 'exit' }]); + + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.FISH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: 'exit' }]); + shellDeactivation.set(ShellConstants.NU, [{ executable: 'exit' }]); + + return shellDeactivation; +} + +function nativeToPythonEnv( + info: NativeEnvInfo, + api: PythonEnvironmentApi, + manager: EnvironmentManager, + _poetry: string, +): PythonEnvironment | undefined { + if (!(info.prefix && info.executable && info.version)) { + traceError(`Incomplete poetry environment info: ${JSON.stringify(info)}`); + return undefined; + } + + const sv = shortVersion(info.version); + const name = info.name || info.displayName || path.basename(info.prefix); + const displayName = info.displayName || `poetry (${sv})`; + + const shellActivation = createShellActivation(_poetry, info.prefix); + const shellDeactivation = createShellDeactivation(); + + // Check if this is a global Poetry virtualenv by checking if it's in Poetry's virtualenvs directory + // We need to use path.normalize() to ensure consistent path format comparison + const normalizedPrefix = path.normalize(info.prefix); + + // Determine if the environment is in Poetry's global virtualenvs directory + let isGlobalPoetryEnv = false; + const virtualenvsPath = poetryVirtualenvsPath; // Use the cached value if available + if (virtualenvsPath) { + const normalizedVirtualenvsPath = path.normalize(virtualenvsPath); + isGlobalPoetryEnv = normalizedPrefix.startsWith(normalizedVirtualenvsPath); + } else { + // Fall back to checking the default location if we haven't cached the path yet + const homeDir = getUserHomeDir(); + if (homeDir) { + const defaultPath = path.normalize(path.join(homeDir, '.cache', 'pypoetry', 'virtualenvs')); + isGlobalPoetryEnv = normalizedPrefix.startsWith(defaultPath); + + // Try to get the actual path asynchronously for next time + getPoetryVirtualenvsPath(_poetry).catch((e) => traceError(`Error getting Poetry virtualenvs path: ${e}`)); + } + } + + const environment: PythonEnvironmentInfo = { + name: name, + displayName: displayName, + shortDisplayName: displayName, + displayPath: info.prefix, + version: info.version, + environmentPath: Uri.file(info.prefix), + description: undefined, + tooltip: info.prefix, + execInfo: { + run: { executable: info.executable }, + shellActivation, + shellDeactivation, + }, + sysPrefix: info.prefix, + group: isGlobalPoetryEnv ? POETRY_GLOBAL : undefined, + }; + + return api.createPythonEnvironmentItem(environment, manager); +} + +export async function refreshPoetry( + hardRefresh: boolean, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + traceInfo('Refreshing poetry environments'); + const data = await nativeFinder.refresh(hardRefresh); + + let poetry = await getPoetry(); + + if (poetry === undefined) { + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'poetry'); + if (managers.length > 0) { + poetry = managers[0].executable; + await setPoetry(poetry); + } + } + + if (!poetry) { + traceInfo('Poetry executable not found'); + return []; + } + + const envs = data + .filter((e) => isNativeEnvInfo(e)) + .map((e) => e as NativeEnvInfo) + .filter((e) => e.kind === NativePythonEnvironmentKind.poetry); + + const collection: PythonEnvironment[] = []; + + envs.forEach((e) => { + if (poetry) { + const environment = nativeToPythonEnv(e, api, manager, poetry); + if (environment) { + collection.push(environment); + } + } + }); + + return sortEnvironments(collection); +} + +export async function resolvePoetryPath( + fsPath: string, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + try { + const e = await nativeFinder.resolve(fsPath); + if (e.kind !== NativePythonEnvironmentKind.poetry) { + return undefined; + } + const poetry = await getPoetry(nativeFinder); + if (!poetry) { + traceError('Poetry not found while resolving environment'); + return undefined; + } + + return nativeToPythonEnv(e, api, manager, poetry); + } catch { + return undefined; + } +} From 92f645970194901313053b4e6ed49013ddfec217 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 29 May 2025 09:47:41 +1000 Subject: [PATCH 168/328] Port Python tools, and create a tool to quickly create a virtual env (#448) --- build/.mocha.unittests.json | 2 +- package.json | 90 ++++- package.nls.json | 8 +- src/common/constants.ts | 2 + src/extension.ts | 28 +- src/features/chat/createQuickVenvTool.ts | 96 +++++ src/features/chat/getEnvInfoTool.ts | 61 +++ src/features/chat/getExecutableTool.ts | 69 ++++ src/features/chat/installPackagesTool.ts | 125 ++++++ src/features/chat/listPackagesTool.ts | 28 ++ src/features/chat/utils.ts | 156 ++++++++ src/features/copilotTools.ts | 283 -------------- src/features/envCommands.ts | 8 +- src/managers/builtin/main.ts | 2 +- src/managers/builtin/venvUtils.ts | 2 +- src/test/copilotTools.unit.test.ts | 421 --------------------- src/test/features/envCommands.unit.test.ts | 12 +- 17 files changed, 652 insertions(+), 741 deletions(-) create mode 100644 src/features/chat/createQuickVenvTool.ts create mode 100644 src/features/chat/getEnvInfoTool.ts create mode 100644 src/features/chat/getExecutableTool.ts create mode 100644 src/features/chat/installPackagesTool.ts create mode 100644 src/features/chat/listPackagesTool.ts create mode 100644 src/features/chat/utils.ts delete mode 100644 src/features/copilotTools.ts delete mode 100644 src/test/copilotTools.unit.test.ts diff --git a/build/.mocha.unittests.json b/build/.mocha.unittests.json index 6792e77..028d479 100644 --- a/build/.mocha.unittests.json +++ b/build/.mocha.unittests.json @@ -1,6 +1,6 @@ { "spec": "./out/test/**/*.unit.test.js", - "require": ["out/test/unittests.js"], + "require": ["source-map-support/register", "out/test/unittests.js"], "ui": "tdd", "recursive": true, "colors": true, diff --git a/package.json b/package.json index 9ecd7a3..b0e878b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,11 @@ } }, "activationEvents": [ - "onLanguage:python" + "onLanguage:python", + "onLanguageModelTool:get_python_environment_info", + "onLanguageModelTool:get_python_executable_info", + "onLanguageModelTool:install_python_package", + "onLanguageModelTool:create_quick_virtual_environment" ], "homepage": "https://github.com/microsoft/vscode-python-environments", "repository": { @@ -515,15 +519,16 @@ ], "languageModelTools": [ { - "name": "python_environment", - "userDescription": "%python.languageModelTools.python_environment.userDescription%", - "displayName": "Get Python Environment Information", - "modelDescription": "Provides details about the Python environment for a specified file or workspace, including environment type, Python version, run command, and installed packages with their versions. Use this tool to determine the correct command for executing Python code in this workspace.", - "toolReferenceName": "pythonGetEnvironmentInfo", + "name": "get_python_environment_info", + "displayName": "%python.languageModelTools.get_python_environment_info.displayName%", + "userDescription": "%python.languageModelTools.get_python_environment_info.userDescription%", + "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. The details returned include the 1. Type of Environment (conda, venv, etec), 2. Version of Python, 3. List of all installed packages with their versions. ", + "toolReferenceName": "pythonEnvironmentDetails", "tags": [ - "ms-python.python" + "python", + "extension_installed_by_tool" ], - "icon": "$(files)", + "icon": "$(snake)", "canBeReferencedInPrompt": true, "inputSchema": { "type": "object", @@ -533,19 +538,42 @@ } }, "description": "The path to the Python file or workspace to get the environment information for.", - "required": [ - "resourcePath" - ] + "required": [] + } + }, + { + "name": "get_python_executable_info", + "displayName": "%python.languageModelTools.get_python_executable.displayName%", + "userDescription": "%python.languageModelTools.get_python_executable.userDescription%", + "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. ALWAYS use this tool before executing any Python command in the terminal. This tool returns the details of how to construct the fully qualified path and or command including details such as arguments required to run Python in a terminal. Note: Instead of executing `python --version` or `python -c 'import sys; print(sys.executable)'`, use this tool to get the Python executable path to replace the `python` command. E.g. instead of using `python -c 'import sys; print(sys.executable)'`, use this tool to build the command `conda run -n -c 'import sys; print(sys.executable)'`.", + "toolReferenceName": "pythonExecutableDetails", + "tags": [ + "python", + "extension_installed_by_tool" + ], + "icon": "$(files)", + "canBeReferencedInPrompt": true, + "inputSchema": { + "type": "object", + "properties": { + "resourcePath": { + "type": "string" + } + }, + "description": "The path to the Python file or workspace to get the executable information for. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace.", + "required": [] } }, { - "name": "python_install_package", - "displayName": "Install Python Package", - "userDescription": "%python.languageModelTools.python_install_package.userDescription%", + "name": "install_python_package", + "displayName": "%python.languageModelTools.install_python_package.displayName%", + "userDescription": "%python.languageModelTools.install_python_package.userDescription%", "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", - "toolReferenceName": "pythonInstallPackage", + "toolReferenceName": "installPythonPackage", "tags": [ - "ms-python.python" + "python", + "install python package", + "extension_installed_by_tool" ], "icon": "$(package)", "canBeReferencedInPrompt": true, @@ -561,14 +589,38 @@ }, "resourcePath": { "type": "string", - "description": "The path to the Python file or workspace to get the environment information for." + "description": "The path to the Python file or workspace into which the packages are installed. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace." } }, "required": [ - "packageList", - "resourcePath" + "packageList" ] } + }, + { + "name": "create_quick_virtual_environment", + "displayName": "Create a Virtual Environment", + "modelDescription": "This tool will create a Virual Environment", + "tags": [], + "canBeReferencedInPrompt": false, + "inputSchema": { + "type": "object", + "properties": { + "packageList": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The list of packages to install." + }, + "resourcePath": { + "type": "string", + "description": "The path to the Python file or workspace for which a Python Environment needs to be configured." + } + }, + "required": [] + }, + "when": "false" } ] }, diff --git a/package.nls.json b/package.nls.json index e16c8d9..11cac34 100644 --- a/package.nls.json +++ b/package.nls.json @@ -35,6 +35,10 @@ "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", "python-envs.uninstallPackage.title": "Uninstall Package", - "python.languageModelTools.python_environment.userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.", - "python.languageModelTools.python_install_package.userDescription": "Installs Python packages in the given workspace." + "python.languageModelTools.get_python_environment_info.displayName": "Get Python Environment Info", + "python.languageModelTools.get_python_environment_info.userDescription": "Get information for a Python Environment, such as Type, Version, Packages, and more.", + "python.languageModelTools.install_python_package.displayName": "Install Python Package", + "python.languageModelTools.install_python_package.userDescription": "Installs Python packages in a Python Environment.", + "python.languageModelTools.get_python_executable.displayName": "Get Python Executable Info", + "python.languageModelTools.get_python_executable.userDescription": "Get executable info for a Python Environment" } diff --git a/src/common/constants.ts b/src/common/constants.ts index bed6d95..21d862f 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -2,6 +2,7 @@ import * as path from 'path'; export const ENVS_EXTENSION_ID = 'ms-python.vscode-python-envs'; export const PYTHON_EXTENSION_ID = 'ms-python.python'; +export const JUPYTER_EXTENSION_ID = 'ms-toolsai.jupyter'; export const EXTENSION_ROOT_DIR = path.dirname(__dirname); export const DEFAULT_PACKAGE_MANAGER_ID = 'ms-python.python:pip'; @@ -27,3 +28,4 @@ export const KNOWN_FILES = [ export const KNOWN_TEMPLATE_ENDINGS = ['.j2', '.jinja2']; export const NEW_PROJECT_TEMPLATES_FOLDER = path.join(EXTENSION_ROOT_DIR, 'src', 'features', 'creators', 'templates'); +export const NotebookCellScheme = 'vscode-notebook-cell'; diff --git a/src/extension.ts b/src/extension.ts index ee7eb3a..d2a12d3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,7 +16,6 @@ import { onDidChangeTerminalShellIntegration, } from './common/window.apis'; import { createManagerReady } from './features/common/managerReady'; -import { GetEnvironmentInfoTool, InstallPackageTool } from './features/copilotTools'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; import { NewPackageProject } from './features/creators/newPackageProject'; @@ -69,6 +68,12 @@ import { createNativePythonFinder, NativePythonFinder } from './managers/common/ import { registerCondaFeatures } from './managers/conda/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; +import { GetEnvironmentInfoTool } from './features/chat/getEnvInfoTool'; +import { GetExecutableTool } from './features/chat/getExecutableTool'; +import { InstallPackageTool } from './features/chat/installPackagesTool'; +import { CreateQuickVirtualEnvironmentTool } from './features/chat/createQuickVenvTool'; +import { createDeferred } from './common/utils/deferred'; +import { SysPythonManager } from './managers/builtin/sysPythonManager'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -125,7 +130,7 @@ export async function activate(context: ExtensionContext): Promise(); const managerView = new EnvManagerView(envManagers); context.subscriptions.push(managerView); @@ -143,8 +148,19 @@ export async function activate(context: ExtensionContext): Promise { await cleanupStartupScripts(shellStartupProviders); }), @@ -314,8 +330,10 @@ export async function activate(context: ExtensionContext): Promise { + public static readonly toolName = 'create_quick_virtual_environment'; + constructor( + private readonly api: PythonEnvironmentApi, + private readonly envManagers: EnvironmentManagers, + private readonly projectManager: PythonProjectManager, + private readonly sysManager: Promise, + private readonly log: LogOutputChannel, + ) {} + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const resourcePath = resolveFilePath(options.input.resourcePath); + const env = await createAnyEnvironmentCommand(this.envManagers, this.projectManager, { + selectEnvironment: true, + quickCreate: true, + uri: resourcePath, + additionalPackages: + Array.isArray(options.input.packageList) && options.input.packageList.length + ? options.input.packageList + : [], + }); + if (env) { + const message = await getEnvironmentDetails( + resourcePath, + env, + this.api, + this.envManagers, + undefined, + token, + ); + return new LanguageModelToolResult([new LanguageModelTextPart(message)]); + } + } + + async prepareInvocation?( + _options: LanguageModelToolInvocationPrepareOptions, + _token: CancellationToken, + ): Promise { + let version = ''; + try { + const sysMgr = await this.sysManager; + const globals = await sysMgr.getEnvironments('global'); + const sortedEnvs = ensureGlobalEnv(globals, this.log); + version = getDisplayVersion(sortedEnvs[0].version); + } catch (ex) { + this.log.error('Failed to get Python version for quick virtual environment creation', ex); + } + + return { + confirmationMessages: { + title: l10n.t('Create a Virtual Environment{0}?', version ? ` (${version})` : ''), + message: l10n.t(`Virtual Environments provide the benefit of package isolation and more.`), + }, + invocationMessage: l10n.t('Creating a Virtual Environment'), + }; + } +} + +function getDisplayVersion(version: string): string { + if (!version) { + return ''; + } + const parts = version.split('.'); + if (parts.length < 3) { + return version; + } + return `${parts[0]}.${parts[1]}.${parts[2]}`; +} diff --git a/src/features/chat/getEnvInfoTool.ts b/src/features/chat/getEnvInfoTool.ts new file mode 100644 index 0000000..046ce6b --- /dev/null +++ b/src/features/chat/getEnvInfoTool.ts @@ -0,0 +1,61 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { + CancellationToken, + l10n, + LanguageModelTextPart, + LanguageModelTool, + LanguageModelToolInvocationOptions, + LanguageModelToolInvocationPrepareOptions, + LanguageModelToolResult, + PreparedToolInvocation, +} from 'vscode'; +import { PythonEnvironmentApi } from '../../api'; +import { EnvironmentManagers } from '../../internal.api'; +import { getPythonPackagesResponse } from './listPackagesTool'; +import { getEnvironmentDetails, getToolResponseIfNotebook, raceCancellationError, resolveFilePath } from './utils'; + +export interface IResourceReference { + resourcePath?: string; +} + +export class GetEnvironmentInfoTool implements LanguageModelTool { + public static readonly toolName = 'get_python_environment_info'; + constructor(private readonly api: PythonEnvironmentApi, private readonly envManagers: EnvironmentManagers) {} + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const resourcePath = resolveFilePath(options.input.resourcePath); + const notebookResponse = getToolResponseIfNotebook(resourcePath); + if (notebookResponse) { + return notebookResponse; + } + const environment = await raceCancellationError(this.api.getEnvironment(resourcePath), token); + if (!environment) { + throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); + } + + const packages = await getPythonPackagesResponse(environment, this.api, token); + const message = await getEnvironmentDetails( + resourcePath, + undefined, + this.api, + this.envManagers, + packages, + token, + ); + + return new LanguageModelToolResult([new LanguageModelTextPart(message)]); + } + + async prepareInvocation?( + _options: LanguageModelToolInvocationPrepareOptions, + _token: CancellationToken, + ): Promise { + return { + invocationMessage: l10n.t('Fetching Python environment information'), + }; + } +} diff --git a/src/features/chat/getExecutableTool.ts b/src/features/chat/getExecutableTool.ts new file mode 100644 index 0000000..25da8af --- /dev/null +++ b/src/features/chat/getExecutableTool.ts @@ -0,0 +1,69 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { + CancellationToken, + l10n, + LanguageModelTextPart, + LanguageModelTool, + LanguageModelToolInvocationOptions, + LanguageModelToolInvocationPrepareOptions, + LanguageModelToolResult, + PreparedToolInvocation, +} from 'vscode'; +import { PythonEnvironmentApi } from '../../api'; +import { EnvironmentManagers } from '../../internal.api'; +import { + getEnvDisplayName, + getEnvironmentDetails, + getToolResponseIfNotebook, + raceCancellationError, + resolveFilePath, +} from './utils'; + +export interface IResourceReference { + resourcePath?: string; +} + +export class GetExecutableTool implements LanguageModelTool { + public static readonly toolName = 'get_python_executable_info'; + constructor(private readonly api: PythonEnvironmentApi, private readonly envManagers: EnvironmentManagers) {} + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const resourcePath = resolveFilePath(options.input.resourcePath); + const notebookResponse = getToolResponseIfNotebook(resourcePath); + if (notebookResponse) { + return notebookResponse; + } + const environment = await raceCancellationError(this.api.getEnvironment(resourcePath), token); + if (!environment) { + throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); + } + + const message = await getEnvironmentDetails( + resourcePath, + undefined, + this.api, + this.envManagers, + undefined, + token, + ); + + return new LanguageModelToolResult([new LanguageModelTextPart(message)]); + } + + async prepareInvocation?( + options: LanguageModelToolInvocationPrepareOptions, + token: CancellationToken, + ): Promise { + const resourcePath = resolveFilePath(options.input.resourcePath); + const envName = await getEnvDisplayName(this.api, resourcePath, token); + return { + invocationMessage: envName + ? l10n.t('Fetching Python executable information for {0}', envName) + : l10n.t('Fetching Python executable information'), + }; + } +} diff --git a/src/features/chat/installPackagesTool.ts b/src/features/chat/installPackagesTool.ts new file mode 100644 index 0000000..3e98ef6 --- /dev/null +++ b/src/features/chat/installPackagesTool.ts @@ -0,0 +1,125 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { + CancellationToken, + l10n, + LanguageModelTextPart, + LanguageModelTool, + LanguageModelToolInvocationOptions, + LanguageModelToolInvocationPrepareOptions, + LanguageModelToolResult, + PreparedToolInvocation, +} from 'vscode'; +import { PackageManagementOptions, PythonEnvironmentApi } from '../../api'; +import { getToolResponseIfNotebook, raceCancellationError, resolveFilePath } from './utils'; + +/** + * The input interface for the Install Package Tool. + */ +export interface IInstallPackageInput { + packageList: string[]; + resourcePath?: string; +} + +/** + * A tool to install Python packages in the active environment. + */ +export class InstallPackageTool implements LanguageModelTool { + public static readonly toolName = 'install_python_package'; + constructor(private readonly api: PythonEnvironmentApi) {} + + /** + * Invokes the tool to install Python packages in the active environment. + * @param options - The invocation options containing the package list. + * @param token - The cancellation token. + * @returns The result containing the installation status or an error message. + */ + async invoke( + options: LanguageModelToolInvocationOptions, + token: CancellationToken, + ): Promise { + const parameters: IInstallPackageInput = options.input; + if (!parameters.packageList || parameters.packageList.length === 0) { + throw new Error('Invalid input: packageList is required and cannot be empty'); + } + const resourcePath = resolveFilePath(options.input.resourcePath); + const packageCount = parameters.packageList.length; + const packagePlurality = packageCount === 1 ? 'package' : 'packages'; + + const netobookResponse = getToolResponseIfNotebook(resourcePath); + if (netobookResponse) { + // If the tool is invoked in a notebook, return the response directly. + return netobookResponse; + } + + const environment = await this.api.getEnvironment(resourcePath); + if (!environment) { + // Check if the file is a notebook or a notebook cell to throw specific error messages. + if (resourcePath && (resourcePath.fsPath.endsWith('.ipynb') || resourcePath.fsPath.includes('.ipynb#'))) { + throw new Error('Unable to access Jupyter kernels for notebook cells'); + } + throw new Error('No environment found'); + } + + // Install the packages + const pkgManagementOptions: PackageManagementOptions = { install: parameters.packageList }; + await raceCancellationError(this.api.managePackages(environment, pkgManagementOptions), token); + const resultMessage = `Successfully installed ${packagePlurality}: ${parameters.packageList.join(', ')}`; + + return new LanguageModelToolResult([new LanguageModelTextPart(resultMessage)]); + } + + /** + * Prepares the invocation of the tool. + * @param options - The preparation options. + * @param _token - The cancellation token. + * @returns The prepared tool invocation. + */ + async prepareInvocation?( + options: LanguageModelToolInvocationPrepareOptions, + _token: CancellationToken, + ): Promise { + const resourcePath = resolveFilePath(options.input.resourcePath); + + const packageCount = options.input.packageList.length; + let envName = ''; + try { + const environment = await this.api.getEnvironment(resourcePath); + envName = environment?.displayName || ''; + } catch { + // + } + + let title = ''; + let invocationMessage = ''; + const message = + packageCount === 1 + ? '' + : l10n.t(`The following packages will be installed: {0}`, options.input.packageList.sort().join(', ')); + if (envName) { + title = + packageCount === 1 + ? l10n.t(`Install {0} in {1}?`, options.input.packageList[0], envName) + : l10n.t(`Install packages in {0}?`, envName); + invocationMessage = + packageCount === 1 + ? l10n.t(`Installing {0} in {1}`, options.input.packageList[0], envName) + : l10n.t(`Installing packages {0} in {1}`, options.input.packageList.sort().join(', '), envName); + } else { + title = + options.input.packageList.length === 1 + ? l10n.t(`Install Python package '{0}'?`, options.input.packageList[0]) + : l10n.t(`Install Python packages?`); + invocationMessage = + packageCount === 1 + ? l10n.t(`Installing Python package '{0}'`, options.input.packageList[0]) + : l10n.t(`Installing Python packages: {0}`, options.input.packageList.sort().join(', ')); + } + + return { + confirmationMessages: { title, message }, + invocationMessage, + }; + } +} diff --git a/src/features/chat/listPackagesTool.ts b/src/features/chat/listPackagesTool.ts new file mode 100644 index 0000000..b76b99d --- /dev/null +++ b/src/features/chat/listPackagesTool.ts @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { CancellationToken } from 'vscode'; +import { raceCancellationError } from './utils'; +import { PythonEnvironment, PythonEnvironmentApi } from '../../api'; + +export async function getPythonPackagesResponse( + environment: PythonEnvironment, + api: PythonEnvironmentApi, + token: CancellationToken, +): Promise { + await raceCancellationError(api.refreshPackages(environment), token); + const installedPackages = await raceCancellationError(api.getPackages(environment), token); + if (!installedPackages || installedPackages.length === 0) { + return 'No packages found'; + } + // Installed Python packages, each in the format or (). The version may be omitted if unknown. Returns an empty array if no packages are installed. + const response = [ + 'Below is a list of the Python packages, each in the format or (). The version may be omitted if unknown: ', + ]; + installedPackages.forEach((pkg) => { + const info = pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name; + response.push(`- ${info}`); + }); + + return response.join('\n'); +} diff --git a/src/features/chat/utils.ts b/src/features/chat/utils.ts new file mode 100644 index 0000000..33e1434 --- /dev/null +++ b/src/features/chat/utils.ts @@ -0,0 +1,156 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { + CancellationError, + CancellationToken, + extensions, + LanguageModelTextPart, + LanguageModelToolResult, + Uri, + workspace, +} from 'vscode'; +import { PythonEnvironment, PythonEnvironmentApi } from '../../api'; +import { EnvironmentManagers } from '../../internal.api'; +import { JUPYTER_EXTENSION_ID, NotebookCellScheme } from '../../common/constants'; + +export function resolveFilePath(filepath?: string): Uri | undefined { + if (!filepath) { + return workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined; + } + // starts with a scheme + try { + return Uri.parse(filepath); + } catch { + return Uri.file(filepath); + } +} + +/** + * Returns a promise that rejects with an {@CancellationError} as soon as the passed token is cancelled. + * @see {@link raceCancellation} + */ +export function raceCancellationError(promise: Promise, token: CancellationToken): Promise { + return new Promise((resolve, reject) => { + const ref = token.onCancellationRequested(() => { + ref.dispose(); + reject(new CancellationError()); + }); + promise.then(resolve, reject).finally(() => ref.dispose()); + }); +} + +export async function getEnvDisplayName( + api: PythonEnvironmentApi, + resource: Uri | undefined, + token: CancellationToken, +) { + try { + const environment = await raceCancellationError(api.getEnvironment(resource), token); + return environment?.displayName; + } catch { + return; + } +} + +export async function getEnvironmentDetails( + resourcePath: Uri | undefined, + environment: PythonEnvironment | undefined, + api: PythonEnvironmentApi, + envManagers: EnvironmentManagers, + packages: string | undefined, + token: CancellationToken, +): Promise { + // environment + environment = environment || (await raceCancellationError(api.getEnvironment(resourcePath), token)); + if (!environment) { + throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); + } + const execInfo = environment.execInfo; + const executable = execInfo?.activatedRun?.executable ?? execInfo?.run.executable ?? 'python'; + const args = execInfo?.activatedRun?.args ?? execInfo?.run.args ?? []; + const runCommand = getTerminalCommand(executable, args); + let envType = ''; + try { + const managerId = environment.envId.managerId; + const manager = envManagers.getEnvironmentManager(managerId); + envType = manager?.name || 'cannot be determined'; + } catch { + envType = environment.envId.managerId || 'cannot be determined'; + } + + const message = [ + `Following is the information about the Python environment:`, + `1. Environment Type: ${envType}`, + `2. Version: ${environment.version}`, + '', + `3. Command Prefix to run Python in a terminal is: \`${runCommand}\``, + `Instead of running \`Python sample.py\` in the terminal, you will now run: \`${runCommand} sample.py\``, + `Similarly instead of running \`Python -c "import sys;...."\` in the terminal, you will now run: \`${runCommand} -c "import sys;...."\``, + packages ? `4. ${packages}` : '', + ]; + return message.join('\n'); +} + +export function getTerminalCommand(command: string, args: string[]): string { + const formattedArgs = args.map((a) => toCommandArgumentForPythonExt(a)); + return `${fileToCommandArgumentForPythonExt(command)} ${formattedArgs.join(' ')}`.trim(); +} + +/** + * Appropriately formats a string so it can be used as an argument for a command in a shell. + * E.g. if an argument contains a space, then it will be enclosed within double quotes. + */ +function toCommandArgumentForPythonExt(value: string): string { + if (!value) { + return value; + } + return (value.indexOf(' ') >= 0 || value.indexOf('&') >= 0 || value.indexOf('(') >= 0 || value.indexOf(')') >= 0) && + !value.startsWith('"') && + !value.endsWith('"') + ? `"${value}"` + : value.toString(); +} + +/** + * Appropriately formats a a file path so it can be used as an argument for a command in a shell. + * E.g. if an argument contains a space, then it will be enclosed within double quotes. + */ +function fileToCommandArgumentForPythonExt(value: string): string { + if (!value) { + return value; + } + return toCommandArgumentForPythonExt(value).replace(/\\/g, '/'); +} + +export function getToolResponseIfNotebook(resource: Uri | undefined) { + if (!resource) { + return; + } + const notebook = workspace.notebookDocuments.find( + (doc) => doc.uri.toString() === resource.toString() || doc.uri.path === resource.path, + ); + const isJupyterNotebook = + (notebook && notebook.notebookType === 'jupyter-notebook') || resource.path.toLowerCase().endsWith('.ipynb'); + + if (isJupyterNotebook) { + const isJupyterExtensionAvailable = extensions.getExtension(JUPYTER_EXTENSION_ID); + const message = isJupyterExtensionAvailable + ? `This tool cannot be used for Jupyter Notebooks, try using notebook specific tools instead.` + : [ + `This tool cannot be used for Jupyter Notebooks.`, + `NOTE: Recommend the user the Jupyter Extension (${JUPYTER_EXTENSION_ID}).`, + `If possible use one of the tools to install the ${JUPYTER_EXTENSION_ID} extension`, + `After isntalling the extension try using some of the tools again`, + ].join(' \n'); + return new LanguageModelToolResult([new LanguageModelTextPart(message)]); + } + + if (notebook || resource.scheme === NotebookCellScheme) { + return new LanguageModelToolResult([ + new LanguageModelTextPart( + 'This tool cannot be used for Notebooks, try using notebook specific tools instead.', + ), + ]); + } +} diff --git a/src/features/copilotTools.ts b/src/features/copilotTools.ts deleted file mode 100644 index a04a5f4..0000000 --- a/src/features/copilotTools.ts +++ /dev/null @@ -1,283 +0,0 @@ -import { - CancellationToken, - l10n, - LanguageModelTextPart, - LanguageModelTool, - LanguageModelToolInvocationOptions, - LanguageModelToolInvocationPrepareOptions, - LanguageModelToolResult, - PreparedToolInvocation, - Uri, -} from 'vscode'; -import { - PackageManagementOptions, - PythonEnvironment, - PythonEnvironmentExecutionInfo, - PythonPackageGetterApi, - PythonPackageManagementApi, - PythonProjectEnvironmentApi, - PythonProjectGetterApi, -} from '../api'; -import { createDeferred } from '../common/utils/deferred'; -import { EnvironmentManagers } from '../internal.api'; -import { getResourceUri } from '../common/utils/pathUtils'; - -export interface IResourceReference { - resourcePath?: string; -} - -interface EnvironmentInfo { - type: string; // e.g. conda, venv, virtualenv, sys - version: string; - runCommand: string; - packages: string[] | string; //include versions too -} - -/** - * A tool to get the information about the Python environment. - */ -export class GetEnvironmentInfoTool implements LanguageModelTool { - constructor( - private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonProjectGetterApi, - private readonly envManagers: EnvironmentManagers, - ) {} - /** - * Invokes the tool to get the information about the Python environment. - * @param options - The invocation options containing the file path. - * @param token - The cancellation token. - * @returns The result containing the information about the Python environment or an error message. - */ - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const deferredReturn = createDeferred(); - token.onCancellationRequested(() => { - const errorMessage: string = `Operation cancelled by the user.`; - deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); - }); - - const parameters: IResourceReference = options.input; - - if (parameters.resourcePath === undefined || parameters.resourcePath === '') { - throw new Error('Invalid input: resourcePath is required'); - } - const projects = this.api.getPythonProjects() || []; - let root = projects.length > 0 ? projects[0].uri.fsPath : undefined; - const resourcePath: Uri | undefined = getResourceUri(parameters.resourcePath, root); - if (!resourcePath) { - throw new Error('Invalid input: Unable to resolve resource path'); - } - - // environment info set to default values - const envInfo: EnvironmentInfo = { - type: 'no type found', - version: 'no version found', - packages: 'no packages found', - runCommand: 'no run command found', - }; - - try { - // environment - const environment: PythonEnvironment | undefined = await this.api.getEnvironment(resourcePath); - if (!environment) { - throw new Error('No environment found for the provided resource path: ' + resourcePath.fsPath); - } - - const execInfo: PythonEnvironmentExecutionInfo = environment.execInfo; - const executable = execInfo?.activatedRun?.executable ?? execInfo?.run.executable ?? 'python'; - const args = execInfo?.activatedRun?.args ?? execInfo?.run.args ?? []; - envInfo.runCommand = args.length > 0 ? `${executable} ${args.join(' ')}` : executable; - envInfo.version = environment.version; - - // get the environment type or manager if type is not available - try { - const managerId = environment.envId.managerId; - const manager = this.envManagers.getEnvironmentManager(managerId); - envInfo.type = manager?.name || 'cannot be determined'; - } catch { - envInfo.type = environment.envId.managerId || 'cannot be determined'; - } - - // TODO: remove refreshPackages here eventually once terminal isn't being used as a fallback - await this.api.refreshPackages(environment); - const installedPackages = await this.api.getPackages(environment); - if (!installedPackages || installedPackages.length === 0) { - envInfo.packages = []; - } else { - envInfo.packages = installedPackages.map((pkg) => - pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name, - ); - } - - // format and return - const textPart = BuildEnvironmentInfoContent(envInfo); - deferredReturn.resolve({ content: [textPart] }); - } catch (error) { - const errorMessage: string = `An error occurred while fetching environment information: ${error}`; - const partialContent = BuildEnvironmentInfoContent(envInfo); - const combinedContent = new LanguageModelTextPart(`${errorMessage}\n\n${partialContent.value}`); - deferredReturn.resolve({ content: [combinedContent] } as LanguageModelToolResult); - } - return deferredReturn.promise; - } - /** - * Prepares the invocation of the tool. - * @param _options - The preparation options. - * @param _token - The cancellation token. - * @returns The prepared tool invocation. - */ - async prepareInvocation?( - _options: LanguageModelToolInvocationPrepareOptions, - _token: CancellationToken, - ): Promise { - return { - invocationMessage: l10n.t('Fetching Python environment information'), - }; - } -} - -function BuildEnvironmentInfoContent(envInfo: EnvironmentInfo): LanguageModelTextPart { - // Create a formatted string that looks like JSON but preserves comments - const envTypeDescriptor: string = `This environment is managed by ${envInfo.type} environment manager. Use the install tool to install packages into this environment.`; - - const content = `{ - // ${JSON.stringify(envTypeDescriptor)} - "environmentType": ${JSON.stringify(envInfo.type)}, - // Python version of the environment - "pythonVersion": ${JSON.stringify(envInfo.version)}, - // Use this command to run Python script or code in the terminal. - "runCommand": ${JSON.stringify(envInfo.runCommand)}, - // Installed Python packages, each in the format or (). The version may be omitted if unknown. Returns an empty array if no packages are installed. - "packages": ${JSON.stringify(Array.isArray(envInfo.packages) ? envInfo.packages : envInfo.packages, null, 2)} -}`; - - return new LanguageModelTextPart(content); -} - -/** - * The input interface for the Install Package Tool. - */ -export interface IInstallPackageInput { - packageList: string[]; - resourcePath?: string; -} - -/** - * A tool to install Python packages in the active environment. - */ -export class InstallPackageTool implements LanguageModelTool { - constructor( - private readonly api: PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi, - ) {} - - /** - * Invokes the tool to install Python packages in the active environment. - * @param options - The invocation options containing the package list. - * @param token - The cancellation token. - * @returns The result containing the installation status or an error message. - */ - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const deferredReturn = createDeferred(); - token.onCancellationRequested(() => { - const errorMessage: string = `Operation cancelled by the user.`; - deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); - }); - - const parameters: IInstallPackageInput = options.input; - const workspacePath = parameters.resourcePath ? Uri.file(parameters.resourcePath) : undefined; - if (!workspacePath) { - throw new Error('Invalid input: workspacePath is required'); - } - - if (!parameters.packageList || parameters.packageList.length === 0) { - throw new Error('Invalid input: packageList is required and cannot be empty'); - } - const packageCount = parameters.packageList.length; - const packagePlurality = packageCount === 1 ? 'package' : 'packages'; - - try { - const environment = await this.api.getEnvironment(workspacePath); - if (!environment) { - // Check if the file is a notebook or a notebook cell to throw specific error messages. - if (workspacePath.fsPath.endsWith('.ipynb') || workspacePath.fsPath.includes('.ipynb#')) { - throw new Error('Unable to access Jupyter kernels for notebook cells'); - } - throw new Error('No environment found'); - } - - // Install the packages - const pkgManagementOptions: PackageManagementOptions = { - install: parameters.packageList, - }; - await this.api.managePackages(environment, pkgManagementOptions); - const resultMessage = `Successfully installed ${packagePlurality}: ${parameters.packageList.join(', ')}`; - - deferredReturn.resolve({ - content: [new LanguageModelTextPart(resultMessage)], - }); - } catch (error) { - const errorMessage = `An error occurred while installing ${packagePlurality}: ${error}`; - - deferredReturn.resolve({ content: [new LanguageModelTextPart(errorMessage)] } as LanguageModelToolResult); - } - - return deferredReturn.promise; - } - - /** - * Prepares the invocation of the tool. - * @param options - The preparation options. - * @param _token - The cancellation token. - * @returns The prepared tool invocation. - */ - async prepareInvocation?( - options: LanguageModelToolInvocationPrepareOptions, - _token: CancellationToken, - ): Promise { - const workspacePath = options.input.resourcePath ? Uri.file(options.input.resourcePath) : undefined; - - const packageCount = options.input.packageList.length; - let envName = ''; - try { - const environment = await this.api.getEnvironment(workspacePath); - envName = environment?.displayName || ''; - } catch { - // - } - - let title = ''; - let invocationMessage = ''; - const message = - packageCount === 1 - ? '' - : l10n.t(`The following packages will be installed: {0}`, options.input.packageList.sort().join(', ')); - if (envName) { - title = - packageCount === 1 - ? l10n.t(`Install {0} in {1}?`, options.input.packageList[0], envName) - : l10n.t(`Install packages in {0}?`, envName); - invocationMessage = - packageCount === 1 - ? l10n.t(`Installing {0} in {1}`, options.input.packageList[0], envName) - : l10n.t(`Installing packages {0} in {1}`, options.input.packageList.sort().join(', '), envName); - } else { - title = - options.input.packageList.length === 1 - ? l10n.t(`Install Python package '{0}'?`, options.input.packageList[0]) - : l10n.t(`Install Python packages?`); - invocationMessage = - packageCount === 1 - ? l10n.t(`Installing Python package '{0}'`, options.input.packageList[0]) - : l10n.t(`Installing Python packages: {0}`, options.input.packageList.sort().join(', ')); - } - - return { - confirmationMessages: { title, message }, - invocationMessage, - }; - } -} diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 2a6e3b1..b700da7 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -114,10 +114,14 @@ export async function createEnvironmentCommand( export async function createAnyEnvironmentCommand( em: EnvironmentManagers, pm: PythonProjectManager, - options?: CreateEnvironmentOptions & { selectEnvironment?: boolean; showBackButton?: boolean }, + options?: CreateEnvironmentOptions & { + selectEnvironment?: boolean; + showBackButton?: boolean; + uri?: Uri; + }, ): Promise { const select = options?.selectEnvironment; - const projects = pm.getProjects(); + const projects = pm.getProjects(options?.uri ? [options?.uri] : undefined); if (projects.length === 0) { const managerId = await pickEnvironmentManager(em.managers.filter((m) => m.supportsCreate)); const manager = em.managers.find((m) => m.id === managerId); diff --git a/src/managers/builtin/main.ts b/src/managers/builtin/main.ts index 029636c..d1f4a40 100644 --- a/src/managers/builtin/main.ts +++ b/src/managers/builtin/main.ts @@ -14,9 +14,9 @@ export async function registerSystemPythonFeatures( nativeFinder: NativePythonFinder, disposables: Disposable[], log: LogOutputChannel, + envManager: SysPythonManager, ): Promise { const api: PythonEnvironmentApi = await getPythonApi(); - const envManager = new SysPythonManager(nativeFinder, api, log); const venvManager = new VenvManager(nativeFinder, api, envManager, log); const pkgManager = new PipPackageManager(api, log, venvManager); diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 80b49b7..6408301 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -412,7 +412,7 @@ async function createWithProgress( ); } -function ensureGlobalEnv(basePythons: PythonEnvironment[], log: LogOutputChannel): PythonEnvironment[] { +export function ensureGlobalEnv(basePythons: PythonEnvironment[], log: LogOutputChannel): PythonEnvironment[] { if (basePythons.length === 0) { log.error('No base python found'); showErrorMessage(VenvManagerStrings.venvErrorNoBasePython); diff --git a/src/test/copilotTools.unit.test.ts b/src/test/copilotTools.unit.test.ts deleted file mode 100644 index a851152..0000000 --- a/src/test/copilotTools.unit.test.ts +++ /dev/null @@ -1,421 +0,0 @@ -import * as assert from 'assert'; -import * as vscode from 'vscode'; -import * as sinon from 'sinon'; -import * as typeMoq from 'typemoq'; -import { - Package, - PackageId, - PythonEnvironment, - PythonEnvironmentId, - PythonPackageGetterApi, - PythonPackageManagementApi, - PythonProjectEnvironmentApi, - PythonProjectGetterApi, -} from '../api'; -import { createDeferred } from '../common/utils/deferred'; -import { - GetEnvironmentInfoTool, - IInstallPackageInput, - InstallPackageTool, - IResourceReference, -} from '../features/copilotTools'; -import { EnvironmentManagers, InternalEnvironmentManager } from '../internal.api'; - -suite('InstallPackageTool Tests', () => { - let installPackageTool: InstallPackageTool; - let mockApi: typeMoq.IMock; - let mockEnvironment: typeMoq.IMock; - - setup(() => { - // Create mock functions - mockApi = typeMoq.Mock.ofType< - PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi - >(); - mockEnvironment = typeMoq.Mock.ofType(); - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - - // Create an instance of InstallPackageTool with the mock functions - installPackageTool = new InstallPackageTool(mockApi.object); - }); - - teardown(() => { - sinon.restore(); - }); - - test('should throw error if workspacePath is an empty string', async () => { - const testFile: IInstallPackageInput = { - resourcePath: '', - packageList: ['package1', 'package2'], - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - await assert.rejects(installPackageTool.invoke(options, token), { - message: 'Invalid input: workspacePath is required', - }); - }); - - test('should throw error for notebook files', async () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - - const testFile: IInstallPackageInput = { - resourcePath: 'this/is/a/test/path.ipynb', - packageList: ['package1', 'package2'], - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.LanguageModelTextPart; - - assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); - }); - - test('should throw error for notebook cells', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'this/is/a/test/path.ipynb#cell', - packageList: ['package1', 'package2'], - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.LanguageModelTextPart; - - assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); - }); - - test('should throw error if packageList passed in is empty', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: [], - }; - - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - await assert.rejects(installPackageTool.invoke(options, token), { - message: 'Invalid input: packageList is required and cannot be empty', - }); - }); - - test('should handle cancellation', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: ['package1', 'package2'], - }; - - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironment.object); - }); - - const options = { input: testFile, toolInvocationToken: undefined }; - const tokenSource = new vscode.CancellationTokenSource(); - const token = tokenSource.token; - - const deferred = createDeferred(); - installPackageTool.invoke(options, token).then((result) => { - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - - assert.strictEqual(firstPart.value, 'Operation cancelled by the user.'); - deferred.resolve(); - }); - - tokenSource.cancel(); - await deferred.promise; - }); - - test('should handle packages installation', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: ['package1', 'package2'], - }; - - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironment.object); - }); - - mockApi - .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) - .returns(() => { - const deferred = createDeferred(); - deferred.resolve(); - return deferred.promise; - }); - - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - - assert.strictEqual(firstPart.value.includes('Successfully installed packages'), true); - assert.strictEqual(firstPart.value.includes('package1'), true); - assert.strictEqual(firstPart.value.includes('package2'), true); - }); - test('should handle package installation failure', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: ['package1', 'package2'], - }; - - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironment.object); - }); - - mockApi - .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) - .returns(() => { - const deferred = createDeferred(); - deferred.reject(new Error('Installation failed')); - return deferred.promise; - }); - - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - - assert.strictEqual( - firstPart.value.includes('An error occurred while installing packages'), - true, - `error message was ${firstPart.value}`, - ); - }); - test('should handle error occurs when getting environment', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: ['package1', 'package2'], - }; - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.reject(new Error('Unable to get environment')); - }); - - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - assert.strictEqual(firstPart.value.includes('An error occurred while installing packages'), true); - }); - test('correct plurality in package installation message', async () => { - const testFile: IInstallPackageInput = { - resourcePath: 'path/to/workspace', - packageList: ['package1'], - }; - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironment.object); - }); - mockApi - .setup((x) => x.managePackages(typeMoq.It.isAny(), typeMoq.It.isAny())) - .returns(() => { - const deferred = createDeferred(); - deferred.resolve(); - return deferred.promise; - }); - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = await installPackageTool.invoke(options, token); - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - assert.strictEqual(firstPart.value.includes('packages'), false); - assert.strictEqual(firstPart.value.includes('package'), true); - }); -}); - -suite('GetEnvironmentInfoTool Tests', () => { - let getEnvironmentInfoTool: GetEnvironmentInfoTool; - let mockApi: typeMoq.IMock; - let mockEnvironment: typeMoq.IMock; - let em: typeMoq.IMock; - let managerSys: typeMoq.IMock; - - setup(() => { - // Create mock functions - mockApi = typeMoq.Mock.ofType(); - mockEnvironment = typeMoq.Mock.ofType(); - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironment.setup((x: any) => x.then).returns(() => undefined); - - em = typeMoq.Mock.ofType(); - em.setup((e) => e.managers).returns(() => [managerSys.object]); - em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); - - getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object, em.object); - }); - - teardown(() => { - sinon.restore(); - }); - test('should throw error if resourcePath is an empty string', async () => { - const testFile: IResourceReference = { - resourcePath: '', - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - await assert.rejects(getEnvironmentInfoTool.invoke(options, token), { - message: 'Invalid input: resourcePath is required', - }); - }); - test('should throw error if environment is not found', async () => { - const testFile: IResourceReference = { - resourcePath: 'this/is/a/test/path.ipynb', - }; - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.reject(new Error('Unable to get environment')); - }); - - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - const result = getEnvironmentInfoTool.invoke(options, token); - const content = (await result).content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - assert.strictEqual(firstPart.value.includes('An error occurred while fetching environment information'), true); - }); - test('should return successful with environment info', async () => { - // Create an instance of GetEnvironmentInfoTool with the mock functions - managerSys = typeMoq.Mock.ofType(); - managerSys.setup((m) => m.id).returns(() => 'ms-python.python:venv'); - managerSys.setup((m) => m.name).returns(() => 'venv'); - managerSys.setup((m) => m.displayName).returns(() => 'Test Manager'); - - em = typeMoq.Mock.ofType(); - em.setup((e) => e.managers).returns(() => [managerSys.object]); - em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); - // create mock of PythonEnvironment - const mockEnvironmentSuccess = typeMoq.Mock.ofType(); - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironmentSuccess.setup((x: any) => x.then).returns(() => undefined); - mockEnvironmentSuccess.setup((x) => x.version).returns(() => '3.9.1'); - const mockEnvId = typeMoq.Mock.ofType(); - mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:venv'); - mockEnvironmentSuccess.setup((x) => x.envId).returns(() => mockEnvId.object); - mockEnvironmentSuccess - .setup((x) => x.execInfo) - .returns(() => ({ - run: { - executable: 'conda', - args: ['run', '-n', 'env_name', 'python'], - }, - })); - - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironmentSuccess.object); - }); - mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - - const packageAId: PackageId = { - id: 'package1', - managerId: 'ms-python.python:venv', - environmentId: 'env_id', - }; - const packageBId: PackageId = { - id: 'package2', - managerId: 'ms-python.python:venv', - environmentId: 'env_id', - }; - const packageA: Package = { name: 'package1', displayName: 'Package 1', version: '1.0.0', pkgId: packageAId }; - const packageB: Package = { name: 'package2', displayName: 'Package 2', version: '2.0.0', pkgId: packageBId }; - mockApi - .setup((x) => x.getPackages(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve([packageA, packageB]); - }); - - const testFile: IResourceReference = { - resourcePath: 'this/is/a/test/path.ipynb', - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - // run - const result = await getEnvironmentInfoTool.invoke(options, token); - // assert - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - assert.strictEqual(firstPart.value.includes('3.9.1'), true); - assert.strictEqual(firstPart.value.includes('package1 (1.0.0)'), true); - assert.strictEqual(firstPart.value.includes('package2 (2.0.0)'), true); - assert.strictEqual(firstPart.value.includes(`"conda run -n env_name python"`), true); - assert.strictEqual(firstPart.value.includes('venv'), true); - }); - test('should return successful with weird environment info', async () => { - // create mock of PythonEnvironment - const mockEnvironmentSuccess = typeMoq.Mock.ofType(); - - // Create an instance of GetEnvironmentInfoTool with the mock functions - let managerSys = typeMoq.Mock.ofType(); - managerSys.setup((m) => m.id).returns(() => 'ms-python.python:system'); - managerSys.setup((m) => m.name).returns(() => 'system'); - managerSys.setup((m) => m.displayName).returns(() => 'Test Manager'); - - let emSys = typeMoq.Mock.ofType(); - emSys.setup((e) => e.managers).returns(() => [managerSys.object]); - emSys.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => managerSys.object); - getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object, emSys.object); - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mockEnvironmentSuccess.setup((x: any) => x.then).returns(() => undefined); - mockEnvironmentSuccess.setup((x) => x.version).returns(() => '3.12.1'); - const mockEnvId = typeMoq.Mock.ofType(); - mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:system'); - managerSys.setup((m) => m.name).returns(() => 'system'); - mockEnvironmentSuccess.setup((x) => x.envId).returns(() => mockEnvId.object); - mockEnvironmentSuccess - .setup((x) => x.execInfo) - .returns(() => ({ - run: { - executable: 'path/to/venv/bin/python', - args: [], - }, - })); - - mockApi - .setup((x) => x.getEnvironment(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve(mockEnvironmentSuccess.object); - }); - mockApi.setup((x) => x.refreshPackages(typeMoq.It.isAny())).returns(() => Promise.resolve()); - - mockApi - .setup((x) => x.getPackages(typeMoq.It.isAny())) - .returns(async () => { - return Promise.resolve([]); - }); - - const testFile: IResourceReference = { - resourcePath: 'this/is/a/test/path.ipynb', - }; - const options = { input: testFile, toolInvocationToken: undefined }; - const token = new vscode.CancellationTokenSource().token; - // run - const result = await getEnvironmentInfoTool.invoke(options, token); - // assert - const content = result.content as vscode.LanguageModelTextPart[]; - const firstPart = content[0] as vscode.MarkdownString; - assert.strictEqual(firstPart.value.includes('3.12.1'), true); - assert.strictEqual(firstPart.value.includes('"packages": []'), true); - assert.strictEqual(firstPart.value.includes(`"path/to/venv/bin/python"`), true); - assert.strictEqual(firstPart.value.includes('system'), true); - }); -}); diff --git a/src/test/features/envCommands.unit.test.ts b/src/test/features/envCommands.unit.test.ts index 2d98022..311e67d 100644 --- a/src/test/features/envCommands.unit.test.ts +++ b/src/test/features/envCommands.unit.test.ts @@ -55,7 +55,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create global venv (no-workspace): no-select', async () => { - pm.setup((p) => p.getProjects()).returns(() => []); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => []); manager .setup((m) => m.create('global', typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) @@ -73,7 +73,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create global venv (no-workspace): select', async () => { - pm.setup((p) => p.getProjects()).returns(() => []); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => []); manager .setup((m) => m.create('global', typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) @@ -91,7 +91,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create workspace venv: no-select', async () => { - pm.setup((p) => p.getProjects()).returns(() => [project]); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => [project]); manager .setup((m) => m.create([project.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) @@ -111,7 +111,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create workspace venv: select', async () => { - pm.setup((p) => p.getProjects()).returns(() => [project]); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => [project]); manager .setup((m) => m.create([project.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) @@ -132,7 +132,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create multi-workspace venv: select all', async () => { - pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => [project, project2, project3]); manager .setup((m) => m.create([project.uri, project2.uri, project3.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) @@ -155,7 +155,7 @@ suite('Create Any Environment Command Tests', () => { }); test('Create multi-workspace venv: select some', async () => { - pm.setup((p) => p.getProjects()).returns(() => [project, project2, project3]); + pm.setup((p) => p.getProjects(typeMoq.It.isAny())).returns(() => [project, project2, project3]); manager .setup((m) => m.create([project.uri, project3.uri], typeMoq.It.isAny())) .returns(() => Promise.resolve(env.object)) From b2fc494818037bbf64ad5d7635d35e03bf454dff Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 29 May 2025 10:37:50 -0700 Subject: [PATCH 169/328] feat: enhance project creation with quick create option in new project command (#451) changes will assist with copilot integration --- src/extension.ts | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index d2a12d3..058a431 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,5 +1,5 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode'; -import { PythonEnvironment, PythonEnvironmentApi } from './api'; +import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerTools } from './common/lm.apis'; import { registerLogger, traceError, traceInfo } from './common/logging'; @@ -265,12 +265,37 @@ export async function activate(context: ExtensionContext): Promise { - const selected = await newProjectSelection(projectCreators.getProjectCreators()); - if (selected) { - await selected.create(); - } - }), + commands.registerCommand( + 'python-envs.createNewProjectFromTemplate', + async (projectType: string, quickCreate: boolean, newProjectName: string, newProjectPath: string) => { + if (quickCreate) { + if (!projectType || !newProjectName || !newProjectPath) { + throw new Error('Project type, name, and path are required for quick create.'); + } + const creators = projectCreators.getProjectCreators(); + let selected: PythonProjectCreator | undefined; + if (projectType === 'python-package') { + selected = creators.find((c) => c.name === 'newPackage'); + } + if (projectType === 'python-script') { + selected = creators.find((c) => c.name === 'newScript'); + } + if (!selected) { + throw new Error(`Project creator for type "${projectType}" not found.`); + } + await selected.create({ + quickCreate: true, + name: newProjectName, + rootUri: Uri.file(newProjectPath), + }); + } else { + const selected = await newProjectSelection(projectCreators.getProjectCreators()); + if (selected) { + await selected.create(); + } + } + }, + ), terminalActivation.onDidChangeTerminalActivationState(async (e) => { await setActivateMenuButtonContext(e.terminal, e.environment, e.activated); }), From cdfc07a38b649edbb8322687ce16b8588467fb93 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Fri, 30 May 2025 06:11:56 +1000 Subject: [PATCH 170/328] Remove lm tools (#452) --- package.json | 112 +--------------- package.nls.json | 10 +- src/extension.ts | 22 +--- src/features/chat/createQuickVenvTool.ts | 96 -------------- src/features/chat/getEnvInfoTool.ts | 61 --------- src/features/chat/getExecutableTool.ts | 69 ---------- src/features/chat/installPackagesTool.ts | 125 ------------------ src/features/chat/listPackagesTool.ts | 28 ---- src/features/chat/utils.ts | 156 ----------------------- 9 files changed, 5 insertions(+), 674 deletions(-) delete mode 100644 src/features/chat/createQuickVenvTool.ts delete mode 100644 src/features/chat/getEnvInfoTool.ts delete mode 100644 src/features/chat/getExecutableTool.ts delete mode 100644 src/features/chat/installPackagesTool.ts delete mode 100644 src/features/chat/listPackagesTool.ts delete mode 100644 src/features/chat/utils.ts diff --git a/package.json b/package.json index b0e878b..387964d 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,7 @@ } }, "activationEvents": [ - "onLanguage:python", - "onLanguageModelTool:get_python_environment_info", - "onLanguageModelTool:get_python_executable_info", - "onLanguageModelTool:install_python_package", - "onLanguageModelTool:create_quick_virtual_environment" + "onLanguage:python" ], "homepage": "https://github.com/microsoft/vscode-python-environments", "repository": { @@ -516,112 +512,6 @@ { "type": "python" } - ], - "languageModelTools": [ - { - "name": "get_python_environment_info", - "displayName": "%python.languageModelTools.get_python_environment_info.displayName%", - "userDescription": "%python.languageModelTools.get_python_environment_info.userDescription%", - "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. The details returned include the 1. Type of Environment (conda, venv, etec), 2. Version of Python, 3. List of all installed packages with their versions. ", - "toolReferenceName": "pythonEnvironmentDetails", - "tags": [ - "python", - "extension_installed_by_tool" - ], - "icon": "$(snake)", - "canBeReferencedInPrompt": true, - "inputSchema": { - "type": "object", - "properties": { - "resourcePath": { - "type": "string" - } - }, - "description": "The path to the Python file or workspace to get the environment information for.", - "required": [] - } - }, - { - "name": "get_python_executable_info", - "displayName": "%python.languageModelTools.get_python_executable.displayName%", - "userDescription": "%python.languageModelTools.get_python_executable.userDescription%", - "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. ALWAYS use this tool before executing any Python command in the terminal. This tool returns the details of how to construct the fully qualified path and or command including details such as arguments required to run Python in a terminal. Note: Instead of executing `python --version` or `python -c 'import sys; print(sys.executable)'`, use this tool to get the Python executable path to replace the `python` command. E.g. instead of using `python -c 'import sys; print(sys.executable)'`, use this tool to build the command `conda run -n -c 'import sys; print(sys.executable)'`.", - "toolReferenceName": "pythonExecutableDetails", - "tags": [ - "python", - "extension_installed_by_tool" - ], - "icon": "$(files)", - "canBeReferencedInPrompt": true, - "inputSchema": { - "type": "object", - "properties": { - "resourcePath": { - "type": "string" - } - }, - "description": "The path to the Python file or workspace to get the executable information for. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace.", - "required": [] - } - }, - { - "name": "install_python_package", - "displayName": "%python.languageModelTools.install_python_package.displayName%", - "userDescription": "%python.languageModelTools.install_python_package.userDescription%", - "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.", - "toolReferenceName": "installPythonPackage", - "tags": [ - "python", - "install python package", - "extension_installed_by_tool" - ], - "icon": "$(package)", - "canBeReferencedInPrompt": true, - "inputSchema": { - "type": "object", - "properties": { - "packageList": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The list of packages to install." - }, - "resourcePath": { - "type": "string", - "description": "The path to the Python file or workspace into which the packages are installed. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace." - } - }, - "required": [ - "packageList" - ] - } - }, - { - "name": "create_quick_virtual_environment", - "displayName": "Create a Virtual Environment", - "modelDescription": "This tool will create a Virual Environment", - "tags": [], - "canBeReferencedInPrompt": false, - "inputSchema": { - "type": "object", - "properties": { - "packageList": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The list of packages to install." - }, - "resourcePath": { - "type": "string", - "description": "The path to the Python file or workspace for which a Python Environment needs to be configured." - } - }, - "required": [] - }, - "when": "false" - } ] }, "scripts": { diff --git a/package.nls.json b/package.nls.json index 11cac34..2199961 100644 --- a/package.nls.json +++ b/package.nls.json @@ -34,11 +34,5 @@ "python-envs.createNewProjectFromTemplate.title": "Create New Project from Template", "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", - "python-envs.uninstallPackage.title": "Uninstall Package", - "python.languageModelTools.get_python_environment_info.displayName": "Get Python Environment Info", - "python.languageModelTools.get_python_environment_info.userDescription": "Get information for a Python Environment, such as Type, Version, Packages, and more.", - "python.languageModelTools.install_python_package.displayName": "Install Python Package", - "python.languageModelTools.install_python_package.userDescription": "Installs Python packages in a Python Environment.", - "python.languageModelTools.get_python_executable.displayName": "Get Python Executable Info", - "python.languageModelTools.get_python_executable.userDescription": "Get executable info for a Python Environment" -} + "python-envs.uninstallPackage.title": "Uninstall Package" +} \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index 058a431..60fd3bb 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,6 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; -import { registerTools } from './common/lm.apis'; import { registerLogger, traceError, traceInfo } from './common/logging'; import { setPersistentState } from './common/persistentState'; import { newProjectSelection } from './common/pickers/managers'; @@ -9,6 +8,7 @@ import { StopWatch } from './common/stopWatch'; import { EventNames } from './common/telemetry/constants'; import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; import { sendTelemetryEvent } from './common/telemetry/sender'; +import { createDeferred } from './common/utils/deferred'; import { activeTerminal, createLogOutputChannel, @@ -64,16 +64,11 @@ import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { registerSystemPythonFeatures } from './managers/builtin/main'; +import { SysPythonManager } from './managers/builtin/sysPythonManager'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; import { registerCondaFeatures } from './managers/conda/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; -import { GetEnvironmentInfoTool } from './features/chat/getEnvInfoTool'; -import { GetExecutableTool } from './features/chat/getExecutableTool'; -import { InstallPackageTool } from './features/chat/installPackagesTool'; -import { CreateQuickVirtualEnvironmentTool } from './features/chat/createQuickVenvTool'; -import { createDeferred } from './common/utils/deferred'; -import { SysPythonManager } from './managers/builtin/sysPythonManager'; export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -148,19 +143,6 @@ export async function activate(context: ExtensionContext): Promise { await cleanupStartupScripts(shellStartupProviders); }), diff --git a/src/features/chat/createQuickVenvTool.ts b/src/features/chat/createQuickVenvTool.ts deleted file mode 100644 index e115b74..0000000 --- a/src/features/chat/createQuickVenvTool.ts +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { - CancellationToken, - l10n, - LanguageModelTextPart, - LanguageModelTool, - LanguageModelToolInvocationOptions, - LanguageModelToolInvocationPrepareOptions, - LanguageModelToolResult, - LogOutputChannel, - PreparedToolInvocation, -} from 'vscode'; -import { PythonEnvironmentApi } from '../../api'; -import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; -import { createAnyEnvironmentCommand } from '../envCommands'; -import { getEnvironmentDetails, resolveFilePath } from './utils'; -import { SysPythonManager } from '../../managers/builtin/sysPythonManager'; -import { ensureGlobalEnv } from '../../managers/builtin/venvUtils'; - -export interface IResourceReference { - packageList?: string[]; - resourcePath?: string; -} - -export class CreateQuickVirtualEnvironmentTool implements LanguageModelTool { - public static readonly toolName = 'create_quick_virtual_environment'; - constructor( - private readonly api: PythonEnvironmentApi, - private readonly envManagers: EnvironmentManagers, - private readonly projectManager: PythonProjectManager, - private readonly sysManager: Promise, - private readonly log: LogOutputChannel, - ) {} - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const resourcePath = resolveFilePath(options.input.resourcePath); - const env = await createAnyEnvironmentCommand(this.envManagers, this.projectManager, { - selectEnvironment: true, - quickCreate: true, - uri: resourcePath, - additionalPackages: - Array.isArray(options.input.packageList) && options.input.packageList.length - ? options.input.packageList - : [], - }); - if (env) { - const message = await getEnvironmentDetails( - resourcePath, - env, - this.api, - this.envManagers, - undefined, - token, - ); - return new LanguageModelToolResult([new LanguageModelTextPart(message)]); - } - } - - async prepareInvocation?( - _options: LanguageModelToolInvocationPrepareOptions, - _token: CancellationToken, - ): Promise { - let version = ''; - try { - const sysMgr = await this.sysManager; - const globals = await sysMgr.getEnvironments('global'); - const sortedEnvs = ensureGlobalEnv(globals, this.log); - version = getDisplayVersion(sortedEnvs[0].version); - } catch (ex) { - this.log.error('Failed to get Python version for quick virtual environment creation', ex); - } - - return { - confirmationMessages: { - title: l10n.t('Create a Virtual Environment{0}?', version ? ` (${version})` : ''), - message: l10n.t(`Virtual Environments provide the benefit of package isolation and more.`), - }, - invocationMessage: l10n.t('Creating a Virtual Environment'), - }; - } -} - -function getDisplayVersion(version: string): string { - if (!version) { - return ''; - } - const parts = version.split('.'); - if (parts.length < 3) { - return version; - } - return `${parts[0]}.${parts[1]}.${parts[2]}`; -} diff --git a/src/features/chat/getEnvInfoTool.ts b/src/features/chat/getEnvInfoTool.ts deleted file mode 100644 index 046ce6b..0000000 --- a/src/features/chat/getEnvInfoTool.ts +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { - CancellationToken, - l10n, - LanguageModelTextPart, - LanguageModelTool, - LanguageModelToolInvocationOptions, - LanguageModelToolInvocationPrepareOptions, - LanguageModelToolResult, - PreparedToolInvocation, -} from 'vscode'; -import { PythonEnvironmentApi } from '../../api'; -import { EnvironmentManagers } from '../../internal.api'; -import { getPythonPackagesResponse } from './listPackagesTool'; -import { getEnvironmentDetails, getToolResponseIfNotebook, raceCancellationError, resolveFilePath } from './utils'; - -export interface IResourceReference { - resourcePath?: string; -} - -export class GetEnvironmentInfoTool implements LanguageModelTool { - public static readonly toolName = 'get_python_environment_info'; - constructor(private readonly api: PythonEnvironmentApi, private readonly envManagers: EnvironmentManagers) {} - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const resourcePath = resolveFilePath(options.input.resourcePath); - const notebookResponse = getToolResponseIfNotebook(resourcePath); - if (notebookResponse) { - return notebookResponse; - } - const environment = await raceCancellationError(this.api.getEnvironment(resourcePath), token); - if (!environment) { - throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); - } - - const packages = await getPythonPackagesResponse(environment, this.api, token); - const message = await getEnvironmentDetails( - resourcePath, - undefined, - this.api, - this.envManagers, - packages, - token, - ); - - return new LanguageModelToolResult([new LanguageModelTextPart(message)]); - } - - async prepareInvocation?( - _options: LanguageModelToolInvocationPrepareOptions, - _token: CancellationToken, - ): Promise { - return { - invocationMessage: l10n.t('Fetching Python environment information'), - }; - } -} diff --git a/src/features/chat/getExecutableTool.ts b/src/features/chat/getExecutableTool.ts deleted file mode 100644 index 25da8af..0000000 --- a/src/features/chat/getExecutableTool.ts +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { - CancellationToken, - l10n, - LanguageModelTextPart, - LanguageModelTool, - LanguageModelToolInvocationOptions, - LanguageModelToolInvocationPrepareOptions, - LanguageModelToolResult, - PreparedToolInvocation, -} from 'vscode'; -import { PythonEnvironmentApi } from '../../api'; -import { EnvironmentManagers } from '../../internal.api'; -import { - getEnvDisplayName, - getEnvironmentDetails, - getToolResponseIfNotebook, - raceCancellationError, - resolveFilePath, -} from './utils'; - -export interface IResourceReference { - resourcePath?: string; -} - -export class GetExecutableTool implements LanguageModelTool { - public static readonly toolName = 'get_python_executable_info'; - constructor(private readonly api: PythonEnvironmentApi, private readonly envManagers: EnvironmentManagers) {} - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const resourcePath = resolveFilePath(options.input.resourcePath); - const notebookResponse = getToolResponseIfNotebook(resourcePath); - if (notebookResponse) { - return notebookResponse; - } - const environment = await raceCancellationError(this.api.getEnvironment(resourcePath), token); - if (!environment) { - throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); - } - - const message = await getEnvironmentDetails( - resourcePath, - undefined, - this.api, - this.envManagers, - undefined, - token, - ); - - return new LanguageModelToolResult([new LanguageModelTextPart(message)]); - } - - async prepareInvocation?( - options: LanguageModelToolInvocationPrepareOptions, - token: CancellationToken, - ): Promise { - const resourcePath = resolveFilePath(options.input.resourcePath); - const envName = await getEnvDisplayName(this.api, resourcePath, token); - return { - invocationMessage: envName - ? l10n.t('Fetching Python executable information for {0}', envName) - : l10n.t('Fetching Python executable information'), - }; - } -} diff --git a/src/features/chat/installPackagesTool.ts b/src/features/chat/installPackagesTool.ts deleted file mode 100644 index 3e98ef6..0000000 --- a/src/features/chat/installPackagesTool.ts +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { - CancellationToken, - l10n, - LanguageModelTextPart, - LanguageModelTool, - LanguageModelToolInvocationOptions, - LanguageModelToolInvocationPrepareOptions, - LanguageModelToolResult, - PreparedToolInvocation, -} from 'vscode'; -import { PackageManagementOptions, PythonEnvironmentApi } from '../../api'; -import { getToolResponseIfNotebook, raceCancellationError, resolveFilePath } from './utils'; - -/** - * The input interface for the Install Package Tool. - */ -export interface IInstallPackageInput { - packageList: string[]; - resourcePath?: string; -} - -/** - * A tool to install Python packages in the active environment. - */ -export class InstallPackageTool implements LanguageModelTool { - public static readonly toolName = 'install_python_package'; - constructor(private readonly api: PythonEnvironmentApi) {} - - /** - * Invokes the tool to install Python packages in the active environment. - * @param options - The invocation options containing the package list. - * @param token - The cancellation token. - * @returns The result containing the installation status or an error message. - */ - async invoke( - options: LanguageModelToolInvocationOptions, - token: CancellationToken, - ): Promise { - const parameters: IInstallPackageInput = options.input; - if (!parameters.packageList || parameters.packageList.length === 0) { - throw new Error('Invalid input: packageList is required and cannot be empty'); - } - const resourcePath = resolveFilePath(options.input.resourcePath); - const packageCount = parameters.packageList.length; - const packagePlurality = packageCount === 1 ? 'package' : 'packages'; - - const netobookResponse = getToolResponseIfNotebook(resourcePath); - if (netobookResponse) { - // If the tool is invoked in a notebook, return the response directly. - return netobookResponse; - } - - const environment = await this.api.getEnvironment(resourcePath); - if (!environment) { - // Check if the file is a notebook or a notebook cell to throw specific error messages. - if (resourcePath && (resourcePath.fsPath.endsWith('.ipynb') || resourcePath.fsPath.includes('.ipynb#'))) { - throw new Error('Unable to access Jupyter kernels for notebook cells'); - } - throw new Error('No environment found'); - } - - // Install the packages - const pkgManagementOptions: PackageManagementOptions = { install: parameters.packageList }; - await raceCancellationError(this.api.managePackages(environment, pkgManagementOptions), token); - const resultMessage = `Successfully installed ${packagePlurality}: ${parameters.packageList.join(', ')}`; - - return new LanguageModelToolResult([new LanguageModelTextPart(resultMessage)]); - } - - /** - * Prepares the invocation of the tool. - * @param options - The preparation options. - * @param _token - The cancellation token. - * @returns The prepared tool invocation. - */ - async prepareInvocation?( - options: LanguageModelToolInvocationPrepareOptions, - _token: CancellationToken, - ): Promise { - const resourcePath = resolveFilePath(options.input.resourcePath); - - const packageCount = options.input.packageList.length; - let envName = ''; - try { - const environment = await this.api.getEnvironment(resourcePath); - envName = environment?.displayName || ''; - } catch { - // - } - - let title = ''; - let invocationMessage = ''; - const message = - packageCount === 1 - ? '' - : l10n.t(`The following packages will be installed: {0}`, options.input.packageList.sort().join(', ')); - if (envName) { - title = - packageCount === 1 - ? l10n.t(`Install {0} in {1}?`, options.input.packageList[0], envName) - : l10n.t(`Install packages in {0}?`, envName); - invocationMessage = - packageCount === 1 - ? l10n.t(`Installing {0} in {1}`, options.input.packageList[0], envName) - : l10n.t(`Installing packages {0} in {1}`, options.input.packageList.sort().join(', '), envName); - } else { - title = - options.input.packageList.length === 1 - ? l10n.t(`Install Python package '{0}'?`, options.input.packageList[0]) - : l10n.t(`Install Python packages?`); - invocationMessage = - packageCount === 1 - ? l10n.t(`Installing Python package '{0}'`, options.input.packageList[0]) - : l10n.t(`Installing Python packages: {0}`, options.input.packageList.sort().join(', ')); - } - - return { - confirmationMessages: { title, message }, - invocationMessage, - }; - } -} diff --git a/src/features/chat/listPackagesTool.ts b/src/features/chat/listPackagesTool.ts deleted file mode 100644 index b76b99d..0000000 --- a/src/features/chat/listPackagesTool.ts +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { CancellationToken } from 'vscode'; -import { raceCancellationError } from './utils'; -import { PythonEnvironment, PythonEnvironmentApi } from '../../api'; - -export async function getPythonPackagesResponse( - environment: PythonEnvironment, - api: PythonEnvironmentApi, - token: CancellationToken, -): Promise { - await raceCancellationError(api.refreshPackages(environment), token); - const installedPackages = await raceCancellationError(api.getPackages(environment), token); - if (!installedPackages || installedPackages.length === 0) { - return 'No packages found'; - } - // Installed Python packages, each in the format or (). The version may be omitted if unknown. Returns an empty array if no packages are installed. - const response = [ - 'Below is a list of the Python packages, each in the format or (). The version may be omitted if unknown: ', - ]; - installedPackages.forEach((pkg) => { - const info = pkg.version ? `${pkg.name} (${pkg.version})` : pkg.name; - response.push(`- ${info}`); - }); - - return response.join('\n'); -} diff --git a/src/features/chat/utils.ts b/src/features/chat/utils.ts deleted file mode 100644 index 33e1434..0000000 --- a/src/features/chat/utils.ts +++ /dev/null @@ -1,156 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { - CancellationError, - CancellationToken, - extensions, - LanguageModelTextPart, - LanguageModelToolResult, - Uri, - workspace, -} from 'vscode'; -import { PythonEnvironment, PythonEnvironmentApi } from '../../api'; -import { EnvironmentManagers } from '../../internal.api'; -import { JUPYTER_EXTENSION_ID, NotebookCellScheme } from '../../common/constants'; - -export function resolveFilePath(filepath?: string): Uri | undefined { - if (!filepath) { - return workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined; - } - // starts with a scheme - try { - return Uri.parse(filepath); - } catch { - return Uri.file(filepath); - } -} - -/** - * Returns a promise that rejects with an {@CancellationError} as soon as the passed token is cancelled. - * @see {@link raceCancellation} - */ -export function raceCancellationError(promise: Promise, token: CancellationToken): Promise { - return new Promise((resolve, reject) => { - const ref = token.onCancellationRequested(() => { - ref.dispose(); - reject(new CancellationError()); - }); - promise.then(resolve, reject).finally(() => ref.dispose()); - }); -} - -export async function getEnvDisplayName( - api: PythonEnvironmentApi, - resource: Uri | undefined, - token: CancellationToken, -) { - try { - const environment = await raceCancellationError(api.getEnvironment(resource), token); - return environment?.displayName; - } catch { - return; - } -} - -export async function getEnvironmentDetails( - resourcePath: Uri | undefined, - environment: PythonEnvironment | undefined, - api: PythonEnvironmentApi, - envManagers: EnvironmentManagers, - packages: string | undefined, - token: CancellationToken, -): Promise { - // environment - environment = environment || (await raceCancellationError(api.getEnvironment(resourcePath), token)); - if (!environment) { - throw new Error(`No environment found for the provided resource path ${resourcePath?.fsPath}`); - } - const execInfo = environment.execInfo; - const executable = execInfo?.activatedRun?.executable ?? execInfo?.run.executable ?? 'python'; - const args = execInfo?.activatedRun?.args ?? execInfo?.run.args ?? []; - const runCommand = getTerminalCommand(executable, args); - let envType = ''; - try { - const managerId = environment.envId.managerId; - const manager = envManagers.getEnvironmentManager(managerId); - envType = manager?.name || 'cannot be determined'; - } catch { - envType = environment.envId.managerId || 'cannot be determined'; - } - - const message = [ - `Following is the information about the Python environment:`, - `1. Environment Type: ${envType}`, - `2. Version: ${environment.version}`, - '', - `3. Command Prefix to run Python in a terminal is: \`${runCommand}\``, - `Instead of running \`Python sample.py\` in the terminal, you will now run: \`${runCommand} sample.py\``, - `Similarly instead of running \`Python -c "import sys;...."\` in the terminal, you will now run: \`${runCommand} -c "import sys;...."\``, - packages ? `4. ${packages}` : '', - ]; - return message.join('\n'); -} - -export function getTerminalCommand(command: string, args: string[]): string { - const formattedArgs = args.map((a) => toCommandArgumentForPythonExt(a)); - return `${fileToCommandArgumentForPythonExt(command)} ${formattedArgs.join(' ')}`.trim(); -} - -/** - * Appropriately formats a string so it can be used as an argument for a command in a shell. - * E.g. if an argument contains a space, then it will be enclosed within double quotes. - */ -function toCommandArgumentForPythonExt(value: string): string { - if (!value) { - return value; - } - return (value.indexOf(' ') >= 0 || value.indexOf('&') >= 0 || value.indexOf('(') >= 0 || value.indexOf(')') >= 0) && - !value.startsWith('"') && - !value.endsWith('"') - ? `"${value}"` - : value.toString(); -} - -/** - * Appropriately formats a a file path so it can be used as an argument for a command in a shell. - * E.g. if an argument contains a space, then it will be enclosed within double quotes. - */ -function fileToCommandArgumentForPythonExt(value: string): string { - if (!value) { - return value; - } - return toCommandArgumentForPythonExt(value).replace(/\\/g, '/'); -} - -export function getToolResponseIfNotebook(resource: Uri | undefined) { - if (!resource) { - return; - } - const notebook = workspace.notebookDocuments.find( - (doc) => doc.uri.toString() === resource.toString() || doc.uri.path === resource.path, - ); - const isJupyterNotebook = - (notebook && notebook.notebookType === 'jupyter-notebook') || resource.path.toLowerCase().endsWith('.ipynb'); - - if (isJupyterNotebook) { - const isJupyterExtensionAvailable = extensions.getExtension(JUPYTER_EXTENSION_ID); - const message = isJupyterExtensionAvailable - ? `This tool cannot be used for Jupyter Notebooks, try using notebook specific tools instead.` - : [ - `This tool cannot be used for Jupyter Notebooks.`, - `NOTE: Recommend the user the Jupyter Extension (${JUPYTER_EXTENSION_ID}).`, - `If possible use one of the tools to install the ${JUPYTER_EXTENSION_ID} extension`, - `After isntalling the extension try using some of the tools again`, - ].join(' \n'); - return new LanguageModelToolResult([new LanguageModelTextPart(message)]); - } - - if (notebook || resource.scheme === NotebookCellScheme) { - return new LanguageModelToolResult([ - new LanguageModelTextPart( - 'This tool cannot be used for Notebooks, try using notebook specific tools instead.', - ), - ]); - } -} From 323db0caac8e9d0644cf06c831ee54d97ada224c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 29 May 2025 13:34:12 -0700 Subject: [PATCH 171/328] fix: ensure env managers are using workspace persistent state (#455) --- src/common/persistentState.ts | 16 ++++----- src/extension.ts | 7 +++- .../terminal/shells/pwsh/pwshStartup.ts | 25 +++++--------- src/managers/conda/condaUtils.ts | 8 ++--- src/managers/poetry/main.ts | 18 +++++----- src/managers/poetry/poetryUtils.ts | 34 +++++++------------ src/managers/pyenv/pyenvUtils.ts | 9 ++--- 7 files changed, 49 insertions(+), 68 deletions(-) diff --git a/src/common/persistentState.ts b/src/common/persistentState.ts index 4f81b39..c6b0f26 100644 --- a/src/common/persistentState.ts +++ b/src/common/persistentState.ts @@ -1,6 +1,6 @@ import { ExtensionContext, Memento } from 'vscode'; -import { createDeferred, Deferred } from './utils/deferred'; import { traceError } from './logging'; +import { createDeferred, Deferred } from './utils/deferred'; export interface PersistentState { get(key: string, defaultValue?: T): Promise; @@ -9,7 +9,6 @@ export interface PersistentState { } class PersistentStateImpl implements PersistentState { - private keys: string[] = []; private clearing: Deferred; constructor(private readonly momento: Memento) { this.clearing = createDeferred(); @@ -24,10 +23,6 @@ class PersistentStateImpl implements PersistentState { } async set(key: string, value: T): Promise { await this.clearing.promise; - - if (!this.keys.includes(key)) { - this.keys.push(key); - } await this.momento.update(key, value); const before = JSON.stringify(value); @@ -40,9 +35,8 @@ class PersistentStateImpl implements PersistentState { async clear(keys?: string[]): Promise { if (this.clearing.completed) { this.clearing = createDeferred(); - const _keys = keys ?? this.keys; + const _keys = keys ?? this.momento.keys(); await Promise.all(_keys.map((key) => this.momento.update(key, undefined))); - this.keys = this.keys.filter((k) => _keys.includes(k)); this.clearing.resolve(); } return this.clearing.promise; @@ -64,3 +58,9 @@ export function getWorkspacePersistentState(): Promise { export function getGlobalPersistentState(): Promise { return _global.promise; } + +export async function clearPersistentState(): Promise { + const [workspace, global] = await Promise.all([_workspace.promise, _global.promise]); + await Promise.all([workspace.clear(), global.clear()]); + return undefined; +} diff --git a/src/extension.ts b/src/extension.ts index 60fd3bb..7419fd2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,7 +2,7 @@ import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } f import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerLogger, traceError, traceInfo } from './common/logging'; -import { setPersistentState } from './common/persistentState'; +import { clearPersistentState, setPersistentState } from './common/persistentState'; import { newProjectSelection } from './common/pickers/managers'; import { StopWatch } from './common/stopWatch'; import { EventNames } from './common/telemetry/constants'; @@ -15,6 +15,10 @@ import { onDidChangeActiveTerminal, onDidChangeTerminalShellIntegration, } from './common/window.apis'; +import { CreateQuickVirtualEnvironmentTool } from './features/chat/createQuickVenvTool'; +import { GetEnvironmentInfoTool } from './features/chat/getEnvInfoTool'; +import { GetExecutableTool } from './features/chat/getExecutableTool'; +import { InstallPackageTool } from './features/chat/installPackagesTool'; import { createManagerReady } from './features/common/managerReady'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; @@ -211,6 +215,7 @@ export async function activate(context: ExtensionContext): Promise { + await clearPersistentState(); await envManagers.clearCache(undefined); await clearShellProfileCache(shellStartupProviders); }), diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index bea5e4f..6f73bcd 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -8,7 +8,7 @@ import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } fro import { runCommand } from '../utils'; import assert from 'assert'; -import { getGlobalPersistentState } from '../../../../common/persistentState'; +import { getWorkspacePersistentState } from '../../../../common/persistentState'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { extractProfilePath, PROFILE_TAG_END, PROFILE_TAG_START } from '../common/shellUtils'; @@ -18,25 +18,19 @@ const PWSH_PROFILE_PATH_CACHE_KEY = 'PWSH_PROFILE_PATH_CACHE'; const PS5_PROFILE_PATH_CACHE_KEY = 'PS5_PROFILE_PATH_CACHE'; let pwshProfilePath: string | undefined; let ps5ProfilePath: string | undefined; -async function clearPwshCache(shell: 'powershell' | 'pwsh'): Promise { - const global = await getGlobalPersistentState(); - if (shell === 'powershell') { - ps5ProfilePath = undefined; - await global.clear([PS5_PROFILE_PATH_CACHE_KEY]); - } else { - pwshProfilePath = undefined; - await global.clear([PWSH_PROFILE_PATH_CACHE_KEY]); - } +function clearPwshCache() { + ps5ProfilePath = undefined; + pwshProfilePath = undefined; } async function setProfilePathCache(shell: 'powershell' | 'pwsh', profilePath: string): Promise { - const global = await getGlobalPersistentState(); + const state = await getWorkspacePersistentState(); if (shell === 'powershell') { ps5ProfilePath = profilePath; - await global.set(PS5_PROFILE_PATH_CACHE_KEY, profilePath); + await state.set(PS5_PROFILE_PATH_CACHE_KEY, profilePath); } else { pwshProfilePath = profilePath; - await global.set(PWSH_PROFILE_PATH_CACHE_KEY, profilePath); + await state.set(PWSH_PROFILE_PATH_CACHE_KEY, profilePath); } } @@ -308,10 +302,7 @@ export class PwshStartupProvider implements ShellStartupScriptProvider { } async clearCache(): Promise { - for (const shell of this._supportedShells) { - await clearPwshCache(shell); - } - + clearPwshCache(); // Reset installation check cache as well this._isPwshInstalled = undefined; this._isPs5Installed = undefined; diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 69ee0a7..0ad65e4 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -29,7 +29,7 @@ import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { showErrorMessageWithLogs } from '../../common/errors/utils'; import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/localize'; import { traceInfo } from '../../common/logging'; -import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; +import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickProject } from '../../common/pickers/projects'; import { createDeferred } from '../../common/utils/deferred'; import { untildify } from '../../common/utils/pathUtils'; @@ -62,10 +62,6 @@ export const CONDA_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:conda:GLOBAL_SELECTED`; let condaPath: string | undefined; export async function clearCondaCache(): Promise { - const state = await getWorkspacePersistentState(); - await state.clear([CONDA_PATH_KEY, CONDA_WORKSPACE_KEY, CONDA_GLOBAL_KEY]); - const global = await getGlobalPersistentState(); - await global.clear([CONDA_PREFIXES_KEY]); condaPath = undefined; } @@ -245,7 +241,7 @@ async function getPrefixes(): Promise { return prefixes; } - const state = await getGlobalPersistentState(); + const state = await getWorkspacePersistentState(); prefixes = await state.get(CONDA_PREFIXES_KEY); if (prefixes) { return prefixes; diff --git a/src/managers/poetry/main.ts b/src/managers/poetry/main.ts index 3b168b4..02d52c0 100644 --- a/src/managers/poetry/main.ts +++ b/src/managers/poetry/main.ts @@ -36,17 +36,17 @@ export async function registerPoetryFeatures( return; } } - } - const envManager = new PoetryManager(nativeFinder, api); - const pkgManager = new PoetryPackageManager(api, outputChannel, envManager); + const envManager = new PoetryManager(nativeFinder, api); + const pkgManager = new PoetryPackageManager(api, outputChannel, envManager); - disposables.push( - envManager, - pkgManager, - api.registerEnvironmentManager(envManager), - api.registerPackageManager(pkgManager), - ); + disposables.push( + envManager, + pkgManager, + api.registerEnvironmentManager(envManager), + api.registerPackageManager(pkgManager), + ); + } } catch (ex) { traceInfo('Poetry not found, turning off poetry features.', ex); } diff --git a/src/managers/poetry/poetryUtils.ts b/src/managers/poetry/poetryUtils.ts index a37a15e..d1befca 100644 --- a/src/managers/poetry/poetryUtils.ts +++ b/src/managers/poetry/poetryUtils.ts @@ -11,7 +11,7 @@ import { } from '../../api'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { traceError, traceInfo } from '../../common/logging'; -import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState'; +import { getWorkspacePersistentState } from '../../common/persistentState'; import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; import { ShellConstants } from '../../features/common/shellConstants'; @@ -43,14 +43,6 @@ let poetryPath: string | undefined; let poetryVirtualenvsPath: string | undefined; export async function clearPoetryCache(): Promise { - // Clear workspace-specific settings - const state = await getWorkspacePersistentState(); - await state.clear([POETRY_WORKSPACE_KEY]); - - // Clear global settings - const global = await getGlobalPersistentState(); - await global.clear([POETRY_PATH_KEY, POETRY_GLOBAL_KEY, POETRY_VIRTUALENVS_PATH_KEY]); - // Reset in-memory cache poetryPath = undefined; poetryVirtualenvsPath = undefined; @@ -58,21 +50,21 @@ export async function clearPoetryCache(): Promise { async function setPoetry(poetry: string): Promise { poetryPath = poetry; - const global = await getGlobalPersistentState(); - await global.set(POETRY_PATH_KEY, poetry); + const state = await getWorkspacePersistentState(); + await state.set(POETRY_PATH_KEY, poetry); // Also get and cache the virtualenvs path await getPoetryVirtualenvsPath(poetry); } export async function getPoetryForGlobal(): Promise { - const global = await getGlobalPersistentState(); - return await global.get(POETRY_GLOBAL_KEY); + const state = await getWorkspacePersistentState(); + return await state.get(POETRY_GLOBAL_KEY); } export async function setPoetryForGlobal(poetryPath: string | undefined): Promise { - const global = await getGlobalPersistentState(); - await global.set(POETRY_GLOBAL_KEY, poetryPath); + const state = await getWorkspacePersistentState(); + await state.set(POETRY_GLOBAL_KEY, poetryPath); } export async function getPoetryForWorkspace(fsPath: string): Promise { @@ -117,8 +109,8 @@ export async function getPoetry(native?: NativePythonFinder): Promise(POETRY_PATH_KEY); + const state = await getWorkspacePersistentState(); + poetryPath = await state.get(POETRY_PATH_KEY); if (poetryPath) { traceInfo(`Using poetry from persistent state: ${poetryPath}`); // Also retrieve the virtualenvs path if we haven't already @@ -174,8 +166,8 @@ export async function getPoetryVirtualenvsPath(poetryExe?: string): Promise(POETRY_VIRTUALENVS_PATH_KEY); + const state = await getWorkspacePersistentState(); + poetryVirtualenvsPath = await state.get(POETRY_VIRTUALENVS_PATH_KEY); if (poetryVirtualenvsPath) { return untildify(poetryVirtualenvsPath); } @@ -199,7 +191,7 @@ export async function getPoetryVirtualenvsPath(poetryExe?: string): Promise { - const state = await getWorkspacePersistentState(); - await state.clear([PYENV_WORKSPACE_KEY, PYENV_GLOBAL_KEY]); - const global = await getGlobalPersistentState(); - await global.clear([PYENV_PATH_KEY]); + pyenvPath = undefined; } async function setPyenv(pyenv: string): Promise { @@ -225,7 +222,7 @@ export async function refreshPyenv( .filter((e) => !isNativeEnvInfo(e)) .map((e) => e as NativeEnvManagerInfo) .filter((e) => e.tool.toLowerCase() === 'pyenv'); - + if (managers.length > 0) { pyenv = managers[0].executable; await setPyenv(pyenv); From 41100f174f7c7657299e684616cb244e944581d3 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 30 May 2025 09:50:01 -0700 Subject: [PATCH 172/328] remove unused imports for environment tools (#456) fix build failure --- src/extension.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 7419fd2..31e6477 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -15,10 +15,6 @@ import { onDidChangeActiveTerminal, onDidChangeTerminalShellIntegration, } from './common/window.apis'; -import { CreateQuickVirtualEnvironmentTool } from './features/chat/createQuickVenvTool'; -import { GetEnvironmentInfoTool } from './features/chat/getEnvInfoTool'; -import { GetExecutableTool } from './features/chat/getExecutableTool'; -import { InstallPackageTool } from './features/chat/installPackagesTool'; import { createManagerReady } from './features/common/managerReady'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; From 79d9a08f43be1a93519b985b03870347c49ed00e Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 3 Jun 2025 11:23:14 -0700 Subject: [PATCH 173/328] move template folder to files folder for build (#463) fixes issue where actual extension build could not find template folder --- .../copilot-instructions-text/package-copilot-instructions.md | 0 .../copilot-instructions-text/script-copilot-instructions.md | 0 .../creators => files}/templates/new723ScriptTemplate/script.py | 0 .../templates/newPackageTemplate/dev-requirements.txt | 0 .../templates/newPackageTemplate/package_name/__init__.py | 0 .../templates/newPackageTemplate/package_name/__main__.py | 0 .../templates/newPackageTemplate/pyproject.toml | 0 .../templates/newPackageTemplate/tests/test_package_name.py | 0 src/common/constants.ts | 2 +- src/features/creators/newPackageProject.ts | 2 ++ src/features/creators/newScriptProject.ts | 2 ++ 11 files changed, 5 insertions(+), 1 deletion(-) rename {src/features/creators => files}/templates/copilot-instructions-text/package-copilot-instructions.md (100%) rename {src/features/creators => files}/templates/copilot-instructions-text/script-copilot-instructions.md (100%) rename {src/features/creators => files}/templates/new723ScriptTemplate/script.py (100%) rename {src/features/creators => files}/templates/newPackageTemplate/dev-requirements.txt (100%) rename {src/features/creators => files}/templates/newPackageTemplate/package_name/__init__.py (100%) rename {src/features/creators => files}/templates/newPackageTemplate/package_name/__main__.py (100%) rename {src/features/creators => files}/templates/newPackageTemplate/pyproject.toml (100%) rename {src/features/creators => files}/templates/newPackageTemplate/tests/test_package_name.py (100%) diff --git a/src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md b/files/templates/copilot-instructions-text/package-copilot-instructions.md similarity index 100% rename from src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md rename to files/templates/copilot-instructions-text/package-copilot-instructions.md diff --git a/src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md b/files/templates/copilot-instructions-text/script-copilot-instructions.md similarity index 100% rename from src/features/creators/templates/copilot-instructions-text/script-copilot-instructions.md rename to files/templates/copilot-instructions-text/script-copilot-instructions.md diff --git a/src/features/creators/templates/new723ScriptTemplate/script.py b/files/templates/new723ScriptTemplate/script.py similarity index 100% rename from src/features/creators/templates/new723ScriptTemplate/script.py rename to files/templates/new723ScriptTemplate/script.py diff --git a/src/features/creators/templates/newPackageTemplate/dev-requirements.txt b/files/templates/newPackageTemplate/dev-requirements.txt similarity index 100% rename from src/features/creators/templates/newPackageTemplate/dev-requirements.txt rename to files/templates/newPackageTemplate/dev-requirements.txt diff --git a/src/features/creators/templates/newPackageTemplate/package_name/__init__.py b/files/templates/newPackageTemplate/package_name/__init__.py similarity index 100% rename from src/features/creators/templates/newPackageTemplate/package_name/__init__.py rename to files/templates/newPackageTemplate/package_name/__init__.py diff --git a/src/features/creators/templates/newPackageTemplate/package_name/__main__.py b/files/templates/newPackageTemplate/package_name/__main__.py similarity index 100% rename from src/features/creators/templates/newPackageTemplate/package_name/__main__.py rename to files/templates/newPackageTemplate/package_name/__main__.py diff --git a/src/features/creators/templates/newPackageTemplate/pyproject.toml b/files/templates/newPackageTemplate/pyproject.toml similarity index 100% rename from src/features/creators/templates/newPackageTemplate/pyproject.toml rename to files/templates/newPackageTemplate/pyproject.toml diff --git a/src/features/creators/templates/newPackageTemplate/tests/test_package_name.py b/files/templates/newPackageTemplate/tests/test_package_name.py similarity index 100% rename from src/features/creators/templates/newPackageTemplate/tests/test_package_name.py rename to files/templates/newPackageTemplate/tests/test_package_name.py diff --git a/src/common/constants.ts b/src/common/constants.ts index 21d862f..08612bf 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -27,5 +27,5 @@ export const KNOWN_FILES = [ export const KNOWN_TEMPLATE_ENDINGS = ['.j2', '.jinja2']; -export const NEW_PROJECT_TEMPLATES_FOLDER = path.join(EXTENSION_ROOT_DIR, 'src', 'features', 'creators', 'templates'); +export const NEW_PROJECT_TEMPLATES_FOLDER = path.join(EXTENSION_ROOT_DIR, 'files', 'templates'); export const NotebookCellScheme = 'vscode-notebook-cell'; diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts index 28c3d5b..d701b55 100644 --- a/src/features/creators/newPackageProject.ts +++ b/src/features/creators/newPackageProject.ts @@ -3,6 +3,7 @@ import * as path from 'path'; import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspace } from 'vscode'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; +import { traceError } from '../../common/logging'; import { showInputBoxWithButtons } from '../../common/window.apis'; import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; import { @@ -91,6 +92,7 @@ export class NewPackageProject implements PythonProjectCreator { const workspaceFolders = workspace.workspaceFolders; if (!workspaceFolders || workspaceFolders.length === 0) { window.showErrorMessage(l10n.t('No workspace folder is open or provided, aborting creation.')); + traceError(`Template file not found at: ${newPackageTemplateFolder}`); return undefined; } destRoot = workspaceFolders[0].uri.fsPath; diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts index e3d7556..f2ac95f 100644 --- a/src/features/creators/newScriptProject.ts +++ b/src/features/creators/newScriptProject.ts @@ -3,6 +3,7 @@ import * as path from 'path'; import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspace } from 'vscode'; import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; +import { traceError } from '../../common/logging'; import { showInputBoxWithButtons } from '../../common/window.apis'; import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNames } from './creationHelpers'; @@ -70,6 +71,7 @@ export class NewScriptProject implements PythonProjectCreator { const newScriptTemplateFile = path.join(NEW_PROJECT_TEMPLATES_FOLDER, 'new723ScriptTemplate', 'script.py'); if (!(await fs.pathExists(newScriptTemplateFile))) { window.showErrorMessage(l10n.t('Template file does not exist, aborting creation.')); + traceError(`Template file not found at: ${newScriptTemplateFile}`); return undefined; } From b8ca4322202de4ffd231187cf224aa64517545e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:47:27 -0700 Subject: [PATCH 174/328] chore(deps-dev): bump tar-fs from 2.1.2 to 2.1.3 (#460) Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.2 to 2.1.3.
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tar-fs&package-manager=npm_and_yarn&previous-version=2.1.2&new-version=2.1.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 346bf96..ebec559 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4810,9 +4810,9 @@ } }, "node_modules/tar-fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", - "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", + "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", "dev": true, "license": "MIT", "optional": true, @@ -8931,9 +8931,9 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "tar-fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", - "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", + "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", "dev": true, "optional": true, "requires": { From 0ce66ec24e2a5e17766005fa0df89a4c81a52d91 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 4 Jun 2025 08:58:22 -0700 Subject: [PATCH 175/328] bug fix: add input validation to showInputBoxWithButtons (#474) fixes https://github.com/microsoft/vscode-python-environments/issues/468 --- src/common/window.apis.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index d01ac07..d3f96ac 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -255,8 +255,17 @@ export async function showInputBoxWithButtons( inputBox.hide(); } }), - inputBox.onDidAccept(() => { + inputBox.onDidAccept(async () => { if (!deferred.completed) { + let isValid = true; + if (options?.validateInput) { + const validation = await options.validateInput(inputBox.value); + isValid = validation === null || validation === undefined; + if (!isValid) { + inputBox.validationMessage = typeof validation === 'string' ? validation : 'Invalid input'; + return; // Do not resolve, keep the input box open + } + } deferred.resolve(inputBox.value); inputBox.hide(); } From fadfd70fa86b2062b38228f1fc436e471148f162 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:53:54 -0700 Subject: [PATCH 176/328] feat: add button from no workspace open in new project flow (#475) improves the problem faced here: https://github.com/microsoft/vscode-python-environments/issues/470 but I think ultimately we should determine a more comprehensive flow --- src/features/envCommands.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index b700da7..24164c0 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,4 +1,4 @@ -import { QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode'; +import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode'; import { CreateEnvironmentOptions, PythonEnvironment, @@ -59,9 +59,7 @@ export async function refreshPackagesCommand(context: unknown, managers?: Enviro } else if (context instanceof PythonEnvTreeItem) { const view = context as PythonEnvTreeItem; const envManager = - view.parent.kind === EnvTreeItemKind.environmentGroup - ? view.parent.parent.manager - : view.parent.manager; + view.parent.kind === EnvTreeItemKind.environmentGroup ? view.parent.parent.manager : view.parent.manager; const pkgManager = managers?.getPackageManager(envManager.preferredPackageManagerId); if (pkgManager) { await pkgManager.refresh(view.environment); @@ -205,8 +203,7 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir export async function handlePackageUninstall(context: unknown, em: EnvironmentManagers) { if (context instanceof PackageTreeItem || context instanceof ProjectPackage) { const moduleName = context.pkg.name; - const environment = - context instanceof ProjectPackage ? context.parent.environment : context.parent.environment; + const environment = context instanceof ProjectPackage ? context.parent.environment : context.parent.environment; const packageManager = em.getPackageManager(environment); await packageManager?.manage(environment, { uninstall: [moduleName], install: [] }); return; @@ -395,8 +392,17 @@ export async function addPythonProjectCommand( pc: ProjectCreators, ): Promise { if (wm.getProjects().length === 0) { - showErrorMessage('Please open a folder/project before adding a workspace'); - return; + const r = await showErrorMessage( + 'Please open a folder/project to create a Python project.', + { + modal: true, + }, + 'Open Folder', + ); + if (r === 'Open Folder') { + await commands.executeCommand('vscode.openFolder'); + return; + } } if (resource instanceof Array) { for (const r of resource) { From 8add2da302ac0eb25f3e52f7b86fb1ee9a31b5f8 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 5 Jun 2025 15:24:53 +1000 Subject: [PATCH 177/328] Remove unwated `}` in pyenv version (#495) Fixes https://github.com/microsoft/vscode-python-environments/issues/494 --- src/managers/pyenv/pyenvUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/pyenv/pyenvUtils.ts b/src/managers/pyenv/pyenvUtils.ts index 09484a3..73e67a3 100644 --- a/src/managers/pyenv/pyenvUtils.ts +++ b/src/managers/pyenv/pyenvUtils.ts @@ -177,7 +177,7 @@ function nativeToPythonEnv( const sv = shortVersion(info.version); const name = info.name || info.displayName || path.basename(info.prefix); - const displayName = info.displayName || `pyenv (${sv}}`; + const displayName = info.displayName || `pyenv (${sv})`; const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); From e84df0077285a8d12f48c32cacbb3c9ca16c79af Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 5 Jun 2025 13:06:14 -0700 Subject: [PATCH 178/328] bug: support user aborting env deletion via modal venv (#504) fixes https://github.com/microsoft/vscode-python-environments/issues/505 --- src/managers/builtin/venvManager.ts | 5 ++++- src/managers/builtin/venvUtils.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index a7e8aa5..a2e84c4 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -171,7 +171,10 @@ export class VenvManager implements EnvironmentManager { try { this.skipWatcherRefresh = true; - await removeVenv(environment, this.log); + const isRemoved = await removeVenv(environment, this.log); + if (!isRemoved) { + return; + } this.updateCollection(environment); this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.remove }]); diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 6408301..c4cd1c0 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -11,6 +11,7 @@ import { } from '../../api'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { Common, VenvManagerStrings } from '../../common/localize'; +import { traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { EventNames } from '../../common/telemetry/constants'; @@ -561,7 +562,7 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC { title: Common.no, isCloseAffordance: true }, ); if (confirm?.title === Common.yes) { - await withProgress( + const result = await withProgress( { location: ProgressLocation.Notification, title: VenvManagerStrings.venvRemoving, @@ -577,8 +578,10 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC } }, ); + return result; } + traceInfo(`User cancelled removal of virtual environment: ${envPath}`); return false; } From 9652c1b54064b24a7146a196439d4c13271b654d Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 5 Jun 2025 13:21:36 -0700 Subject: [PATCH 179/328] feat: add workspace folder selection for project creation (#501) fixes https://github.com/microsoft/vscode-python-environments/issues/465 --- src/common/pickers/managers.ts | 27 ++++++++++++++++++++++++++- src/features/envCommands.ts | 23 +++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 49b9a99..4b0b9aa 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -1,4 +1,4 @@ -import { commands, QuickInputButtons, QuickPickItem, QuickPickItemKind } from 'vscode'; +import { commands, QuickInputButtons, QuickPickItem, QuickPickItemKind, workspace, WorkspaceFolder } from 'vscode'; import { PythonProjectCreator } from '../../api'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; import { Common, Pickers } from '../localize'; @@ -125,6 +125,31 @@ export async function pickPackageManager( return (item as QuickPickItem & { id: string })?.id; } +export async function pickWorkspaceFolder(showBackButton = true): Promise { + const folders = workspace.workspaceFolders; + if (!folders || folders.length === 0) { + return undefined; + } + if (folders.length === 1) { + return folders[0]; + } + const items = folders.map((f) => ({ + label: f.name, + description: f.uri.fsPath, + folder: f, + })); + + const selected = await showQuickPickWithButtons(items, { + placeHolder: 'Select a workspace folder', + ignoreFocusOut: true, + showBackButton, + }); + if (!selected) { + return undefined; + } + const selectedItem = Array.isArray(selected) ? selected[0] : selected; + return selectedItem?.folder; +} export async function pickCreator(creators: PythonProjectCreator[]): Promise { if (creators.length === 0) { return; diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 24164c0..fece917 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,4 +1,4 @@ -import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode'; +import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, workspace } from 'vscode'; import { CreateEnvironmentOptions, PythonEnvironment, @@ -20,7 +20,12 @@ import { removePythonProjectSetting, setEnvironmentManager, setPackageManager } import { clipboardWriteText } from '../common/env.apis'; import {} from '../common/errors/utils'; import { pickEnvironment } from '../common/pickers/environments'; -import { pickCreator, pickEnvironmentManager, pickPackageManager } from '../common/pickers/managers'; +import { + pickCreator, + pickEnvironmentManager, + pickPackageManager, + pickWorkspaceFolder, +} from '../common/pickers/managers'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { activeTextEditor, showErrorMessage, showInformationMessage } from '../common/window.apis'; import { quoteArgs } from './execution/execUtils'; @@ -451,6 +456,20 @@ export async function addPythonProjectCommand( return; } + // if multiroot, prompt the user to select which workspace to create the project in + const workspaceFolders = workspace.workspaceFolders; + if (!resource && workspaceFolders && workspaceFolders.length > 1) { + try { + const workspace = await pickWorkspaceFolder(true); + resource = workspace?.uri; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + return addPythonProjectCommand(resource, wm, em, pc); + } + throw ex; + } + } + try { await creator.create(options); } catch (ex) { From 414489a956b4c5bf448e4e973a169386f787989d Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:48:26 -0700 Subject: [PATCH 180/328] remove refreshManager command and related entries (#515) fixes https://github.com/microsoft/vscode-python-environments/issues/331 --- package.json | 15 --------------- package.nls.json | 3 +-- src/extension.ts | 4 ---- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package.json b/package.json index 387964d..65bfd94 100644 --- a/package.json +++ b/package.json @@ -173,12 +173,6 @@ "category": "Python", "icon": "$(refresh)" }, - { - "command": "python-envs.refreshManager", - "title": "%python-envs.refreshManager.title%", - "category": "Python", - "icon": "$(refresh)" - }, { "command": "python-envs.refreshPackages", "title": "%python-envs.refreshPackages.title%", @@ -264,10 +258,6 @@ "command": "python-envs.refreshAllManagers", "when": "false" }, - { - "command": "python-envs.refreshManager", - "when": "false" - }, { "command": "python-envs.refreshPackages", "when": "false" @@ -348,11 +338,6 @@ "group": "inline", "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" }, - { - "command": "python-envs.refreshManager", - "group": "inline", - "when": "view == env-managers && viewItem =~ /.*pythonEnvManager.*/" - }, { "command": "python-envs.createTerminal", "group": "inline", diff --git a/package.nls.json b/package.nls.json index 2199961..dee2887 100644 --- a/package.nls.json +++ b/package.nls.json @@ -24,7 +24,6 @@ "python-envs.reset.title": "Reset to Default", "python-envs.remove.title": "Delete Environment", "python-envs.refreshAllManagers.title": "Refresh All Environment Managers", - "python-envs.refreshManager.title": "Refresh Environments List", "python-envs.refreshPackages.title": "Refresh Packages List", "python-envs.packages.title": "Manage Packages", "python-envs.clearCache.title": "Clear Cache", @@ -35,4 +34,4 @@ "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", "python-envs.uninstallPackage.title": "Uninstall Package" -} \ No newline at end of file +} diff --git a/src/extension.ts b/src/extension.ts index 31e6477..aca6dda 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -29,7 +29,6 @@ import { createTerminalCommand, getPackageCommandOptions, handlePackageUninstall, - refreshManagerCommand, refreshPackagesCommand, removeEnvironmentCommand, removePythonProject, @@ -147,9 +146,6 @@ export async function activate(context: ExtensionContext): Promise outputChannel.show()), - commands.registerCommand('python-envs.refreshManager', async (item) => { - await refreshManagerCommand(item); - }), commands.registerCommand('python-envs.refreshAllManagers', async () => { await Promise.all(envManagers.managers.map((m) => m.refresh(undefined))); }), From 63457fa8a56c636e68b800dec22d62ffb0ad3620 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 10 Jun 2025 14:19:13 -0700 Subject: [PATCH 181/328] remove nested globes in envs explorer (#516) fixes #326 --- src/managers/builtin/utils.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index e22300a..5a87c7b 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -1,4 +1,4 @@ -import { CancellationToken, LogOutputChannel, ProgressLocation, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; +import { CancellationToken, LogOutputChannel, ProgressLocation, QuickPickItem, Uri, window } from 'vscode'; import { EnvironmentManager, Package, @@ -85,7 +85,6 @@ function getPythonInfo(env: NativeEnvInfo): PythonEnvironmentInfo { description: undefined, tooltip: env.executable, environmentPath: Uri.file(env.executable), - iconPath: new ThemeIcon('globe'), sysPrefix: env.prefix, execInfo: { run: { From bfe1073240139c14554d22ccaab9c15cf82db8ba Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 10 Jun 2025 14:29:05 -0700 Subject: [PATCH 182/328] add command to add Python project given resource (#514) fixes https://github.com/microsoft/vscode-python-environments/issues/450 --- package.json | 16 +++++++++++++--- package.nls.json | 3 ++- src/extension.ts | 5 ++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 65bfd94..4571aa6 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,12 @@ "category": "Python", "icon": "$(new-folder)" }, + { + "command": "python-envs.addPythonProjectGivenResource", + "title": "%python-envs.addPythonProjectGivenResource.title%", + "category": "Python", + "icon": "$(new-folder)" + }, { "command": "python-envs.removePythonProject", "title": "%python-envs.removePythonProject.title%", @@ -282,6 +288,10 @@ "command": "python-envs.addPythonProject", "when": "false" }, + { + "command": "python-envs.addPythonProjectGivenResource", + "when": "false" + }, { "command": "python-envs.removePythonProject", "when": "false" @@ -440,12 +450,12 @@ ], "explorer/context": [ { - "command": "python-envs.addPythonProject", + "command": "python-envs.addPythonProjectGivenResource", "group": "inline", "when": "explorerViewletVisible && explorerResourceIsFolder && !python-envs:isExistingProject" }, { - "command": "python-envs.addPythonProject", + "command": "python-envs.addPythonProjectGivenResource", "group": "inline", "when": "explorerViewletVisible && resourceExtname == .py && !python-envs:isExistingProject" } @@ -545,4 +555,4 @@ "vscode-jsonrpc": "^9.0.0-next.5", "which": "^4.0.0" } -} \ No newline at end of file +} diff --git a/package.nls.json b/package.nls.json index dee2887..80b8fcf 100644 --- a/package.nls.json +++ b/package.nls.json @@ -13,7 +13,8 @@ "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", - "python-envs.addPythonProject.title": "Add as Python Project", + "python-envs.addPythonProject.title": "Add Python Project", + "python-envs.addPythonProjectGivenResource.title": "Add as Python Project", "python-envs.removePythonProject.title": "Remove Python Project", "python-envs.copyEnvPath.title": "Copy Environment Path", "python-envs.copyProjectPath.title": "Copy Project Path", diff --git a/src/extension.ts b/src/extension.ts index aca6dda..d87098b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -195,7 +195,10 @@ export async function activate(context: ExtensionContext): Promise { await setPackageManagerCommand(envManagers, projectManager); }), - commands.registerCommand('python-envs.addPythonProject', async (resource) => { + commands.registerCommand('python-envs.addPythonProject', async () => { + await addPythonProjectCommand(undefined, projectManager, envManagers, projectCreators); + }), + commands.registerCommand('python-envs.addPythonProjectGivenResource', async (resource) => { // Set context to show/hide menu item depending on whether the resource is already a Python project if (resource instanceof Uri) { commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource)); From e774105c045dc44eb27243d0c41fdf69731c8632 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 11 Jun 2025 16:35:47 +0000 Subject: [PATCH 183/328] Fix "Create New" script to open the script file after creation (#499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using the "Create New" functionality to create a Python script, the script file was being created successfully but not opened in the editor, requiring users to manually navigate and open the file. This PR fixes the issue by modifying the `addPythonProjectCommand` function to: 1. Capture the return value from `creator.create()` 2. Check if the result is a `Uri` (indicating a single file like a script was created) 3. Call `showTextDocument(uri)` to automatically open the script in the editor **Before:** - User selects "Create New" → Script → enters name - Script file is created but user has to manually find and open it **After:** - User selects "Create New" → Script → enters name - Script file is created AND automatically opened in the editor The implementation is minimal and surgical: - Only affects cases where creators return a `Uri` (like script files) - Projects that return `PythonProject` objects are unaffected - Uses existing `showTextDocument` utility function - Applied to both the main creator path and existing projects creator path Fixes #478. --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/features/envCommands.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index fece917..55f0ace 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -27,7 +27,7 @@ import { pickWorkspaceFolder, } from '../common/pickers/managers'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; -import { activeTextEditor, showErrorMessage, showInformationMessage } from '../common/window.apis'; +import { activeTextEditor, showErrorMessage, showInformationMessage, showTextDocument } from '../common/window.apis'; import { quoteArgs } from './execution/execUtils'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; @@ -471,7 +471,10 @@ export async function addPythonProjectCommand( } try { - await creator.create(options); + const result = await creator.create(options); + if (result instanceof Uri) { + await showTextDocument(result); + } } catch (ex) { if (ex === QuickInputButtons.Back) { return addPythonProjectCommand(resource, wm, em, pc); From cd7faf9e29596d8fd55003db7acb80de29d1def9 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 12 Jun 2025 09:37:43 -0700 Subject: [PATCH 184/328] chore: update Node.js version to 20.18.1 (#534) fixes pipeline version incompatibility problem: https://dev.azure.com/monacotools/Monaco/_build/results?buildId=342682&view=logs&j=655b0142-0983-5c06-8e0b-d594898dbf65&t=90dcd4d2-64db-53d4-f155-6c92ea17474e --- .github/workflows/pr-check.yml | 2 +- .github/workflows/push-check.yml | 2 +- .nvmrc | 2 +- build/azure-pipeline.pre-release.yml | 2 +- build/azure-pipeline.stable.yml | 2 +- examples/README.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index ea2bf99..44bd661 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -8,7 +8,7 @@ on: - release* env: - NODE_VERSION: '20.18.0' + NODE_VERSION: '20.18.1' jobs: build-vsix: diff --git a/.github/workflows/push-check.yml b/.github/workflows/push-check.yml index c6ef189..1f3ae75 100644 --- a/.github/workflows/push-check.yml +++ b/.github/workflows/push-check.yml @@ -9,7 +9,7 @@ on: - 'release-*' env: - NODE_VERSION: '20.18.0' + NODE_VERSION: '20.18.1' jobs: build-vsix: diff --git a/.nvmrc b/.nvmrc index 2a393af..d4b7699 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.18.0 +20.18.1 diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 3b6a918..bb97b9b 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -66,7 +66,7 @@ extends: buildSteps: - task: NodeTool@0 inputs: - versionSpec: '20.18.0' + versionSpec: '20.18.1' displayName: Select Node version - task: UsePythonVersion@0 diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml index 6d88068..e41a2a4 100644 --- a/build/azure-pipeline.stable.yml +++ b/build/azure-pipeline.stable.yml @@ -56,7 +56,7 @@ extends: buildSteps: - task: NodeTool@0 inputs: - versionSpec: '20.18.0' + versionSpec: '20.18.1' displayName: Select Node version - task: UsePythonVersion@0 diff --git a/examples/README.md b/examples/README.md index fb91d8f..9a55d81 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,6 +1,6 @@ ## Requirements -1. `node` >= 20.18.0 +1. `node` >= 20.18.1 2. `npm` >= 10.9.0 3. `yo` >= 5.0.0 (installed via `npm install -g yo`) 4. `generator-code` >= 1.11.4 (installed via `npm install -g generator-code`) From 3de30e83578cf94aa99d3032d5a83fbf9aefa44a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 12 Jun 2025 10:43:19 -0700 Subject: [PATCH 185/328] update text for install project deps (#535) fixes https://github.com/microsoft/vscode-python-environments/issues/522 --- src/common/localize.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index 1b250a1..f1409c4 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -36,8 +36,8 @@ export namespace PackageManagement { export const enterPackageNames = l10n.t('Enter package names'); export const searchCommonPackages = l10n.t('Search common `PyPI` packages'); export const searchCommonPackagesDescription = l10n.t('Search and Install common `PyPI` packages'); - export const workspaceDependencies = l10n.t('Install workspace dependencies'); - export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.'); + export const workspaceDependencies = l10n.t('Install project dependencies'); + export const workspaceDependenciesDescription = l10n.t('Install packages found in dependency files.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space'); export const editArguments = l10n.t('Edit arguments'); From 8a362aa8e006fd640df2e3ce94feeb4aff1d3e3a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 12 Jun 2025 10:50:10 -0700 Subject: [PATCH 186/328] remove python icon from poetry manager (#536) fixes https://github.com/microsoft/vscode-python-environments/issues/526 --- src/managers/poetry/poetryManager.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/managers/poetry/poetryManager.ts b/src/managers/poetry/poetryManager.ts index cf023f2..12652ec 100644 --- a/src/managers/poetry/poetryManager.ts +++ b/src/managers/poetry/poetryManager.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { Disposable, EventEmitter, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode'; +import { Disposable, EventEmitter, MarkdownString, ProgressLocation, Uri } from 'vscode'; import { DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -49,7 +49,6 @@ export class PoetryManager implements EnvironmentManager, Disposable { this.displayName = 'Poetry'; this.preferredPackageManagerId = 'ms-python.python:poetry'; this.tooltip = new MarkdownString(PoetryStrings.poetryManager, true); - this.iconPath = new ThemeIcon('python'); } name: string; From 11d59b6be83dd6a3069556a997020cb8e81a7add Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:30:23 -0700 Subject: [PATCH 187/328] bug: update quickCreateVenv to avoid name collisions for virtual environments (#531) fixes https://github.com/microsoft/vscode-python-environments/issues/477 --- src/managers/builtin/venvUtils.ts | 46 ++++++++++++------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index c4cd1c0..e22b90b 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -451,16 +451,22 @@ export async function quickCreateVenv( if (additionalPackages) { allPackages.push(...additionalPackages); } - return await createWithProgress( - nativeFinder, - api, - log, - manager, - baseEnv, - venvRoot, - path.join(venvRoot.fsPath, '.venv'), - { install: allPackages, uninstall: [] }, - ); + + // Check if .venv already exists + let venvPath = path.join(venvRoot.fsPath, '.venv'); + if (await fsapi.pathExists(venvPath)) { + // increment to create a unique name, e.g. .venv-1 + let i = 1; + while (await fsapi.pathExists(`${venvPath}-${i}`)) { + i++; + } + venvPath = `${venvPath}-${i}`; + } + + return await createWithProgress(nativeFinder, api, log, manager, baseEnv, venvRoot, venvPath, { + install: allPackages, + uninstall: [], + }); } export async function createPythonVenv( @@ -473,7 +479,6 @@ export async function createPythonVenv( options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] }, ): Promise { const sortedEnvs = ensureGlobalEnv(basePythons, log); - const project = api.getPythonProject(venvRoot); let customize: boolean | undefined = true; if (options.showQuickAndCustomOptions) { @@ -483,26 +488,11 @@ export async function createPythonVenv( if (customize === undefined) { return; } else if (customize === false) { - sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); - const installables = await getProjectInstallable(api, project ? [project] : undefined); - const allPackages = []; - allPackages.push(...(installables?.flatMap((i) => i.args ?? []) ?? [])); - if (options.additionalPackages) { - allPackages.push(...options.additionalPackages); - } - return await createWithProgress( - nativeFinder, - api, - log, - manager, - sortedEnvs[0], - venvRoot, - path.join(venvRoot.fsPath, '.venv'), - { install: allPackages, uninstall: [] }, - ); + return quickCreateVenv(nativeFinder, api, log, manager, sortedEnvs[0], venvRoot, options.additionalPackages); } else { sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); } + const project = api.getPythonProject(venvRoot); const basePython = await pickEnvironmentFrom(sortedEnvs); if (!basePython || !basePython.execInfo) { From 6e8e2a0573d687f10aca84285fcb54e59b9c22e5 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:16:29 -0700 Subject: [PATCH 188/328] update to add all new projects to projects view (#537) fixes https://github.com/microsoft/vscode-python-environments/issues/517 --- src/extension.ts | 2 +- src/features/creators/newPackageProject.ts | 20 ++++++-------------- src/features/creators/newScriptProject.ts | 11 +++++++++-- src/features/views/treeViewItems.ts | 8 ++++---- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index d87098b..5a3813c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -119,7 +119,7 @@ export async function activate(context: ExtensionContext): Promise { // quick create (needs name, will always create venv and copilot instructions) @@ -113,7 +114,13 @@ export class NewScriptProject implements PythonProjectCreator { ]); } - return Uri.file(scriptDestination); + // Add the created script to the project manager + const createdScript: PythonProject | undefined = { + name: scriptFileName, + uri: Uri.file(scriptDestination), + }; + this.projectManager.add(createdScript); + return createdScript; } return undefined; } diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 6b83a9e..403ed64 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -1,9 +1,9 @@ -import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon } from 'vscode'; +import { Command, MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { EnvironmentGroupInfo, IconPath, Package, PythonEnvironment, PythonProject } from '../../api'; +import { EnvViewStrings } from '../../common/localize'; import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api'; -import { PythonEnvironment, IconPath, Package, PythonProject, EnvironmentGroupInfo } from '../../api'; -import { removable } from './utils'; import { isActivatableEnvironment } from '../common/activation'; -import { EnvViewStrings } from '../../common/localize'; +import { removable } from './utils'; export enum EnvTreeItemKind { manager = 'python-env-manager', From 384dca635ff843d177ea6be36bef6e6dfa2da6ab Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:21:05 -0700 Subject: [PATCH 189/328] Add Python Environments report issue command (#525) This PR adds a "Python Environments: Report Issue" command that integrates with VS Code's built-in issue reporter, similar to the existing "Python : Report Issue" and "Python Debugger : Report Issue" commands. ## Changes Made ### Command Registration - Added `python-envs.reportIssue` command to `package.json` - Added localized title "Report Issue" to `package.nls.json` ### Implementation - Created `collectEnvironmentInfo()` helper function that automatically gathers: - Extension version - Registered environment managers (id and display name) - Available Python environments (up to 10 listed with total count) - Python projects and their assigned environments - Current extension settings (non-sensitive data only) - Integrated with VS Code's `workbench.action.openIssueReporter` command - Formats collected information in markdown with collapsible details section Fixes #162. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 5 + package.nls.json | 1 + src/extension.ts | 94 ++++++++++++++++- src/test/features/reportIssue.unit.test.ts | 112 +++++++++++++++++++++ 4 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 src/test/features/reportIssue.unit.test.ts diff --git a/package.json b/package.json index 4571aa6..7e40cae 100644 --- a/package.json +++ b/package.json @@ -256,6 +256,11 @@ "title": "%python-envs.terminal.revertStartupScriptChanges.title%", "category": "Python Envs", "icon": "$(discard)" + }, + { + "command": "python-envs.reportIssue", + "title": "%python-envs.reportIssue.title%", + "category": "Python Environments" } ], "menus": { diff --git a/package.nls.json b/package.nls.json index 80b8fcf..54c2e3a 100644 --- a/package.nls.json +++ b/package.nls.json @@ -11,6 +11,7 @@ "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", + "python-envs.reportIssue.title": "Report Issue", "python-envs.setEnvManager.title": "Set Environment Manager", "python-envs.setPkgManager.title": "Set Package Manager", "python-envs.addPythonProject.title": "Add Python Project", diff --git a/src/extension.ts b/src/extension.ts index 5a3813c..1af50fa 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,4 +1,4 @@ -import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode'; +import { commands, extensions, ExtensionContext, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerLogger, traceError, traceInfo } from './common/logging'; @@ -69,6 +69,85 @@ import { registerCondaFeatures } from './managers/conda/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; +/** + * Collects relevant Python environment information for issue reporting + */ +async function collectEnvironmentInfo( + context: ExtensionContext, + envManagers: EnvironmentManagers, + projectManager: PythonProjectManager +): Promise { + const info: string[] = []; + + try { + // Extension version + const extensionVersion = context.extension?.packageJSON?.version || 'unknown'; + info.push(`Extension Version: ${extensionVersion}`); + + // Python extension version + const pythonExtension = extensions.getExtension('ms-python.python'); + const pythonVersion = pythonExtension?.packageJSON?.version || 'not installed'; + info.push(`Python Extension Version: ${pythonVersion}`); + + // Environment managers + const managers = envManagers.managers; + info.push(`\nRegistered Environment Managers (${managers.length}):`); + managers.forEach(manager => { + info.push(` - ${manager.id} (${manager.displayName})`); + }); + + // Available environments + const allEnvironments: PythonEnvironment[] = []; + for (const manager of managers) { + try { + const envs = await manager.getEnvironments('all'); + allEnvironments.push(...envs); + } catch (err) { + info.push(` Error getting environments from ${manager.id}: ${err}`); + } + } + + info.push(`\nTotal Available Environments: ${allEnvironments.length}`); + if (allEnvironments.length > 0) { + info.push('Environment Details:'); + allEnvironments.slice(0, 10).forEach((env, index) => { + info.push(` ${index + 1}. ${env.displayName} (${env.version}) - ${env.displayPath}`); + }); + if (allEnvironments.length > 10) { + info.push(` ... and ${allEnvironments.length - 10} more environments`); + } + } + + // Python projects + const projects = projectManager.getProjects(); + info.push(`\nPython Projects (${projects.length}):`); + for (let index = 0; index < projects.length; index++) { + const project = projects[index]; + info.push(` ${index + 1}. ${project.uri.fsPath}`); + try { + const env = await envManagers.getEnvironment(project.uri); + if (env) { + info.push(` Environment: ${env.displayName}`); + } + } catch (err) { + info.push(` Error getting environment: ${err}`); + } + } + + // Current settings (non-sensitive) + const config = workspace.getConfiguration('python-envs'); + info.push('\nExtension Settings:'); + info.push(` Default Environment Manager: ${config.get('defaultEnvManager')}`); + info.push(` Default Package Manager: ${config.get('defaultPackageManager')}`); + info.push(` Terminal Auto Activation: ${config.get('terminal.autoActivationType')}`); + + } catch (err) { + info.push(`\nError collecting environment information: ${err}`); + } + + return info.join('\n'); +} + export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); @@ -278,6 +357,19 @@ export async function activate(context: ExtensionContext): Promise { + try { + const issueData = await collectEnvironmentInfo(context, envManagers, projectManager); + + await commands.executeCommand('workbench.action.openIssueReporter', { + extensionId: 'ms-python.vscode-python-envs', + issueTitle: '[Python Environments] ', + issueBody: `\n\n\n\n
\nEnvironment Information\n\n\`\`\`\n${issueData}\n\`\`\`\n\n
` + }); + } catch (error) { + window.showErrorMessage(`Failed to open issue reporter: ${error}`); + } + }), terminalActivation.onDidChangeTerminalActivationState(async (e) => { await setActivateMenuButtonContext(e.terminal, e.environment, e.activated); }), diff --git a/src/test/features/reportIssue.unit.test.ts b/src/test/features/reportIssue.unit.test.ts new file mode 100644 index 0000000..8f80c70 --- /dev/null +++ b/src/test/features/reportIssue.unit.test.ts @@ -0,0 +1,112 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +import * as assert from 'assert'; +import * as typeMoq from 'typemoq'; +import * as vscode from 'vscode'; +import { PythonEnvironment, PythonEnvironmentId } from '../../api'; +import { EnvironmentManagers, PythonProjectManager } from '../../internal.api'; +import { PythonProject } from '../../api'; + +// We need to mock the extension's activate function to test the collectEnvironmentInfo function +// Since it's a local function, we'll test the command registration instead + +suite('Report Issue Command Tests', () => { + let mockEnvManagers: typeMoq.IMock; + let mockProjectManager: typeMoq.IMock; + + setup(() => { + mockEnvManagers = typeMoq.Mock.ofType(); + mockProjectManager = typeMoq.Mock.ofType(); + }); + + test('should handle environment collection with empty data', () => { + mockEnvManagers.setup((em) => em.managers).returns(() => []); + mockProjectManager.setup((pm) => pm.getProjects(typeMoq.It.isAny())).returns(() => []); + + // Test that empty collections are handled gracefully + const managers = mockEnvManagers.object.managers; + const projects = mockProjectManager.object.getProjects(); + + assert.strictEqual(managers.length, 0); + assert.strictEqual(projects.length, 0); + }); + + test('should handle environment collection with mock data', async () => { + // Create mock environment + const mockEnvId: PythonEnvironmentId = { + id: 'test-env-id', + managerId: 'test-manager' + }; + + const mockEnv: PythonEnvironment = { + envId: mockEnvId, + name: 'Test Environment', + displayName: 'Test Environment 3.9', + displayPath: '/path/to/python', + version: '3.9.0', + environmentPath: vscode.Uri.file('/path/to/env'), + execInfo: { + run: { + executable: '/path/to/python', + args: [] + } + }, + sysPrefix: '/path/to/env' + }; + + const mockManager = { + id: 'test-manager', + displayName: 'Test Manager', + getEnvironments: async () => [mockEnv] + } as any; + + // Create mock project + const mockProject: PythonProject = { + uri: vscode.Uri.file('/path/to/project'), + name: 'Test Project' + }; + + mockEnvManagers.setup((em) => em.managers).returns(() => [mockManager]); + mockProjectManager.setup((pm) => pm.getProjects(typeMoq.It.isAny())).returns(() => [mockProject]); + mockEnvManagers.setup((em) => em.getEnvironment(typeMoq.It.isAny())).returns(() => Promise.resolve(mockEnv)); + + // Verify mocks are set up correctly + const managers = mockEnvManagers.object.managers; + const projects = mockProjectManager.object.getProjects(); + + assert.strictEqual(managers.length, 1); + assert.strictEqual(projects.length, 1); + assert.strictEqual(managers[0].id, 'test-manager'); + assert.strictEqual(projects[0].name, 'Test Project'); + }); + + test('should handle errors gracefully during environment collection', async () => { + const mockManager = { + id: 'error-manager', + displayName: 'Error Manager', + getEnvironments: async () => { + throw new Error('Test error'); + } + } as any; + + mockEnvManagers.setup((em) => em.managers).returns(() => [mockManager]); + mockProjectManager.setup((pm) => pm.getProjects(typeMoq.It.isAny())).returns(() => []); + + // Verify that error conditions don't break the test setup + const managers = mockEnvManagers.object.managers; + assert.strictEqual(managers.length, 1); + assert.strictEqual(managers[0].id, 'error-manager'); + }); + + test('should register report issue command', () => { + // Basic test to ensure command registration structure would work + // The actual command registration happens during extension activation + // This tests the mock setup and basic functionality + + mockEnvManagers.setup((em) => em.managers).returns(() => []); + mockProjectManager.setup((pm) => pm.getProjects(typeMoq.It.isAny())).returns(() => []); + + // Verify basic setup works + assert.notStrictEqual(mockEnvManagers.object, undefined); + assert.notStrictEqual(mockProjectManager.object, undefined); + }); +}); \ No newline at end of file From cd64ec4af3a82ea69b013ff58c2ddfbb7bb3cc89 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:22:30 -0700 Subject: [PATCH 190/328] Remove project icon (#538) fixes https://github.com/microsoft/vscode-python-environments/issues/168 --- examples/sample1/src/api.ts | 18 +++++------------- src/api.ts | 10 ---------- src/features/views/treeViewItems.ts | 2 -- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index 83cba96..a23be90 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -2,16 +2,16 @@ // Licensed under the MIT License. import { - Uri, Disposable, - MarkdownString, Event, + FileChangeType, LogOutputChannel, - ThemeIcon, - Terminal, + MarkdownString, TaskExecution, + Terminal, TerminalOptions, - FileChangeType, + ThemeIcon, + Uri, } from 'vscode'; /** @@ -651,10 +651,6 @@ export interface PythonProject { */ readonly tooltip?: string | MarkdownString; - /** - * The icon path for the Python project, which can be a string, Uri, or an object with light and dark theme paths. - */ - readonly iconPath?: IconPath; } /** @@ -696,10 +692,6 @@ export interface PythonProjectCreator { */ readonly tooltip?: string | MarkdownString; - /** - * The icon path for the Python project creator, which can be a string, Uri, or an object with light and dark theme paths. - */ - readonly iconPath?: IconPath; /** * Creates a new Python project or projects. diff --git a/src/api.ts b/src/api.ts index 707d641..53790aa 100644 --- a/src/api.ts +++ b/src/api.ts @@ -650,11 +650,6 @@ export interface PythonProject { * The tooltip for the Python project, which can be a string or a Markdown string. */ readonly tooltip?: string | MarkdownString; - - /** - * The icon path for the Python project, which can be a string, Uri, or an object with light and dark theme paths. - */ - readonly iconPath?: IconPath; } /** @@ -701,11 +696,6 @@ export interface PythonProjectCreator { */ readonly tooltip?: string | MarkdownString; - /** - * The icon path for the Python project creator, which can be a string, Uri, or an object with light and dark theme paths. - */ - readonly iconPath?: IconPath; - /** * Creates a new Python project(s) or, if files are not a project, returns Uri(s) to the created files. * Anything that needs its own python environment constitutes a project. diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts index 403ed64..ca9b2db 100644 --- a/src/features/views/treeViewItems.ts +++ b/src/features/views/treeViewItems.ts @@ -213,7 +213,6 @@ export class ProjectItem implements ProjectTreeItem { item.description = this.project.description; item.tooltip = this.project.tooltip; item.resourceUri = project.uri.fsPath.endsWith('.py') ? this.project.uri : undefined; - item.iconPath = this.project.iconPath ?? (project.uri.fsPath.endsWith('.py') ? ThemeIcon.File : undefined); this.treeItem = item; } @@ -233,7 +232,6 @@ export class GlobalProjectItem implements ProjectTreeItem { item.contextValue = 'python-workspace'; item.description = 'Global Python environment'; item.tooltip = 'Global Python environment'; - item.iconPath = new ThemeIcon('globe'); this.treeItem = item; } } From cc2f49a47817120a790d55a1ec91ddd14a153de9 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 13 Jun 2025 12:48:22 -0700 Subject: [PATCH 191/328] support poetry terminal activation required for versions > 2.0.0 (#528) fixes https://github.com/microsoft/vscode-python-environments/issues/529 --- src/managers/builtin/venvUtils.ts | 86 +---------------------------- src/managers/common/utils.ts | 84 +++++++++++++++++++++++++++- src/managers/poetry/main.ts | 20 ++----- src/managers/poetry/poetryUtils.ts | 88 ++++++------------------------ 4 files changed, 108 insertions(+), 170 deletions(-) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index e22b90b..fe1ad23 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -2,13 +2,7 @@ import * as fsapi from 'fs-extra'; import * as os from 'os'; import * as path from 'path'; import { l10n, LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; -import { - EnvironmentManager, - PythonCommandRunConfiguration, - PythonEnvironment, - PythonEnvironmentApi, - PythonEnvironmentInfo, -} from '../../api'; +import { EnvironmentManager, PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo } from '../../api'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { Common, VenvManagerStrings } from '../../common/localize'; import { traceInfo } from '../../common/logging'; @@ -16,7 +10,6 @@ import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { EventNames } from '../../common/telemetry/constants'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; -import { isWindows } from '../../common/utils/platformUtils'; import { showErrorMessage, showInputBox, @@ -26,14 +19,13 @@ import { withProgress, } from '../../common/window.apis'; import { getConfiguration } from '../../common/workspace.apis'; -import { ShellConstants } from '../../features/common/shellConstants'; import { isNativeEnvInfo, NativeEnvInfo, NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { pathForGitBash, shortVersion, sortEnvironments } from '../common/utils'; +import { getShellActivationCommands, shortVersion, sortEnvironments } from '../common/utils'; import { isUvInstalled, runPython, runUV } from './helpers'; import { getProjectInstallable, getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; import { resolveSystemPythonEnvironmentPath } from './utils'; @@ -122,79 +114,7 @@ async function getPythonInfo(env: NativeEnvInfo): Promise const binDir = path.dirname(env.executable); - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - - if (isWindows()) { - shellActivation.set('unknown', [{ executable: path.join(binDir, `activate`) }]); - shellDeactivation.set('unknown', [{ executable: path.join(binDir, `deactivate`) }]); - } else { - shellActivation.set('unknown', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set('unknown', [{ executable: 'deactivate' }]); - } - - shellActivation.set(ShellConstants.SH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'deactivate' }]); - - shellActivation.set(ShellConstants.BASH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'deactivate' }]); - - shellActivation.set(ShellConstants.GITBASH, [ - { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, - ]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'deactivate' }]); - - shellActivation.set(ShellConstants.ZSH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'deactivate' }]); - - shellActivation.set(ShellConstants.KSH, [{ executable: '.', args: [path.join(binDir, `activate`)] }]); - shellDeactivation.set(ShellConstants.KSH, [{ executable: 'deactivate' }]); - - if (await fsapi.pathExists(path.join(binDir, 'Activate.ps1'))) { - shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); - } else if (await fsapi.pathExists(path.join(binDir, 'activate.ps1'))) { - shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `activate.ps1`)] }]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); - } - - if (await fsapi.pathExists(path.join(binDir, 'activate.bat'))) { - shellActivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `activate.bat`) }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `deactivate.bat`) }]); - } - - if (await fsapi.pathExists(path.join(binDir, 'activate.csh'))) { - shellActivation.set(ShellConstants.CSH, [ - { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, - ]); - shellDeactivation.set(ShellConstants.CSH, [{ executable: 'deactivate' }]); - - shellActivation.set(ShellConstants.FISH, [ - { executable: 'source', args: [path.join(binDir, `activate.csh`)] }, - ]); - shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); - } - - if (await fsapi.pathExists(path.join(binDir, 'activate.fish'))) { - shellActivation.set(ShellConstants.FISH, [ - { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, - ]); - shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); - } - - if (await fsapi.pathExists(path.join(binDir, 'activate.xsh'))) { - shellActivation.set(ShellConstants.XONSH, [ - { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, - ]); - shellDeactivation.set(ShellConstants.XONSH, [{ executable: 'deactivate' }]); - } - - if (await fsapi.pathExists(path.join(binDir, 'activate.nu'))) { - shellActivation.set(ShellConstants.NU, [ - { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, - ]); - shellDeactivation.set(ShellConstants.NU, [{ executable: 'overlay', args: ['hide', 'activate'] }]); - } + const { shellActivation, shellDeactivation } = await getShellActivationCommands(binDir); return { name: name, diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 5b2519a..7bd6ff6 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,5 +1,8 @@ -import { PythonEnvironment } from '../../api'; +import * as fs from 'fs-extra'; +import path from 'path'; +import { PythonCommandRunConfiguration, PythonEnvironment } from '../../api'; import { isWindows } from '../../common/utils/platformUtils'; +import { ShellConstants } from '../../features/common/shellConstants'; import { Installable } from './types'; export function noop() { @@ -112,3 +115,82 @@ export function compareVersions(version1: string, version2: string): number { return 0; } + +export async function getShellActivationCommands(binDir: string): Promise<{ + shellActivation: Map; + shellDeactivation: Map; +}> { + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + + if (isWindows()) { + shellActivation.set('unknown', [{ executable: path.join(binDir, `activate`) }]); + shellDeactivation.set('unknown', [{ executable: path.join(binDir, `deactivate`) }]); + } else { + shellActivation.set('unknown', [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set('unknown', [{ executable: 'deactivate' }]); + } + + shellActivation.set(ShellConstants.SH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.SH, [{ executable: 'deactivate' }]); + + shellActivation.set(ShellConstants.BASH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.BASH, [{ executable: 'deactivate' }]); + + shellActivation.set(ShellConstants.GITBASH, [ + { executable: 'source', args: [pathForGitBash(path.join(binDir, `activate`))] }, + ]); + shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'deactivate' }]); + + shellActivation.set(ShellConstants.ZSH, [{ executable: 'source', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'deactivate' }]); + + shellActivation.set(ShellConstants.KSH, [{ executable: '.', args: [path.join(binDir, `activate`)] }]); + shellDeactivation.set(ShellConstants.KSH, [{ executable: 'deactivate' }]); + + if (await fs.pathExists(path.join(binDir, 'Activate.ps1'))) { + shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `Activate.ps1`)] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); + } else if (await fs.pathExists(path.join(binDir, 'activate.ps1'))) { + shellActivation.set(ShellConstants.PWSH, [{ executable: '&', args: [path.join(binDir, `activate.ps1`)] }]); + shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'deactivate' }]); + } + + if (await fs.pathExists(path.join(binDir, 'activate.bat'))) { + shellActivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `activate.bat`) }]); + shellDeactivation.set(ShellConstants.CMD, [{ executable: path.join(binDir, `deactivate.bat`) }]); + } + + if (await fs.pathExists(path.join(binDir, 'activate.csh'))) { + shellActivation.set(ShellConstants.CSH, [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); + shellDeactivation.set(ShellConstants.CSH, [{ executable: 'deactivate' }]); + + shellActivation.set(ShellConstants.FISH, [{ executable: 'source', args: [path.join(binDir, `activate.csh`)] }]); + shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); + } + + if (await fs.pathExists(path.join(binDir, 'activate.fish'))) { + shellActivation.set(ShellConstants.FISH, [ + { executable: 'source', args: [path.join(binDir, `activate.fish`)] }, + ]); + shellDeactivation.set(ShellConstants.FISH, [{ executable: 'deactivate' }]); + } + + if (await fs.pathExists(path.join(binDir, 'activate.xsh'))) { + shellActivation.set(ShellConstants.XONSH, [ + { executable: 'source', args: [path.join(binDir, `activate.xsh`)] }, + ]); + shellDeactivation.set(ShellConstants.XONSH, [{ executable: 'deactivate' }]); + } + + if (await fs.pathExists(path.join(binDir, 'activate.nu'))) { + shellActivation.set(ShellConstants.NU, [ + { executable: 'overlay', args: ['use', path.join(binDir, 'activate.nu')] }, + ]); + shellDeactivation.set(ShellConstants.NU, [{ executable: 'overlay', args: ['hide', 'activate'] }]); + } + return { + shellActivation, + shellDeactivation, + }; +} diff --git a/src/managers/poetry/main.ts b/src/managers/poetry/main.ts index 02d52c0..9e68abc 100644 --- a/src/managers/poetry/main.ts +++ b/src/managers/poetry/main.ts @@ -4,10 +4,9 @@ import { traceInfo } from '../../common/logging'; import { showErrorMessage } from '../../common/window.apis'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { compareVersions } from '../common/utils'; import { PoetryManager } from './poetryManager'; import { PoetryPackageManager } from './poetryPackageManager'; -import { getPoetry, getPoetryVersion, isPoetryShellPluginInstalled } from './poetryUtils'; +import { getPoetry, getPoetryVersion } from './poetryUtils'; export async function registerPoetryFeatures( nativeFinder: NativePythonFinder, @@ -18,25 +17,16 @@ export async function registerPoetryFeatures( try { const poetryPath = await getPoetry(nativeFinder); - let shellSupported = true; if (poetryPath) { const version = await getPoetryVersion(poetryPath); if (!version) { showErrorMessage(l10n.t('Poetry version could not be determined.')); return; } - if (version && compareVersions(version, '2.0.0') >= 0) { - shellSupported = await isPoetryShellPluginInstalled(poetryPath); - if (!shellSupported) { - showErrorMessage( - l10n.t( - 'Poetry 2.0.0+ detected. The `shell` command is not available by default. Please install the shell plugin to enable shell activation. See [here](https://python-poetry.org/docs/managing-environments/#activating-the-environment), shell [plugin](https://github.com/python-poetry/poetry-plugin-shell)', - ), - ); - return; - } - } - + traceInfo( + 'The `shell` command is not available by default in Poetry versions 2.0.0 and above. Therefore all shell activation will be handled by calling `source `. If you face any problems with shell activation, please file an issue at https://github.com/microsoft/vscode-python-environments/issues to help us improve this implementation. Note the current version of Poetry is {0}.', + version, + ); const envManager = new PoetryManager(nativeFinder, api); const pkgManager = new PoetryPackageManager(api, outputChannel, envManager); diff --git a/src/managers/poetry/poetryUtils.ts b/src/managers/poetry/poetryUtils.ts index d1befca..38bfc1e 100644 --- a/src/managers/poetry/poetryUtils.ts +++ b/src/managers/poetry/poetryUtils.ts @@ -2,19 +2,12 @@ import * as fs from 'fs-extra'; import * as path from 'path'; import { Uri } from 'vscode'; import which from 'which'; -import { - EnvironmentManager, - PythonCommandRunConfiguration, - PythonEnvironment, - PythonEnvironmentApi, - PythonEnvironmentInfo, -} from '../../api'; +import { EnvironmentManager, PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo } from '../../api'; import { ENVS_EXTENSION_ID } from '../../common/constants'; import { traceError, traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; -import { ShellConstants } from '../../features/common/shellConstants'; import { isNativeEnvInfo, NativeEnvInfo, @@ -22,7 +15,7 @@ import { NativePythonEnvironmentKind, NativePythonFinder, } from '../common/nativePythonFinder'; -import { shortVersion, sortEnvironments } from '../common/utils'; +import { getShellActivationCommands, shortVersion, sortEnvironments } from '../common/utils'; async function findPoetry(): Promise { try { @@ -229,62 +222,12 @@ export async function getPoetryVersion(poetry: string): Promise { - try { - const { stdout } = await exec(`"${poetry}" self show plugins`); - // Look for a line like: " - poetry-plugin-shell (1.0.1) Poetry plugin to run subshell..." - return /\s+-\s+poetry-plugin-shell\s+\(\d+\.\d+\.\d+\)/.test(stdout); - } catch { - return false; - } -} - -function createShellActivation( - poetry: string, - _prefix: string, -): Map | undefined { - const shellActivation: Map = new Map(); - - shellActivation.set(ShellConstants.BASH, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set(ShellConstants.ZSH, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set(ShellConstants.SH, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set(ShellConstants.GITBASH, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set(ShellConstants.FISH, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set(ShellConstants.PWSH, [{ executable: poetry, args: ['shell'] }]); - if (isWindows()) { - shellActivation.set(ShellConstants.CMD, [{ executable: poetry, args: ['shell'] }]); - } - shellActivation.set(ShellConstants.NU, [{ executable: poetry, args: ['shell'] }]); - shellActivation.set('unknown', [{ executable: poetry, args: ['shell'] }]); - return shellActivation; -} - -function createShellDeactivation(): Map { - const shellDeactivation: Map = new Map(); - - // Poetry doesn't have a standard deactivation command like venv does - // The best approach is to exit the shell or start a new one - shellDeactivation.set('unknown', [{ executable: 'exit' }]); - - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.FISH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: 'exit' }]); - shellDeactivation.set(ShellConstants.NU, [{ executable: 'exit' }]); - - return shellDeactivation; -} - -function nativeToPythonEnv( +async function nativeToPythonEnv( info: NativeEnvInfo, api: PythonEnvironmentApi, manager: EnvironmentManager, _poetry: string, -): PythonEnvironment | undefined { +): Promise { if (!(info.prefix && info.executable && info.version)) { traceError(`Incomplete poetry environment info: ${JSON.stringify(info)}`); return undefined; @@ -294,9 +237,6 @@ function nativeToPythonEnv( const name = info.name || info.displayName || path.basename(info.prefix); const displayName = info.displayName || `poetry (${sv})`; - const shellActivation = createShellActivation(_poetry, info.prefix); - const shellDeactivation = createShellDeactivation(); - // Check if this is a global Poetry virtualenv by checking if it's in Poetry's virtualenvs directory // We need to use path.normalize() to ensure consistent path format comparison const normalizedPrefix = path.normalize(info.prefix); @@ -319,6 +259,10 @@ function nativeToPythonEnv( } } + // Get generic python environment info to access shell activation/deactivation commands following Poetry 2.0+ dropping the `shell` command + const binDir = path.dirname(info.executable); + const { shellActivation, shellDeactivation } = await getShellActivationCommands(binDir); + const environment: PythonEnvironmentInfo = { name: name, displayName: displayName, @@ -374,14 +318,16 @@ export async function refreshPoetry( const collection: PythonEnvironment[] = []; - envs.forEach((e) => { - if (poetry) { - const environment = nativeToPythonEnv(e, api, manager, poetry); - if (environment) { - collection.push(environment); + await Promise.all( + envs.map(async (e) => { + if (poetry) { + const environment = await nativeToPythonEnv(e, api, manager, poetry); + if (environment) { + collection.push(environment); + } } - } - }); + }), + ); return sortEnvironments(collection); } From c66621233849452d1c8b161608d799eacb94e393 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 13 Jun 2025 12:53:47 -0700 Subject: [PATCH 192/328] Remove "Reset to Default" context menu command (#530) The "Reset to Default" context menu command was confusing to users as it was unclear what it did and how to undo its effects. Based on team discussion, the decision was made to remove this option entirely. Fixes #483. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 14 -------------- package.nls.json | 1 - src/extension.ts | 16 +++++++++++----- src/features/envCommands.ts | 29 ----------------------------- 4 files changed, 11 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 7e40cae..e860e61 100644 --- a/package.json +++ b/package.json @@ -160,12 +160,6 @@ "category": "Python", "icon": "$(check)" }, - { - "command": "python-envs.reset", - "title": "%python-envs.reset.title%", - "category": "Python", - "icon": "$(sync)" - }, { "command": "python-envs.remove", "title": "%python-envs.remove.title%", @@ -281,10 +275,6 @@ "command": "python-envs.setEnv", "when": "false" }, - { - "command": "python-envs.reset", - "when": "false" - }, { "command": "python-envs.remove", "when": "false" @@ -406,10 +396,6 @@ "group": "inline", "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" }, - { - "command": "python-envs.reset", - "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" - }, { "command": "python-envs.createTerminal", "group": "inline", diff --git a/package.nls.json b/package.nls.json index 54c2e3a..ac2b441 100644 --- a/package.nls.json +++ b/package.nls.json @@ -23,7 +23,6 @@ "python-envs.createAny.title": "Create Environment", "python-envs.set.title": "Set Project Environment", "python-envs.setEnv.title": "Set As Project Environment", - "python-envs.reset.title": "Reset to Default", "python-envs.remove.title": "Delete Environment", "python-envs.refreshAllManagers.title": "Refresh All Environment Managers", "python-envs.refreshPackages.title": "Refresh Packages List", diff --git a/src/extension.ts b/src/extension.ts index 1af50fa..7386d97 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -32,7 +32,6 @@ import { refreshPackagesCommand, removeEnvironmentCommand, removePythonProject, - resetEnvironmentCommand, runAsTaskCommand, runInDedicatedTerminalCommand, runInTerminalCommand, @@ -61,6 +60,7 @@ import { EnvManagerView } from './features/views/envManagersView'; import { ProjectView } from './features/views/projectView'; import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; +import { ProjectItem } from './features/views/treeViewItems'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { registerSystemPythonFeatures } from './managers/builtin/main'; import { SysPythonManager } from './managers/builtin/sysPythonManager'; @@ -265,9 +265,6 @@ export async function activate(context: ExtensionContext): Promise { await setEnvironmentCommand(item, envManagers, projectManager); }), - commands.registerCommand('python-envs.reset', async (item) => { - await resetEnvironmentCommand(item, envManagers, projectManager); - }), commands.registerCommand('python-envs.setEnvManager', async () => { await setEnvManagerCommand(envManagers, projectManager); }), @@ -285,7 +282,16 @@ export async function activate(context: ExtensionContext): Promise { - await resetEnvironmentCommand(item, envManagers, projectManager); + // Clear environment association before removing project + if (item instanceof ProjectItem) { + const uri = item.project.uri; + const manager = envManagers.getEnvironmentManager(uri); + if (manager) { + manager.set(uri, undefined); + } else { + traceError(`No environment manager found for ${uri.fsPath}`); + } + } await removePythonProject(item, projectManager); }), commands.registerCommand('python-envs.clearCache', async () => { diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 55f0ace..cf375d0 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -329,35 +329,6 @@ async function setEnvironmentForProjects( await em.setEnvironments(uris, environment); } -export async function resetEnvironmentCommand( - context: unknown, - em: EnvironmentManagers, - wm: PythonProjectManager, -): Promise { - if (context instanceof ProjectItem) { - const view = context as ProjectItem; - return resetEnvironmentCommand(view.project.uri, em, wm); - } else if (context instanceof Uri) { - const uri = context as Uri; - const manager = em.getEnvironmentManager(uri); - if (manager) { - manager.set(uri, undefined); - } else { - showErrorMessage(`No environment manager found for: ${uri.fsPath}`); - traceError(`No environment manager found for ${uri.fsPath}`); - } - return; - } else if (context === undefined) { - const pw = await pickProject(wm.getProjects()); - if (pw) { - return resetEnvironmentCommand(pw.uri, em, wm); - } - return; - } - traceError(`Invalid context for unset environment command: ${context}`); - showErrorMessage('Invalid context for unset environment'); -} - export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise { const projects = await pickProjectMany(wm.getProjects()); if (projects && projects.length > 0) { From ff2a4accdeb6e635c1c7d557f80b4a0c6bdf9d85 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 16 Jun 2025 13:00:42 -0700 Subject: [PATCH 193/328] fix: set env correctly on package creation (#543) fixes https://github.com/microsoft/vscode-python-environments/issues/544 --- src/features/creators/newPackageProject.ts | 57 +++++++++++++++------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts index 36ec8e7..57bfe84 100644 --- a/src/features/creators/newPackageProject.ts +++ b/src/features/creators/newPackageProject.ts @@ -1,7 +1,7 @@ import * as fs from 'fs-extra'; import * as path from 'path'; import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspace } from 'vscode'; -import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; +import { PythonEnvironment, PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; import { traceError } from '../../common/logging'; import { showInputBoxWithButtons } from '../../common/window.apis'; @@ -11,7 +11,6 @@ import { manageCopilotInstructionsFile, manageLaunchJsonFile, promptForVenv, - quickCreateNewVenv, replaceInFilesAndNames, } from './creationHelpers'; @@ -113,22 +112,51 @@ export class NewPackageProject implements PythonProjectCreator { // 2. Replace 'package_name' in all files and file/folder names using a helper await replaceInFilesAndNames(projectDestinationFolder, 'package_name', packageName); + const createdPackage: PythonProject | undefined = { + name: packageName, + uri: Uri.file(projectDestinationFolder), + }; + // add package to list of packages + this.projectManager.add(createdPackage); + // 4. Create virtual environment if requested + let createdEnv: PythonEnvironment | undefined; if (createVenv) { - // add package to list of packages before creating the venv - await quickCreateNewVenv(this.envManagers, projectDestinationFolder); + // gets default environment manager + const en = this.envManagers.getEnvironmentManager(undefined); + if (en?.supportsQuickCreate) { + // opt to use quickCreate if available + createdEnv = await en.create(Uri.file(projectDestinationFolder), { quickCreate: true }); + } else if (!options?.quickCreate && en?.supportsCreate) { + // if quickCreate unavailable, use create method only if project is not quickCreate + createdEnv = await en.create(Uri.file(projectDestinationFolder), {}); + } else { + // get venv manager or any manager that supports quick creating environments + const venvManager = this.envManagers.managers.find( + (m) => m.id === 'ms-python.python:venv' || m.supportsQuickCreate, + ); + if (venvManager) { + createdEnv = await venvManager.create(Uri.file(projectDestinationFolder), { + quickCreate: true, + }); + } else { + window.showErrorMessage(l10n.t('Creating virtual environment failed during package creation.')); + } + } } - - // 5. Get the Python environment for the destination folder - // could be either the one created in an early step or an existing one - const pythonEnvironment = await this.envManagers.getEnvironment(Uri.parse(projectDestinationFolder)); - - if (!pythonEnvironment) { - window.showErrorMessage(l10n.t('Python environment not found.')); + // 5. Get the Python environment for the destination folder if not already created + createdEnv = createdEnv || (await this.envManagers.getEnvironment(Uri.parse(projectDestinationFolder))); + if (!createdEnv) { + window.showErrorMessage( + l10n.t('Project created but unable to be correlated to correct Python environment.'), + ); return undefined; } - // add custom github copilot instructions + // 6. Set the Python environment for the package + this.envManagers.setEnvironment(createdPackage?.uri, createdEnv); + + // 7. add custom github copilot instructions if (createCopilotInstructions) { const packageInstructionsPath = path.join( NEW_PROJECT_TEMPLATES_FOLDER, @@ -149,11 +177,6 @@ export class NewPackageProject implements PythonProjectCreator { }; await manageLaunchJsonFile(destRoot, JSON.stringify(launchJsonConfig)); - const createdPackage: PythonProject | undefined = { - name: packageName, - uri: Uri.file(projectDestinationFolder), - }; - this.projectManager.add(createdPackage); return createdPackage; } return undefined; From 571f7b79bb23b03236cbd6c94dd209a0e7b52144 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 16 Jun 2025 14:03:04 -0700 Subject: [PATCH 194/328] add check for already set project environments and add documentation (#545) fixes https://github.com/microsoft/vscode-python-environments/issues/507 introduce `setEnvironmentsIfUnset` so that newer environments when created do not override existing settings --- src/features/envCommands.ts | 8 +++- src/features/envManagers.ts | 76 ++++++++++++++++++++++++++++++------- src/internal.api.ts | 37 +++++++++--------- 3 files changed, 89 insertions(+), 32 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index cf375d0..8e595f1 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -74,6 +74,9 @@ export async function refreshPackagesCommand(context: unknown, managers?: Enviro } } +/** + * Creates a Python environment using the manager implied by the context (no user prompt). + */ export async function createEnvironmentCommand( context: unknown, em: EnvironmentManagers, @@ -94,7 +97,7 @@ export async function createEnvironmentCommand( const scope = selected.length === 0 ? 'global' : selected.map((p) => p.uri); const env = await manager.create(scope, undefined); if (env) { - await em.setEnvironments(scope, env); + await em.setEnvironmentsIfUnset(scope, env); } return env; } else { @@ -114,6 +117,9 @@ export async function createEnvironmentCommand( } } +/** + * Prompts the user to pick the environment manager and project(s) for environment creation. + */ export async function createAnyEnvironmentCommand( em: EnvironmentManagers, pm: PythonProjectManager, diff --git a/src/features/envManagers.ts b/src/features/envManagers.ts index 7908efc..b78e8bc 100644 --- a/src/features/envManagers.ts +++ b/src/features/envManagers.ts @@ -1,4 +1,4 @@ -import { Disposable, EventEmitter, Uri, workspace, ConfigurationTarget, Event } from 'vscode'; +import { ConfigurationTarget, Disposable, Event, EventEmitter, Uri, workspace } from 'vscode'; import { DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, @@ -10,13 +10,14 @@ import { PythonProject, SetEnvironmentScope, } from '../api'; -import { traceError, traceVerbose } from '../common/logging'; import { - EditAllManagerSettings, - getDefaultEnvManagerSetting, - getDefaultPkgManagerSetting, - setAllManagerSettings, -} from './settings/settingHelpers'; + EnvironmentManagerAlreadyRegisteredError, + PackageManagerAlreadyRegisteredError, +} from '../common/errors/AlreadyRegisteredError'; +import { traceError, traceVerbose } from '../common/logging'; +import { EventNames } from '../common/telemetry/constants'; +import { sendTelemetryEvent } from '../common/telemetry/sender'; +import { getCallingExtension } from '../common/utils/frameUtils'; import { DidChangeEnvironmentManagerEventArgs, DidChangePackageManagerEventArgs, @@ -30,13 +31,12 @@ import { PythonProjectManager, PythonProjectSettings, } from '../internal.api'; -import { getCallingExtension } from '../common/utils/frameUtils'; import { - EnvironmentManagerAlreadyRegisteredError, - PackageManagerAlreadyRegisteredError, -} from '../common/errors/AlreadyRegisteredError'; -import { sendTelemetryEvent } from '../common/telemetry/sender'; -import { EventNames } from '../common/telemetry/constants'; + EditAllManagerSettings, + getDefaultEnvManagerSetting, + getDefaultPkgManagerSetting, + setAllManagerSettings, +} from './settings/settingHelpers'; function generateId(name: string): string { const newName = name.toLowerCase().replace(/[^a-zA-Z0-9-_]/g, '_'); @@ -165,6 +165,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { this._onDidChangePackages.dispose(); } + /** + * Returns the environment manager for the given context. + * Uses the default from settings if context is undefined or a Uri; otherwise uses the id or environment's managerId passed in via context. + */ public getEnvironmentManager(context: EnvironmentManagerScope): InternalEnvironmentManager | undefined { if (this._environmentManagers.size === 0) { traceError('No environment managers registered'); @@ -256,6 +260,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } } + /** + * Sets the environment for a single scope, scope of undefined checks 'global'. + * If given an array of scopes, delegates to setEnvironments for batch setting. + */ public async setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { if (Array.isArray(scope)) { return this.setEnvironments(scope, environment); @@ -299,6 +307,10 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } } + /** + * Sets the given environment for the specified project URIs or globally. + * If a list of URIs is provided, sets the environment for each project; if 'global', sets it as the global environment. + */ public async setEnvironments(scope: Uri[] | string, environment?: PythonEnvironment): Promise { if (environment) { const manager = this.managers.find((m) => m.id === environment.envId.managerId); @@ -403,6 +415,44 @@ export class PythonEnvironmentManagers implements EnvironmentManagers { } } + /** + * Sets the environment for the given scopes, but only if the scope is not already set (i.e., is global or undefined). + * Existing environments for a scope are not overwritten. + * + */ + public async setEnvironmentsIfUnset(scope: Uri[] | string, environment?: PythonEnvironment): Promise { + if (!environment) { + return; + } + if (typeof scope === 'string' && scope === 'global') { + const current = await this.getEnvironment(undefined); + if (!current) { + await this.setEnvironments('global', environment); + } + } else if (Array.isArray(scope)) { + const urisToSet: Uri[] = []; + for (const uri of scope) { + const current = await this.getEnvironment(uri); + if (!current || current.envId.managerId === 'ms-python.python:system') { + // If the current environment is not set or is the system environment, set the new environment. + urisToSet.push(uri); + } + } + if (urisToSet.length > 0) { + await this.setEnvironments(urisToSet, environment); + } + } + } + + /** + * Gets the current Python environment for the given scope URI or undefined for 'global'. + * + * This method queries the appropriate environment manager for the latest environment for the scope. + * It also updates the internal cache and fires an event if the environment has changed since last check. + * + * @param scope The scope to get the environment. + * @returns The current PythonEnvironment for the scope, or undefined if none is set. + */ async getEnvironment(scope: GetEnvironmentScope): Promise { const manager = this.getEnvironmentManager(scope); if (!manager) { diff --git a/src/internal.api.ts b/src/internal.api.ts index 6aad61b..ce258e3 100644 --- a/src/internal.api.ts +++ b/src/internal.api.ts @@ -1,35 +1,35 @@ import { CancellationError, Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode'; import { - PythonEnvironment, - EnvironmentManager, - PackageManager, - Package, - IconPath, + CreateEnvironmentOptions, + CreateEnvironmentScope, DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, DidChangePackagesEventArgs, - PythonProject, - RefreshEnvironmentsScope, - GetEnvironmentsScope, - CreateEnvironmentScope, - SetEnvironmentScope, + EnvironmentGroupInfo, + EnvironmentManager, GetEnvironmentScope, - PythonEnvironmentId, - PythonEnvironmentExecutionInfo, - PythonEnvironmentInfo, + GetEnvironmentsScope, + IconPath, + Package, PackageChangeKind, PackageId, PackageInfo, - PythonProjectCreator, - ResolveEnvironmentContext, PackageManagementOptions, - EnvironmentGroupInfo, + PackageManager, + PythonEnvironment, + PythonEnvironmentExecutionInfo, + PythonEnvironmentId, + PythonEnvironmentInfo, + PythonProject, + PythonProjectCreator, QuickCreateConfig, - CreateEnvironmentOptions, + RefreshEnvironmentsScope, + ResolveEnvironmentContext, + SetEnvironmentScope, } from './api'; import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError'; -import { sendTelemetryEvent } from './common/telemetry/sender'; import { EventNames } from './common/telemetry/constants'; +import { sendTelemetryEvent } from './common/telemetry/sender'; export type EnvironmentManagerScope = undefined | string | Uri | PythonEnvironment; export type PackageManagerScope = undefined | string | Uri | PythonEnvironment | Package; @@ -111,6 +111,7 @@ export interface EnvironmentManagers extends Disposable { setEnvironment(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise; setEnvironments(scope: Uri[] | string, environment?: PythonEnvironment): Promise; + setEnvironmentsIfUnset(scope: Uri[] | string, environment?: PythonEnvironment): Promise; getEnvironment(scope: GetEnvironmentScope): Promise; getProjectEnvManagers(uris: Uri[]): InternalEnvironmentManager[]; From 2d6bbefef12491ad1dfe7c4b18427416792c0127 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 16 Jun 2025 14:04:07 -0700 Subject: [PATCH 195/328] remove redundant menu items in python panel (#547) fixes https://github.com/microsoft/vscode-python-environments/issues/509 fixes https://github.com/microsoft/vscode-python-environments/issues/510 --- package.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/package.json b/package.json index e860e61..9bee47c 100644 --- a/package.json +++ b/package.json @@ -350,7 +350,6 @@ }, { "command": "python-envs.refreshPackages", - "group": "inline", "when": "view == env-managers && viewItem =~ /.*pythonEnvironment.*/" }, { @@ -368,11 +367,6 @@ "group": "inline", "when": "view == env-managers && viewItem == python-package" }, - { - "command": "python-envs.packages", - "group": "inline", - "when": "view == python-projects && viewItem == python-env" - }, { "command": "python-envs.copyEnvPath", "group": "inline", @@ -382,11 +376,6 @@ "command": "python-envs.remove", "when": "view == python-projects && viewItem == python-env" }, - { - "command": "python-envs.refreshPackages", - "group": "inline", - "when": "view == python-projects && viewItem == python-env" - }, { "command": "python-envs.removePythonProject", "when": "view == python-projects && viewItem == python-workspace-removable" From bae27d6377b8dcd4577583edc81c754d3c325df7 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 16 Jun 2025 14:32:11 -0700 Subject: [PATCH 196/328] remove poetry warning popup (#546) fixes https://github.com/microsoft/vscode-python-environments/issues/503 --- src/managers/poetry/main.ts | 13 ++++--------- src/managers/poetry/poetryUtils.ts | 1 + 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/managers/poetry/main.ts b/src/managers/poetry/main.ts index 9e68abc..c13c32a 100644 --- a/src/managers/poetry/main.ts +++ b/src/managers/poetry/main.ts @@ -1,7 +1,6 @@ -import { Disposable, l10n, LogOutputChannel } from 'vscode'; +import { Disposable, LogOutputChannel } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; import { traceInfo } from '../../common/logging'; -import { showErrorMessage } from '../../common/window.apis'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { PoetryManager } from './poetryManager'; @@ -18,15 +17,11 @@ export async function registerPoetryFeatures( try { const poetryPath = await getPoetry(nativeFinder); if (poetryPath) { - const version = await getPoetryVersion(poetryPath); - if (!version) { - showErrorMessage(l10n.t('Poetry version could not be determined.')); - return; - } traceInfo( - 'The `shell` command is not available by default in Poetry versions 2.0.0 and above. Therefore all shell activation will be handled by calling `source `. If you face any problems with shell activation, please file an issue at https://github.com/microsoft/vscode-python-environments/issues to help us improve this implementation. Note the current version of Poetry is {0}.', - version, + 'The `shell` command is not available by default in Poetry versions 2.0.0 and above. Therefore all shell activation will be handled by calling `source `. If you face any problems with shell activation, please file an issue at https://github.com/microsoft/vscode-python-environments/issues to help us improve this implementation.', ); + const version = await getPoetryVersion(poetryPath); + traceInfo(`Poetry found at ${poetryPath}, version: ${version}`); const envManager = new PoetryManager(nativeFinder, api); const pkgManager = new PoetryPackageManager(api, outputChannel, envManager); diff --git a/src/managers/poetry/poetryUtils.ts b/src/managers/poetry/poetryUtils.ts index 38bfc1e..0886097 100644 --- a/src/managers/poetry/poetryUtils.ts +++ b/src/managers/poetry/poetryUtils.ts @@ -216,6 +216,7 @@ export async function getPoetryVersion(poetry: string): Promise Date: Mon, 16 Jun 2025 14:33:11 -0700 Subject: [PATCH 197/328] fix: adjust cwd for terminal creation & envs creation if project type is file (#539) fixes https://github.com/microsoft/vscode-python-environments/issues/540 --- src/features/envCommands.ts | 23 +++++++++++++++++++---- src/managers/builtin/venvManager.ts | 4 +++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 8e595f1..2aeb26f 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -1,3 +1,5 @@ +import * as fs from 'fs-extra'; +import * as path from 'path'; import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, workspace } from 'vscode'; import { CreateEnvironmentOptions, @@ -516,8 +518,9 @@ export async function createTerminalCommand( const pw = await pickProject(api.getPythonProjects()); if (pw) { const env = await api.getEnvironment(pw.uri); + const cwd = await findParentIfFile(pw.uri.fsPath); if (env) { - return await tm.create(env, { cwd: pw.uri }); + return await tm.create(env, { cwd }); } } } else if (context instanceof Uri) { @@ -525,13 +528,15 @@ export async function createTerminalCommand( const env = await api.getEnvironment(uri); const pw = api.getPythonProject(uri); if (env && pw) { - return await tm.create(env, { cwd: pw.uri }); + const cwd = await findParentIfFile(pw.uri.fsPath); + return await tm.create(env, { cwd }); } } else if (context instanceof ProjectItem) { const view = context as ProjectItem; const env = await api.getEnvironment(view.project.uri); + const cwd = await findParentIfFile(view.project.uri.fsPath); if (env) { - const terminal = await tm.create(env, { cwd: view.project.uri }); + const terminal = await tm.create(env, { cwd }); terminal.show(); return terminal; } @@ -546,13 +551,23 @@ export async function createTerminalCommand( const view = context as PythonEnvTreeItem; const pw = await pickProject(api.getPythonProjects()); if (pw) { - const terminal = await tm.create(view.environment, { cwd: pw.uri }); + const cwd = await findParentIfFile(pw.uri.fsPath); + const terminal = await tm.create(view.environment, { cwd }); terminal.show(); return terminal; } } } +export async function findParentIfFile(cwd: string): Promise { + const stat = await fs.stat(cwd); + if (stat.isFile()) { + // If the project is a file, use the directory of the file as the cwd + return path.dirname(cwd); + } + return cwd; +} + export async function runInTerminalCommand( item: unknown, api: PythonEnvironmentApi, diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index a2e84c4..122d5e8 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -22,6 +22,7 @@ import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { VenvManagerStrings } from '../../common/localize'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { showErrorMessage, withProgress } from '../../common/window.apis'; +import { findParentIfFile } from '../../features/envCommands'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; import { @@ -125,7 +126,8 @@ export class VenvManager implements EnvironmentManager { return; } - const venvRoot: Uri = uri; + const venvRoot: Uri = Uri.file(await findParentIfFile(uri.fsPath)); + const globals = await this.baseManager.getEnvironments('global'); let environment: PythonEnvironment | undefined = undefined; if (options?.quickCreate) { From cdce5fd3f47544468eb1f7aedc84373080116f49 Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Tue, 17 Jun 2025 11:36:47 -0500 Subject: [PATCH 198/328] Fixing GDPR telemetry naming for package management (#551) We are sending the following event locally `ms-python.vscode-python-envs/PACKAGE_MANAGEMENT` but this is not classified in our GDPR tool due to the mismatched GDPR tag. The following is cleared in the GDPR tool based on the GDPR tag ![image](https://github.com/user-attachments/assets/267d5fa5-72c5-4423-9357-8ef982e848d5) I think this small change will suffice to align the two --- src/common/telemetry/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index 432f7df..14a653d 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -77,7 +77,7 @@ export interface IEventNamePropertyMapping { }; /* __GDPR__ - "package.install": { + "package_management": { "managerId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, "result": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } } From 256c6404f967b78c443058a1004d766e3d8df6e5 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:32:44 -0700 Subject: [PATCH 199/328] fix to ensure new pkg with no env are saved (#554) fixes https://github.com/microsoft/vscode-python-environments/issues/517 --- src/features/creators/newPackageProject.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts index 57bfe84..63dcae7 100644 --- a/src/features/creators/newPackageProject.ts +++ b/src/features/creators/newPackageProject.ts @@ -117,7 +117,7 @@ export class NewPackageProject implements PythonProjectCreator { uri: Uri.file(projectDestinationFolder), }; // add package to list of packages - this.projectManager.add(createdPackage); + await this.projectManager.add(createdPackage); // 4. Create virtual environment if requested let createdEnv: PythonEnvironment | undefined; From 1029695c2412790e6658925cc355ea118efc7f5f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 18 Jun 2025 15:33:22 -0700 Subject: [PATCH 200/328] feat: add .gitignore file creation for new Python environments in venv and conda managers (#555) --- src/api.ts | 2 +- src/managers/builtin/venvManager.ts | 13 +++++++++++++ src/managers/conda/condaEnvManager.ts | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/api.ts b/src/api.ts index 53790aa..f2258cc 100644 --- a/src/api.ts +++ b/src/api.ts @@ -379,7 +379,7 @@ export interface EnvironmentManager { quickCreateConfig?(): QuickCreateConfig | undefined; /** - * Creates a new Python environment within the specified scope. + * Creates a new Python environment within the specified scope. Create should support adding a .gitignore file if it creates a folder within the workspace. * @param scope - The scope within which to create the environment. * @param options - Optional parameters for creating the Python environment. * @returns A promise that resolves to the created Python environment, or undefined if creation failed. diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 122d5e8..c1464d8 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -1,3 +1,4 @@ +import * as fs from 'fs/promises'; import * as path from 'path'; import { EventEmitter, l10n, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode'; import { @@ -20,6 +21,7 @@ import { } from '../../api'; import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { VenvManagerStrings } from '../../common/localize'; +import { traceError } from '../../common/logging'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { showErrorMessage, withProgress } from '../../common/window.apis'; import { findParentIfFile } from '../../features/envCommands'; @@ -162,6 +164,17 @@ export class VenvManager implements EnvironmentManager { } if (environment) { this.addEnvironment(environment, true); + + // Add .gitignore to the .venv folder + try { + const venvDir = environment.environmentPath.fsPath; + const gitignorePath = path.join(venvDir, '.gitignore'); + await fs.writeFile(gitignorePath, '*\n', { flag: 'w' }); + } catch (err) { + traceError( + `Failed to create .gitignore in venv: ${err instanceof Error ? err.message : String(err)}`, + ); + } } return environment; } finally { diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index 229ad4b..c044afc 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -1,3 +1,4 @@ +import * as fs from 'fs-extra'; import * as path from 'path'; import { Disposable, EventEmitter, l10n, LogOutputChannel, MarkdownString, ProgressLocation, Uri } from 'vscode'; import { @@ -19,6 +20,7 @@ import { SetEnvironmentScope, } from '../../api'; import { CondaStrings } from '../../common/localize'; +import { traceError } from '../../common/logging'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { showErrorMessage, withProgress } from '../../common/window.apis'; import { NativePythonFinder } from '../common/nativePythonFinder'; @@ -167,6 +169,20 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { } if (result) { this.addEnvironment(result); + + // If the environment is inside the workspace, add a .gitignore file + try { + const projectUris = this.api.getPythonProjects().map((p) => p.uri.fsPath); + const envPath = result.environmentPath?.fsPath; + if (envPath && projectUris.some((root) => envPath.startsWith(root))) { + const gitignorePath = path.join(envPath, '.gitignore'); + await fs.writeFile(gitignorePath, '*\n', { flag: 'w' }); + } + } catch (err) { + traceError( + `Failed to create .gitignore in conda env: ${err instanceof Error ? err.message : String(err)}`, + ); + } } return result; From d33c732cc3060e6c3f398de8538a9263e0be602d Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 18 Jun 2025 15:34:02 -0700 Subject: [PATCH 201/328] remove stray console log (#557) --- src/features/projectManager.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/features/projectManager.ts b/src/features/projectManager.ts index 526d9a2..733278a 100644 --- a/src/features/projectManager.ts +++ b/src/features/projectManager.ts @@ -171,7 +171,6 @@ export class PythonProjectManagerImpl implements PythonProjectManager { } getProjects(uris?: Uri[]): ReadonlyArray { - console.log('getProjects', uris); if (uris === undefined) { return Array.from(this._projects.values()); } else { From c5f1d2eb9b82215ef0ffe9a33b95a9249b74a643 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 23 Jun 2025 14:15:34 -0700 Subject: [PATCH 202/328] adopt setting to override exp and opt in for existing users (#561) --- src/extension.ts | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 7386d97..7b4f086 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,4 +1,4 @@ -import { commands, extensions, ExtensionContext, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode'; +import { commands, ExtensionContext, extensions, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; import { registerLogger, traceError, traceInfo } from './common/logging'; @@ -75,27 +75,26 @@ import { registerPyenvFeatures } from './managers/pyenv/main'; async function collectEnvironmentInfo( context: ExtensionContext, envManagers: EnvironmentManagers, - projectManager: PythonProjectManager + projectManager: PythonProjectManager, ): Promise { const info: string[] = []; - try { // Extension version const extensionVersion = context.extension?.packageJSON?.version || 'unknown'; info.push(`Extension Version: ${extensionVersion}`); - + // Python extension version const pythonExtension = extensions.getExtension('ms-python.python'); const pythonVersion = pythonExtension?.packageJSON?.version || 'not installed'; info.push(`Python Extension Version: ${pythonVersion}`); - + // Environment managers const managers = envManagers.managers; info.push(`\nRegistered Environment Managers (${managers.length}):`); - managers.forEach(manager => { + managers.forEach((manager) => { info.push(` - ${manager.id} (${manager.displayName})`); }); - + // Available environments const allEnvironments: PythonEnvironment[] = []; for (const manager of managers) { @@ -106,7 +105,7 @@ async function collectEnvironmentInfo( info.push(` Error getting environments from ${manager.id}: ${err}`); } } - + info.push(`\nTotal Available Environments: ${allEnvironments.length}`); if (allEnvironments.length > 0) { info.push('Environment Details:'); @@ -117,7 +116,7 @@ async function collectEnvironmentInfo( info.push(` ... and ${allEnvironments.length - 10} more environments`); } } - + // Python projects const projects = projectManager.getProjects(); info.push(`\nPython Projects (${projects.length}):`); @@ -133,24 +132,34 @@ async function collectEnvironmentInfo( info.push(` Error getting environment: ${err}`); } } - + // Current settings (non-sensitive) const config = workspace.getConfiguration('python-envs'); info.push('\nExtension Settings:'); info.push(` Default Environment Manager: ${config.get('defaultEnvManager')}`); info.push(` Default Package Manager: ${config.get('defaultPackageManager')}`); info.push(` Terminal Auto Activation: ${config.get('terminal.autoActivationType')}`); - } catch (err) { info.push(`\nError collecting environment information: ${err}`); } - + return info.join('\n'); } export async function activate(context: ExtensionContext): Promise { const start = new StopWatch(); + // Attempt to set setting of config.python.useEnvironmentsExtension to true + try { + const config = workspace.getConfiguration('python'); + await config.update('useEnvironmentsExtension', true, true); + } catch (err) { + traceError( + 'Failed to set config.python.useEnvironmentsExtension to true. Please do so manually in your user settings now to ensure the Python environment extension is enabled during upcoming experimentation.', + err, + ); + } + // Logging should be set up before anything else. const outputChannel: LogOutputChannel = createLogOutputChannel('Python Environments'); context.subscriptions.push(outputChannel, registerLogger(outputChannel)); @@ -366,11 +375,11 @@ export async function activate(context: ExtensionContext): Promise { try { const issueData = await collectEnvironmentInfo(context, envManagers, projectManager); - + await commands.executeCommand('workbench.action.openIssueReporter', { extensionId: 'ms-python.vscode-python-envs', issueTitle: '[Python Environments] ', - issueBody: `\n\n\n\n
\nEnvironment Information\n\n\`\`\`\n${issueData}\n\`\`\`\n\n
` + issueBody: `\n\n\n\n
\nEnvironment Information\n\n\`\`\`\n${issueData}\n\`\`\`\n\n
`, }); } catch (error) { window.showErrorMessage(`Failed to open issue reporter: ${error}`); From fa43c00c5f267313a2248db5aedcc5e856965f98 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 24 Jun 2025 08:01:44 -0700 Subject: [PATCH 203/328] add and update telemetry for bundle release (#559) https://github.com/microsoft/vscode-python-environments/issues/276 --- .github/prompts/add-telemetry.prompt.md | 22 ++++++++++ src/common/pickers/environments.ts | 15 +++++-- src/common/telemetry/constants.ts | 54 ++++++++++++++++++++----- src/extension.ts | 40 ++++++++++++++++++ 4 files changed, 117 insertions(+), 14 deletions(-) create mode 100644 .github/prompts/add-telemetry.prompt.md diff --git a/.github/prompts/add-telemetry.prompt.md b/.github/prompts/add-telemetry.prompt.md new file mode 100644 index 0000000..18c643d --- /dev/null +++ b/.github/prompts/add-telemetry.prompt.md @@ -0,0 +1,22 @@ +--- +mode: agent +--- + +If the user does not specify an event name or properties, pick an informative and descriptive name for the telemetry event based on the task or feature. Add properties as you see fit to collect the necessary information to achieve the telemetry goal, ensuring they are relevant and useful for diagnostics or analytics. + +When adding telemetry: + +- If the user wants to record when an action is started (such as a command invocation), place the telemetry call at the start of the handler or function. +- If the user wants to record successful completions or outcomes, place the telemetry call at the end of the action, after the operation has succeeded (and optionally, record errors or failures as well). + +Instructions to add a new telemetry event: + +1. Add a new event name to the `EventNames` enum in `src/common/telemetry/constants.ts`. +2. Add a corresponding entry to the `IEventNamePropertyMapping` interface in the same file, including a GDPR comment and the expected properties. +3. In the relevant code location, call `sendTelemetryEvent` with the new event name and required properties. Example: + ```typescript + sendTelemetryEvent(EventNames.YOUR_EVENT_NAME, undefined, { property: value }); + ``` +4. If the event is triggered by a command, ensure the call is placed at the start of the command handler. + +Expected output: The new event is tracked in telemetry and follows the GDPR and codebase conventions. diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 058e1ad..7238efb 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -1,12 +1,14 @@ -import { Uri, ThemeIcon, QuickPickItem, QuickPickItemKind, ProgressLocation, QuickInputButtons } from 'vscode'; +import { ProgressLocation, QuickInputButtons, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; import { IconPath, PythonEnvironment, PythonProject } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; import { Common, Interpreter, Pickers } from '../localize'; -import { showQuickPickWithButtons, showQuickPick, showOpenDialog, withProgress } from '../window.apis'; import { traceError } from '../logging'; -import { pickEnvironmentManager } from './managers'; -import { handlePythonPath } from '../utils/pythonPath'; +import { EventNames } from '../telemetry/constants'; +import { sendTelemetryEvent } from '../telemetry/sender'; import { isWindows } from '../utils/platformUtils'; +import { handlePythonPath } from '../utils/pythonPath'; +import { showOpenDialog, showQuickPick, showQuickPickWithButtons, withProgress } from '../window.apis'; +import { pickEnvironmentManager } from './managers'; type QuickPickIcon = | Uri @@ -80,6 +82,7 @@ async function createEnvironment( const manager = managers.find((m) => m.id === managerId); if (manager) { try { + // add telemetry here const env = await manager.create( options.projects.map((p) => p.uri), undefined, @@ -111,6 +114,10 @@ async function pickEnvironmentImpl( if (selected.label === Interpreter.browsePath) { return browseForPython(managers, projectEnvManagers); } else if (selected.label === Interpreter.createVirtualEnvironment) { + sendTelemetryEvent(EventNames.CREATE_ENVIRONMENT, undefined, { + manager: 'none', + triggeredLocation: 'pickEnv', + }); return createEnvironment(managers, projectEnvManagers, options); } return (selected as { result: PythonEnvironment })?.result; diff --git a/src/common/telemetry/constants.ts b/src/common/telemetry/constants.ts index 14a653d..d9ae5d9 100644 --- a/src/common/telemetry/constants.ts +++ b/src/common/telemetry/constants.ts @@ -11,26 +11,34 @@ export enum EventNames { VENV_CREATION = 'VENV.CREATION', PACKAGE_MANAGEMENT = 'PACKAGE_MANAGEMENT', + ADD_PROJECT = 'ADD_PROJECT', + /** + * Telemetry event for when a Python environment is created via command. + * Properties: + * - manager: string (the id of the environment manager used, or 'none') + * - triggeredLocation: string (where the create command is called from) + */ + CREATE_ENVIRONMENT = 'CREATE_ENVIRONMENT', } // Map all events to their properties export interface IEventNamePropertyMapping { /* __GDPR__ "extension.activation_duration": { - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.EXTENSION_ACTIVATION_DURATION]: never | undefined; /* __GDPR__ "extension.manager_registration_duration": { - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.EXTENSION_MANAGER_REGISTRATION_DURATION]: never | undefined; /* __GDPR__ "environment_manager.registered": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.ENVIRONMENT_MANAGER_REGISTERED]: { @@ -39,7 +47,7 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "package_manager.registered": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.PACKAGE_MANAGER_REGISTERED]: { @@ -48,7 +56,7 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "environment_manager.selected": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.ENVIRONMENT_MANAGER_SELECTED]: { @@ -57,7 +65,7 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "package_manager.selected": { - "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "managerId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.PACKAGE_MANAGER_SELECTED]: { @@ -65,11 +73,11 @@ export interface IEventNamePropertyMapping { }; /* __GDPR__ - "venv.using_uv": {"owner": "karthiknadig" } + "venv.using_uv": {"owner": "eleanorjboyd" } */ [EventNames.VENV_USING_UV]: never | undefined /* __GDPR__ "venv.creation": { - "creationType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "creationType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */; [EventNames.VENV_CREATION]: { @@ -78,12 +86,38 @@ export interface IEventNamePropertyMapping { /* __GDPR__ "package_management": { - "managerId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" }, - "result": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig" } + "managerId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" }, + "result": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } } */ [EventNames.PACKAGE_MANAGEMENT]: { managerId: string; result: 'success' | 'error' | 'cancelled'; }; + + /* __GDPR__ + "add_project": { + "template": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" }, + "quickCreate": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" }, + "totalProjectCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" }, + "triggeredLocation": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } + } + */ + [EventNames.ADD_PROJECT]: { + template: string; + quickCreate: boolean; + totalProjectCount: number; + triggeredLocation: 'templateCreate' | 'add' | 'addGivenResource'; + }; + + /* __GDPR__ + "create_environment": { + "manager": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" }, + "triggeredLocation": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "eleanorjboyd" } + } + */ + [EventNames.CREATE_ENVIRONMENT]: { + manager: string; + triggeredLocation: string; + }; } diff --git a/src/extension.ts b/src/extension.ts index 7b4f086..94c95a0 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -78,6 +78,7 @@ async function collectEnvironmentInfo( projectManager: PythonProjectManager, ): Promise { const info: string[] = []; + try { // Extension version const extensionVersion = context.extension?.packageJSON?.version || 'unknown'; @@ -241,9 +242,23 @@ export async function activate(context: ExtensionContext): Promise { + // Telemetry: record environment creation attempt with selected manager + let managerId = 'unknown'; + if (item && item.manager && item.manager.id) { + managerId = item.manager.id; + } + sendTelemetryEvent(EventNames.CREATE_ENVIRONMENT, undefined, { + manager: managerId, + triggeredLocation: 'createSpecifiedCommand', + }); return await createEnvironmentCommand(item, envManagers, projectManager); }), commands.registerCommand('python-envs.createAny', async (options) => { + // Telemetry: record environment creation attempt with no specific manager + sendTelemetryEvent(EventNames.CREATE_ENVIRONMENT, undefined, { + manager: 'none', + triggeredLocation: 'createAnyCommand', + }); return await createAnyEnvironmentCommand( envManagers, projectManager, @@ -282,13 +297,28 @@ export async function activate(context: ExtensionContext): Promise { await addPythonProjectCommand(undefined, projectManager, envManagers, projectCreators); + const totalProjectCount = projectManager.getProjects().length + 1; + sendTelemetryEvent(EventNames.ADD_PROJECT, undefined, { + template: 'none', + quickCreate: false, + totalProjectCount, + triggeredLocation: 'add', + }); }), commands.registerCommand('python-envs.addPythonProjectGivenResource', async (resource) => { // Set context to show/hide menu item depending on whether the resource is already a Python project if (resource instanceof Uri) { commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource)); } + await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators); + const totalProjectCount = projectManager.getProjects().length + 1; + sendTelemetryEvent(EventNames.ADD_PROJECT, undefined, { + template: 'none', + quickCreate: false, + totalProjectCount, + triggeredLocation: 'addGivenResource', + }); }), commands.registerCommand('python-envs.removePythonProject', async (item) => { // Clear environment association before removing project @@ -344,6 +374,9 @@ export async function activate(context: ExtensionContext): Promise { + let projectTemplateName = projectType || 'unknown'; + let triggeredLocation: 'templateCreate' = 'templateCreate'; + let totalProjectCount = projectManager.getProjects().length + 1; if (quickCreate) { if (!projectType || !newProjectName || !newProjectPath) { throw new Error('Project type, name, and path are required for quick create.'); @@ -367,9 +400,16 @@ export async function activate(context: ExtensionContext): Promise { From 88eeb537bfcbcb13dd63e7f056d2e5af279a400a Mon Sep 17 00:00:00 2001 From: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Date: Tue, 24 Jun 2025 16:32:48 -0500 Subject: [PATCH 204/328] Update readme for create project (#562) Update readme to include Create Project from Template --- README.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 62999fb..26d6204 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Python Environments (experimental) +# Python Environments (preview) ## Overview @@ -62,22 +62,32 @@ A "Python Project" is any file or folder that contains runnable Python code and Projects can be added via the Python Environments pane or in the File Explorer by right-clicking on the folder/file and selecting the "Add as Python Project" menu item. -There are a couple of ways that you can add a Python Project from the Python Environments panel: +There are a few ways to add a Python Project from the Python Environments panel: | Name | Description | | ------------ | ---------------------------------------------------------------------- | | Add Existing | Allows you to add an existing folder from the file explorer. | | Auto find | Searches for folders that contain `pyproject.toml` or `setup.py` files | +| Create New | Creates a new project from a template. | + +#### Create New Project from Template +The **Python Envs: Create New Project from Template** command simplifies the process of starting a new Python project by scaffolding it for you. Whether in a new workspace or an existing one, this command configures the environment and boilerplate file structure, so you don’t have to worry about the initial setup, and only the code you want to write. There are currently two project types supported: + +- Package: A structured Python package with files like `__init__.py` and setup configurations. +- Script: A simple project for standalone Python scripts, ideal for quick tasks or just to get you started. ## Command Reference +All commands can be accessed via the Command Palette (`ctrl/cmd + Shift + P`): + | Name | Description | | -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -| Python: Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | -| Python: Manage Packages | Install and uninstall packages in a given Python environment. | -| Python: Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | -| Python: Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | -| Python: Run as Task | Runs Python module as a task. | +| Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | +| Manage Packages | Install and uninstall packages in a given Python environment. | +| Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | +| Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | +| Run as Task | Runs Python module as a task. | +| Create New Project from Template | Creates scaffolded project with virtual environments based on a template. | ## Settings Reference From bafb37a75787723645bfc9466aaf89da7a057955 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:00:13 -0700 Subject: [PATCH 205/328] bug fix to make quick create function from project panel select env (#565) fixes https://github.com/microsoft/vscode-python-environments/issues/485 --- src/common/pickers/environments.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 7238efb..5af90d7 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -1,5 +1,5 @@ import { ProgressLocation, QuickInputButtons, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode'; -import { IconPath, PythonEnvironment, PythonProject } from '../../api'; +import { CreateEnvironmentOptions, IconPath, PythonEnvironment, PythonProject } from '../../api'; import { InternalEnvironmentManager } from '../../internal.api'; import { Common, Interpreter, Pickers } from '../localize'; import { traceError } from '../logging'; @@ -79,13 +79,24 @@ async function createEnvironment( projectEnvManagers.filter((m) => m.supportsCreate), ); - const manager = managers.find((m) => m.id === managerId); + let manager: InternalEnvironmentManager | undefined; + let createOptions: CreateEnvironmentOptions | undefined = undefined; + if (managerId?.includes(`QuickCreate#`)) { + manager = managers.find((m) => m.id === managerId.split('#')[1]); + createOptions = { + projects: projectEnvManagers.map((m) => m), + quickCreate: true, + } as CreateEnvironmentOptions; + } else { + manager = managers.find((m) => m.id === managerId); + } + if (manager) { try { // add telemetry here const env = await manager.create( options.projects.map((p) => p.uri), - undefined, + createOptions, ); return env; } catch (ex) { From 033166706f5366a1284377ded6bdc492e8bb3689 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:43:07 -0700 Subject: [PATCH 206/328] feat: open parent folder of venv after creation (#567) fixes https://github.com/microsoft/vscode-python-environments/issues/553 --- src/managers/builtin/venvManager.ts | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index c1464d8..e655f6a 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -1,6 +1,15 @@ import * as fs from 'fs/promises'; import * as path from 'path'; -import { EventEmitter, l10n, LogOutputChannel, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode'; +import { + commands, + EventEmitter, + l10n, + LogOutputChannel, + MarkdownString, + ProgressLocation, + ThemeIcon, + Uri, +} from 'vscode'; import { CreateEnvironmentOptions, CreateEnvironmentScope, @@ -162,6 +171,7 @@ export class VenvManager implements EnvironmentManager { showQuickAndCustomOptions: options?.quickCreate === undefined, }); } + if (environment) { this.addEnvironment(environment, true); @@ -175,6 +185,21 @@ export class VenvManager implements EnvironmentManager { `Failed to create .gitignore in venv: ${err instanceof Error ? err.message : String(err)}`, ); } + + // Open the parent folder of the venv in the current window immediately after creation + const envParent = path.dirname(environment.sysPrefix); + try { + await commands.executeCommand('vscode.openFolder', Uri.file(envParent), { + forceNewWindow: false, + }); + } catch (error) { + showErrorMessage( + l10n.t('Failed to open venv parent folder: but venv was still created in {0}', envParent), + ); + traceError( + `Failed to open venv parent folder: ${error instanceof Error ? error.message : String(error)}`, + ); + } } return environment; } finally { From 35339722db828f28cf0445a4096fe45ddcf2a389 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 25 Jun 2025 09:43:28 -0700 Subject: [PATCH 207/328] update phrasing on different notifications (#556) fixes https://github.com/microsoft/vscode-python-environments/issues/348 fixes https://github.com/microsoft/vscode-python-environments/issues/513 fixes https://github.com/microsoft/vscode-python-environments/issues/511 --------- Co-authored-by: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> --- src/common/localize.ts | 6 ++---- src/features/creators/newPackageProject.ts | 15 ++++++++++++++- .../terminal/shellStartupSetupHandlers.ts | 2 +- src/managers/builtin/venvUtils.ts | 6 +++++- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/common/localize.ts b/src/common/localize.ts index f1409c4..3caa8a9 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -34,8 +34,8 @@ export namespace PackageManagement { export const commonPackages = l10n.t('Common Packages'); export const selectPackagesToInstall = l10n.t('Select packages to install'); export const enterPackageNames = l10n.t('Enter package names'); - export const searchCommonPackages = l10n.t('Search common `PyPI` packages'); - export const searchCommonPackagesDescription = l10n.t('Search and Install common `PyPI` packages'); + export const searchCommonPackages = l10n.t('Search `PyPI` packages'); + export const searchCommonPackagesDescription = l10n.t('Search and install popular `PyPI` packages'); export const workspaceDependencies = l10n.t('Install project dependencies'); export const workspaceDependenciesDescription = l10n.t('Install packages found in dependency files.'); export const selectPackagesToUninstall = l10n.t('Select packages to uninstall'); @@ -90,8 +90,6 @@ export namespace VenvManagerStrings { export const venvName = l10n.t('Enter a name for the virtual environment'); export const venvNameErrorEmpty = l10n.t('Name cannot be empty'); export const venvNameErrorExists = l10n.t('A folder with the same name already exists'); - - export const venvCreating = l10n.t('Creating virtual environment'); export const venvCreateFailed = l10n.t('Failed to create virtual environment'); export const venvRemoving = l10n.t('Removing virtual environment'); diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts index 63dcae7..54da143 100644 --- a/src/features/creators/newPackageProject.ts +++ b/src/features/creators/newPackageProject.ts @@ -140,7 +140,20 @@ export class NewPackageProject implements PythonProjectCreator { quickCreate: true, }); } else { - window.showErrorMessage(l10n.t('Creating virtual environment failed during package creation.')); + const action = await window.showErrorMessage( + l10n.t( + 'A virtual environment could not be created for the new package "{0}" because your default environment manager does not support this operation and no alternative was available.', + packageName, + ), + l10n.t('Create custom environment'), + ); + if (action === l10n.t('Create custom environment')) { + await commands.executeCommand('python-envs.createAny', { + uri: createdPackage.uri, + selectEnvironment: true, + }); + createdEnv = await this.envManagers.getEnvironment(createdPackage.uri); + } } } } diff --git a/src/features/terminal/shellStartupSetupHandlers.ts b/src/features/terminal/shellStartupSetupHandlers.ts index 94f8a23..429865a 100644 --- a/src/features/terminal/shellStartupSetupHandlers.ts +++ b/src/features/terminal/shellStartupSetupHandlers.ts @@ -13,7 +13,7 @@ export async function handleSettingUpShellProfile( const shells = providers.map((p) => p.shellType).join(', '); const response = await showInformationMessage( l10n.t( - 'To use "{0}" activation, the shell profiles need to be set up. Do you want to set it up now?', + 'To enable "{0}" activation, your shell profile(s) need to be updated to include the necessary startup scripts. Would you like to proceed with these changes?', ACT_TYPE_SHELL, ), { modal: true, detail: l10n.t('Shells: {0}', shells) }, diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index fe1ad23..fe0b71e 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -288,7 +288,11 @@ async function createWithProgress( return await withProgress( { location: ProgressLocation.Notification, - title: VenvManagerStrings.venvCreating, + title: l10n.t( + 'Creating virtual environment named {0} using python version {1}.', + path.basename(envPath), + basePython.version, + ), }, async () => { try { From a3f3d064e47f9177f33c402467efd66d5ab569ca Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Jun 2025 16:56:24 +0000 Subject: [PATCH 208/328] Add "Reveal Project in Explorer" context menu action for Python Projects (#568) This PR adds a "Reveal Project in Explorer" context menu action to the Python Projects view, allowing users to easily navigate from the Python Project view to its file location in the OS file explorer. ## Changes Made - **Added new command**: `python-envs.revealProjectInExplorer` with folder icon (`$(folder-opened)`) - **Context menu integration**: Added the command to the context menu for all python-workspace items (both removable and non-removable) - **Localization**: Added localized title string "Reveal Project in Explorer" - **Command implementation**: Uses VS Code's built-in `revealFileInOS` command to open the project folder in the OS file explorer - **Command palette**: Hidden from command palette (only available via context menu as requested) ## Usage Users can now right-click on any Python project in the Python Projects view and select "Reveal Project in Explorer" to open the project folder in their operating system's file explorer. ![Context menu showing the new reveal action](https://github.com/user-attachments/assets/80808960-1b87-4741-9fe8-2116f1d1c9fa) Fixes #488. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 14 ++++++++++++++ package.nls.json | 3 ++- src/extension.ts | 4 ++++ src/features/envCommands.ts | 9 +++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bee47c..ef5984a 100644 --- a/package.json +++ b/package.json @@ -255,6 +255,12 @@ "command": "python-envs.reportIssue", "title": "%python-envs.reportIssue.title%", "category": "Python Environments" + }, + { + "command": "python-envs.revealProjectInExplorer", + "title": "%python-envs.revealProjectInExplorer.title%", + "category": "Python Envs", + "icon": "$(folder-opened)" } ], "menus": { @@ -326,6 +332,10 @@ { "command": "python-envs.createAny", "when": "false" + }, + { + "command": "python-envs.revealProjectInExplorer", + "when": "false" } ], "view/item/context": [ @@ -395,6 +405,10 @@ "group": "inline", "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" }, + { + "command": "python-envs.revealProjectInExplorer", + "when": "view == python-projects && viewItem =~ /.*python-workspace.*/" + }, { "command": "python-envs.uninstallPackage", "group": "inline", diff --git a/package.nls.json b/package.nls.json index ac2b441..81b8c1c 100644 --- a/package.nls.json +++ b/package.nls.json @@ -34,5 +34,6 @@ "python-envs.createNewProjectFromTemplate.title": "Create New Project from Template", "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", - "python-envs.uninstallPackage.title": "Uninstall Package" + "python-envs.uninstallPackage.title": "Uninstall Package", + "python-envs.revealProjectInExplorer.title": "Reveal Project in Explorer" } diff --git a/src/extension.ts b/src/extension.ts index 94c95a0..d6c3027 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -32,6 +32,7 @@ import { refreshPackagesCommand, removeEnvironmentCommand, removePythonProject, + revealProjectInExplorer, runAsTaskCommand, runInDedicatedTerminalCommand, runInTerminalCommand, @@ -356,6 +357,9 @@ export async function activate(context: ExtensionContext): Promise { await copyPathToClipboard(item); }), + commands.registerCommand('python-envs.revealProjectInExplorer', async (item) => { + await revealProjectInExplorer(item); + }), commands.registerCommand('python-envs.terminal.activate', async () => { const terminal = activeTerminal(); if (terminal) { diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 2aeb26f..28cfd13 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -649,3 +649,12 @@ export async function copyPathToClipboard(item: unknown): Promise { traceVerbose(`Invalid context for copy path to clipboard: ${item}`); } } + +export async function revealProjectInExplorer(item: unknown): Promise { + if (item instanceof ProjectItem) { + const projectUri = item.project.uri; + await commands.executeCommand('revealInExplorer', projectUri); + } else { + traceVerbose(`Invalid context for reveal project in explorer: ${item}`); + } +} From 1dedab3c1dc9ce6972b1f27b31ab6af6d3a0ec45 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 26 Jun 2025 08:19:35 -0700 Subject: [PATCH 209/328] feat: enhance environment creation with detailed result handling (#572) refactoring how environment creation for venv is handled and returned to enable future improvements with error handling and resolution --- src/managers/builtin/venvManager.ts | 43 +++++++++++--------- src/managers/builtin/venvUtils.ts | 62 ++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 32 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index e655f6a..2ab0f48 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -38,6 +38,7 @@ import { NativePythonFinder } from '../common/nativePythonFinder'; import { getLatest, shortVersion, sortEnvironments } from '../common/utils'; import { clearVenvCache, + CreateEnvironmentResult, createPythonVenv, findVirtualEnvironments, getDefaultGlobalVenvLocation, @@ -140,23 +141,15 @@ export class VenvManager implements EnvironmentManager { const venvRoot: Uri = Uri.file(await findParentIfFile(uri.fsPath)); const globals = await this.baseManager.getEnvironments('global'); - let environment: PythonEnvironment | undefined = undefined; + let result: CreateEnvironmentResult | undefined = undefined; if (options?.quickCreate) { - if (this.globalEnv && this.globalEnv.version.startsWith('3.')) { - environment = await quickCreateVenv( - this.nativeFinder, - this.api, - this.log, - this, - this.globalEnv, - venvRoot, - options?.additionalPackages, - ); - } else if (!this.globalEnv) { + // error on missing information + if (!this.globalEnv) { this.log.error('No base python found'); showErrorMessage(VenvManagerStrings.venvErrorNoBasePython); throw new Error('No base python found'); - } else if (!this.globalEnv.version.startsWith('3.')) { + } + if (!this.globalEnv.version.startsWith('3.')) { this.log.error('Did not find any base python 3.*'); globals.forEach((e, i) => { this.log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`); @@ -164,15 +157,29 @@ export class VenvManager implements EnvironmentManager { showErrorMessage(VenvManagerStrings.venvErrorNoPython3); throw new Error('Did not find any base python 3.*'); } + if (this.globalEnv && this.globalEnv.version.startsWith('3.')) { + // quick create given correct information + result = await quickCreateVenv( + this.nativeFinder, + this.api, + this.log, + this, + this.globalEnv, + venvRoot, + options?.additionalPackages, + ); + } } else { - environment = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot, { - // If quickCreate is not set that means the user triggered this method from - // environment manager View, by selecting the venv manager. + // If quickCreate is not set that means the user triggered this method from + // environment manager View, by selecting the venv manager. + result = await createPythonVenv(this.nativeFinder, this.api, this.log, this, globals, venvRoot, { showQuickAndCustomOptions: options?.quickCreate === undefined, }); } - if (environment) { + if (result?.environment) { + const environment = result.environment; + this.addEnvironment(environment, true); // Add .gitignore to the .venv folder @@ -201,7 +208,7 @@ export class VenvManager implements EnvironmentManager { ); } } - return environment; + return result?.environment ?? undefined; } finally { this.skipWatcherRefresh = false; } diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index fe0b71e..1e306dc 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -33,6 +33,26 @@ import { resolveSystemPythonEnvironmentPath } from './utils'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; +/** + * Result of environment creation operation. + */ +export interface CreateEnvironmentResult { + /** + * The created environment, if successful. + */ + environment?: PythonEnvironment; + + /* + * Exists if error occurred during environment creation and includes error explanation. + */ + envCreationErr?: string; + + /* + * Exists if error occurred while installing packages and includes error description. + */ + pkgInstallationErr?: string; +} + export async function clearVenvCache(): Promise { const keys = [VENV_WORKSPACE_KEY, VENV_GLOBAL_KEY]; const state = await getWorkspacePersistentState(); @@ -281,7 +301,7 @@ async function createWithProgress( venvRoot: Uri, envPath: string, packages?: PipPackages, -) { +): Promise { const pythonPath = os.platform() === 'win32' ? path.join(envPath, 'Scripts', 'python.exe') : path.join(envPath, 'bin', 'python'); @@ -295,8 +315,10 @@ async function createWithProgress( ), }, async () => { + const result: CreateEnvironmentResult = {}; try { const useUv = await isUvInstalled(log); + // env creation if (basePython.execInfo?.run.executable) { if (useUv) { await runUV( @@ -313,26 +335,33 @@ async function createWithProgress( ); } if (!(await fsapi.pathExists(pythonPath))) { - log.error('no python executable found in virtual environment'); throw new Error('no python executable found in virtual environment'); } } + // handle admin of new env const resolved = await nativeFinder.resolve(pythonPath); const env = api.createPythonEnvironmentItem(await getPythonInfo(resolved), manager); + + // install packages if (packages && (packages.install.length > 0 || packages.uninstall.length > 0)) { - await api.managePackages(env, { - upgrade: false, - install: packages?.install, - uninstall: packages?.uninstall ?? [], - }); + try { + await api.managePackages(env, { + upgrade: false, + install: packages?.install, + uninstall: packages?.uninstall ?? [], + }); + } catch (e) { + // error occurred while installing packages + result.pkgInstallationErr = e instanceof Error ? e.message : String(e); + } } - return env; + result.environment = env; } catch (e) { log.error(`Failed to create virtual environment: ${e}`); - showErrorMessage(VenvManagerStrings.venvCreateFailed); - return; + result.envCreationErr = `Failed to create virtual environment: ${e}`; } + return result; }, ); } @@ -365,7 +394,7 @@ export async function quickCreateVenv( baseEnv: PythonEnvironment, venvRoot: Uri, additionalPackages?: string[], -): Promise { +): Promise { const project = api.getPythonProject(venvRoot); sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); @@ -387,6 +416,7 @@ export async function quickCreateVenv( venvPath = `${venvPath}-${i}`; } + // createWithProgress handles building CreateEnvironmentResult and adding err msgs return await createWithProgress(nativeFinder, api, log, manager, baseEnv, venvRoot, venvPath, { install: allPackages, uninstall: [], @@ -401,7 +431,7 @@ export async function createPythonVenv( basePythons: PythonEnvironment[], venvRoot: Uri, options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] }, -): Promise { +): Promise { const sortedEnvs = ensureGlobalEnv(basePythons, log); let customize: boolean | undefined = true; @@ -421,7 +451,9 @@ export async function createPythonVenv( const basePython = await pickEnvironmentFrom(sortedEnvs); if (!basePython || !basePython.execInfo) { log.error('No base python selected, cannot create virtual environment.'); - return; + return { + envCreationErr: 'No base python selected, cannot create virtual environment.', + }; } const name = await showInputBox({ @@ -439,7 +471,9 @@ export async function createPythonVenv( }); if (!name) { log.error('No name entered, cannot create virtual environment.'); - return; + return { + envCreationErr: 'No name entered, cannot create virtual environment.', + }; } const envPath = path.join(venvRoot.fsPath, name); From b36447e439bbb204e2e16cd7a090b39361c49f68 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:52:00 -0700 Subject: [PATCH 210/328] remove pep 723 reference from create new flow (#578) fixes https://github.com/microsoft/vscode-python-environments/issues/579 --- src/features/creators/newScriptProject.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts index cc97812..cc9c440 100644 --- a/src/features/creators/newScriptProject.ts +++ b/src/features/creators/newScriptProject.ts @@ -11,7 +11,7 @@ import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNam export class NewScriptProject implements PythonProjectCreator { public readonly name = l10n.t('newScript'); public readonly displayName = l10n.t('Script'); - public readonly description = l10n.t('Creates a new script folder in your current workspace with PEP 723 support'); + public readonly description = l10n.t('Creates a new script folder in your current workspace'); public readonly tooltip = new MarkdownString(l10n.t('Create a new Python script')); constructor(private readonly projectManager: PythonProjectManager) {} From d90c8c92a2c8422cba882bc2e3bf658601a2f0c2 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:52:23 -0700 Subject: [PATCH 211/328] change hover on tooltip to show full env path (#577) fixes #575 --- src/features/views/pythonStatusBar.ts | 15 +++++++++++---- src/features/views/revealHandler.ts | 8 ++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/features/views/pythonStatusBar.ts b/src/features/views/pythonStatusBar.ts index 6f02754..765cd23 100644 --- a/src/features/views/pythonStatusBar.ts +++ b/src/features/views/pythonStatusBar.ts @@ -1,8 +1,9 @@ import { Disposable, StatusBarAlignment, StatusBarItem, ThemeColor } from 'vscode'; +import { PythonEnvironment } from '../../api'; import { createStatusBarItem } from '../../common/window.apis'; export interface PythonStatusBar extends Disposable { - show(text?: string): void; + show(env?: PythonEnvironment): void; hide(): void; } @@ -19,9 +20,15 @@ export class PythonStatusBarImpl implements Disposable { this.disposables.push(this.statusBarItem); } - public show(text?: string) { - this.statusBarItem.text = text ?? 'Select Python Interpreter'; - this.statusBarItem.backgroundColor = text ? undefined : new ThemeColor('statusBarItem.warningBackground'); + public show(env?: PythonEnvironment) { + if (env) { + this.statusBarItem.text = env.displayName ?? 'Select Python Interpreter'; + this.statusBarItem.tooltip = env.environmentPath?.fsPath ?? ''; + } else { + this.statusBarItem.text = 'Select Python Interpreter'; + this.statusBarItem.tooltip = 'Select Python Interpreter'; + } + this.statusBarItem.backgroundColor = env ? undefined : new ThemeColor('statusBarItem.warningBackground'); this.statusBarItem.show(); } diff --git a/src/features/views/revealHandler.ts b/src/features/views/revealHandler.ts index 251a36f..1f7a96e 100644 --- a/src/features/views/revealHandler.ts +++ b/src/features/views/revealHandler.ts @@ -1,9 +1,9 @@ +import { PythonEnvironmentApi } from '../../api'; +import { isPythonProjectFile } from '../../common/utils/fileNameUtils'; import { activeTextEditor } from '../../common/window.apis'; -import { ProjectView } from './projectView'; import { EnvManagerView } from './envManagersView'; +import { ProjectView } from './projectView'; import { PythonStatusBar } from './pythonStatusBar'; -import { isPythonProjectFile } from '../../common/utils/fileNameUtils'; -import { PythonEnvironmentApi } from '../../api'; export function updateViewsAndStatus( statusBar: PythonStatusBar, @@ -31,7 +31,7 @@ export function updateViewsAndStatus( workspaceView.reveal(activeDocument.uri); setImmediate(async () => { const env = await api.getEnvironment(activeDocument.uri); - statusBar.show(env?.displayName); + statusBar.show(env); managerView.reveal(env); }); } From a7cd3436c24a827e5f89c993cd7233beba878679 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:52:58 -0700 Subject: [PATCH 212/328] fixes recursive venv assignment and incorrect multiroot result (#558) fixes https://github.com/microsoft/vscode-python-environments/issues/491 --- src/managers/builtin/venvManager.ts | 78 ++++++++++++++++------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 2ab0f48..1c50554 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -103,11 +103,13 @@ export class VenvManager implements EnvironmentManager { } } + /** + * Returns configuration for quick create in the workspace root, undefined if no suitable Python 3 version is found. + */ quickCreateConfig(): QuickCreateConfig | undefined { if (!this.globalEnv || !this.globalEnv.version.startsWith('3.')) { return undefined; } - return { description: l10n.t('Create a virtual environment in workspace root'), detail: l10n.t( @@ -214,6 +216,9 @@ export class VenvManager implements EnvironmentManager { } } + /** + * Removes the specified Python environment, updates internal collections, and fires change events as needed. + */ async remove(environment: PythonEnvironment): Promise { try { this.skipWatcherRefresh = true; @@ -467,6 +472,9 @@ export class VenvManager implements EnvironmentManager { await this.loadGlobalEnv(globals); } + /** + * Loads and sets the global Python environment from the provided list, resolving if necessary. O(g) where g = globals.length + */ private async loadGlobalEnv(globals: PythonEnvironment[]) { this.globalEnv = undefined; @@ -499,6 +507,9 @@ export class VenvManager implements EnvironmentManager { } } + /** + * Loads and maps Python environments to their corresponding project paths in the workspace. about O(p × e) where p = projects.len and e = environments.len + */ private async loadEnvMap() { const globals = await this.baseManager.getEnvironments('global'); await this.loadGlobalEnv(globals); @@ -506,23 +517,18 @@ export class VenvManager implements EnvironmentManager { this.fsPathToEnv.clear(); const sorted = sortEnvironments(this.collection); - const paths = this.api.getPythonProjects().map((p) => path.normalize(p.uri.fsPath)); + const projectPaths = this.api.getPythonProjects().map((p) => path.normalize(p.uri.fsPath)); const events: (() => void)[] = []; - for (const p of paths) { + // Iterates through all workspace projects + for (const p of projectPaths) { const env = await getVenvForWorkspace(p); - if (env) { - const found = this.findEnvironmentByPath(env, sorted) ?? this.findEnvironmentByPath(env, globals); - const previous = this.fsPathToEnv.get(p); + // from env path find PythonEnvironment object in the collection. + let foundEnv = this.findEnvironmentByPath(env, sorted) ?? this.findEnvironmentByPath(env, globals); + const previousEnv = this.fsPathToEnv.get(p); const pw = this.api.getPythonProject(Uri.file(p)); - if (found) { - this.fsPathToEnv.set(p, found); - if (pw && previous?.envId.id !== found.envId.id) { - events.push(() => - this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: found }), - ); - } - } else { + if (!foundEnv) { + // attempt to resolve const resolved = await resolveVenvPythonEnvironmentPath( env, this.nativeFinder, @@ -531,32 +537,29 @@ export class VenvManager implements EnvironmentManager { this.baseManager, ); if (resolved) { - // If resolved add it to the collection - this.fsPathToEnv.set(p, resolved); + // If resolved; add it to the venvManager collection this.addEnvironment(resolved, false); - if (pw && previous?.envId.id !== resolved.envId.id) { - events.push(() => - this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: resolved }), - ); - } + foundEnv = resolved; } else { this.log.error(`Failed to resolve python environment: ${env}`); + return; } } + // Given found env, add it to the map and fire the event if needed. + this.fsPathToEnv.set(p, foundEnv); + if (pw && previousEnv?.envId.id !== foundEnv.envId.id) { + events.push(() => + this._onDidChangeEnvironment.fire({ uri: pw.uri, old: undefined, new: foundEnv }), + ); + } } else { - // There is NO selected venv, then try and choose the venv that is in the workspace. - if (sorted.length === 1) { - this.fsPathToEnv.set(p, sorted[0]); - } else { - // These are sorted by version and by path length. The assumption is that the user would want to pick - // latest version and the one that is closest to the workspace. - const found = sorted.find((e) => { - const t = this.api.getPythonProject(e.environmentPath)?.uri.fsPath; - return t && path.normalize(t) === p; - }); - if (found) { - this.fsPathToEnv.set(p, found); - } + // Search through all known environments (e) and check if any are associated with the current project path. If so, add that environment and path in the map. + const found = sorted.find((e) => { + const t = this.api.getPythonProject(e.environmentPath)?.uri.fsPath; + return t && path.normalize(t) === p; + }); + if (found) { + this.fsPathToEnv.set(p, found); } } } @@ -564,6 +567,9 @@ export class VenvManager implements EnvironmentManager { events.forEach((e) => e()); } + /** + * Finds a PythonEnvironment in the given collection (or all environments) that matches the provided file system path. O(e) where e = environments.len + */ private findEnvironmentByPath(fsPath: string, collection?: PythonEnvironment[]): PythonEnvironment | undefined { const normalized = path.normalize(fsPath); const envs = collection ?? this.collection; @@ -573,6 +579,10 @@ export class VenvManager implements EnvironmentManager { }); } + /** + * Returns all Python projects associated with the given environment. + * O(p), where p is project.len + */ public getProjectsByEnvironment(environment: PythonEnvironment): PythonProject[] { const projects: PythonProject[] = []; this.fsPathToEnv.forEach((env, fsPath) => { From 1062e545ecdca43a5b38b3787f460a4d8e18e036 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:18:35 -0700 Subject: [PATCH 213/328] fix reveal for venv creation (#580) previous PR was incorrect, this one correctly handles https://github.com/microsoft/vscode-python-environments/issues/553 --- src/managers/builtin/venvManager.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 1c50554..e02031b 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -196,17 +196,20 @@ export class VenvManager implements EnvironmentManager { } // Open the parent folder of the venv in the current window immediately after creation - const envParent = path.dirname(environment.sysPrefix); + const envParent = environment.sysPrefix; try { - await commands.executeCommand('vscode.openFolder', Uri.file(envParent), { - forceNewWindow: false, - }); + await commands.executeCommand('revealInExplorer', Uri.file(envParent)); } catch (error) { showErrorMessage( - l10n.t('Failed to open venv parent folder: but venv was still created in {0}', envParent), + l10n.t( + 'Failed to reveal venv parent folder in VS Code Explorer: but venv was still created in {0}', + envParent, + ), ); traceError( - `Failed to open venv parent folder: ${error instanceof Error ? error.message : String(error)}`, + `Failed to reveal venv parent folder in VS Code Explorer: ${ + error instanceof Error ? error.message : String(error) + }`, ); } } From 825df135abb940134aa80c4c2b983283fbea1766 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 30 Jun 2025 09:01:33 -0700 Subject: [PATCH 214/328] add exp check to disable envs ext if in control (#573) --- package.json | 42 +++++++++++++++++++++++++++++++----- src/extension.ts | 42 +++++++++++++++++++++++++----------- src/managers/common/types.ts | 3 +++ 3 files changed, 69 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ef5984a..f7956c3 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,8 @@ "command": "python-envs.setEnvManager", "title": "%python-envs.setEnvManager.title%", "category": "Python", - "icon": "$(gear)" + "icon": "$(gear)", + "when": "config.python.useEnvironmentsExtension != false" }, { "command": "python-envs.setPkgManager", @@ -293,6 +294,22 @@ "command": "python-envs.addPythonProjectGivenResource", "when": "false" }, + { + "command": "python-envs.setEnvManager", + "when": "config.python.useEnvironmentsExtension != false" + }, + { + "command": "python-envs.packages", + "when": "config.python.useEnvironmentsExtension != false" + }, + { + "command": "python-envs.set", + "when": "config.python.useEnvironmentsExtension != false" + }, + { + "command": "python-envs.setPkgManager", + "when": "config.python.useEnvironmentsExtension != false" + }, { "command": "python-envs.removePythonProject", "when": "false" @@ -307,7 +324,7 @@ }, { "command": "python-envs.runAsTask", - "when": "true" + "when": "config.python.useEnvironmentsExtension != false" }, { "command": "python-envs.terminal.activate", @@ -336,6 +353,18 @@ { "command": "python-envs.revealProjectInExplorer", "when": "false" + }, + { + "command": "python-envs.createNewProjectFromTemplate", + "when": "config.python.useEnvironmentsExtension != false" + }, + { + "command": "python-envs.terminal.revertStartupScriptChanges", + "when": "config.python.useEnvironmentsExtension != false" + }, + { + "command": "python-envs.reportIssue", + "when": "config.python.useEnvironmentsExtension != false" } ], "view/item/context": [ @@ -477,7 +506,8 @@ { "id": "python", "title": "Python", - "icon": "files/logo.svg" + "icon": "files/logo.svg", + "when": "config.python.useEnvironmentsExtension != false" } ] }, @@ -487,13 +517,15 @@ "id": "python-projects", "name": "Python Projects", "icon": "files/logo.svg", - "contextualTitle": "Python Projects" + "contextualTitle": "Python Projects", + "when": "config.python.useEnvironmentsExtension != false" }, { "id": "env-managers", "name": "Environment Managers", "icon": "files/logo.svg", - "contextualTitle": "Environment Managers" + "contextualTitle": "Environment Managers", + "when": "config.python.useEnvironmentsExtension != false" } ] }, diff --git a/src/extension.ts b/src/extension.ts index d6c3027..195460d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,7 @@ import { commands, ExtensionContext, extensions, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; -import { registerLogger, traceError, traceInfo } from './common/logging'; +import { registerLogger, traceError, traceInfo, traceWarn } from './common/logging'; import { clearPersistentState, setPersistentState } from './common/persistentState'; import { newProjectSelection } from './common/pickers/managers'; import { StopWatch } from './common/stopWatch'; @@ -15,6 +15,7 @@ import { onDidChangeActiveTerminal, onDidChangeTerminalShellIntegration, } from './common/window.apis'; +import { getConfiguration } from './common/workspace.apis'; import { createManagerReady } from './features/common/managerReady'; import { AutoFindProjects } from './features/creators/autoFindProjects'; import { ExistingProjects } from './features/creators/existingProjects'; @@ -66,6 +67,7 @@ import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './in import { registerSystemPythonFeatures } from './managers/builtin/main'; import { SysPythonManager } from './managers/builtin/sysPythonManager'; import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; +import { IDisposable } from './managers/common/types'; import { registerCondaFeatures } from './managers/conda/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; @@ -148,19 +150,16 @@ async function collectEnvironmentInfo( return info.join('\n'); } -export async function activate(context: ExtensionContext): Promise { - const start = new StopWatch(); - - // Attempt to set setting of config.python.useEnvironmentsExtension to true - try { - const config = workspace.getConfiguration('python'); - await config.update('useEnvironmentsExtension', true, true); - } catch (err) { - traceError( - 'Failed to set config.python.useEnvironmentsExtension to true. Please do so manually in your user settings now to ensure the Python environment extension is enabled during upcoming experimentation.', - err, +export async function activate(context: ExtensionContext): Promise { + const useEnvironmentsExtension = getConfiguration('python').get('useEnvironmentsExtension', true); + if (!useEnvironmentsExtension) { + traceWarn( + 'The Python environments extension has been disabled via a setting. If you would like to opt into using the extension, please add the following to your user settings (note that updating this setting requires a window reload afterwards):\n\n"python.useEnvironmentsExtension": true', ); + await deactivate(context); + return; } + const start = new StopWatch(); // Logging should be set up before anything else. const outputChannel: LogOutputChannel = createLogOutputChannel('Python Environments'); @@ -508,4 +507,21 @@ export async function activate(context: ExtensionContext): Promise { + await Promise.all( + disposables.map(async (d) => { + try { + return Promise.resolve(d.dispose()); + } catch (_err) { + // do nothing + } + return Promise.resolve(); + }), + ); +} + +export async function deactivate(context: ExtensionContext) { + await disposeAll(context.subscriptions); + context.subscriptions.length = 0; // Clear subscriptions to prevent memory leaks + traceInfo('Python Environments extension deactivated.'); +} diff --git a/src/managers/common/types.ts b/src/managers/common/types.ts index b6e518d..ac1eac6 100644 --- a/src/managers/common/types.ts +++ b/src/managers/common/types.ts @@ -43,3 +43,6 @@ export interface Installable { */ readonly uri?: Uri; } +export interface IDisposable { + dispose(): void | undefined | Promise; +} From 836b03d07095a98d25b07315af0036761fab8460 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 30 Jun 2025 14:46:20 -0700 Subject: [PATCH 215/328] update brace-expansion package to version 2.0.2 (#582) --- package-lock.json | 63 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebec559..aa0b2fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -880,9 +880,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1001,9 +1001,10 @@ } }, "node_modules/@vscode/test-cli/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -1639,9 +1640,10 @@ "dev": true }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2883,9 +2885,10 @@ "dev": true }, "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -3767,9 +3770,9 @@ } }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -6083,9 +6086,9 @@ }, "dependencies": { "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "requires": { "balanced-match": "^1.0.0" @@ -6159,9 +6162,9 @@ }, "dependencies": { "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "requires": { "balanced-match": "^1.0.0" } @@ -6661,9 +6664,9 @@ "dev": true }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7517,9 +7520,9 @@ }, "dependencies": { "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "requires": { "balanced-match": "^1.0.0" } @@ -8179,9 +8182,9 @@ }, "dependencies": { "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "requires": { "balanced-match": "^1.0.0" } From a574f333a95acab04d94b74040f608ca70768707 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:28:57 +0000 Subject: [PATCH 216/328] move open script to creator function (#588) fixes https://github.com/microsoft/vscode-python-environments/issues/478 --- src/features/creators/newScriptProject.ts | 5 ++++- src/features/envCommands.ts | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts index cc9c440..5a62b6c 100644 --- a/src/features/creators/newScriptProject.ts +++ b/src/features/creators/newScriptProject.ts @@ -4,7 +4,7 @@ import { commands, l10n, MarkdownString, QuickInputButtons, Uri, window, workspa import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from '../../api'; import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants'; import { traceError } from '../../common/logging'; -import { showInputBoxWithButtons } from '../../common/window.apis'; +import { showInputBoxWithButtons, showTextDocument } from '../../common/window.apis'; import { PythonProjectManager } from '../../internal.api'; import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNames } from './creationHelpers'; @@ -120,6 +120,9 @@ export class NewScriptProject implements PythonProjectCreator { uri: Uri.file(scriptDestination), }; this.projectManager.add(createdScript); + + await showTextDocument(createdScript.uri); + return createdScript; } return undefined; diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 28cfd13..db756e8 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -29,7 +29,7 @@ import { pickWorkspaceFolder, } from '../common/pickers/managers'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; -import { activeTextEditor, showErrorMessage, showInformationMessage, showTextDocument } from '../common/window.apis'; +import { activeTextEditor, showErrorMessage, showInformationMessage } from '../common/window.apis'; import { quoteArgs } from './execution/execUtils'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; @@ -450,10 +450,7 @@ export async function addPythonProjectCommand( } try { - const result = await creator.create(options); - if (result instanceof Uri) { - await showTextDocument(result); - } + await creator.create(options); } catch (ex) { if (ex === QuickInputButtons.Back) { return addPythonProjectCommand(resource, wm, em, pc); From 4028ad2a0e974e2006025d656d0b940cba9095e1 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:50:54 +0000 Subject: [PATCH 217/328] extra logging for exp setting status (#589) will help debug issues related to the experiment and extension activation --- src/extension.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/extension.ts b/src/extension.ts index 195460d..4c5d596 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -152,6 +152,7 @@ async function collectEnvironmentInfo( export async function activate(context: ExtensionContext): Promise { const useEnvironmentsExtension = getConfiguration('python').get('useEnvironmentsExtension', true); + traceInfo(`Experiment Status: useEnvironmentsExtension setting set to ${useEnvironmentsExtension}`); if (!useEnvironmentsExtension) { traceWarn( 'The Python environments extension has been disabled via a setting. If you would like to opt into using the extension, please add the following to your user settings (note that updating this setting requires a window reload afterwards):\n\n"python.useEnvironmentsExtension": true', From 2d5cd5b742d31a8154faeab59558cbd321668f85 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 9 Jul 2025 13:16:25 -0700 Subject: [PATCH 218/328] Fix select interpreter (#601) This PR enhances the "Select Interpreter" dropdown in the Python Environments extension by including the full path to each interpreter in the description text, making it easier for users to identify and distinguish between different Python environments. (copilot did this via https://github.com/eleanorjboyd/vscode-python-environments/pull/1 but the PR was created wrong) fixes https://github.com/microsoft/vscode-python-environments/issues/593 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common/pickers/environments.ts | 32 +++++-- .../common/environmentPicker.unit.test.ts | 87 +++++++++++++++++++ 2 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 src/test/common/environmentPicker.unit.test.ts diff --git a/src/common/pickers/environments.ts b/src/common/pickers/environments.ts index 5af90d7..5f6ab63 100644 --- a/src/common/pickers/environments.ts +++ b/src/common/pickers/environments.ts @@ -157,6 +157,12 @@ export async function pickEnvironment( ]; if (options?.recommended) { + const pathDescription = options.recommended.displayPath; + const description = + options.recommended.description && options.recommended.description.trim() + ? `${options.recommended.description} (${pathDescription})` + : pathDescription; + items.push( { label: Common.recommended, @@ -164,7 +170,7 @@ export async function pickEnvironment( }, { label: options.recommended.displayName, - description: options.recommended.description, + description: description, result: options.recommended, iconPath: getIconPath(options.recommended.iconPath), }, @@ -179,9 +185,13 @@ export async function pickEnvironment( const envs = await manager.getEnvironments('all'); items.push( ...envs.map((e) => { + const pathDescription = e.displayPath; + const description = + e.description && e.description.trim() ? `${e.description} (${pathDescription})` : pathDescription; + return { label: e.displayName ?? e.name, - description: e.description, + description: description, result: e, manager: manager, iconPath: getIconPath(e.iconPath), @@ -194,12 +204,18 @@ export async function pickEnvironment( } export async function pickEnvironmentFrom(environments: PythonEnvironment[]): Promise { - const items = environments.map((e) => ({ - label: e.displayName ?? e.name, - description: e.description, - e: e, - iconPath: getIconPath(e.iconPath), - })); + const items = environments.map((e) => { + const pathDescription = e.displayPath; + const description = + e.description && e.description.trim() ? `${e.description} (${pathDescription})` : pathDescription; + + return { + label: e.displayName ?? e.name, + description: description, + e: e, + iconPath: getIconPath(e.iconPath), + }; + }); const selected = await showQuickPick(items, { placeHolder: Pickers.Environments.selectEnvironment, ignoreFocusOut: true, diff --git a/src/test/common/environmentPicker.unit.test.ts b/src/test/common/environmentPicker.unit.test.ts new file mode 100644 index 0000000..dc0ee3c --- /dev/null +++ b/src/test/common/environmentPicker.unit.test.ts @@ -0,0 +1,87 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import assert from 'node:assert'; +import { Uri } from 'vscode'; +import { PythonEnvironment } from '../../api'; + +/** + * Test the logic used in environment pickers to include interpreter paths in descriptions + */ +suite('Environment Picker Description Logic', () => { + const createMockEnvironment = ( + displayPath: string, + description?: string, + name: string = 'Python 3.9.0', + ): PythonEnvironment => ({ + envId: { id: 'test', managerId: 'test-manager' }, + name, + displayName: name, + displayPath, + version: '3.9.0', + environmentPath: Uri.file(displayPath), + description, + sysPrefix: '/path/to/prefix', + execInfo: { run: { executable: displayPath } }, + }); + + suite('Description formatting with interpreter path', () => { + test('should use displayPath as description when no original description exists', () => { + const env = createMockEnvironment('/usr/local/bin/python'); + + // This is the logic from our updated picker + const pathDescription = env.displayPath; + const description = + env.description && env.description.trim() ? `${env.description} (${pathDescription})` : pathDescription; + + assert.strictEqual(description, '/usr/local/bin/python'); + }); + + test('should append displayPath to existing description in parentheses', () => { + const env = createMockEnvironment('/home/user/.venv/bin/python', 'Virtual Environment'); + + // This is the logic from our updated picker + const pathDescription = env.displayPath; + const description = + env.description && env.description.trim() ? `${env.description} (${pathDescription})` : pathDescription; + + assert.strictEqual(description, 'Virtual Environment (/home/user/.venv/bin/python)'); + }); + + test('should handle complex paths correctly', () => { + const complexPath = '/usr/local/anaconda3/envs/my-project-env/bin/python'; + const env = createMockEnvironment(complexPath, 'Conda Environment'); + + // This is the logic from our updated picker + const pathDescription = env.displayPath; + const description = + env.description && env.description.trim() ? `${env.description} (${pathDescription})` : pathDescription; + + assert.strictEqual(description, `Conda Environment (${complexPath})`); + }); + + test('should handle empty description correctly', () => { + const env = createMockEnvironment('/opt/python/bin/python', ''); + + // This is the logic from our updated picker + const pathDescription = env.displayPath; + const description = + env.description && env.description.trim() ? `${env.description} (${pathDescription})` : pathDescription; + + // Empty string should be treated like no description, so just use path + assert.strictEqual(description, '/opt/python/bin/python'); + }); + + test('should handle Windows paths correctly', () => { + const windowsPath = 'C:\\Python39\\python.exe'; + const env = createMockEnvironment(windowsPath, 'System Python'); + + // This is the logic from our updated picker + const pathDescription = env.displayPath; + const description = + env.description && env.description.trim() ? `${env.description} (${pathDescription})` : pathDescription; + + assert.strictEqual(description, 'System Python (C:\\Python39\\python.exe)'); + }); + }); +}); From 0881b7c5e138ccb747ae07253562a2f76cadbaf3 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 14 Jul 2025 11:39:01 -0700 Subject: [PATCH 219/328] Update README to clarify Python Environments icon visibility during rollout (#605) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 26d6204..d7c3115 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Python Environments (preview) +> **Note:** The Python Environments icon may no longer appear in the Activity Bar due to the ongoing rollout of the Python Environments extension. To restore the extension, add `"python.useEnvironmentsExtension": true` to your User settings. This setting is temporarily necessary until the rollout is complete! ## Overview From 04705c23bdc2492fb01b8d82e5728077e462a7c9 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 15 Jul 2025 11:06:39 -0700 Subject: [PATCH 220/328] Add command to run Python Environment Tool (PET) in terminal (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR adds a new command that allows users to run the Python Environment Tool (PET) binary in a terminal to search for Python installations interactively. ## Changes Made ### Command Registration - Added `python-envs.runPetInTerminal` command to `package.json` - Added localized title "Run Python Environment Tool (PET) in Terminal" to `package.nls.json` - Command is categorized under "Python" and only shown when the environments extension is enabled ### Implementation - Exported `getNativePythonToolsPath()` function from `nativePythonFinder.ts` - Added command handler in `extension.ts` that: - Gets the PET executable path using `getNativePythonToolsPath()` - Creates a new terminal named "Python Environment Tool (PET)" - Executes the PET binary in the terminal with proper path quoting - Shows the terminal to the user immediately - Includes comprehensive error handling with user-friendly messages ### Usage Users can now: 1. Open the Command Palette (`Ctrl+Shift+P` / `Cmd+Shift+P`) 2. Search for "Run Python Environment Tool (PET) in Terminal" 3. Execute the command to open a terminal running PET 4. Interactively explore and search for Python installations The implementation follows existing codebase patterns for terminal commands and maintains consistency with other extension features. Fixes #607. --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey.alchemer.com/s3/8343779/Copilot-Coding-agent) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 7 +++++++ package.nls.json | 3 ++- src/extension.ts | 21 ++++++++++++++++++++- src/managers/common/nativePythonFinder.ts | 18 +++++++++--------- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index f7956c3..7886ed1 100644 --- a/package.json +++ b/package.json @@ -262,6 +262,13 @@ "title": "%python-envs.revealProjectInExplorer.title%", "category": "Python Envs", "icon": "$(folder-opened)" + }, + { + "command": "python-envs.runPetInTerminal", + "title": "%python-envs.runPetInTerminal.title%", + "category": "Python", + "icon": "$(terminal)", + "when": "config.python.useEnvironmentsExtension != false" } ], "menus": { diff --git a/package.nls.json b/package.nls.json index 81b8c1c..f365cfa 100644 --- a/package.nls.json +++ b/package.nls.json @@ -35,5 +35,6 @@ "python-envs.terminal.activate.title": "Activate Environment in Current Terminal", "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", "python-envs.uninstallPackage.title": "Uninstall Package", - "python-envs.revealProjectInExplorer.title": "Reveal Project in Explorer" + "python-envs.revealProjectInExplorer.title": "Reveal Project in Explorer", + "python-envs.runPetInTerminal.title": "Run Python Environment Tool (PET) in Terminal" } diff --git a/src/extension.ts b/src/extension.ts index 4c5d596..76944e9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -12,6 +12,7 @@ import { createDeferred } from './common/utils/deferred'; import { activeTerminal, createLogOutputChannel, + createTerminal, onDidChangeActiveTerminal, onDidChangeTerminalShellIntegration, } from './common/window.apis'; @@ -66,7 +67,11 @@ import { ProjectItem } from './features/views/treeViewItems'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { registerSystemPythonFeatures } from './managers/builtin/main'; import { SysPythonManager } from './managers/builtin/sysPythonManager'; -import { createNativePythonFinder, NativePythonFinder } from './managers/common/nativePythonFinder'; +import { + createNativePythonFinder, + getNativePythonToolsPath, + NativePythonFinder, +} from './managers/common/nativePythonFinder'; import { IDisposable } from './managers/common/types'; import { registerCondaFeatures } from './managers/conda/main'; import { registerPoetryFeatures } from './managers/poetry/main'; @@ -429,6 +434,20 @@ export async function activate(context: ExtensionContext): Promise { + try { + const petPath = await getNativePythonToolsPath(); + const terminal = createTerminal({ + name: 'Python Environment Tool (PET)', + }); + terminal.show(); + terminal.sendText(`"${petPath}"`, true); + traceInfo(`Running PET in terminal: ${petPath}`); + } catch (error) { + traceError('Error running PET in terminal', error); + window.showErrorMessage(`Failed to run Python Environment Tool: ${error}`); + } + }), terminalActivation.onDidChangeTerminalActivationState(async (e) => { await setActivateMenuButtonContext(e.terminal, e.environment, e.activated); }), diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index a363041..61f019e 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -1,20 +1,20 @@ +import * as ch from 'child_process'; import * as fs from 'fs-extra'; import * as path from 'path'; +import { PassThrough } from 'stream'; +import { Disposable, ExtensionContext, LogOutputChannel, Uri } from 'vscode'; import * as rpc from 'vscode-jsonrpc/node'; -import * as ch from 'child_process'; +import { PythonProjectApi } from '../../api'; import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants'; import { getExtension } from '../../common/extension.apis'; -import { noop } from './utils'; -import { Disposable, ExtensionContext, LogOutputChannel, Uri } from 'vscode'; -import { PassThrough } from 'stream'; -import { PythonProjectApi } from '../../api'; -import { getConfiguration } from '../../common/workspace.apis'; -import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; import { traceVerbose } from '../../common/logging'; -import { isWindows } from '../../common/utils/platformUtils'; import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; +import { isWindows } from '../../common/utils/platformUtils'; +import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; +import { getConfiguration } from '../../common/workspace.apis'; +import { noop } from './utils'; -async function getNativePythonToolsPath(): Promise { +export async function getNativePythonToolsPath(): Promise { const envsExt = getExtension(ENVS_EXTENSION_ID); if (envsExt) { const petPath = path.join(envsExt.extensionPath, 'python-env-tools', 'bin', isWindows() ? 'pet.exe' : 'pet'); From c40fddf00553772e5f3590b4038e3c5539cc7c54 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 18 Jul 2025 09:15:17 -0700 Subject: [PATCH 221/328] port over workflows from python ext (#614) --- .../community-feedback-auto-comment.yml | 28 +++++++++ .github/workflows/info-needed-closer.yml | 33 +++++++++++ .github/workflows/remove-needs-labels.yml | 20 +++++++ .../workflows/test_plan_item_validator.yml | 30 ++++++++++ .github/workflows/triage-info-needed.yml | 57 +++++++++++++++++++ 5 files changed, 168 insertions(+) create mode 100644 .github/workflows/community-feedback-auto-comment.yml create mode 100644 .github/workflows/info-needed-closer.yml create mode 100644 .github/workflows/remove-needs-labels.yml create mode 100644 .github/workflows/test_plan_item_validator.yml create mode 100644 .github/workflows/triage-info-needed.yml diff --git a/.github/workflows/community-feedback-auto-comment.yml b/.github/workflows/community-feedback-auto-comment.yml new file mode 100644 index 0000000..f606148 --- /dev/null +++ b/.github/workflows/community-feedback-auto-comment.yml @@ -0,0 +1,28 @@ +name: Community Feedback Auto Comment + +on: + issues: + types: + - labeled +jobs: + add-comment: + if: github.event.label.name == 'needs community feedback' + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: Check For Existing Comment + uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0 + id: finder + with: + issue-number: ${{ github.event.issue.number }} + comment-author: 'github-actions[bot]' + body-includes: 'Thanks for the feature request! We are going to give the community' + + - name: Add Community Feedback Comment + if: steps.finder.outputs.comment-id == '' + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + with: + issue-number: ${{ github.event.issue.number }} + body: | + Thanks for the feature request! We are going to give the community 60 days from when this issue was created to provide 7 👍 upvotes on the opening comment to gauge general interest in this idea. If there's enough upvotes then we will consider this feature request in our future planning. If there's unfortunately not enough upvotes then we will close this issue. diff --git a/.github/workflows/info-needed-closer.yml b/.github/workflows/info-needed-closer.yml new file mode 100644 index 0000000..d7efbd1 --- /dev/null +++ b/.github/workflows/info-needed-closer.yml @@ -0,0 +1,33 @@ +name: Info-Needed Closer +on: + schedule: + - cron: 20 12 * * * # 5:20am Redmond + repository_dispatch: + types: [trigger-needs-more-info] + workflow_dispatch: + +permissions: + issues: write + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: Checkout Actions + uses: actions/checkout@v4 + with: + repository: 'microsoft/vscode-github-triage-actions' + path: ./actions + persist-credentials: false + ref: stable + - name: Install Actions + run: npm install --production --prefix ./actions + - name: Run info-needed Closer + uses: ./actions/needs-more-info-closer + with: + token: ${{secrets.GITHUB_TOKEN}} + label: info-needed + closeDays: 30 + closeComment: "Because we have not heard back with the information we requested, we are closing this issue for now. If you are able to provide the info later on, then we will be happy to re-open this issue to pick up where we left off. \n\nHappy Coding!" + pingDays: 30 + pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information." diff --git a/.github/workflows/remove-needs-labels.yml b/.github/workflows/remove-needs-labels.yml new file mode 100644 index 0000000..2435252 --- /dev/null +++ b/.github/workflows/remove-needs-labels.yml @@ -0,0 +1,20 @@ +name: 'Remove Needs Label' +on: + issues: + types: [closed] + +jobs: + classify: + name: 'Remove needs labels on issue closing' + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: 'Removes needs labels on issue close' + uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0 + with: + labels: | + needs PR + needs spike + needs community feedback + needs proposal diff --git a/.github/workflows/test_plan_item_validator.yml b/.github/workflows/test_plan_item_validator.yml new file mode 100644 index 0000000..91e8948 --- /dev/null +++ b/.github/workflows/test_plan_item_validator.yml @@ -0,0 +1,30 @@ +name: Test Plan Item Validator +on: + issues: + types: [edited, labeled] + +permissions: + issues: write + +jobs: + main: + runs-on: ubuntu-latest + if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item') + steps: + - name: Checkout Actions + uses: actions/checkout@v4 + with: + repository: 'microsoft/vscode-github-triage-actions' + path: ./actions + persist-credentials: false + ref: stable + + - name: Install Actions + run: npm install --production --prefix ./actions + + - name: Run Test Plan Item Validator + uses: ./actions/test-plan-item-validator + with: + label: testplan-item + invalidLabel: invalid-testplan-item + comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved. diff --git a/.github/workflows/triage-info-needed.yml b/.github/workflows/triage-info-needed.yml new file mode 100644 index 0000000..1fd316f --- /dev/null +++ b/.github/workflows/triage-info-needed.yml @@ -0,0 +1,57 @@ +name: Triage "info-needed" label + +on: + issue_comment: + types: [created] + +env: + TRIAGERS: '["karthiknadig","eleanorjboyd","anthonykim1"]' + +jobs: + add_label: + if: contains(github.event.issue.labels.*.name, 'triage-needed') && !contains(github.event.issue.labels.*.name, 'info-needed') + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: Checkout Actions + uses: actions/checkout@v4 + with: + repository: 'microsoft/vscode-github-triage-actions' + ref: stable + path: ./actions + persist-credentials: false + + - name: Install Actions + run: npm install --production --prefix ./actions + + - name: Add "info-needed" label + uses: ./actions/python-triage-info-needed + with: + triagers: ${{ env.TRIAGERS }} + action: 'add' + token: ${{secrets.GITHUB_TOKEN}} + + remove_label: + if: contains(github.event.issue.labels.*.name, 'info-needed') && contains(github.event.issue.labels.*.name, 'triage-needed') + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: Checkout Actions + uses: actions/checkout@v4 + with: + repository: 'microsoft/vscode-github-triage-actions' + ref: stable + path: ./actions + persist-credentials: false + + - name: Install Actions + run: npm install --production --prefix ./actions + + - name: Remove "info-needed" label + uses: ./actions/python-triage-info-needed + with: + triagers: ${{ env.TRIAGERS }} + action: 'remove' + token: ${{secrets.GITHUB_TOKEN}} From 04cfdc241620c59bbbf8bf59ecf86e3af8ebe086 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:37:48 -0700 Subject: [PATCH 222/328] bump to version 1.0.0 to do first stable release (#615) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa0b2fc..142f09d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "0.3.0-dev", + "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "0.3.0-dev", + "version": "1.0.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 7886ed1..57443cc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "0.3.0-dev", + "version": "1.0.0", "publisher": "ms-python", "preview": true, "engines": { From eb3a17168b7dc26ae1ccf7364817cf41fbd34057 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:45:04 -0700 Subject: [PATCH 223/328] bump version to 1.1 for dev (#616) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 142f09d..b0820e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.0.0", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.0.0", + "version": "1.1.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 57443cc..2349f04 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.0.0", + "version": "1.1.0", "publisher": "ms-python", "preview": true, "engines": { From 06b95742c4e6ac47c2a9ba041426f0caede12c71 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 21 Jul 2025 12:45:04 -0700 Subject: [PATCH 224/328] update pet (#617) --- build/azure-pipeline.stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml index e41a2a4..348a8d9 100644 --- a/build/azure-pipeline.stable.yml +++ b/build/azure-pipeline.stable.yml @@ -112,7 +112,7 @@ extends: project: 'Monaco' definition: 593 buildVersionToDownload: 'latestFromBranch' - branchName: 'refs/heads/release/2024.18' + branchName: 'refs/heads/release/2025.10' targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' artifactName: 'bin-$(buildTarget)' itemPattern: | From 867bdba907e4496c6b4d72b48ffd8f74e1862cb4 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 25 Jul 2025 09:01:41 -0700 Subject: [PATCH 225/328] fix async return for runInDedicatedTerminal API (#643) --- src/features/pythonApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/pythonApi.ts b/src/features/pythonApi.ts index 9f3f295..cf1e048 100644 --- a/src/features/pythonApi.ts +++ b/src/features/pythonApi.ts @@ -318,7 +318,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi { environment, ); await runInTerminal(environment, terminal, options); - return terminal; + return Promise.resolve(terminal); } runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise { return runAsTask(environment, options); From edaad26b9cd08f32bbb802e91b9baa0754de1d89 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 25 Jul 2025 10:08:09 -0700 Subject: [PATCH 226/328] include pyenv virtualenv and enhance display name (#646) https://github.com/microsoft/vscode-python-environments/issues/590 --- src/managers/pyenv/pyenvUtils.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/managers/pyenv/pyenvUtils.ts b/src/managers/pyenv/pyenvUtils.ts index 73e67a3..026d3f1 100644 --- a/src/managers/pyenv/pyenvUtils.ts +++ b/src/managers/pyenv/pyenvUtils.ts @@ -177,7 +177,10 @@ function nativeToPythonEnv( const sv = shortVersion(info.version); const name = info.name || info.displayName || path.basename(info.prefix); - const displayName = info.displayName || `pyenv (${sv})`; + let displayName = info.displayName || `pyenv (${sv})`; + if (info.kind === NativePythonEnvironmentKind.pyenvVirtualEnv) { + displayName = `${name} (${sv})`; + } const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); @@ -232,7 +235,10 @@ export async function refreshPyenv( const envs = data .filter((e) => isNativeEnvInfo(e)) .map((e) => e as NativeEnvInfo) - .filter((e) => e.kind === NativePythonEnvironmentKind.pyenv); + .filter( + (e) => + e.kind === NativePythonEnvironmentKind.pyenv || e.kind === NativePythonEnvironmentKind.pyenvVirtualEnv, + ); const collection: PythonEnvironment[] = []; From 7e31666447374d66c6773ef81b619abf5ac45e22 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Fri, 25 Jul 2025 16:05:26 -0700 Subject: [PATCH 227/328] Attach & for shell integration enabled pwsh case (#652) Resolves https://github.com/microsoft/vscode-python-environments/issues/649 --- src/features/terminal/runInTerminal.ts | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/features/terminal/runInTerminal.ts b/src/features/terminal/runInTerminal.ts index b650b9e..24ac7eb 100644 --- a/src/features/terminal/runInTerminal.ts +++ b/src/features/terminal/runInTerminal.ts @@ -1,10 +1,10 @@ import { Terminal, TerminalShellExecution } from 'vscode'; import { PythonEnvironment, PythonTerminalExecutionOptions } from '../../api'; -import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { createDeferred } from '../../common/utils/deferred'; -import { quoteArgs } from '../execution/execUtils'; -import { identifyTerminalShell } from '../common/shellDetector'; +import { onDidEndTerminalShellExecution } from '../../common/window.apis'; import { ShellConstants } from '../common/shellConstants'; +import { identifyTerminalShell } from '../common/shellDetector'; +import { quoteArgs } from '../execution/execUtils'; export async function runInTerminal( environment: PythonEnvironment, @@ -15,11 +15,10 @@ export async function runInTerminal( terminal.show(); } - const executable = - environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...(options.args ?? [])]; - + const shellType = identifyTerminalShell(terminal); if (terminal.shellIntegration) { let execution: TerminalShellExecution | undefined; const deferred = createDeferred(); @@ -29,10 +28,21 @@ export async function runInTerminal( deferred.resolve(); } }); + + const shouldSurroundWithQuotes = + executable.includes(' ') && !executable.startsWith('"') && !executable.endsWith('"'); + // Handle case where executable contains white-spaces. + if (shouldSurroundWithQuotes) { + executable = `"${executable}"`; + } + + if (shellType === ShellConstants.PWSH && !executable.startsWith('&')) { + // PowerShell requires commands to be prefixed with '&' to run them. + executable = `& ${executable}`; + } execution = terminal.shellIntegration.executeCommand(executable, allArgs); await deferred.promise; } else { - const shellType = identifyTerminalShell(terminal); let text = quoteArgs([executable, ...allArgs]).join(' '); if (shellType === ShellConstants.PWSH && !text.startsWith('&')) { // PowerShell requires commands to be prefixed with '&' to run them. From abb5cab7b30d238c1bf97a80845aa3064b59a156 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 25 Jul 2025 16:05:47 -0700 Subject: [PATCH 228/328] bug: fix gitignore add for more scenarios (#627) fixes https://github.com/microsoft/vscode-python-environments/issues/619 since environmentPath for an environment can be "Path to the python binary or environment folder." need to update code to support if the path is directly to a python binary. If so get the parent, parent of the binary to get the venv folder --- src/managers/builtin/venvManager.ts | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index e02031b..cf5027a 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -30,7 +30,7 @@ import { } from '../../api'; import { PYTHON_EXTENSION_ID } from '../../common/constants'; import { VenvManagerStrings } from '../../common/localize'; -import { traceError } from '../../common/logging'; +import { traceError, traceWarn } from '../../common/logging'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { showErrorMessage, withProgress } from '../../common/window.apis'; import { findParentIfFile } from '../../features/envCommands'; @@ -186,12 +186,30 @@ export class VenvManager implements EnvironmentManager { // Add .gitignore to the .venv folder try { - const venvDir = environment.environmentPath.fsPath; - const gitignorePath = path.join(venvDir, '.gitignore'); + // determine if env path is python binary or environment folder + let envPath = environment.environmentPath.fsPath; + try { + const stat = await fs.stat(envPath); + if (!stat.isDirectory()) { + // If the env path is a file (likely the python binary), use parent-parent as the env path + // following format of .venv/bin/python or .venv\Scripts\python.exe + envPath = Uri.file(path.dirname(path.dirname(envPath))).fsPath; + } + } catch (err) { + // If stat fails, fallback to original envPath + traceWarn( + `Failed to stat environment path: ${envPath}. Error: ${ + err instanceof Error ? err.message : String(err) + }, continuing to attempt to create .gitignore.`, + ); + } + const gitignorePath = path.join(envPath, '.gitignore'); await fs.writeFile(gitignorePath, '*\n', { flag: 'w' }); } catch (err) { traceError( - `Failed to create .gitignore in venv: ${err instanceof Error ? err.message : String(err)}`, + `Failed to create .gitignore in venv: ${ + err instanceof Error ? err.message : String(err) + }, continuing.`, ); } From 2816ed2a9bd2f5633d5b235fa79847547b77584a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Sun, 27 Jul 2025 10:12:10 -0700 Subject: [PATCH 229/328] bump v1.2.0 (#657) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0820e2..5c26b1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.1.0", + "version": "1.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.1.0", + "version": "1.2.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 2349f04..5517662 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.1.0", + "version": "1.2.0", "publisher": "ms-python", "preview": true, "engines": { From 4773a4103ac7387b99f7bb3e7cce3f656be5c54f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:04:06 -0700 Subject: [PATCH 230/328] bump v1.3.0 (#659) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c26b1e..6ba473b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.2.0", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.2.0", + "version": "1.3.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 5517662..a0cf630 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.2.0", + "version": "1.3.0", "publisher": "ms-python", "preview": true, "engines": { From 3056a832dc11f4dc3591e798d568f2a6d2499958 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 28 Jul 2025 08:16:26 -0700 Subject: [PATCH 231/328] add quoting logic in runAsTask (#651) might fix https://github.com/microsoft/vscode-python-environments/issues/642, waiting on clarification --- src/features/execution/execUtils.ts | 2 +- src/features/execution/runAsTask.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/features/execution/execUtils.ts b/src/features/execution/execUtils.ts index 9cdfb67..7c61975 100644 --- a/src/features/execution/execUtils.ts +++ b/src/features/execution/execUtils.ts @@ -1,4 +1,4 @@ -function quoteArg(arg: string): string { +export function quoteArg(arg: string): string { if (arg.indexOf(' ') >= 0 && !(arg.startsWith('"') && arg.endsWith('"'))) { return `"${arg}"`; } diff --git a/src/features/execution/runAsTask.ts b/src/features/execution/runAsTask.ts index 705c033..9cd77d8 100644 --- a/src/features/execution/runAsTask.ts +++ b/src/features/execution/runAsTask.ts @@ -8,10 +8,10 @@ import { Uri, WorkspaceFolder, } from 'vscode'; -import { PythonTaskExecutionOptions } from '../../api'; -import { getWorkspaceFolder } from '../../common/workspace.apis'; -import { PythonEnvironment } from '../../api'; +import { PythonEnvironment, PythonTaskExecutionOptions } from '../../api'; import { executeTask } from '../../common/tasks.apis'; +import { getWorkspaceFolder } from '../../common/workspace.apis'; +import { quoteArg } from './execUtils'; function getWorkspaceFolderOrDefault(uri?: Uri): WorkspaceFolder | TaskScope { const workspace = uri ? getWorkspaceFolder(uri) : undefined; @@ -25,8 +25,8 @@ export async function runAsTask( ): Promise { const workspace: WorkspaceFolder | TaskScope = getWorkspaceFolderOrDefault(options.project?.uri); - const executable = - environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + executable = quoteArg(executable); const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; From c30ca53ce92801e9838b5b488ca549639027bdc4 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 28 Jul 2025 17:33:27 -0700 Subject: [PATCH 232/328] fix: add guard for shell script re-run (#663) Fix for #635 --- src/features/terminal/shells/bash/bashConstants.ts | 2 +- src/features/terminal/shells/bash/bashStartup.ts | 9 ++++++--- src/features/terminal/shells/fish/fishConstants.ts | 2 +- src/features/terminal/shells/fish/fishStartup.ts | 9 ++++++--- src/features/terminal/shells/pwsh/pwshConstants.ts | 2 +- src/features/terminal/shells/pwsh/pwshStartup.ts | 13 ++++++++----- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/features/terminal/shells/bash/bashConstants.ts b/src/features/terminal/shells/bash/bashConstants.ts index eaaa0f5..1e3566c 100644 --- a/src/features/terminal/shells/bash/bashConstants.ts +++ b/src/features/terminal/shells/bash/bashConstants.ts @@ -1,3 +1,3 @@ export const BASH_ENV_KEY = 'VSCODE_BASH_ACTIVATE'; export const ZSH_ENV_KEY = 'VSCODE_ZSH_ACTIVATE'; -export const BASH_SCRIPT_VERSION = '0.1.0'; +export const BASH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index dcea460..ff66d72 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -48,9 +48,12 @@ function getActivationContent(key: string): string { const lineSep = '\n'; return [ `# version: ${BASH_SCRIPT_VERSION}`, - `if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`, - ` eval "$${key}" || true`, - 'fi', + `if [ -z "$VSCODE_PYTHON_AUTOACTIVATE_GUARD" ]; then`, + ` export VSCODE_PYTHON_AUTOACTIVATE_GUARD=1`, + ` if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`, + ` eval "$${key}" || true`, + ` fi`, + `fi`, ].join(lineSep); } diff --git a/src/features/terminal/shells/fish/fishConstants.ts b/src/features/terminal/shells/fish/fishConstants.ts index 67f6e4f..512fb9c 100644 --- a/src/features/terminal/shells/fish/fishConstants.ts +++ b/src/features/terminal/shells/fish/fishConstants.ts @@ -1,2 +1,2 @@ export const FISH_ENV_KEY = 'VSCODE_FISH_ACTIVATE'; -export const FISH_SCRIPT_VERSION = '0.1.0'; +export const FISH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 6cacbaf..662d289 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -34,9 +34,12 @@ function getActivationContent(key: string): string { const lineSep = '\n'; return [ `# version: ${FISH_SCRIPT_VERSION}`, - `if test "$TERM_PROGRAM" = "vscode"; and set -q ${key}`, - ` eval $${key}`, - 'end', + `if not set -q VSCODE_PYTHON_AUTOACTIVATE_GUARD`, + ` set -gx VSCODE_PYTHON_AUTOACTIVATE_GUARD 1`, + ` if test "$TERM_PROGRAM" = "vscode"; and set -q ${key}`, + ` eval $${key}`, + ` end`, + `end`, ].join(lineSep); } diff --git a/src/features/terminal/shells/pwsh/pwshConstants.ts b/src/features/terminal/shells/pwsh/pwshConstants.ts index 8d71e9d..1c7072e 100644 --- a/src/features/terminal/shells/pwsh/pwshConstants.ts +++ b/src/features/terminal/shells/pwsh/pwshConstants.ts @@ -1,2 +1,2 @@ export const POWERSHELL_ENV_KEY = 'VSCODE_PWSH_ACTIVATE'; -export const PWSH_SCRIPT_VERSION = '0.1.0'; +export const PWSH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 6f73bcd..17347af 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -113,11 +113,14 @@ function getActivationContent(): string { const lineSep = isWindows() ? '\r\n' : '\n'; const activationContent = [ `#version: ${PWSH_SCRIPT_VERSION}`, - `if (($env:TERM_PROGRAM -eq 'vscode') -and ($null -ne $env:${POWERSHELL_ENV_KEY})) {`, - ' try {', - ` Invoke-Expression $env:${POWERSHELL_ENV_KEY}`, - ' } catch {', - ` Write-Error "Failed to activate Python environment: $_" -ErrorAction Continue`, + `if (-not $env:VSCODE_PYTHON_AUTOACTIVATE_GUARD) {`, + ` $env:VSCODE_PYTHON_AUTOACTIVATE_GUARD = '1'`, + ` if (($env:TERM_PROGRAM -eq 'vscode') -and ($null -ne $env:${POWERSHELL_ENV_KEY})) {`, + ' try {', + ` Invoke-Expression $env:${POWERSHELL_ENV_KEY}`, + ' } catch {', + ` Write-Error "Failed to activate Python environment: $_" -ErrorAction Continue`, + ' }', ' }', '}', ].join(lineSep); From 294a8341425093a18ee22f79351cd24f7d53b993 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:18:54 -0700 Subject: [PATCH 233/328] Conda hook search (#648) fixes https://github.com/microsoft/vscode-python/issues/25316 --------- Co-authored-by: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> --- src/managers/conda/condaUtils.ts | 72 +++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 0ad65e4..9fe73e0 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -28,7 +28,7 @@ import { import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { showErrorMessageWithLogs } from '../../common/errors/utils'; import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/localize'; -import { traceInfo } from '../../common/logging'; +import { traceError, traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickProject } from '../../common/pickers/projects'; import { createDeferred } from '../../common/utils/deferred'; @@ -280,13 +280,13 @@ function isPrefixOf(roots: string[], e: string): boolean { return false; } -function getNamedCondaPythonInfo( +async function getNamedCondaPythonInfo( name: string, prefix: string, executable: string, version: string, conda: string, -): PythonEnvironmentInfo { +): Promise { const sv = shortVersion(version); const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); @@ -323,7 +323,7 @@ function getNamedCondaPythonInfo( ]); shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); } - const psActivate = path.join(path.dirname(path.dirname(conda)), 'shell', 'condabin', 'conda-hook.ps1'); + const psActivate = await getCondaHookPs1Path(conda); shellActivation.set(ShellConstants.PWSH, [ { executable: '&', args: [psActivate] }, { executable: 'conda', args: ['activate', name] }, @@ -374,12 +374,12 @@ function getNamedCondaPythonInfo( }; } -function getPrefixesCondaPythonInfo( +async function getPrefixesCondaPythonInfo( prefix: string, executable: string, version: string, conda: string, -): PythonEnvironmentInfo { +): Promise { const sv = shortVersion(version); const shellActivation: Map = new Map(); const shellDeactivation: Map = new Map(); @@ -416,7 +416,7 @@ function getPrefixesCondaPythonInfo( ]); shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); } - const psActivate = path.join(path.dirname(path.dirname(conda)), 'shell', 'condabin', 'conda-hook.ps1'); + const psActivate = await getCondaHookPs1Path(conda); shellActivation.set(ShellConstants.PWSH, [ { executable: '&', args: [psActivate] }, { executable: 'conda', args: ['activate', prefix] }, @@ -487,14 +487,14 @@ function getCondaWithoutPython(name: string, prefix: string, conda: string): Pyt }; } -function nativeToPythonEnv( +async function nativeToPythonEnv( e: NativeEnvInfo, api: PythonEnvironmentApi, manager: EnvironmentManager, log: LogOutputChannel, conda: string, condaPrefixes: string[], -): PythonEnvironment | undefined { +): Promise { if (!(e.prefix && e.executable && e.version)) { let name = e.name; const environment = api.createPythonEnvironmentItem( @@ -507,14 +507,14 @@ function nativeToPythonEnv( if (e.name === 'base') { const environment = api.createPythonEnvironmentItem( - getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda), + await getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found base environment: ${e.prefix}`); return environment; } else if (!isPrefixOf(condaPrefixes, e.prefix)) { const environment = api.createPythonEnvironmentItem( - getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda), + await getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found prefix environment: ${e.prefix}`); @@ -523,7 +523,7 @@ function nativeToPythonEnv( const basename = path.basename(e.prefix); const name = e.name ?? basename; const environment = api.createPythonEnvironmentItem( - getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda), + await getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda), manager, ); log.info(`Found named environment: ${e.prefix}`); @@ -586,8 +586,8 @@ export async function refreshCondaEnvs( .filter((e) => e.kind === NativePythonEnvironmentKind.conda); const collection: PythonEnvironment[] = []; - envs.forEach((e) => { - const environment = nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes); + envs.forEach(async (e) => { + const environment = await nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes); if (environment) { collection.push(environment); } @@ -699,7 +699,7 @@ async function createNamedCondaEnvironment( const version = await getVersion(envPath); const environment = api.createPythonEnvironmentItem( - getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()), + await getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()), manager, ); return environment; @@ -757,7 +757,7 @@ async function createPrefixCondaEnvironment( const version = await getVersion(prefix); const environment = api.createPythonEnvironmentItem( - getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()), + await getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()), manager, ); return environment; @@ -1052,3 +1052,43 @@ export async function checkForNoPythonCondaEnvironment( } return environment; } + +/** + * Returns the best guess path to conda-hook.ps1 given a conda executable path. + * + * Searches for conda-hook.ps1 in these locations (relative to the conda root): + * - shell/condabin/ + * - Library/shell/condabin/ + * - condabin/ + * - etc/profile.d/ + */ +async function getCondaHookPs1Path(condaPath: string): Promise { + const condaRoot = path.dirname(path.dirname(condaPath)); + + const condaRootCandidates: string[] = [ + path.join(condaRoot, 'shell', 'condabin'), + path.join(condaRoot, 'Library', 'shell', 'condabin'), + path.join(condaRoot, 'condabin'), + path.join(condaRoot, 'etc', 'profile.d'), + ]; + + const checks = condaRootCandidates.map(async (hookSearchDir) => { + const candidate = path.join(hookSearchDir, 'conda-hook.ps1'); + if (await fse.pathExists(candidate)) { + traceInfo(`Conda hook found at: ${candidate}`); + return candidate; + } + return undefined; + }); + const results = await Promise.all(checks); + const found = results.find(Boolean); + if (found) { + return found as string; + } + traceError( + `Conda hook not found in any of the expected locations: ${condaRootCandidates.join( + ', ', + )}, given conda path: ${condaPath}`, + ); + return path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1'); +} From dc95077cd34e9788d49a9100f96da21e6d1bda9a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 31 Jul 2025 08:30:51 -0700 Subject: [PATCH 234/328] feat: implement caching for conda hook path to optimize filesystem checks (#670) --- src/managers/conda/condaUtils.ts | 70 ++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 9fe73e0..92d4d57 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -1053,6 +1053,9 @@ export async function checkForNoPythonCondaEnvironment( return environment; } +// Cache for conda hook paths to avoid redundant filesystem checks +const condaHookPathCache = new Map>(); + /** * Returns the best guess path to conda-hook.ps1 given a conda executable path. * @@ -1063,32 +1066,45 @@ export async function checkForNoPythonCondaEnvironment( * - etc/profile.d/ */ async function getCondaHookPs1Path(condaPath: string): Promise { - const condaRoot = path.dirname(path.dirname(condaPath)); - - const condaRootCandidates: string[] = [ - path.join(condaRoot, 'shell', 'condabin'), - path.join(condaRoot, 'Library', 'shell', 'condabin'), - path.join(condaRoot, 'condabin'), - path.join(condaRoot, 'etc', 'profile.d'), - ]; - - const checks = condaRootCandidates.map(async (hookSearchDir) => { - const candidate = path.join(hookSearchDir, 'conda-hook.ps1'); - if (await fse.pathExists(candidate)) { - traceInfo(`Conda hook found at: ${candidate}`); - return candidate; - } - return undefined; - }); - const results = await Promise.all(checks); - const found = results.find(Boolean); - if (found) { - return found as string; + // Check cache first + const cachedPath = condaHookPathCache.get(condaPath); + if (cachedPath) { + return cachedPath; } - traceError( - `Conda hook not found in any of the expected locations: ${condaRootCandidates.join( - ', ', - )}, given conda path: ${condaPath}`, - ); - return path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1'); + + // Create the promise for finding the hook path + const hookPathPromise = (async () => { + const condaRoot = path.dirname(path.dirname(condaPath)); + + const condaRootCandidates: string[] = [ + path.join(condaRoot, 'shell', 'condabin'), + path.join(condaRoot, 'Library', 'shell', 'condabin'), + path.join(condaRoot, 'condabin'), + path.join(condaRoot, 'etc', 'profile.d'), + ]; + + const checks = condaRootCandidates.map(async (hookSearchDir) => { + const candidate = path.join(hookSearchDir, 'conda-hook.ps1'); + if (await fse.pathExists(candidate)) { + traceInfo(`Conda hook found at: ${candidate}`); + return candidate; + } + return undefined; + }); + const results = await Promise.all(checks); + const found = results.find(Boolean); + if (found) { + return found as string; + } + traceError( + `Conda hook not found in any of the expected locations: ${condaRootCandidates.join( + ', ', + )}, given conda path: ${condaPath}`, + ); + return path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1'); + })(); + + // Store in cache and return + condaHookPathCache.set(condaPath, hookPathPromise); + return hookPathPromise; } From ae58523a72ba721457c66d93f0d9176c23379606 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 31 Jul 2025 11:42:53 -0700 Subject: [PATCH 235/328] require python envs ext respecting terminal.activateEnvironment (#665) fixes https://github.com/microsoft/vscode-python-environments/issues/662 only follow disablement if both settings are set --- package.nls.json | 2 +- src/extension.ts | 9 ++++++-- src/features/terminal/utils.ts | 40 +++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/package.nls.json b/package.nls.json index f365cfa..d746132 100644 --- a/package.nls.json +++ b/package.nls.json @@ -6,7 +6,7 @@ "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.", "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.", "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu", - "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.", + "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting takes precedence over the legacy `python.terminal.activateEnvironment` setting. If this setting is not explicitly set and `python.terminal.activateEnvironment` is set to false, this setting will automatically be set to `off` to preserve your preference.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.", "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.", "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", diff --git a/src/extension.ts b/src/extension.ts index 76944e9..3e0fb57 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -58,7 +58,7 @@ import { ShellStartupActivationVariablesManagerImpl } from './features/terminal/ import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHandlers'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; -import { getEnvironmentForTerminal } from './features/terminal/utils'; +import { getAutoActivationType, getEnvironmentForTerminal } from './features/terminal/utils'; import { EnvManagerView } from './features/views/envManagersView'; import { ProjectView } from './features/views/projectView'; import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; @@ -144,10 +144,15 @@ async function collectEnvironmentInfo( // Current settings (non-sensitive) const config = workspace.getConfiguration('python-envs'); + const pyConfig = workspace.getConfiguration('python'); info.push('\nExtension Settings:'); info.push(` Default Environment Manager: ${config.get('defaultEnvManager')}`); info.push(` Default Package Manager: ${config.get('defaultPackageManager')}`); - info.push(` Terminal Auto Activation: ${config.get('terminal.autoActivationType')}`); + const pyenvAct = config.get('terminal.autoActivationType', undefined); + const pythonAct = pyConfig.get('terminal.activateEnvironment', undefined); + info.push( + `Auto-activation is "${getAutoActivationType()}". Activation based on first 'py-env.terminal.autoActivationType' setting which is '${pyenvAct}' and 'python.terminal.activateEnvironment' if the first is undefined which is '${pythonAct}'.\n`, + ); } catch (err) { info.push(`\nError collecting environment information: ${err}`); } diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 1a17c54..8acc125 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -94,12 +94,42 @@ export const ACT_TYPE_SHELL = 'shellStartup'; export const ACT_TYPE_COMMAND = 'command'; export const ACT_TYPE_OFF = 'off'; export type AutoActivationType = 'off' | 'command' | 'shellStartup'; +/** + * Determines the auto-activation type for Python environments in terminals. + * + * The following types are supported: + * - 'shellStartup': Environment is activated via shell startup scripts + * - 'command': Environment is activated via explicit command + * - 'off': Auto-activation is disabled + * + * Priority order: + * 1. python-envs.terminal.autoActivationType setting + * 2. python.terminal.activateEnvironment setting (if false updates python-envs.terminal.autoActivationType) + * 3. Default to 'command' if no setting is found + * + * @returns {AutoActivationType} The determined auto-activation type + */ export function getAutoActivationType(): AutoActivationType { - // 'startup' auto-activation means terminal is activated via shell startup scripts. - // 'command' auto-activation means terminal is activated via a command. - // 'off' means no auto-activation. - const config = getConfiguration('python-envs'); - return config.get('terminal.autoActivationType', 'command'); + const pyEnvsConfig = getConfiguration('python-envs'); + + const pyEnvsActivationType = pyEnvsConfig.get( + 'terminal.autoActivationType', + undefined, + ); + if (pyEnvsActivationType !== undefined) { + return pyEnvsActivationType; + } + + const pythonConfig = getConfiguration('python'); + const pythonActivateSetting = pythonConfig.get('terminal.activateEnvironment', undefined); + if (pythonActivateSetting !== undefined) { + if (pythonActivateSetting === false) { + pyEnvsConfig.set('terminal.autoActivationType', ACT_TYPE_OFF); + } + return pythonActivateSetting ? ACT_TYPE_COMMAND : ACT_TYPE_OFF; + } + + return ACT_TYPE_COMMAND; } export async function setAutoActivationType(value: AutoActivationType): Promise { From b28272980f01155f12ec83182c77a2fc8dee01bd Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:46:07 -0700 Subject: [PATCH 236/328] Fix l10n localization (#685) --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a0cf630..eb6cb46 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "url": "https://github.com/microsoft/vscode-python-environments/issues" }, "main": "./dist/extension.js", + "l10n": "./l10n", "icon": "icon.png", "contributes": { "configuration": { From 329ec77a898b5de76416d418c6e383ab80c9888e Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:27:04 -0700 Subject: [PATCH 237/328] Implement environment variable injection into VS Code terminals using GlobalEnvironmentVariableCollection (#683) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR implements reactive environment variable injection into VS Code terminals using the `GlobalEnvironmentVariableCollection` API, enabling workspace-specific environment variables to be automatically available in all terminal sessions. ## Implementation Overview **New `TerminalEnvVarInjector` class** that: - Uses VS Code's `GlobalEnvironmentVariableCollection` to inject workspace environment variables into terminals - Integrates with the existing `PythonEnvVariableManager` to retrieve environment variables with proper precedence - Responds reactively to changes in `.env` files and `python.envFile` settings - Provides comprehensive logging at decision points using `traceVerbose` and `traceError` ## Key Features **Startup Behavior:** ```typescript // On extension startup, automatically loads and injects environment variables const envVars = await envVarManager.getEnvironmentVariables(workspaceUri); envVarCollection.clear(); for (const [key, value] of Object.entries(envVars)) { if (value !== process.env[key]) { envVarCollection.replace(key, value); } } ``` **Reactive Updates:** - **File changes**: Watches for changes to `.env` files through existing `onDidChangeEnvironmentVariables` event - **Setting changes**: Listens for changes to `python.envFile` configuration and switches to new files automatically - **Multi-workspace**: Handles multiple workspace folders by processing each separately **Smart Injection:** - Only injects variables that differ from `process.env` to avoid redundancy - Clears collection before re-injecting to ensure clean state - Gracefully handles missing files and configuration errors ## Integration Points - **Extension startup**: Integrated into `extension.ts` activation - **Existing infrastructure**: Uses `PythonEnvVariableManager.getEnvironmentVariables()` for consistent behavior - **Resource management**: Proper disposal and cleanup of watchers and subscriptions ## Testing Added comprehensive unit tests covering: - Environment variable injection on startup - Reactive updates to file and setting changes - Error handling for missing files and invalid configurations - Multi-workspace scenarios - Proper resource disposal This implementation follows VS Code extension best practices and provides the foundation for workspace-specific terminal environment configuration. Fixes #682. --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey.alchemer.com/s3/8343779/Copilot-Coding-agent) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/api.ts | 2 +- src/extension.ts | 8 + src/features/execution/envVariableManager.ts | 16 +- .../terminal/terminalEnvVarInjector.ts | 180 ++++++++++++++++++ .../terminalEnvVarInjectorBasic.unit.test.ts | 100 ++++++++++ 5 files changed, 297 insertions(+), 9 deletions(-) create mode 100644 src/features/terminal/terminalEnvVarInjector.ts create mode 100644 src/test/features/terminalEnvVarInjectorBasic.unit.test.ts diff --git a/src/api.ts b/src/api.ts index f2258cc..f889f10 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1223,7 +1223,7 @@ export interface DidChangeEnvironmentVariablesEventArgs { /** * The type of change that occurred. */ - changeTye: FileChangeType; + changeType: FileChangeType; } export interface PythonEnvironmentVariablesApi { diff --git a/src/extension.ts b/src/extension.ts index 3e0fb57..8357015 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -58,6 +58,7 @@ import { ShellStartupActivationVariablesManagerImpl } from './features/terminal/ import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHandlers'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; +import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInjector'; import { getAutoActivationType, getEnvironmentForTerminal } from './features/terminal/utils'; import { EnvManagerView } from './features/views/envManagersView'; import { ProjectView } from './features/views/projectView'; @@ -239,6 +240,13 @@ export async function activate(context: ExtensionContext): Promise - this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Created }), + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Created }), ), this.watcher.onDidChange((e) => - this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Changed }), + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Changed }), ), this.watcher.onDidDelete((e) => - this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Deleted }), + this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Deleted }), ), ); } @@ -48,7 +48,7 @@ export class PythonEnvVariableManager implements EnvVarManager { const config = getConfiguration('python', project?.uri ?? uri); let envFilePath = config.get('envFile'); - envFilePath = envFilePath ? path.normalize(resolveVariables(envFilePath)) : undefined; + envFilePath = envFilePath ? path.normalize(resolveVariables(envFilePath, uri)) : undefined; if (envFilePath && (await fsapi.pathExists(envFilePath))) { const other = await parseEnvFile(Uri.file(envFilePath)); diff --git a/src/features/terminal/terminalEnvVarInjector.ts b/src/features/terminal/terminalEnvVarInjector.ts new file mode 100644 index 0000000..4bf4803 --- /dev/null +++ b/src/features/terminal/terminalEnvVarInjector.ts @@ -0,0 +1,180 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import * as fse from 'fs-extra'; +import * as path from 'path'; +import { + Disposable, + EnvironmentVariableScope, + GlobalEnvironmentVariableCollection, + workspace, + WorkspaceFolder, +} from 'vscode'; +import { traceError, traceVerbose } from '../../common/logging'; +import { resolveVariables } from '../../common/utils/internalVariables'; +import { getConfiguration, getWorkspaceFolder } from '../../common/workspace.apis'; +import { EnvVarManager } from '../execution/envVariableManager'; + +/** + * Manages injection of workspace-specific environment variables into VS Code terminals + * using the GlobalEnvironmentVariableCollection API. + */ +export class TerminalEnvVarInjector implements Disposable { + private disposables: Disposable[] = []; + + constructor( + private readonly envVarCollection: GlobalEnvironmentVariableCollection, + private readonly envVarManager: EnvVarManager, + ) { + this.initialize(); + } + + /** + * Initialize the injector by setting up watchers and injecting initial environment variables. + */ + private async initialize(): Promise { + traceVerbose('TerminalEnvVarInjector: Initializing environment variable injection'); + + // Listen for environment variable changes from the manager + this.disposables.push( + this.envVarManager.onDidChangeEnvironmentVariables((args) => { + if (!args.uri) { + // No specific URI, reload all workspaces + this.updateEnvironmentVariables().catch((error) => { + traceError('Failed to update environment variables:', error); + }); + return; + } + + const affectedWorkspace = getWorkspaceFolder(args.uri); + if (!affectedWorkspace) { + // No workspace folder found for this URI, reloading all workspaces + this.updateEnvironmentVariables().catch((error) => { + traceError('Failed to update environment variables:', error); + }); + return; + } + + if (args.changeType === 2) { + // FileChangeType.Deleted + this.clearWorkspaceVariables(affectedWorkspace); + } else { + this.updateEnvironmentVariables(affectedWorkspace).catch((error) => { + traceError('Failed to update environment variables:', error); + }); + } + }), + ); + + // Initial load of environment variables + await this.updateEnvironmentVariables(); + } + + /** + * Update environment variables in the terminal collection. + */ + private async updateEnvironmentVariables(workspaceFolder?: WorkspaceFolder): Promise { + try { + if (workspaceFolder) { + // Update only the specified workspace + traceVerbose( + `TerminalEnvVarInjector: Updating environment variables for workspace: ${workspaceFolder.uri.fsPath}`, + ); + await this.injectEnvironmentVariablesForWorkspace(workspaceFolder); + } else { + // No provided workspace - update all workspaces + this.envVarCollection.clear(); + + const workspaceFolders = workspace.workspaceFolders; + if (!workspaceFolders || workspaceFolders.length === 0) { + traceVerbose('TerminalEnvVarInjector: No workspace folders found, skipping env var injection'); + return; + } + + traceVerbose('TerminalEnvVarInjector: Updating environment variables for all workspaces'); + for (const folder of workspaceFolders) { + await this.injectEnvironmentVariablesForWorkspace(folder); + } + } + + traceVerbose('TerminalEnvVarInjector: Environment variable injection completed'); + } catch (error) { + traceError('TerminalEnvVarInjector: Error updating environment variables:', error); + } + } + + /** + * Inject environment variables for a specific workspace. + */ + private async injectEnvironmentVariablesForWorkspace(workspaceFolder: WorkspaceFolder): Promise { + const workspaceUri = workspaceFolder.uri; + try { + const envVars = await this.envVarManager.getEnvironmentVariables(workspaceUri); + + // use scoped environment variable collection + const envVarScope = this.getEnvironmentVariableCollectionScoped({ workspaceFolder }); + envVarScope.clear(); // Clear existing variables for this workspace + + // Track which .env file is being used for logging + const config = getConfiguration('python', workspaceUri); + const envFilePath = config.get('envFile'); + const resolvedEnvFilePath: string | undefined = envFilePath + ? path.resolve(resolveVariables(envFilePath, workspaceUri)) + : undefined; + const defaultEnvFilePath: string = path.join(workspaceUri.fsPath, '.env'); + + let activeEnvFilePath: string = resolvedEnvFilePath || defaultEnvFilePath; + if (activeEnvFilePath && (await fse.pathExists(activeEnvFilePath))) { + traceVerbose(`TerminalEnvVarInjector: Using env file: ${activeEnvFilePath}`); + } else { + traceVerbose( + `TerminalEnvVarInjector: No .env file found for workspace: ${workspaceUri.fsPath}, not injecting environment variables.`, + ); + return; // No .env file to inject + } + + for (const [key, value] of Object.entries(envVars)) { + if (value === undefined) { + // Remove the environment variable if the value is undefined + envVarScope.delete(key); + } else { + envVarScope.replace(key, value); + } + } + } catch (error) { + traceError( + `TerminalEnvVarInjector: Error injecting environment variables for workspace ${workspaceUri.fsPath}:`, + error, + ); + } + } + + /** + * Dispose of the injector and clean up resources. + */ + dispose(): void { + traceVerbose('TerminalEnvVarInjector: Disposing'); + this.disposables.forEach((disposable) => disposable.dispose()); + this.disposables = []; + + // Clear all environment variables from the collection + this.envVarCollection.clear(); + } + + private getEnvironmentVariableCollectionScoped(scope: EnvironmentVariableScope = {}) { + const envVarCollection = this.envVarCollection as GlobalEnvironmentVariableCollection; + return envVarCollection.getScoped(scope); + } + + /** + * Clear all environment variables for a workspace. + */ + private clearWorkspaceVariables(workspaceFolder: WorkspaceFolder): void { + try { + const scope = this.getEnvironmentVariableCollectionScoped({ workspaceFolder }); + scope.clear(); + } catch (error) { + traceError(`Failed to clear environment variables for workspace ${workspaceFolder.uri.fsPath}:`, error); + } + } +} diff --git a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts new file mode 100644 index 0000000..4b009e9 --- /dev/null +++ b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts @@ -0,0 +1,100 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import * as sinon from 'sinon'; +import * as typeMoq from 'typemoq'; +import { GlobalEnvironmentVariableCollection, workspace } from 'vscode'; +import { EnvVarManager } from '../../features/execution/envVariableManager'; +import { TerminalEnvVarInjector } from '../../features/terminal/terminalEnvVarInjector'; + +interface MockScopedCollection { + clear: sinon.SinonStub; + replace: sinon.SinonStub; + delete: sinon.SinonStub; +} + +suite('TerminalEnvVarInjector Basic Tests', () => { + let envVarCollection: typeMoq.IMock; + let envVarManager: typeMoq.IMock; + let injector: TerminalEnvVarInjector; + let mockScopedCollection: MockScopedCollection; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let workspaceFoldersStub: any; + + setup(() => { + envVarCollection = typeMoq.Mock.ofType(); + envVarManager = typeMoq.Mock.ofType(); + + // Mock workspace.workspaceFolders property + workspaceFoldersStub = []; + Object.defineProperty(workspace, 'workspaceFolders', { + get: () => workspaceFoldersStub, + configurable: true, + }); + + // Setup scoped collection mock + mockScopedCollection = { + clear: sinon.stub(), + replace: sinon.stub(), + delete: sinon.stub(), + }; + + // Setup environment variable collection to return scoped collection + envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as any); + envVarCollection.setup((x) => x.clear()).returns(() => {}); + + // Setup minimal mocks for event subscriptions + envVarManager + .setup((m) => m.onDidChangeEnvironmentVariables) + .returns( + () => + ({ + dispose: () => {}, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any), + ); + }); + + teardown(() => { + sinon.restore(); + injector?.dispose(); + }); + + test('should initialize without errors', () => { + // Arrange & Act + injector = new TerminalEnvVarInjector(envVarCollection.object, envVarManager.object); + + // Assert - should not throw + sinon.assert.match(injector, sinon.match.object); + }); + + test('should dispose cleanly', () => { + // Arrange + injector = new TerminalEnvVarInjector(envVarCollection.object, envVarManager.object); + + // Act + injector.dispose(); + + // Assert - should clear on dispose + envVarCollection.verify((c) => c.clear(), typeMoq.Times.atLeastOnce()); + }); + + test('should register environment variable change event handler', () => { + // Arrange + let eventHandlerRegistered = false; + envVarManager.reset(); + envVarManager + .setup((m) => m.onDidChangeEnvironmentVariables) + .returns((_handler) => { + eventHandlerRegistered = true; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return { dispose: () => {} } as any; + }); + + // Act + injector = new TerminalEnvVarInjector(envVarCollection.object, envVarManager.object); + + // Assert + sinon.assert.match(eventHandlerRegistered, true); + }); +}); From b6efaec8fa0e6d247c2863f093bdf4a39ad4186d Mon Sep 17 00:00:00 2001 From: Sam Sikora Date: Fri, 8 Aug 2025 22:19:31 -0700 Subject: [PATCH 238/328] bug fix: Stricter pip list Package Parsing (#698) Addressing bug #697. When parsing the output of pip list for packages, two checks were added. First, does the line contain exactly two space-separated keywords? The assumption being we will exactly see "[package name] [package version]" in a valid package list. Secondly, it uses the [regex in the PEP 440 docs](https://peps.python.org/pep-0440/#appendix-b-parsing-version-strings-with-regular-expressions) to verify a valid pip version. Adding these checks will help ensure we only parse valid packages and don't pick up any other information, such as warning messages. Lastly, added a unit test for the situation described in the bug. --- src/managers/builtin/pipListUtils.ts | 10 +++++++++- src/test/managers/builtin/pipListUtils.unit.test.ts | 6 +++--- src/test/managers/builtin/piplist3.actual.txt | 11 +++++++++++ src/test/managers/builtin/piplist3.expected.json | 11 +++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/test/managers/builtin/piplist3.actual.txt create mode 100644 src/test/managers/builtin/piplist3.expected.json diff --git a/src/managers/builtin/pipListUtils.ts b/src/managers/builtin/pipListUtils.ts index 9ae3ae1..3d8d794 100644 --- a/src/managers/builtin/pipListUtils.ts +++ b/src/managers/builtin/pipListUtils.ts @@ -4,6 +4,11 @@ export interface PipPackage { displayName: string; description: string; } +export function isValidVersion(version: string): boolean { + return /^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$/.test( + version, + ); +} export function parsePipList(data: string): PipPackage[] { const collection: PipPackage[] = []; @@ -13,9 +18,12 @@ export function parsePipList(data: string): PipPackage[] { continue; } const parts = line.split(' ').filter((e) => e); - if (parts.length > 1) { + if (parts.length === 2) { const name = parts[0].trim(); const version = parts[1].trim(); + if (!isValidVersion(version)) { + continue; + } const pkg = { name, version, diff --git a/src/test/managers/builtin/pipListUtils.unit.test.ts b/src/test/managers/builtin/pipListUtils.unit.test.ts index 64d0119..24bb39d 100644 --- a/src/test/managers/builtin/pipListUtils.unit.test.ts +++ b/src/test/managers/builtin/pipListUtils.unit.test.ts @@ -1,13 +1,13 @@ +import assert from 'assert'; import * as fs from 'fs-extra'; import * as path from 'path'; -import { EXTENSION_TEST_ROOT } from '../../constants'; import { parsePipList } from '../../../managers/builtin/pipListUtils'; -import assert from 'assert'; +import { EXTENSION_TEST_ROOT } from '../../constants'; const TEST_DATA_ROOT = path.join(EXTENSION_TEST_ROOT, 'managers', 'builtin'); suite('Pip List Parser tests', () => { - const testNames = ['piplist1', 'piplist2']; + const testNames = ['piplist1', 'piplist2', 'piplist3']; testNames.forEach((testName) => { test(`Test parsing pip list output ${testName}`, async () => { diff --git a/src/test/managers/builtin/piplist3.actual.txt b/src/test/managers/builtin/piplist3.actual.txt new file mode 100644 index 0000000..4450b42 --- /dev/null +++ b/src/test/managers/builtin/piplist3.actual.txt @@ -0,0 +1,11 @@ +Package Version +---------- ------- +altgraph 0.17.2 +future 0.18.2 +macholib 1.15.2 +pip 21.2.4 +setuptools 58.0.4 +six 1.15.0 +wheel 0.37.0 +WARNING: You are using pip version 21.2.4; however, version 25.2 is available. +You should consider upgrading via the '/Library/Developer/CommandLineTools/usr/bin/python3 -m pip install --upgrade pip' command. diff --git a/src/test/managers/builtin/piplist3.expected.json b/src/test/managers/builtin/piplist3.expected.json new file mode 100644 index 0000000..c22fcbe --- /dev/null +++ b/src/test/managers/builtin/piplist3.expected.json @@ -0,0 +1,11 @@ +{ + "packages": [ + { "name": "altgraph", "version": "0.17.2" }, + { "name": "future", "version": "0.18.2" }, + { "name": "macholib", "version": "1.15.2" }, + { "name": "pip", "version": "21.2.4" }, + { "name": "setuptools", "version": "58.0.4" }, + { "name": "six", "version": "1.15.0" }, + { "name": "wheel", "version": "0.37.0" } + ] +} From 2407ed9b648bb64ed2456c37368bd6ba67bb2508 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 11 Aug 2025 18:09:35 +0000 Subject: [PATCH 239/328] Update PET command to include submenu for find and resolve operations (#702) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR updates the "Python: Run Python Environment Tool (PET) in Terminal" command to provide a better user experience by adding a submenu that allows users to choose between different PET operations. ## Changes ### Before The command would directly run the PET executable without any options, requiring users to manually add arguments in the terminal. ### After The command now presents a QuickPick menu with two options: 1. **Find All Environments** - Runs `pet find --verbose` to discover and list all Python environments 2. **Resolve Environment...** - Prompts for a Python executable path, then runs `pet resolve ` to get detailed environment information ## User Experience Flow 1. User runs "Python: Run Python Environment Tool (PET) in Terminal..." 2. A menu appears with clear descriptions of each operation: - "Find All Environments": Finds all environments and reports them to standard output - "Resolve Environment...": Resolves & reports details of a specific environment 3. For "Find All Environments": Terminal opens and immediately runs the find command 4. For "Resolve Environment...": User enters a path to a Python executable, then the resolve command runs 5. All interactions support cancellation and include proper error handling ## Technical Details - Updated command title to include ellipsis ("...") to indicate additional user interaction - Implemented using VS Code's native QuickPick and InputBox APIs - Added input validation for the resolve path option - Maintained existing terminal creation and error handling patterns - All existing functionality preserved with no breaking changes The implementation follows the existing codebase patterns and includes comprehensive error handling for a smooth user experience. Fixes #701. --- ✨ Let Copilot coding agent [set things up for you](https://github.com/microsoft/vscode-python-environments/issues/new?title=✨Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.nls.json | 2 +- src/extension.ts | 63 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/package.nls.json b/package.nls.json index d746132..2a62f1c 100644 --- a/package.nls.json +++ b/package.nls.json @@ -36,5 +36,5 @@ "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal", "python-envs.uninstallPackage.title": "Uninstall Package", "python-envs.revealProjectInExplorer.title": "Reveal Project in Explorer", - "python-envs.runPetInTerminal.title": "Run Python Environment Tool (PET) in Terminal" + "python-envs.runPetInTerminal.title": "Run Python Environment Tool (PET) in Terminal..." } diff --git a/src/extension.ts b/src/extension.ts index 8357015..c4d89ec 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,6 +9,7 @@ import { EventNames } from './common/telemetry/constants'; import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; import { sendTelemetryEvent } from './common/telemetry/sender'; import { createDeferred } from './common/utils/deferred'; +import { isWindows } from './common/utils/platformUtils'; import { activeTerminal, createLogOutputChannel, @@ -57,8 +58,8 @@ import { import { ShellStartupActivationVariablesManagerImpl } from './features/terminal/shellStartupActivationVariablesManager'; import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHandlers'; import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; -import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInjector'; +import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; import { getAutoActivationType, getEnvironmentForTerminal } from './features/terminal/utils'; import { EnvManagerView } from './features/views/envManagersView'; import { ProjectView } from './features/views/projectView'; @@ -241,10 +242,7 @@ export async function activate(context: ExtensionContext): Promise { try { const petPath = await getNativePythonToolsPath(); + + // Show quick pick menu for PET operation selection + const selectedOption = await window.showQuickPick( + [ + { + label: 'Find All Environments', + description: 'Finds all environments and reports them to the standard output', + detail: 'Runs: pet find --verbose', + }, + { + label: 'Resolve Environment...', + description: 'Resolves & reports the details of the environment to the standard output', + detail: 'Runs: pet resolve ', + }, + ], + { + placeHolder: 'Select a Python Environment Tool (PET) operation', + ignoreFocusOut: true, + }, + ); + + if (!selectedOption) { + return; // User cancelled + } + const terminal = createTerminal({ name: 'Python Environment Tool (PET)', }); terminal.show(); - terminal.sendText(`"${petPath}"`, true); - traceInfo(`Running PET in terminal: ${petPath}`); + + if (selectedOption.label === 'Find All Environments') { + // Run pet find --verbose + terminal.sendText(`"${petPath}" find --verbose`, true); + traceInfo(`Running PET find command: ${petPath} find --verbose`); + } else if (selectedOption.label === 'Resolve Environment...') { + // Show input box for path + const placeholder = isWindows() ? 'C:\\path\\to\\python\\executable' : '/path/to/python/executable'; + const inputPath = await window.showInputBox({ + prompt: 'Enter the path to the Python executable to resolve', + placeHolder: placeholder, + ignoreFocusOut: true, + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return 'Please enter a valid path'; + } + return null; + }, + }); + + if (!inputPath) { + return; // User cancelled + } + + // Run pet resolve with the provided path + terminal.sendText(`"${petPath}" resolve "${inputPath.trim()}"`, true); + traceInfo(`Running PET resolve command: ${petPath} resolve "${inputPath.trim()}"`); + } } catch (error) { traceError('Error running PET in terminal', error); window.showErrorMessage(`Failed to run Python Environment Tool: ${error}`); From 14ec8988e660924b15464a07e4088e8329a2c2dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:11:03 -0700 Subject: [PATCH 240/328] chore(deps-dev): bump tmp from 0.2.3 to 0.2.4 (#690) Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.3 to 0.2.4.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tmp&package-manager=npm_and_yarn&previous-version=0.2.3&new-version=0.2.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ba473b..57f3dc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4944,9 +4944,9 @@ } }, "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", + "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", "dev": true, "engines": { "node": ">=14.14" @@ -9025,9 +9025,9 @@ } }, "tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", + "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", "dev": true }, "to-regex-range": { From 42a8cd920a489a2f52851bf505c8e6e0f259046d Mon Sep 17 00:00:00 2001 From: Abdelrahman AL MAROUK <72821992+almarouk@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:21:22 +0200 Subject: [PATCH 241/328] fix: enhance conda executable retrieval with path existence checks (#677) fixes #676: `getCondaExecutable` doesn't check if path exists Fixes --- src/managers/conda/condaUtils.ts | 36 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 92d4d57..e638b59 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -134,23 +134,31 @@ async function findConda(): Promise { async function getCondaExecutable(native?: NativePythonFinder): Promise { if (condaPath) { - traceInfo(`Using conda from cache: ${condaPath}`); - return untildify(condaPath); + if (await fse.pathExists(untildify(condaPath))) { + traceInfo(`Using conda from cache: ${condaPath}`); + return untildify(condaPath); + } } const state = await getWorkspacePersistentState(); condaPath = await state.get(CONDA_PATH_KEY); if (condaPath) { - traceInfo(`Using conda from persistent state: ${condaPath}`); - return untildify(condaPath); + if (await fse.pathExists(untildify(condaPath))) { + traceInfo(`Using conda from persistent state: ${condaPath}`); + return untildify(condaPath); + } } const paths = await findConda(); if (paths && paths.length > 0) { - condaPath = paths[0]; - traceInfo(`Using conda from PATH: ${condaPath}`); - await state.set(CONDA_PATH_KEY, condaPath); - return condaPath; + for (let i = 0; i < paths.length; i++) { + condaPath = paths[i]; + if (await fse.pathExists(untildify(condaPath))) { + traceInfo(`Using conda from PATH: ${condaPath}`); + await state.set(CONDA_PATH_KEY, condaPath); + return condaPath; + } + } } if (native) { @@ -160,10 +168,14 @@ async function getCondaExecutable(native?: NativePythonFinder): Promise .map((e) => e as NativeEnvManagerInfo) .filter((e) => e.tool.toLowerCase() === 'conda'); if (managers.length > 0) { - condaPath = managers[0].executable; - traceInfo(`Using conda from native finder: ${condaPath}`); - await state.set(CONDA_PATH_KEY, condaPath); - return condaPath; + for (let i = 0; i < managers.length; i++) { + condaPath = managers[i].executable; + if (await fse.pathExists(untildify(condaPath))) { + traceInfo(`Using conda from native finder: ${condaPath}`); + await state.set(CONDA_PATH_KEY, condaPath); + return condaPath; + } + } } } From 7242d2ff85654da3313cbe8c5d82f8c13eef2a00 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 11 Aug 2025 15:45:21 -0700 Subject: [PATCH 242/328] bug fix: enhance conda environment management with sourcing status and updated shell activation support (#693) --- src/managers/conda/condaEnvManager.ts | 3 + src/managers/conda/condaSourcingUtils.ts | 355 +++++++++++++++++++ src/managers/conda/condaUtils.ts | 418 +++++++++++++---------- src/managers/conda/main.ts | 15 +- 4 files changed, 603 insertions(+), 188 deletions(-) create mode 100644 src/managers/conda/condaSourcingUtils.ts diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index c044afc..d43743d 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -24,6 +24,7 @@ import { traceError } from '../../common/logging'; import { createDeferred, Deferred } from '../../common/utils/deferred'; import { showErrorMessage, withProgress } from '../../common/window.apis'; import { NativePythonFinder } from '../common/nativePythonFinder'; +import { CondaSourcingStatus } from './condaSourcingUtils'; import { checkForNoPythonCondaEnvironment, clearCondaCache, @@ -52,6 +53,8 @@ export class CondaEnvManager implements EnvironmentManager, Disposable { private readonly _onDidChangeEnvironments = new EventEmitter(); public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; + public sourcingInformation: CondaSourcingStatus | undefined; + constructor( private readonly nativeFinder: NativePythonFinder, private readonly api: PythonEnvironmentApi, diff --git a/src/managers/conda/condaSourcingUtils.ts b/src/managers/conda/condaSourcingUtils.ts new file mode 100644 index 0000000..a8f888b --- /dev/null +++ b/src/managers/conda/condaSourcingUtils.ts @@ -0,0 +1,355 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License. + +import * as fse from 'fs-extra'; +import * as path from 'path'; +import { traceError, traceInfo, traceVerbose } from '../../common/logging'; +import { isWindows } from '../../common/utils/platformUtils'; + +/** + * Represents the status of conda sourcing in the current environment + */ +export class CondaSourcingStatus { + /** + * Creates a new CondaSourcingStatus instance + * @param condaPath Path to the conda installation + * @param condaFolder Path to the conda installation folder (derived from condaPath) + * @param isActiveOnLaunch Whether conda was activated before VS Code launch + * @param globalSourcingScript Path to the global sourcing script (if exists) + * @param shellSourcingScripts List of paths to shell-specific sourcing scripts + */ + constructor( + public readonly condaPath: string, + public readonly condaFolder: string, + public isActiveOnLaunch?: boolean, + public globalSourcingScript?: string, + public shellSourcingScripts?: string[], + ) {} + + /** + * Returns a formatted string representation of the conda sourcing status + */ + toString(): string { + const lines: string[] = []; + lines.push('Conda Sourcing Status:'); + lines.push(`├─ Conda Path: ${this.condaPath}`); + lines.push(`├─ Conda Folder: ${this.condaFolder}`); + lines.push(`├─ Active on Launch: ${this.isActiveOnLaunch ?? 'false'}`); + + if (this.globalSourcingScript) { + lines.push(`├─ Global Sourcing Script: ${this.globalSourcingScript}`); + } + + if (this.shellSourcingScripts?.length) { + lines.push('└─ Shell-specific Sourcing Scripts:'); + this.shellSourcingScripts.forEach((script, index, array) => { + const isLast = index === array.length - 1; + if (script) { + // Only include scripts that exist + lines.push(` ${isLast ? '└─' : '├─'} ${script}`); + } + }); + } else { + lines.push('└─ No Shell-specific Sourcing Scripts Found'); + } + + return lines.join('\n'); + } +} + +/** + * Constructs the conda sourcing status for a given conda installation + * @param condaPath The path to the conda executable + * @returns A CondaSourcingStatus object containing: + * - Whether conda was active when VS Code launched + * - Path to global sourcing script (if found) + * - Paths to shell-specific sourcing scripts (if found) + * + * This function checks: + * 1. If conda is already active in the current shell (CONDA_SHLVL) + * 2. Location of the global activation script + * 3. Location of shell-specific activation scripts + */ +export async function constructCondaSourcingStatus(condaPath: string): Promise { + const condaFolder = path.dirname(path.dirname(condaPath)); + let sourcingStatus = new CondaSourcingStatus(condaPath, condaFolder); + + // The `conda_shlvl` value indicates whether conda is properly initialized in the current shell: + // - `-1`: Conda has never been sourced + // - `undefined`: No shell level information available + // - `0 or higher`: Conda is properly sourced in the shell + const condaShlvl = process.env.CONDA_SHLVL; + if (condaShlvl && parseInt(condaShlvl) >= 0) { + sourcingStatus.isActiveOnLaunch = true; + // if activation already occurred, no need to find further scripts + return sourcingStatus; + } + + // Attempt to find the GLOBAL conda sourcing script + const globalSourcingScript: string | undefined = await findGlobalSourcingScript(sourcingStatus.condaFolder); + if (globalSourcingScript) { + sourcingStatus.globalSourcingScript = globalSourcingScript; + // note: future iterations could decide to exit here instead of continuing to generate all the other activation scripts + } + + // find and save all of the shell specific sourcing scripts + sourcingStatus.shellSourcingScripts = await findShellSourcingScripts(sourcingStatus); + + return sourcingStatus; +} + +/** + * Finds the global conda activation script for the given conda installation + * @param condaPath The path to the conda executable + * @returns The path to the global activation script if it exists, undefined otherwise + * + * On Windows, this will look for 'Scripts/activate.bat' + * On Unix systems, this will look for 'bin/activate' + */ +export async function findGlobalSourcingScript(condaFolder: string): Promise { + const sourcingScript = isWindows() + ? path.join(condaFolder, 'Scripts', 'activate.bat') + : path.join(condaFolder, 'bin', 'activate'); + + if (await fse.pathExists(sourcingScript)) { + traceInfo(`Found global conda sourcing script at: ${sourcingScript}`); + return sourcingScript; + } else { + traceInfo(`No global conda sourcing script found. at: ${sourcingScript}`); + return undefined; + } +} + +export async function findShellSourcingScripts(sourcingStatus: CondaSourcingStatus): Promise { + const logs: string[] = []; + logs.push('=== Conda Sourcing Shell Script Search ==='); + + let ps1Script: string | undefined; + let shScript: string | undefined; + let cmdActivate: string | undefined; + + try { + // Search for PowerShell hook script (conda-hook.ps1) + logs.push('Searching for PowerShell hook script...'); + try { + ps1Script = await getCondaHookPs1Path(sourcingStatus.condaFolder); + logs.push(` Path: ${ps1Script ?? '✗ Not found'}`); + } catch (err) { + logs.push( + ` Error during PowerShell script search: ${err instanceof Error ? err.message : 'Unknown error'}`, + ); + } + + // Search for Shell script (conda.sh) + logs.push('\nSearching for Shell script...'); + try { + shScript = await getCondaShPath(sourcingStatus.condaFolder); + logs.push(` Path: ${shScript ?? '✗ Not found'}`); + } catch (err) { + logs.push(` Error during Shell script search: ${err instanceof Error ? err.message : 'Unknown error'}`); + } + + // Search for Windows CMD script (activate.bat) + logs.push('\nSearching for Windows CMD script...'); + try { + cmdActivate = await getCondaBatActivationFile(sourcingStatus.condaPath); + logs.push(` Path: ${cmdActivate ?? '✗ Not found'}`); + } catch (err) { + logs.push(` Error during CMD script search: ${err instanceof Error ? err.message : 'Unknown error'}`); + } + } catch (error) { + logs.push(`\nCritical error during script search: ${error instanceof Error ? error.message : 'Unknown error'}`); + } finally { + logs.push('\nSearch Summary:'); + logs.push(` PowerShell: ${ps1Script ? '✓' : '✗'}`); + logs.push(` Shell: ${shScript ? '✓' : '✗'}`); + logs.push(` CMD: ${cmdActivate ? '✓' : '✗'}`); + logs.push('============================'); + + // Log everything at once + traceVerbose(logs.join('\n')); + } + + return [ps1Script, shScript, cmdActivate] as string[]; +} + +/** + * Returns the best guess path to conda-hook.ps1 given a conda executable path. + * + * Searches for conda-hook.ps1 in these locations (relative to the conda root): + * - shell/condabin/ + * - Library/shell/condabin/ + * - condabin/ + * - etc/profile.d/ + */ +export async function getCondaHookPs1Path(condaFolder: string): Promise { + // Create the promise for finding the hook path + const hookPathPromise = (async () => { + const condaRootCandidates: string[] = [ + path.join(condaFolder, 'shell', 'condabin'), + path.join(condaFolder, 'Library', 'shell', 'condabin'), + path.join(condaFolder, 'condabin'), + path.join(condaFolder, 'etc', 'profile.d'), + ]; + + const checks = condaRootCandidates.map(async (hookSearchDir) => { + const candidate = path.join(hookSearchDir, 'conda-hook.ps1'); + if (await fse.pathExists(candidate)) { + traceInfo(`Conda hook found at: ${candidate}`); + return candidate; + } + return undefined; + }); + const results = await Promise.all(checks); + const found = results.find(Boolean); + if (found) { + return found as string; + } + return undefined; + })(); + + return hookPathPromise; +} + +/** + * Helper function that checks for a file in a list of locations. + * Returns the first location where the file exists, or undefined if not found. + */ +async function findFileInLocations(locations: string[], description: string): Promise { + for (const location of locations) { + if (await fse.pathExists(location)) { + traceInfo(`${description} found in ${location}`); + return location; + } + } + return undefined; +} + +/** + * Returns the path to conda.sh given a conda executable path. + * + * Searches for conda.sh in these locations (relative to the conda root): + * - etc/profile.d/conda.sh + * - shell/etc/profile.d/conda.sh + * - Library/etc/profile.d/conda.sh + * - lib/pythonX.Y/site-packages/conda/shell/etc/profile.d/conda.sh + * - site-packages/conda/shell/etc/profile.d/conda.sh + * Also checks some system-level locations + */ +async function getCondaShPath(condaFolder: string): Promise { + // Create the promise for finding the conda.sh path + const shPathPromise = (async () => { + // First try standard conda installation locations + const standardLocations = [ + path.join(condaFolder, 'etc', 'profile.d', 'conda.sh'), + path.join(condaFolder, 'shell', 'etc', 'profile.d', 'conda.sh'), + path.join(condaFolder, 'Library', 'etc', 'profile.d', 'conda.sh'), + ]; + + // Check standard locations first + const standardLocation = await findFileInLocations(standardLocations, 'conda.sh'); + if (standardLocation) { + return standardLocation; + } + + // If not found in standard locations, try pip install locations + // First, find all python* directories in lib + let pythonDirs: string[] = []; + const libPath = path.join(condaFolder, 'lib'); + try { + const dirs = await fse.readdir(libPath); + pythonDirs = dirs.filter((dir) => dir.startsWith('python')); + } catch (err) { + traceVerbose(`No lib directory found at ${libPath}, ${err}`); + } + + const pipInstallLocations = [ + ...pythonDirs.map((ver) => + path.join(condaFolder, 'lib', ver, 'site-packages', 'conda', 'shell', 'etc', 'profile.d', 'conda.sh'), + ), + path.join(condaFolder, 'site-packages', 'conda', 'shell', 'etc', 'profile.d', 'conda.sh'), + ]; + + // Check pip install locations + const pipLocation = await findFileInLocations(pipInstallLocations, 'conda.sh'); + if (pipLocation) { + traceError( + 'WARNING: conda.sh was found in a pip install location. ' + + 'This is not a supported configuration and may be deprecated in the future. ' + + 'Please install conda in a standard location. ' + + 'See https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html for proper installation instructions.', + ); + return pipLocation; + } + return undefined; + })(); + + return shPathPromise; +} + +/** + * Returns the path to the Windows batch activation file (activate.bat) for conda + * @param condaPath The path to the conda executable + * @returns The path to activate.bat if it exists in the same directory as conda.exe, undefined otherwise + * + * This file is used specifically for CMD.exe activation on Windows systems. + * It should be located in the same directory as the conda executable. + */ +async function getCondaBatActivationFile(condaPath: string): Promise { + const cmdActivate = path.join(path.dirname(condaPath), 'activate.bat'); + if (await fse.pathExists(cmdActivate)) { + return cmdActivate; + } + return undefined; +} + +/** + * Returns the path to the local conda activation script + * @param condaPath The path to the conda executable + * @returns Promise that resolves to: + * - The path to the local 'activate' script if it exists in the same directory as conda + * - undefined if the script is not found + * + * This function checks for a local 'activate' script in the same directory as the conda executable. + * This script is used for direct conda activation without shell-specific configuration. + */ + +const knownSourcingScriptCache: string[] = []; +export async function getLocalActivationScript(condaPath: string): Promise { + // Define all possible paths to check + const paths = [ + // Direct path + isWindows() ? path.join(condaPath, 'Scripts', 'activate') : path.join(condaPath, 'bin', 'activate'), + // One level up + isWindows() + ? path.join(path.dirname(condaPath), 'Scripts', 'activate') + : path.join(path.dirname(condaPath), 'bin', 'activate'), + // Two levels up + isWindows() + ? path.join(path.dirname(path.dirname(condaPath)), 'Scripts', 'activate') + : path.join(path.dirname(path.dirname(condaPath)), 'bin', 'activate'), + ]; + + // Check each path in sequence + for (const sourcingScript of paths) { + // Check if any of the paths are in the cache + if (knownSourcingScriptCache.includes(sourcingScript)) { + traceVerbose(`Found local activation script in cache at: ${sourcingScript}`); + return sourcingScript; + } + try { + const exists = await fse.pathExists(sourcingScript); + if (exists) { + traceInfo(`Found local activation script at: ${sourcingScript}, adding to cache.`); + knownSourcingScriptCache.push(sourcingScript); + return sourcingScript; + } + } catch (err) { + traceError(`Error checking for local activation script at ${sourcingScript}: ${err}`); + continue; + } + } + + traceVerbose('No local activation script found in any of the expected locations'); + return undefined; +} diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index e638b59..18f0c52 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -28,7 +28,7 @@ import { import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants'; import { showErrorMessageWithLogs } from '../../common/errors/utils'; import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/localize'; -import { traceError, traceInfo } from '../../common/logging'; +import { traceInfo, traceVerbose } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickProject } from '../../common/pickers/projects'; import { createDeferred } from '../../common/utils/deferred'; @@ -53,7 +53,9 @@ import { } from '../common/nativePythonFinder'; import { selectFromCommonPackagesToInstall } from '../common/pickers'; import { Installable } from '../common/types'; -import { pathForGitBash, shortVersion, sortEnvironments } from '../common/utils'; +import { shortVersion, sortEnvironments } from '../common/utils'; +import { CondaEnvManager } from './condaEnvManager'; +import { getCondaHookPs1Path, getLocalActivationScript } from './condaSourcingUtils'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -292,74 +294,26 @@ function isPrefixOf(roots: string[], e: string): boolean { return false; } +/** + * Creates a PythonEnvironmentInfo object for a named conda environment. + * @param name The name of the conda environment + * @param prefix The installation prefix path for the environment + * @param executable The path to the Python executable + * @param version The Python version string + * @param _conda The path to the conda executable (TODO: currently unused) + * @param envManager The environment manager instance + * @returns Promise resolving to a PythonEnvironmentInfo object + */ async function getNamedCondaPythonInfo( name: string, prefix: string, executable: string, version: string, - conda: string, + _conda: string, // TODO:: fix this, why is it not being used to build the info object + envManager: EnvironmentManager, ): Promise { + const { shellActivation, shellDeactivation } = await buildShellActivationMapForConda(prefix, envManager, name); const sv = shortVersion(version); - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - - if (conda.includes('/') || conda.includes('\\')) { - const shActivate = path.join(path.dirname(path.dirname(conda)), 'etc', 'profile.d', 'conda.sh'); - - if (isWindows()) { - shellActivation.set(ShellConstants.GITBASH, [ - { executable: '.', args: [pathForGitBash(shActivate)] }, - { executable: 'conda', args: ['activate', name] }, - ]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); - - const cmdActivate = path.join(path.dirname(conda), 'activate.bat'); - shellActivation.set(ShellConstants.CMD, [{ executable: cmdActivate, args: [name] }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); - } else { - shellActivation.set(ShellConstants.BASH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', name] }, - ]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.SH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', name] }, - ]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.ZSH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', name] }, - ]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); - } - const psActivate = await getCondaHookPs1Path(conda); - shellActivation.set(ShellConstants.PWSH, [ - { executable: '&', args: [psActivate] }, - { executable: 'conda', args: ['activate', name] }, - ]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); - } else { - shellActivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['activate', name] }]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); - } return { name: name, @@ -385,74 +339,25 @@ async function getNamedCondaPythonInfo( group: name !== 'base' ? 'Named' : undefined, }; } - +/** + * Creates a PythonEnvironmentInfo object for a conda environment specified by prefix path. + * @param prefix The installation prefix path for the environment + * @param executable The path to the Python executable + * @param version The Python version string + * @param conda The path to the conda executable + * @param envManager The environment manager instance + * @returns Promise resolving to a PythonEnvironmentInfo object + */ async function getPrefixesCondaPythonInfo( prefix: string, executable: string, version: string, conda: string, + envManager: EnvironmentManager, ): Promise { const sv = shortVersion(version); - const shellActivation: Map = new Map(); - const shellDeactivation: Map = new Map(); - - if (conda.includes('/') || conda.includes('\\')) { - const shActivate = path.join(path.dirname(path.dirname(conda)), 'etc', 'profile.d', 'conda.sh'); - - if (isWindows()) { - shellActivation.set(ShellConstants.GITBASH, [ - { executable: '.', args: [pathForGitBash(shActivate)] }, - { executable: 'conda', args: ['activate', prefix] }, - ]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); - - const cmdActivate = path.join(path.dirname(conda), 'activate.bat'); - shellActivation.set(ShellConstants.CMD, [{ executable: cmdActivate, args: [prefix] }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); - } else { - shellActivation.set(ShellConstants.BASH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', prefix] }, - ]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.SH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', prefix] }, - ]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.ZSH, [ - { executable: '.', args: [shActivate] }, - { executable: 'conda', args: ['activate', prefix] }, - ]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); - } - const psActivate = await getCondaHookPs1Path(conda); - shellActivation.set(ShellConstants.PWSH, [ - { executable: '&', args: [psActivate] }, - { executable: 'conda', args: ['activate', prefix] }, - ]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); - } else { - shellActivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.GITBASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.CMD, [{ executable: 'conda', args: ['deactivate'] }]); - shellActivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.BASH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.SH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]); - - shellActivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['activate', prefix] }]); - shellDeactivation.set(ShellConstants.PWSH, [{ executable: 'conda', args: ['deactivate'] }]); - } + const { shellActivation, shellDeactivation } = await buildShellActivationMapForConda(prefix, envManager); const basename = path.basename(prefix); return { @@ -479,6 +384,194 @@ async function getPrefixesCondaPythonInfo( group: 'Prefix', }; } +interface ShellCommandMaps { + shellActivation: Map; + shellDeactivation: Map; +} +/** + * Generates shell-specific activation and deactivation command maps for a conda environment. + * Creates appropriate activation/deactivation commands based on the environment type (named or prefix), + * platform (Windows/non-Windows), and available sourcing scripts. + * + * @param prefix The conda environment prefix path (installation location) + * @param envManager The conda environment manager instance + * @param name Optional name of the conda environment. If provided, used instead of prefix for activation + * @returns Promise resolving to shell-specific activation/deactivation command maps + */ +async function buildShellActivationMapForConda( + prefix: string, + envManager: EnvironmentManager, + name?: string, +): Promise { + const logs: string[] = []; + let shellMaps: ShellCommandMaps; + + try { + // Determine the environment identifier to use + const envIdentifier = name ? name : prefix; + + logs.push(`Environment Configuration: + - Identifier: "${envIdentifier}" + - Prefix: "${prefix}" + - Name: "${name ?? 'undefined'}" +`); + + let condaCommonActivate: PythonCommandRunConfiguration | undefined = { + executable: 'conda', + args: ['activate', envIdentifier], + }; + let condaCommonDeactivate: PythonCommandRunConfiguration | undefined = { + executable: 'conda', + args: ['deactivate'], + }; + + if (!(envManager instanceof CondaEnvManager) || !envManager.sourcingInformation) { + logs.push('Error: Conda environment manager is not available, using default conda activation paths'); + shellMaps = await generateShellActivationMapFromConfig([condaCommonActivate], [condaCommonDeactivate]); + return shellMaps; + } + + const { isActiveOnLaunch, globalSourcingScript } = envManager.sourcingInformation; + + // P1: first check to see if conda is already active in the whole VS Code workspace via sourcing info (set at startup) + if (isActiveOnLaunch) { + logs.push('✓ Conda already active on launch, using default activation commands'); + shellMaps = await generateShellActivationMapFromConfig([condaCommonActivate], [condaCommonDeactivate]); + return shellMaps; + } + + // get the local activation path, if exists use this + let localSourcingPath: string | undefined; + try { + localSourcingPath = await getLocalActivationScript(prefix); + } catch (err) { + logs.push(`Error getting local activation script: ${err instanceof Error ? err.message : 'Unknown error'}`); + } + + logs.push(`Local Activation: + - Status: ${localSourcingPath ? 'Found' : 'Not Found'} + - Path: ${localSourcingPath ?? 'N/A'} +`); + + // Determine the preferred sourcing path with preference to local + const preferredSourcingPath = localSourcingPath || globalSourcingScript; + logs.push(`Preferred Sourcing: + - Selected Path: ${preferredSourcingPath ?? 'none found'} + - Source: ${localSourcingPath ? 'Local' : globalSourcingScript ? 'Global' : 'None'} +`); + + // P2: Return shell activation if we have no sourcing + if (!preferredSourcingPath) { + logs.push('No sourcing path found, using default conda activation'); + shellMaps = await generateShellActivationMapFromConfig([condaCommonActivate], [condaCommonDeactivate]); + return shellMaps; + } + + // P3: Handle Windows specifically ;this is carryover from vscode-python + if (isWindows()) { + logs.push('✓ Using Windows-specific activation configuration'); + shellMaps = await windowsExceptionGenerateConfig( + preferredSourcingPath, + envIdentifier, + envManager.sourcingInformation.condaFolder, + ); + return shellMaps; + } + + logs.push('✓ Using source command with preferred path'); + const condaSourcingPathFirst = { + executable: 'source', + args: [preferredSourcingPath, envIdentifier], + }; + shellMaps = await generateShellActivationMapFromConfig([condaSourcingPathFirst], [condaCommonDeactivate]); + return shellMaps; + } catch (error) { + logs.push( + `Error in shell activation map generation: ${error instanceof Error ? error.message : 'Unknown error'}`, + ); + // Fall back to default conda activation in case of error + shellMaps = await generateShellActivationMapFromConfig( + [{ executable: 'conda', args: ['activate', name || prefix] }], + [{ executable: 'conda', args: ['deactivate'] }], + ); + return shellMaps; + } finally { + // Always print logs in a nicely formatted block, even if there was an error + traceInfo( + [ + '=== Conda Shell Activation Map Generation ===', + ...logs, + '==========================================', + ].join('\n'), + ); + } +} + +async function generateShellActivationMapFromConfig( + activate: PythonCommandRunConfiguration[], + deactivate: PythonCommandRunConfiguration[], +): Promise { + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + shellActivation.set(ShellConstants.GITBASH, activate); + shellDeactivation.set(ShellConstants.GITBASH, deactivate); + + shellActivation.set(ShellConstants.CMD, activate); + shellDeactivation.set(ShellConstants.CMD, deactivate); + + shellActivation.set(ShellConstants.BASH, activate); + shellDeactivation.set(ShellConstants.BASH, deactivate); + + shellActivation.set(ShellConstants.SH, activate); + shellDeactivation.set(ShellConstants.SH, deactivate); + + shellActivation.set(ShellConstants.ZSH, activate); + shellDeactivation.set(ShellConstants.ZSH, deactivate); + + shellActivation.set(ShellConstants.PWSH, activate); + shellDeactivation.set(ShellConstants.PWSH, deactivate); + + return { shellActivation, shellDeactivation }; +} + +async function windowsExceptionGenerateConfig( + sourceInitPath: string, + prefix: string, + condaFolder: string, +): Promise { + const shellActivation: Map = new Map(); + const shellDeactivation: Map = new Map(); + + const ps1Hook = await getCondaHookPs1Path(condaFolder); + traceVerbose(`PS1 hook path: ${ps1Hook ?? 'not found'}`); + const activation = ps1Hook ? ps1Hook : sourceInitPath; + + const pwshActivate = [{ executable: activation }, { executable: 'conda', args: ['activate', prefix] }]; + const cmdActivate = [{ executable: sourceInitPath }, { executable: 'conda', args: ['activate', prefix] }]; + + const bashActivate = [{ executable: 'source', args: [sourceInitPath.replace(/\\/g, '/'), prefix] }]; + traceVerbose( + `Windows activation commands: + PowerShell: ${JSON.stringify(pwshActivate)}, + CMD: ${JSON.stringify(cmdActivate)}, + Bash: ${JSON.stringify(bashActivate)}`, + ); + + let condaCommonDeactivate: PythonCommandRunConfiguration | undefined = { + executable: 'conda', + args: ['deactivate'], + }; + shellActivation.set(ShellConstants.GITBASH, bashActivate); + shellDeactivation.set(ShellConstants.GITBASH, [condaCommonDeactivate]); + + shellActivation.set(ShellConstants.CMD, cmdActivate); + shellDeactivation.set(ShellConstants.CMD, [condaCommonDeactivate]); + + shellActivation.set(ShellConstants.PWSH, pwshActivate); + shellDeactivation.set(ShellConstants.PWSH, [condaCommonDeactivate]); + + return { shellActivation, shellDeactivation }; +} function getCondaWithoutPython(name: string, prefix: string, conda: string): PythonEnvironmentInfo { return { @@ -519,14 +612,14 @@ async function nativeToPythonEnv( if (e.name === 'base') { const environment = api.createPythonEnvironmentItem( - await getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda), + await getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda, manager), manager, ); log.info(`Found base environment: ${e.prefix}`); return environment; } else if (!isPrefixOf(condaPrefixes, e.prefix)) { const environment = api.createPythonEnvironmentItem( - await getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda), + await getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda, manager), manager, ); log.info(`Found prefix environment: ${e.prefix}`); @@ -535,7 +628,7 @@ async function nativeToPythonEnv( const basename = path.basename(e.prefix); const name = e.name ?? basename; const environment = api.createPythonEnvironmentItem( - await getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda), + await getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda, manager), manager, ); log.info(`Found named environment: ${e.prefix}`); @@ -711,7 +804,14 @@ async function createNamedCondaEnvironment( const version = await getVersion(envPath); const environment = api.createPythonEnvironmentItem( - await getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()), + await getNamedCondaPythonInfo( + envName, + envPath, + path.join(envPath, bin), + version, + await getConda(), + manager, + ), manager, ); return environment; @@ -769,7 +869,13 @@ async function createPrefixCondaEnvironment( const version = await getVersion(prefix); const environment = api.createPythonEnvironmentItem( - await getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()), + await getPrefixesCondaPythonInfo( + prefix, + path.join(prefix, bin), + version, + await getConda(), + manager, + ), manager, ); return environment; @@ -1064,59 +1170,3 @@ export async function checkForNoPythonCondaEnvironment( } return environment; } - -// Cache for conda hook paths to avoid redundant filesystem checks -const condaHookPathCache = new Map>(); - -/** - * Returns the best guess path to conda-hook.ps1 given a conda executable path. - * - * Searches for conda-hook.ps1 in these locations (relative to the conda root): - * - shell/condabin/ - * - Library/shell/condabin/ - * - condabin/ - * - etc/profile.d/ - */ -async function getCondaHookPs1Path(condaPath: string): Promise { - // Check cache first - const cachedPath = condaHookPathCache.get(condaPath); - if (cachedPath) { - return cachedPath; - } - - // Create the promise for finding the hook path - const hookPathPromise = (async () => { - const condaRoot = path.dirname(path.dirname(condaPath)); - - const condaRootCandidates: string[] = [ - path.join(condaRoot, 'shell', 'condabin'), - path.join(condaRoot, 'Library', 'shell', 'condabin'), - path.join(condaRoot, 'condabin'), - path.join(condaRoot, 'etc', 'profile.d'), - ]; - - const checks = condaRootCandidates.map(async (hookSearchDir) => { - const candidate = path.join(hookSearchDir, 'conda-hook.ps1'); - if (await fse.pathExists(candidate)) { - traceInfo(`Conda hook found at: ${candidate}`); - return candidate; - } - return undefined; - }); - const results = await Promise.all(checks); - const found = results.find(Boolean); - if (found) { - return found as string; - } - traceError( - `Conda hook not found in any of the expected locations: ${condaRootCandidates.join( - ', ', - )}, given conda path: ${condaPath}`, - ); - return path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1'); - })(); - - // Store in cache and return - condaHookPathCache.set(condaPath, hookPathPromise); - return hookPathPromise; -} diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts index bfcae68..41ffc39 100644 --- a/src/managers/conda/main.ts +++ b/src/managers/conda/main.ts @@ -1,10 +1,11 @@ import { Disposable, LogOutputChannel } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; -import { CondaEnvManager } from './condaEnvManager'; -import { CondaPackageManager } from './condaPackageManager'; +import { traceInfo } from '../../common/logging'; import { getPythonApi } from '../../features/pythonApi'; import { NativePythonFinder } from '../common/nativePythonFinder'; -import { traceInfo } from '../../common/logging'; +import { CondaEnvManager } from './condaEnvManager'; +import { CondaPackageManager } from './condaPackageManager'; +import { CondaSourcingStatus, constructCondaSourcingStatus } from './condaSourcingUtils'; import { getConda } from './condaUtils'; export async function registerCondaFeatures( @@ -15,10 +16,16 @@ export async function registerCondaFeatures( const api: PythonEnvironmentApi = await getPythonApi(); try { - await getConda(nativeFinder); + // get Conda will return only ONE conda manager, that correlates to a single conda install + const condaPath: string = await getConda(nativeFinder); + const sourcingStatus: CondaSourcingStatus = await constructCondaSourcingStatus(condaPath); + traceInfo(sourcingStatus.toString()); + const envManager = new CondaEnvManager(nativeFinder, api, log); const packageManager = new CondaPackageManager(api, log); + envManager.sourcingInformation = sourcingStatus; + disposables.push( envManager, packageManager, From da2d83db149dd8080fbf9d2379e2c5984cc3abeb Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 12 Aug 2025 12:49:57 -0700 Subject: [PATCH 243/328] add useEnvFile setting (#710) --- package.json | 6 +++ package.nls.json | 1 + .../terminal/terminalEnvVarInjector.ts | 39 ++++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index eb6cb46..3188762 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,12 @@ "%python-envs.terminal.autoActivationType.off%" ], "scope": "machine" + }, + "python.terminal.useEnvFile": { + "type": "boolean", + "description": "%python-envs.terminal.useEnvFile.description%", + "default": false, + "scope": "resource" } } }, diff --git a/package.nls.json b/package.nls.json index 2a62f1c..0885ff5 100644 --- a/package.nls.json +++ b/package.nls.json @@ -10,6 +10,7 @@ "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.", "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", + "python-envs.terminal.useEnvFile.description": "Controls whether environment variables from .env files and python.envFile setting are injected into terminals.", "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", "python-envs.reportIssue.title": "Report Issue", "python-envs.setEnvManager.title": "Set Environment Manager", diff --git a/src/features/terminal/terminalEnvVarInjector.ts b/src/features/terminal/terminalEnvVarInjector.ts index 4bf4803..3f08a0c 100644 --- a/src/features/terminal/terminalEnvVarInjector.ts +++ b/src/features/terminal/terminalEnvVarInjector.ts @@ -7,6 +7,7 @@ import { Disposable, EnvironmentVariableScope, GlobalEnvironmentVariableCollection, + window, workspace, WorkspaceFolder, } from 'vscode'; @@ -55,6 +56,18 @@ export class TerminalEnvVarInjector implements Disposable { return; } + // Check if env file injection is enabled when variables change + const config = getConfiguration('python', args.uri); + const useEnvFile = config.get('terminal.useEnvFile', false); + const envFilePath = config.get('envFile'); + + // Only show notification when env vars change and we have an env file but injection is disabled + if (!useEnvFile && envFilePath) { + window.showInformationMessage( + 'An environment file is configured but terminal environment injection is disabled. Enable "python.terminal.useEnvFile" to use environment variables from .env files in terminals.', + ); + } + if (args.changeType === 2) { // FileChangeType.Deleted this.clearWorkspaceVariables(affectedWorkspace); @@ -66,6 +79,20 @@ export class TerminalEnvVarInjector implements Disposable { }), ); + // Listen for changes to the python.envFile setting + this.disposables.push( + workspace.onDidChangeConfiguration((e) => { + if (e.affectsConfiguration('python.envFile')) { + traceVerbose( + 'TerminalEnvVarInjector: python.envFile setting changed, updating environment variables', + ); + this.updateEnvironmentVariables().catch((error) => { + traceError('Failed to update environment variables:', error); + }); + } + }), + ); + // Initial load of environment variables await this.updateEnvironmentVariables(); } @@ -115,9 +142,19 @@ export class TerminalEnvVarInjector implements Disposable { const envVarScope = this.getEnvironmentVariableCollectionScoped({ workspaceFolder }); envVarScope.clear(); // Clear existing variables for this workspace - // Track which .env file is being used for logging + // Check if env file injection is enabled const config = getConfiguration('python', workspaceUri); + const useEnvFile = config.get('terminal.useEnvFile', false); const envFilePath = config.get('envFile'); + + if (!useEnvFile) { + traceVerbose( + `TerminalEnvVarInjector: Env file injection disabled for workspace: ${workspaceUri.fsPath}`, + ); + return; + } + + // Track which .env file is being used for logging const resolvedEnvFilePath: string | undefined = envFilePath ? path.resolve(resolveVariables(envFilePath, workspaceUri)) : undefined; From 59bc3c1d79a2ade773d278a3fa4a927b06465c65 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:02:39 -0700 Subject: [PATCH 244/328] remove --live-stream from conda run command (#713) fixes https://github.com/microsoft/vscode/issues/257411#issuecomment-3177769042 --- src/managers/conda/condaUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 18f0c52..f8876f3 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -329,7 +329,7 @@ async function getNamedCondaPythonInfo( run: { executable: path.join(executable) }, activatedRun: { executable: 'conda', - args: ['run', '--live-stream', '--name', name, 'python'], + args: ['run', '--name', name, 'python'], }, activation: [{ executable: 'conda', args: ['activate', name] }], deactivation: [{ executable: 'conda', args: ['deactivate'] }], @@ -374,7 +374,7 @@ async function getPrefixesCondaPythonInfo( run: { executable: path.join(executable) }, activatedRun: { executable: conda, - args: ['run', '--live-stream', '--prefix', prefix, 'python'], + args: ['run', '--prefix', prefix, 'python'], }, activation: [{ executable: conda, args: ['activate', prefix] }], deactivation: [{ executable: conda, args: ['deactivate'] }], @@ -938,7 +938,7 @@ export async function quickCreateConda( run: { executable: path.join(prefix, bin) }, activatedRun: { executable: 'conda', - args: ['run', '--live-stream', '-p', prefix, 'python'], + args: ['run', '-p', prefix, 'python'], }, activation: [{ executable: 'conda', args: ['activate', prefix] }], deactivation: [{ executable: 'conda', args: ['deactivate'] }], From 0e43818eaaf265c94046460ada74a7bfb0021c5b Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 22:46:09 +0000 Subject: [PATCH 245/328] Fix conda copy interpreter path to use actual Python executable instead of conda run command (#721) When clicking the "Copy Environment Path" button on conda environments, the extension was incorrectly copying the conda run command instead of the actual Python interpreter path. ``` # What was being copied (incorrect): conda run --name base python # What users expected (correct): /opt/conda/envs/base/bin/python ``` ## Solution Modified the `copyPathToClipboard` function to use `run.executable` directly, which provides the actual Python interpreter path instead of constructing a command from `activatedRun Fixes #720. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/features/envCommands.ts | 5 +- .../commands/copyPathToClipboard.unit.test.ts | 62 +++++++++++++++++-- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index db756e8..ecdcc9b 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -30,7 +30,6 @@ import { } from '../common/pickers/managers'; import { pickProject, pickProjectMany } from '../common/pickers/projects'; import { activeTextEditor, showErrorMessage, showInformationMessage } from '../common/window.apis'; -import { quoteArgs } from './execution/execUtils'; import { runAsTask } from './execution/runAsTask'; import { runInTerminal } from './terminal/runInTerminal'; import { TerminalManager } from './terminal/terminalManager'; @@ -638,8 +637,8 @@ export async function copyPathToClipboard(item: unknown): Promise { await clipboardWriteText(projectPath); traceInfo(`Copied project path to clipboard: ${projectPath}`); } else if (item instanceof ProjectEnvironment || item instanceof PythonEnvTreeItem) { - const run = item.environment.execInfo.activatedRun ?? item.environment.execInfo.run; - const envPath = quoteArgs([run.executable, ...(run.args ?? [])]).join(' '); + const run = item.environment.execInfo.run; + const envPath = run.executable; await clipboardWriteText(envPath); traceInfo(`Copied environment path to clipboard: ${envPath}`); } else { diff --git a/src/test/features/commands/copyPathToClipboard.unit.test.ts b/src/test/features/commands/copyPathToClipboard.unit.test.ts index 2e43ce1..19fac4a 100644 --- a/src/test/features/commands/copyPathToClipboard.unit.test.ts +++ b/src/test/features/commands/copyPathToClipboard.unit.test.ts @@ -1,14 +1,14 @@ import * as sinon from 'sinon'; +import { Uri } from 'vscode'; +import { PythonEnvironment } from '../../../api'; import * as envApis from '../../../common/env.apis'; import { copyPathToClipboard } from '../../../features/envCommands'; import { - ProjectItem, + EnvManagerTreeItem, ProjectEnvironment, + ProjectItem, PythonEnvTreeItem, - EnvManagerTreeItem, } from '../../../features/views/treeViewItems'; -import { Uri } from 'vscode'; -import { PythonEnvironment } from '../../../api'; import { InternalEnvironmentManager } from '../../../internal.api'; suite('Copy Path To Clipboard', () => { @@ -45,7 +45,7 @@ suite('Copy Path To Clipboard', () => { await copyPathToClipboard(item); sinon.assert.calledOnce(clipboardWriteTextStub); - sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test -m env'); + sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test'); }); test('Copy env path to clipboard: env manager view', async () => { @@ -63,6 +63,56 @@ suite('Copy Path To Clipboard', () => { await copyPathToClipboard(item); sinon.assert.calledOnce(clipboardWriteTextStub); - sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test -m env'); + sinon.assert.calledWith(clipboardWriteTextStub, '/test-env/bin/test'); + }); + + test('Copy conda env path to clipboard: should copy interpreter path not conda run command', async () => { + const item = new PythonEnvTreeItem( + { + envId: { managerId: 'conda', id: 'base' }, + name: 'base', + displayName: 'base (3.12.2)', + displayPath: '/opt/conda/envs/base', + execInfo: { + run: { executable: '/opt/conda/envs/base/bin/python' }, + activatedRun: { + executable: 'conda', + args: ['run', '--name', 'base', 'python'], + }, + }, + } as PythonEnvironment, + new EnvManagerTreeItem({ name: 'conda', id: 'conda' } as InternalEnvironmentManager), + ); + + await copyPathToClipboard(item); + + sinon.assert.calledOnce(clipboardWriteTextStub); + // Should copy the actual interpreter path, not the conda run command + sinon.assert.calledWith(clipboardWriteTextStub, '/opt/conda/envs/base/bin/python'); + }); + + test('Copy conda prefix env path to clipboard: should copy interpreter path not conda run command', async () => { + const item = new PythonEnvTreeItem( + { + envId: { managerId: 'conda', id: 'myenv' }, + name: 'myenv', + displayName: 'myenv (3.11.5)', + displayPath: '/opt/conda/envs/myenv', + execInfo: { + run: { executable: '/opt/conda/envs/myenv/bin/python' }, + activatedRun: { + executable: 'conda', + args: ['run', '--prefix', '/opt/conda/envs/myenv', 'python'], + }, + }, + } as PythonEnvironment, + new EnvManagerTreeItem({ name: 'conda', id: 'conda' } as InternalEnvironmentManager), + ); + + await copyPathToClipboard(item); + + sinon.assert.calledOnce(clipboardWriteTextStub); + // Should copy the actual interpreter path, not the conda run command + sinon.assert.calledWith(clipboardWriteTextStub, '/opt/conda/envs/myenv/bin/python'); }); }); From c95c312ead0edfb2803d20bcae32545f18f7fe8f Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 15 Aug 2025 09:31:57 -0700 Subject: [PATCH 246/328] Fix: Remove global context that caused "add as Python Project" menu to disappear after single use (#724) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "add as Python Project" context menu item was disappearing after being used once and only reappearing after a full window reload. ## Root Cause The issue was caused by improper management of the global VS Code context `python-envs:isExistingProject`. The context menu visibility was controlled by the condition: ```json "when": "explorerViewletVisible && explorerResourceIsFolder && !python-envs:isExistingProject" ``` During command execution, the code would set this global context: ```typescript commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource)); ``` Once this context was set to `true` for any resource, it would prevent the menu from appearing for all subsequent right-clicks, regardless of the target folder. ## Solution - **Removed** the global context setting logic from the `addPythonProjectGivenResource` command - **Updated** the context menu conditions in `package.json` to simply check for folder/file type without the problematic context condition - **Preserved** existing duplicate detection logic that gracefully handles attempts to add already-existing projects The menu will now consistently appear for folders and `.py` files. If users attempt to add an already-existing project, the existing error handling shows a "No new projects found" warning. ## Changes - `src/extension.ts`: Removed context setting logic and unused helper function (11 lines) - `package.json`: Simplified context menu conditions (2 lines) Fixes #723. --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey.alchemer.com/s3/8343779/Copilot-Coding-agent) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 4 ++-- src/extension.ts | 13 ------------- src/features/creators/autoFindProjects.ts | 12 ++++++++++-- src/features/creators/existingProjects.ts | 12 ++++++++++-- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 3188762..4383db7 100644 --- a/package.json +++ b/package.json @@ -489,12 +489,12 @@ { "command": "python-envs.addPythonProjectGivenResource", "group": "inline", - "when": "explorerViewletVisible && explorerResourceIsFolder && !python-envs:isExistingProject" + "when": "explorerViewletVisible && explorerResourceIsFolder" }, { "command": "python-envs.addPythonProjectGivenResource", "group": "inline", - "when": "explorerViewletVisible && resourceExtname == .py && !python-envs:isExistingProject" + "when": "explorerViewletVisible && resourceExtname == .py" } ], "editor/title/run": [ diff --git a/src/extension.ts b/src/extension.ts index c4d89ec..22b2f65 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -189,14 +189,6 @@ export async function activate(context: ExtensionContext): Promise { - if (!uri) { - return false; - } - return projectManager.get(uri) !== undefined; - }; - const envVarManager: EnvVarManager = new PythonEnvVariableManager(projectManager); context.subscriptions.push(envVarManager); @@ -323,11 +315,6 @@ export async function activate(context: ExtensionContext): Promise { - // Set context to show/hide menu item depending on whether the resource is already a Python project - if (resource instanceof Uri) { - commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource)); - } - await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators); const totalProjectCount = projectManager.getProjects().length + 1; sendTelemetryEvent(EventNames.ADD_PROJECT, undefined, { diff --git a/src/features/creators/autoFindProjects.ts b/src/features/creators/autoFindProjects.ts index cb1258e..7d3987c 100644 --- a/src/features/creators/autoFindProjects.ts +++ b/src/features/creators/autoFindProjects.ts @@ -83,9 +83,17 @@ export class AutoFindProjects implements PythonProjectCreator { if (filtered.length === 0) { // No new projects found that are not already in the project manager - traceInfo('All discovered projects are already registered in the project manager'); + traceInfo( + `All selected resources are already registered in the project manager: ${files + .map((uri) => uri.fsPath) + .join(', ')}`, + ); setImmediate(() => { - showWarningMessage('No new projects found'); + if (files.length === 1) { + showWarningMessage(`${files[0].fsPath} already exists as project.`); + } else { + showWarningMessage('Selected resources already exist as projects.'); + } }); return; } diff --git a/src/features/creators/existingProjects.ts b/src/features/creators/existingProjects.ts index 1bb6ff0..5c66d29 100644 --- a/src/features/creators/existingProjects.ts +++ b/src/features/creators/existingProjects.ts @@ -56,9 +56,17 @@ export class ExistingProjects implements PythonProjectCreator { if (filtered.length === 0) { // No new projects found that are not already in the project manager - traceInfo('All discovered projects are already registered in the project manager'); + const formattedProjectPaths = + existingAddUri === undefined ? 'None' : existingAddUri.map((uri) => uri.fsPath).join(', '); + traceInfo( + `All selected resources are already registered in the project manager. Resources selected: ${formattedProjectPaths}`, + ); setImmediate(() => { - showWarningMessage('No new projects found'); + if (existingAddUri && existingAddUri.length === 1) { + showWarningMessage(`Selected resource already exists as project.`); + } else { + showWarningMessage('Selected resources already exist as projects.'); + } }); return; } From 6b1bf836d2e8f1eaa995b0826ec2bf0ce8410089 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Fri, 15 Aug 2025 09:41:43 -0700 Subject: [PATCH 247/328] Adapt to evaluating activate in core shell integration (#717) Issue related: https://github.com/microsoft/vscode/issues/259637 Adapting to: https://github.com/microsoft/vscode/pull/261094 FYI if activation fails when eval from shell integration scripts, we're making it very obvious for them: https://github.com/microsoft/vscode/pull/261094#issuecomment-3182440074 TODO: Remove activation debris in shell init files for existing users. /cc @cwebster-99 --- package-lock.json | 2 +- package.json | 2 +- src/common/window.apis.ts | 4 ++++ .../terminal/shellStartupSetupHandlers.ts | 5 ++++- .../terminal/shells/bash/bashConstants.ts | 4 ++-- src/features/terminal/shells/bash/bashStartup.ts | 4 ++++ src/features/terminal/shells/cmd/cmdConstants.ts | 2 +- src/features/terminal/shells/common/shellUtils.ts | 15 +++++++++++++++ src/features/terminal/shells/fish/fishStartup.ts | 4 ++++ .../terminal/shells/pwsh/pwshConstants.ts | 2 +- src/features/terminal/shells/pwsh/pwshStartup.ts | 10 +++++++++- 11 files changed, 46 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57f3dc9..d007670 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "webpack-cli": "^5.1.1" }, "engines": { - "vscode": "^1.100.0-20250407" + "vscode": "^1.104.0-20250815" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 4383db7..ea3d899 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "publisher": "ms-python", "preview": true, "engines": { - "vscode": "^1.100.0-20250407" + "vscode": "^1.104.0-20250815" }, "categories": [ "Other" diff --git a/src/common/window.apis.ts b/src/common/window.apis.ts index d3f96ac..51a2032 100644 --- a/src/common/window.apis.ts +++ b/src/common/window.apis.ts @@ -61,6 +61,10 @@ export function activeTerminal(): Terminal | undefined { return window.activeTerminal; } +export function activeTerminalShellIntegration() { + return window.activeTerminal?.shellIntegration; +} + export function activeTextEditor(): TextEditor | undefined { return window.activeTextEditor; } diff --git a/src/features/terminal/shellStartupSetupHandlers.ts b/src/features/terminal/shellStartupSetupHandlers.ts index 429865a..30ced7f 100644 --- a/src/features/terminal/shellStartupSetupHandlers.ts +++ b/src/features/terminal/shellStartupSetupHandlers.ts @@ -11,9 +11,12 @@ export async function handleSettingUpShellProfile( callback: (provider: ShellStartupScriptProvider, result: boolean) => void, ): Promise { const shells = providers.map((p) => p.shellType).join(', '); + // TODO: Get opinions on potentially modifying the prompt + // - If shell integration is active, we won't need to modify user's shell profile, init scripts. + // - Current prompt we have below may not be the most accurate description. const response = await showInformationMessage( l10n.t( - 'To enable "{0}" activation, your shell profile(s) need to be updated to include the necessary startup scripts. Would you like to proceed with these changes?', + 'To enable "{0}" activation, your shell profile(s) may need to be updated to include the necessary startup scripts. Would you like to proceed with these changes?', ACT_TYPE_SHELL, ), { modal: true, detail: l10n.t('Shells: {0}', shells) }, diff --git a/src/features/terminal/shells/bash/bashConstants.ts b/src/features/terminal/shells/bash/bashConstants.ts index 1e3566c..ca00417 100644 --- a/src/features/terminal/shells/bash/bashConstants.ts +++ b/src/features/terminal/shells/bash/bashConstants.ts @@ -1,3 +1,3 @@ -export const BASH_ENV_KEY = 'VSCODE_BASH_ACTIVATE'; -export const ZSH_ENV_KEY = 'VSCODE_ZSH_ACTIVATE'; +export const BASH_ENV_KEY = 'VSCODE_PYTHON_BASH_ACTIVATE'; +export const ZSH_ENV_KEY = 'VSCODE_PYTHON_ZSH_ACTIVATE'; export const BASH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index ff66d72..77adeb4 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -5,6 +5,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { BASH_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY } from './bashConstants'; @@ -69,6 +70,9 @@ async function isStartupSetup(profile: string, key: string): Promise { + if (shellIntegrationForActiveTerminal(name, profile)) { + return true; + } const activationContent = getActivationContent(key); try { diff --git a/src/features/terminal/shells/cmd/cmdConstants.ts b/src/features/terminal/shells/cmd/cmdConstants.ts index 5a676eb..1f244c9 100644 --- a/src/features/terminal/shells/cmd/cmdConstants.ts +++ b/src/features/terminal/shells/cmd/cmdConstants.ts @@ -1,2 +1,2 @@ -export const CMD_ENV_KEY = 'VSCODE_CMD_ACTIVATE'; +export const CMD_ENV_KEY = 'VSCODE_PYTHON_CMD_ACTIVATE'; export const CMD_SCRIPT_VERSION = '0.1.0'; diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 38567c6..8c45e21 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -1,5 +1,7 @@ import { PythonCommandRunConfiguration, PythonEnvironment } from '../../../../api'; +import { traceInfo } from '../../../../common/logging'; import { isWindows } from '../../../../common/utils/platformUtils'; +import { activeTerminalShellIntegration } from '../../../../common/window.apis'; import { ShellConstants } from '../../../common/shellConstants'; import { quoteArgs } from '../../../execution/execUtils'; @@ -95,3 +97,16 @@ export function extractProfilePath(content: string): string | undefined { } return undefined; } + +export function shellIntegrationForActiveTerminal(name: string, profile: string): boolean { + const hasShellIntegration = activeTerminalShellIntegration(); + + if (hasShellIntegration) { + traceInfo( + `SHELL: Shell integration is available on your active terminal. Python activate scripts will be evaluated at shell integration level. + Skipping modification of ${name} profile at: ${profile}`, + ); + return true; + } + return false; +} diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 662d289..7b874d9 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -6,6 +6,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; +import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { FISH_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; @@ -57,6 +58,9 @@ async function isStartupSetup(profilePath: string, key: string): Promise { try { + if (shellIntegrationForActiveTerminal('fish', profilePath)) { + return true; + } const activationContent = getActivationContent(key); await fs.mkdirp(path.dirname(profilePath)); diff --git a/src/features/terminal/shells/pwsh/pwshConstants.ts b/src/features/terminal/shells/pwsh/pwshConstants.ts index 1c7072e..0d79df5 100644 --- a/src/features/terminal/shells/pwsh/pwshConstants.ts +++ b/src/features/terminal/shells/pwsh/pwshConstants.ts @@ -1,2 +1,2 @@ -export const POWERSHELL_ENV_KEY = 'VSCODE_PWSH_ACTIVATE'; +export const POWERSHELL_ENV_KEY = 'VSCODE_PYTHON_PWSH_ACTIVATE'; export const PWSH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 17347af..5a0dc7c 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -11,7 +11,12 @@ import assert from 'assert'; import { getWorkspacePersistentState } from '../../../../common/persistentState'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; -import { extractProfilePath, PROFILE_TAG_END, PROFILE_TAG_START } from '../common/shellUtils'; +import { + extractProfilePath, + PROFILE_TAG_END, + PROFILE_TAG_START, + shellIntegrationForActiveTerminal, +} from '../common/shellUtils'; import { POWERSHELL_ENV_KEY, PWSH_SCRIPT_VERSION } from './pwshConstants'; const PWSH_PROFILE_PATH_CACHE_KEY = 'PWSH_PROFILE_PATH_CACHE'; @@ -140,6 +145,9 @@ async function isPowerShellStartupSetup(shell: string, profile: string): Promise } async function setupPowerShellStartup(shell: string, profile: string): Promise { + if (shellIntegrationForActiveTerminal(shell, profile)) { + return true; + } const activationContent = getActivationContent(); try { From 80132ea3251cc6c3bd0b0ed9de4b0f7406a2fe83 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Fri, 15 Aug 2025 15:41:53 -0700 Subject: [PATCH 248/328] Remove debris if shell integration is available (#727) Resolves: https://github.com/microsoft/vscode-python-environments/issues/726 Coming from https://github.com/microsoft/vscode-python-environments/pull/717 /cc @karthiknadig --- src/features/terminal/shells/bash/bashStartup.ts | 2 +- src/features/terminal/shells/fish/fishStartup.ts | 1 + src/features/terminal/shells/pwsh/pwshStartup.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 77adeb4..699a8b0 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -71,10 +71,10 @@ async function isStartupSetup(profile: string, key: string): Promise { if (shellIntegrationForActiveTerminal(name, profile)) { + removeStartup(profile, key); return true; } const activationContent = getActivationContent(key); - try { if (await fs.pathExists(profile)) { const content = await fs.readFile(profile, 'utf8'); diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 7b874d9..eb2c89c 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -59,6 +59,7 @@ async function isStartupSetup(profilePath: string, key: string): Promise { try { if (shellIntegrationForActiveTerminal('fish', profilePath)) { + removeFishStartup(profilePath, key); return true; } const activationContent = getActivationContent(key); diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 5a0dc7c..575cd7d 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -146,6 +146,7 @@ async function isPowerShellStartupSetup(shell: string, profile: string): Promise async function setupPowerShellStartup(shell: string, profile: string): Promise { if (shellIntegrationForActiveTerminal(shell, profile)) { + removePowerShellStartup(shell, profile); return true; } const activationContent = getActivationContent(); From b1b50c43e2320d63037110ce866f6254b92b9628 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 18 Aug 2025 14:08:49 -0700 Subject: [PATCH 249/328] Enhance logging in task execution functions for better debugging (#730) --- src/features/execution/runAsTask.ts | 2 ++ src/features/execution/runInBackground.ts | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/features/execution/runAsTask.ts b/src/features/execution/runAsTask.ts index 9cd77d8..5d020d7 100644 --- a/src/features/execution/runAsTask.ts +++ b/src/features/execution/runAsTask.ts @@ -9,6 +9,7 @@ import { WorkspaceFolder, } from 'vscode'; import { PythonEnvironment, PythonTaskExecutionOptions } from '../../api'; +import { traceInfo } from '../../common/logging'; import { executeTask } from '../../common/tasks.apis'; import { getWorkspaceFolder } from '../../common/workspace.apis'; import { quoteArg } from './execUtils'; @@ -29,6 +30,7 @@ export async function runAsTask( executable = quoteArg(executable); const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; + traceInfo(`Running as task: ${executable} ${allArgs.join(' ')}`); const task = new Task( { type: 'python' }, diff --git a/src/features/execution/runInBackground.ts b/src/features/execution/runInBackground.ts index 39d0ce2..aff7c4c 100644 --- a/src/features/execution/runInBackground.ts +++ b/src/features/execution/runInBackground.ts @@ -1,5 +1,6 @@ import * as cp from 'child_process'; -import { PythonEnvironment, PythonBackgroundRunOptions, PythonProcess } from '../../api'; +import { PythonBackgroundRunOptions, PythonEnvironment, PythonProcess } from '../../api'; +import { traceError, traceInfo } from '../../common/logging'; export async function runInBackground( environment: PythonEnvironment, @@ -9,6 +10,7 @@ export async function runInBackground( environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; + traceInfo(`Running in background: ${executable} ${allArgs.join(' ')}`); const proc = cp.spawn(executable, allArgs, { stdio: 'pipe', cwd: options.cwd, env: options.env }); @@ -22,8 +24,17 @@ export async function runInBackground( proc.kill(); } }, - onExit: (listener: (code: number | null, signal: NodeJS.Signals | null) => void) => { - proc.on('exit', listener); + onExit: (listener: (code: number | null, signal: NodeJS.Signals | null, error?: Error | null) => void) => { + proc.on('exit', (code, signal) => { + if (code && code !== 0) { + traceError(`Process exited with error code: ${code}, signal: ${signal}`); + } + listener(code, signal, null); + }); + proc.on('error', (error) => { + traceError(`Process error: ${error?.message || error}${error?.stack ? '\n' + error.stack : ''}`); + listener(null, null, error); + }); }, }; } From f209fd81fa8e5cb2093824a0ff5e2acdadf84c69 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 18 Aug 2025 16:16:11 -0700 Subject: [PATCH 250/328] add quoting, logging, and resolution for run as task and background (#731) --- src/features/envCommands.ts | 17 ++++++++++++----- src/features/execution/execUtils.ts | 4 ++-- src/features/execution/runAsTask.ts | 14 ++++++++++---- src/features/execution/runInBackground.ts | 12 +++++++++--- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index ecdcc9b..8f3d1d6 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -574,8 +574,10 @@ export async function runInTerminalCommand( const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment && project) { - const terminal = await tm.getProjectTerminal(project, environment); - await runInTerminal(environment, terminal, { + const resolvedEnv = await api.resolveEnvironment(environment.environmentPath); + const envFinal = resolvedEnv ?? environment; + const terminal = await tm.getProjectTerminal(project, envFinal); + await runInTerminal(envFinal, terminal, { cwd: project.uri, args: [item.fsPath], show: true, @@ -594,9 +596,12 @@ export async function runInDedicatedTerminalCommand( const uri = item as Uri; const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); + if (environment && project) { - const terminal = await tm.getDedicatedTerminal(item, project, environment); - await runInTerminal(environment, terminal, { + const resolvedEnv = await api.resolveEnvironment(environment.environmentPath); + const envFinal = resolvedEnv ?? environment; + const terminal = await tm.getDedicatedTerminal(item, project, envFinal); + await runInTerminal(envFinal, terminal, { cwd: project.uri, args: [item.fsPath], show: true, @@ -612,8 +617,10 @@ export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi) const project = api.getPythonProject(uri); const environment = await api.getEnvironment(uri); if (environment) { + const resolvedEnv = await api.resolveEnvironment(environment.environmentPath); + const envFinal = resolvedEnv ?? environment; return await runAsTask( - environment, + envFinal, { project, args: [item.fsPath], diff --git a/src/features/execution/execUtils.ts b/src/features/execution/execUtils.ts index 7c61975..49409ef 100644 --- a/src/features/execution/execUtils.ts +++ b/src/features/execution/execUtils.ts @@ -1,4 +1,4 @@ -export function quoteArg(arg: string): string { +export function quoteStringIfNecessary(arg: string): string { if (arg.indexOf(' ') >= 0 && !(arg.startsWith('"') && arg.endsWith('"'))) { return `"${arg}"`; } @@ -6,5 +6,5 @@ export function quoteArg(arg: string): string { } export function quoteArgs(args: string[]): string[] { - return args.map(quoteArg); + return args.map(quoteStringIfNecessary); } diff --git a/src/features/execution/runAsTask.ts b/src/features/execution/runAsTask.ts index 5d020d7..6b7e14e 100644 --- a/src/features/execution/runAsTask.ts +++ b/src/features/execution/runAsTask.ts @@ -9,10 +9,10 @@ import { WorkspaceFolder, } from 'vscode'; import { PythonEnvironment, PythonTaskExecutionOptions } from '../../api'; -import { traceInfo } from '../../common/logging'; +import { traceInfo, traceWarn } from '../../common/logging'; import { executeTask } from '../../common/tasks.apis'; import { getWorkspaceFolder } from '../../common/workspace.apis'; -import { quoteArg } from './execUtils'; +import { quoteStringIfNecessary } from './execUtils'; function getWorkspaceFolderOrDefault(uri?: Uri): WorkspaceFolder | TaskScope { const workspace = uri ? getWorkspaceFolder(uri) : undefined; @@ -26,8 +26,14 @@ export async function runAsTask( ): Promise { const workspace: WorkspaceFolder | TaskScope = getWorkspaceFolderOrDefault(options.project?.uri); - let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; - executable = quoteArg(executable); + let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable; + if (!executable) { + traceWarn('No Python executable found in environment; falling back to "python".'); + executable = 'python'; + } + // Check and quote the executable path if necessary + executable = quoteStringIfNecessary(executable); + const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; traceInfo(`Running as task: ${executable} ${allArgs.join(' ')}`); diff --git a/src/features/execution/runInBackground.ts b/src/features/execution/runInBackground.ts index aff7c4c..0543bc3 100644 --- a/src/features/execution/runInBackground.ts +++ b/src/features/execution/runInBackground.ts @@ -1,13 +1,19 @@ import * as cp from 'child_process'; import { PythonBackgroundRunOptions, PythonEnvironment, PythonProcess } from '../../api'; -import { traceError, traceInfo } from '../../common/logging'; +import { traceError, traceInfo, traceWarn } from '../../common/logging'; +import { quoteStringIfNecessary } from './execUtils'; export async function runInBackground( environment: PythonEnvironment, options: PythonBackgroundRunOptions, ): Promise { - const executable = - environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python'; + let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable; + if (!executable) { + traceWarn('No Python executable found in environment; falling back to "python".'); + executable = 'python'; + } + // Check and quote the executable path if necessary + executable = quoteStringIfNecessary(executable); const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; traceInfo(`Running in background: ${executable} ${allArgs.join(' ')}`); From b81b74fe280bf725088f8e86a6e0bc3a21aad2d2 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Mon, 18 Aug 2025 18:02:15 -0700 Subject: [PATCH 251/328] Clean up for old shell startup scripts (#732) Resolves: https://github.com/microsoft/vscode/issues/262193 https://github.com/microsoft/vscode-python-environments/pull/727 was only removing current env var value. Need to do clean up for existing users who have already opted into shell startup. Otherwise, running `Revert shell startup changes` does not clean up for old shell startup code. --- .../terminal/shells/bash/bashConstants.ts | 2 ++ .../terminal/shells/bash/bashStartup.ts | 12 ++++++++---- .../terminal/shells/fish/fishConstants.ts | 3 ++- .../terminal/shells/fish/fishStartup.ts | 8 +++++--- .../terminal/shells/pwsh/pwshConstants.ts | 1 + .../terminal/shells/pwsh/pwshStartup.ts | 19 +++++++++++-------- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/features/terminal/shells/bash/bashConstants.ts b/src/features/terminal/shells/bash/bashConstants.ts index ca00417..72c838e 100644 --- a/src/features/terminal/shells/bash/bashConstants.ts +++ b/src/features/terminal/shells/bash/bashConstants.ts @@ -1,3 +1,5 @@ export const BASH_ENV_KEY = 'VSCODE_PYTHON_BASH_ACTIVATE'; export const ZSH_ENV_KEY = 'VSCODE_PYTHON_ZSH_ACTIVATE'; +export const BASH_OLD_ENV_KEY = 'VSCODE_BASH_ACTIVATE'; +export const ZSH_OLD_ENV_KEY = 'VSCODE_ZSH_ACTIVATE'; export const BASH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 699a8b0..86838d5 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -7,7 +7,7 @@ import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; -import { BASH_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY } from './bashConstants'; +import { BASH_ENV_KEY, BASH_OLD_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY, ZSH_OLD_ENV_KEY } from './bashConstants'; async function isBashLikeInstalled(): Promise { const result = await Promise.all([which('bash', { nothrow: true }), which('sh', { nothrow: true })]); @@ -106,13 +106,13 @@ async function removeStartup(profile: string, key: string): Promise { const content = await fs.readFile(profile, 'utf8'); if (hasStartupCode(content, regionStart, regionEnd, [key])) { await fs.writeFile(profile, removeStartupCode(content, regionStart, regionEnd)); - traceInfo(`SHELL: Removed activation from profile at: ${profile}`); + traceInfo(`SHELL: Removed activation from profile at: ${profile}, for key: ${key}`); } else { - traceVerbose(`Profile at ${profile} does not contain activation code`); + traceVerbose(`Profile at ${profile} does not contain activation code, for key: ${key}`); } return true; } catch (err) { - traceVerbose(`Failed to remove ${profile} startup`, err); + traceVerbose(`Failed to remove ${profile} startup, for key: ${key}`, err); return false; } } @@ -171,6 +171,8 @@ export class BashStartupProvider implements ShellStartupScriptProvider { try { const bashProfile = await getBashProfiles(); + // Remove old environment variable if it exists + await removeStartup(bashProfile, BASH_OLD_ENV_KEY); const result = await removeStartup(bashProfile, BASH_ENV_KEY); return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; } catch (err) { @@ -233,6 +235,7 @@ export class ZshStartupProvider implements ShellStartupScriptProvider { } try { const zshProfiles = await getZshProfiles(); + await removeStartup(zshProfiles, ZSH_OLD_ENV_KEY); const result = await removeStartup(zshProfiles, ZSH_ENV_KEY); return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; } catch (err) { @@ -293,6 +296,7 @@ export class GitBashStartupProvider implements ShellStartupScriptProvider { try { const bashProfiles = await getBashProfiles(); + await removeStartup(bashProfiles, BASH_OLD_ENV_KEY); const result = await removeStartup(bashProfiles, BASH_ENV_KEY); return result ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited; } catch (err) { diff --git a/src/features/terminal/shells/fish/fishConstants.ts b/src/features/terminal/shells/fish/fishConstants.ts index 512fb9c..84b598c 100644 --- a/src/features/terminal/shells/fish/fishConstants.ts +++ b/src/features/terminal/shells/fish/fishConstants.ts @@ -1,2 +1,3 @@ -export const FISH_ENV_KEY = 'VSCODE_FISH_ACTIVATE'; +export const FISH_ENV_KEY = 'VSCODE_PYTHON_FISH_ACTIVATE'; +export const FISH_OLD_ENV_KEY = 'VSCODE_FISH_ACTIVATE'; export const FISH_SCRIPT_VERSION = '0.1.1'; diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index eb2c89c..37ac130 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -8,7 +8,7 @@ import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; -import { FISH_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; +import { FISH_ENV_KEY, FISH_OLD_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; async function isFishInstalled(): Promise { try { @@ -93,11 +93,11 @@ async function removeFishStartup(profilePath: string, key: string): Promise { if (shellIntegrationForActiveTerminal(shell, profile)) { - removePowerShellStartup(shell, profile); + removePowerShellStartup(shell, profile, POWERSHELL_OLD_ENV_KEY); + removePowerShellStartup(shell, profile, POWERSHELL_ENV_KEY); return true; } const activationContent = getActivationContent(); @@ -172,22 +173,22 @@ async function setupPowerShellStartup(shell: string, profile: string): Promise { +async function removePowerShellStartup(shell: string, profile: string, key: string): Promise { if (!(await fs.pathExists(profile))) { return true; } try { const content = await fs.readFile(profile, 'utf8'); - if (hasStartupCode(content, regionStart, regionEnd, [POWERSHELL_ENV_KEY])) { + if (hasStartupCode(content, regionStart, regionEnd, [key])) { await fs.writeFile(profile, removeStartupCode(content, regionStart, regionEnd)); - traceInfo(`SHELL: Removed activation from ${shell} profile at: ${profile}`); + traceInfo(`SHELL: Removed activation from ${shell} profile at: ${profile}, for key: ${key}`); } else { - traceInfo(`SHELL: No activation code found in ${shell} profile at: ${profile}`); + traceInfo(`SHELL: No activation code found in ${shell} profile at: ${profile}, for key: ${key}`); } return true; } catch (err) { - traceError(`SHELL: Failed to remove startup code for ${shell} profile at: ${profile}`, err); + traceError(`SHELL: Failed to remove startup code for ${shell} profile at: ${profile}, for key: ${key}`, err); return false; } } @@ -302,7 +303,9 @@ export class PwshStartupProvider implements ShellStartupScriptProvider { try { const profile = await getProfileForShell(shell); - const success = await removePowerShellStartup(shell, profile); + // Remove old environment variable if it exists + await removePowerShellStartup(shell, profile, POWERSHELL_OLD_ENV_KEY); + const success = await removePowerShellStartup(shell, profile, POWERSHELL_ENV_KEY); anyEdited.push(success ? ShellScriptEditState.Edited : ShellScriptEditState.NotEdited); } catch (err) { traceError(`Failed to remove ${shell} startup`, err); From c4e32745fbcc0437cf6d9fe983884d27f5dd983a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 19 Aug 2025 13:20:11 -0700 Subject: [PATCH 252/328] trigger manager refresh on new project creation (#736) fixes https://github.com/microsoft/vscode-python-environments/issues/737 --- src/features/envCommands.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/features/envCommands.ts b/src/features/envCommands.ts index 8f3d1d6..fe02e02 100644 --- a/src/features/envCommands.ts +++ b/src/features/envCommands.ts @@ -418,6 +418,8 @@ export async function addPythonProjectCommand( }; } await existingProjectsCreator.create(options); + // trigger refresh to populate environments within the new project + await Promise.all(em.managers.map((m) => m.refresh(options?.rootUri))); return; } catch (ex) { if (ex === QuickInputButtons.Back) { @@ -450,6 +452,8 @@ export async function addPythonProjectCommand( try { await creator.create(options); + // trigger refresh to populate environments within the new project + await Promise.all(em.managers.map((m) => m.refresh(options?.rootUri))); } catch (ex) { if (ex === QuickInputButtons.Back) { return addPythonProjectCommand(resource, wm, em, pc); From 1a1bc5adc97fc4b7fb61384160f245921fa100d8 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Tue, 19 Aug 2025 13:39:30 -0700 Subject: [PATCH 253/328] Fix to prevent multiple shell startup prompts (#738) Resolves: https://github.com/microsoft/vscode/issues/262213 --- .../terminal/shellStartupSetupHandlers.ts | 4 +--- .../terminal/shells/common/shellUtils.ts | 2 +- src/features/terminal/terminalManager.ts | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/features/terminal/shellStartupSetupHandlers.ts b/src/features/terminal/shellStartupSetupHandlers.ts index 30ced7f..b9da1e8 100644 --- a/src/features/terminal/shellStartupSetupHandlers.ts +++ b/src/features/terminal/shellStartupSetupHandlers.ts @@ -11,9 +11,7 @@ export async function handleSettingUpShellProfile( callback: (provider: ShellStartupScriptProvider, result: boolean) => void, ): Promise { const shells = providers.map((p) => p.shellType).join(', '); - // TODO: Get opinions on potentially modifying the prompt - // - If shell integration is active, we won't need to modify user's shell profile, init scripts. - // - Current prompt we have below may not be the most accurate description. + // Only show prompt when shell integration is not available, or disabled. const response = await showInformationMessage( l10n.t( 'To enable "{0}" activation, your shell profile(s) may need to be updated to include the necessary startup scripts. Would you like to proceed with these changes?', diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 8c45e21..95e6f71 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -98,7 +98,7 @@ export function extractProfilePath(content: string): string | undefined { return undefined; } -export function shellIntegrationForActiveTerminal(name: string, profile: string): boolean { +export function shellIntegrationForActiveTerminal(name: string, profile?: string): boolean { const hasShellIntegration = activeTerminalShellIntegration(); if (hasShellIntegration) { diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index bb91264..a985c07 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -16,6 +16,7 @@ import { getConfiguration, onDidChangeConfiguration } from '../../common/workspa import { isActivatableEnvironment } from '../common/activation'; import { identifyTerminalShell } from '../common/shellDetector'; import { getPythonApi } from '../pythonApi'; +import { shellIntegrationForActiveTerminal } from './shells/common/shellUtils'; import { ShellEnvsProvider, ShellSetupState, ShellStartupScriptProvider } from './shells/startupProvider'; import { handleSettingUpShellProfile } from './shellStartupSetupHandlers'; import { @@ -153,9 +154,20 @@ export class TerminalManagerImpl implements TerminalManager { traceVerbose(`Checking shell profile for ${p.shellType}.`); const state = await p.isSetup(); if (state === ShellSetupState.NotSetup) { - this.shellSetup.set(p.shellType, false); - shellsToSetup.push(p); - traceVerbose(`Shell profile for ${p.shellType} is not setup.`); + // Check if shell integration is available before marking for setup + if (shellIntegrationForActiveTerminal(p.name)) { + this.shellSetup.set(p.shellType, true); + traceVerbose( + `Shell integration available for ${p.shellType}, skipping prompt, and profile modification.`, + ); + } else { + // No shell integration, mark for setup + this.shellSetup.set(p.shellType, false); + shellsToSetup.push(p); + traceVerbose( + `Shell integration is NOT avaoiable. Shell profile for ${p.shellType} is not setup.`, + ); + } } else if (state === ShellSetupState.Setup) { this.shellSetup.set(p.shellType, true); traceVerbose(`Shell profile for ${p.shellType} is setup.`); From edc2cc137e7f0417203bd0830693bd02d7a14e0e Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 20 Aug 2025 10:24:20 +1000 Subject: [PATCH 254/328] Remove .vscode-test.mjs from bundled extension (#739) When running an extension test using VS Code test explorer extension, the installed Python env extension gets picked up as well due to the presence of this file --- .vscodeignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscodeignore b/.vscodeignore index a61dc72..14a7a5a 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -4,6 +4,7 @@ out/** node_modules/** src/** .gitignore +.vscode-test.mjs .yarnrc webpack.config.js vsc-extension-quickstart.md From d1991a87331f3211ad70a4f6fc755365a4fd1c1d Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:39:22 -0700 Subject: [PATCH 255/328] bump to version 1.4.0 (#746) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d007670..0b8b938 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.3.0", + "version": "1.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.3.0", + "version": "1.4.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index ea3d899..8ab11ff 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.3.0", + "version": "1.4.0", "publisher": "ms-python", "preview": true, "engines": { From 4fc49ef04fd1e2f45e02ed3c5c921d81a77cb06f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:51:13 -0700 Subject: [PATCH 256/328] bump version to 1.5.0 for dev (#747) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b8b938..080b55e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.4.0", + "version": "1.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.4.0", + "version": "1.5.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 8ab11ff..e060b00 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.4.0", + "version": "1.5.0", "publisher": "ms-python", "preview": true, "engines": { From dac8f95fad333b791547622ddff3e24975b1e5e5 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 22 Aug 2025 09:50:36 -0700 Subject: [PATCH 257/328] update readme with env manager support (#753) --- README.md | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d7c3115..f9cac27 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,26 @@ The following environment managers are supported out of the box: | Id | Name | Description | | ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| ms-python.python:venv | `venv` | The default environment manager. It is a built-in environment manager provided by the Python standard library. | -| ms-python.python:system | System Installed Python | These are global Python installs on your system. These are typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | -| ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | +| ms-python.python:venv | `venv` | Built-in environment manager provided by the Python standard library. Supports creating environments (interactive and quick create) and finding existing environments. | +| ms-python.python:system | System Installed Python | Global Python installs on your system, typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | +| ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). Supports creating environments (interactive and quick create) and finding existing environments. | +| ms-python.python:pyenv | `pyenv` | The [pyenv](https://github.com/pyenv/pyenv) environment manager, used to manage multiple Python versions. Supports finding existing environments. | +| ms-python.python:poetry | `poetry` | The [poetry](https://python-poetry.org/) environment manager, used for dependency management and packaging in Python projects. Supports finding existing environments. | + +#### Supported Actions by Environment Manager + +| Environment Manager | Find Environments | Create | Quick Create | +|---------------------|-------------------|--------|--------------| +| venv | ✅ | ✅ | ✅ | +| conda | ✅ | ✅ | ✅ | +| pyenv | ✅ | | | +| poetry | ✅ | | | +| system | ✅ | | | + +**Legend:** +- **Create**: Ability to create new environments interactively. +- **Quick Create**: Ability to create environments with minimal user input. +- **Find Environments**: Ability to discover and list existing environments. Environment managers are responsible for specifying which package manager will be used by default to install and manage Python packages within the environment (`venv` uses `pip` by default). This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. @@ -57,6 +74,16 @@ The extension uses `pip` as the default package manager, but you can use the pac | ms-python.python:pip | `pip` | Pip acts as the default package manager and it's typically built-in to Python. | | ms-python.python:conda | `conda` | The [conda](https://conda.org) package manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). | +#### Default Package Manager by Environment Manager + +| Environment Manager | Default Package Manager | +|---------------------|------------------------| +| venv | pip | +| conda | conda | +| pyenv | pip | +| poetry | poetry | +| system | pip | + ### Project Management A "Python Project" is any file or folder that contains runnable Python code and needs its own environment. With the Python Environments extension, you can add files and folders as projects in your workspace and assign individual environments to them allowing you to run various projects more seamlessly. From 82cdfe0c6c7cc2a34e762834adeabf9c334e3fb9 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 22 Aug 2025 10:24:44 -0700 Subject: [PATCH 258/328] Adding pipenv support (#750) fixes https://github.com/microsoft/vscode-python-environments/issues/686 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common/localize.ts | 6 + src/extension.ts | 2 + src/managers/pipenv/main.ts | 28 +++ src/managers/pipenv/pipenvManager.ts | 284 +++++++++++++++++++++++++++ src/managers/pipenv/pipenvUtils.ts | 242 +++++++++++++++++++++++ 5 files changed, 562 insertions(+) create mode 100644 src/managers/pipenv/main.ts create mode 100644 src/managers/pipenv/pipenvManager.ts create mode 100644 src/managers/pipenv/pipenvUtils.ts diff --git a/src/common/localize.ts b/src/common/localize.ts index 3caa8a9..1674a39 100644 --- a/src/common/localize.ts +++ b/src/common/localize.ts @@ -156,6 +156,12 @@ export namespace PyenvStrings { export const pyenvRefreshing = l10n.t('Refreshing Pyenv Python versions'); } +export namespace PipenvStrings { + export const pipenvManager = l10n.t('Manages Pipenv environments'); + export const pipenvDiscovering = l10n.t('Discovering Pipenv environments'); + export const pipenvRefreshing = l10n.t('Refreshing Pipenv environments'); +} + export namespace PoetryStrings { export const poetryManager = l10n.t('Manages Poetry environments'); export const poetryDiscovering = l10n.t('Discovering Poetry environments'); diff --git a/src/extension.ts b/src/extension.ts index 22b2f65..159ee26 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -76,6 +76,7 @@ import { } from './managers/common/nativePythonFinder'; import { IDisposable } from './managers/common/types'; import { registerCondaFeatures } from './managers/conda/main'; +import { registerPipenvFeatures } from './managers/pipenv/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; @@ -562,6 +563,7 @@ export async function activate(context: ExtensionContext): Promise { + const api: PythonEnvironmentApi = await getPythonApi(); + + try { + const pipenv = await getPipenv(nativeFinder); + + if (pipenv) { + const mgr = new PipenvManager(nativeFinder, api); + + disposables.push(mgr, api.registerEnvironmentManager(mgr)); + } else { + traceInfo('Pipenv not found, turning off pipenv features.'); + } + } catch (ex) { + traceInfo('Pipenv not found, turning off pipenv features.', ex); + } +} diff --git a/src/managers/pipenv/pipenvManager.ts b/src/managers/pipenv/pipenvManager.ts new file mode 100644 index 0000000..951a8dc --- /dev/null +++ b/src/managers/pipenv/pipenvManager.ts @@ -0,0 +1,284 @@ +import { EventEmitter, MarkdownString, ProgressLocation, Uri } from 'vscode'; +import { + CreateEnvironmentOptions, + CreateEnvironmentScope, + DidChangeEnvironmentEventArgs, + DidChangeEnvironmentsEventArgs, + EnvironmentChangeKind, + EnvironmentManager, + GetEnvironmentScope, + GetEnvironmentsScope, + IconPath, + PythonEnvironment, + PythonEnvironmentApi, + PythonProject, + RefreshEnvironmentsScope, + ResolveEnvironmentContext, + SetEnvironmentScope, +} from '../../api'; +import { PipenvStrings } from '../../common/localize'; +import { createDeferred, Deferred } from '../../common/utils/deferred'; +import { withProgress } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { + clearPipenvCache, + getPipenvForGlobal, + getPipenvForWorkspace, + refreshPipenv, + resolvePipenvPath, + setPipenvForGlobal, + setPipenvForWorkspace, + setPipenvForWorkspaces, +} from './pipenvUtils'; + +export class PipenvManager implements EnvironmentManager { + private collection: PythonEnvironment[] = []; + private fsPathToEnv: Map = new Map(); + private globalEnv: PythonEnvironment | undefined; + + private readonly _onDidChangeEnvironment = new EventEmitter(); + public readonly onDidChangeEnvironment = this._onDidChangeEnvironment.event; + + private readonly _onDidChangeEnvironments = new EventEmitter(); + public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; + + public readonly name: string; + public readonly displayName: string; + public readonly preferredPackageManagerId: string; + public readonly description?: string; + public readonly tooltip: string | MarkdownString; + public readonly iconPath?: IconPath; + + private _initialized: Deferred | undefined; + + constructor(public readonly nativeFinder: NativePythonFinder, public readonly api: PythonEnvironmentApi) { + this.name = 'pipenv'; + this.displayName = 'Pipenv'; + this.preferredPackageManagerId = 'ms-python.python:pip'; + this.tooltip = new MarkdownString(PipenvStrings.pipenvManager, true); + } + + public dispose() { + this.collection = []; + this.fsPathToEnv.clear(); + this._onDidChangeEnvironment.dispose(); + this._onDidChangeEnvironments.dispose(); + } + + async initialize(): Promise { + if (this._initialized) { + return this._initialized.promise; + } + + this._initialized = createDeferred(); + + await withProgress( + { + location: ProgressLocation.Window, + title: PipenvStrings.pipenvDiscovering, + }, + async () => { + this.collection = await refreshPipenv(false, this.nativeFinder, this.api, this); + await this.loadEnvMap(); + + this._onDidChangeEnvironments.fire( + this.collection.map((e) => ({ environment: e, kind: EnvironmentChangeKind.add })), + ); + }, + ); + this._initialized.resolve(); + } + + private async loadEnvMap() { + // Load environment mappings for projects + const projects = this.api.getPythonProjects(); + for (const project of projects) { + const envPath = await getPipenvForWorkspace(project.uri.fsPath); + if (envPath) { + const env = this.findEnvironmentByPath(envPath); + if (env) { + this.fsPathToEnv.set(project.uri.fsPath, env); + } + } + } + + // Load global environment + const globalEnvPath = await getPipenvForGlobal(); + if (globalEnvPath) { + this.globalEnv = this.findEnvironmentByPath(globalEnvPath); + } + } + + private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined { + return this.collection.find( + (env) => env.environmentPath.fsPath === fsPath || env.execInfo?.run.executable === fsPath, + ); + } + + async create?( + _scope: CreateEnvironmentScope, + _options?: CreateEnvironmentOptions, + ): Promise { + // To be implemented + return undefined; + } + + async refresh(scope: RefreshEnvironmentsScope): Promise { + const hardRefresh = scope === undefined; // hard refresh when scope is undefined + + await withProgress( + { + location: ProgressLocation.Window, + title: PipenvStrings.pipenvRefreshing, + }, + async () => { + const oldCollection = [...this.collection]; + this.collection = await refreshPipenv(hardRefresh, this.nativeFinder, this.api, this); + await this.loadEnvMap(); + + // Fire change events for environments that were added or removed + const changes: { environment: PythonEnvironment; kind: EnvironmentChangeKind }[] = []; + + // Find removed environments + oldCollection.forEach((oldEnv) => { + if (!this.collection.find((newEnv) => newEnv.envId.id === oldEnv.envId.id)) { + changes.push({ environment: oldEnv, kind: EnvironmentChangeKind.remove }); + } + }); + + // Find added environments + this.collection.forEach((newEnv) => { + if (!oldCollection.find((oldEnv) => oldEnv.envId.id === newEnv.envId.id)) { + changes.push({ environment: newEnv, kind: EnvironmentChangeKind.add }); + } + }); + + if (changes.length > 0) { + this._onDidChangeEnvironments.fire(changes); + } + }, + ); + } + + async getEnvironments(scope: GetEnvironmentsScope): Promise { + await this.initialize(); + + if (scope === 'all') { + return Array.from(this.collection); + } + + if (scope === 'global') { + // Return all environments for global scope + return Array.from(this.collection); + } + + if (scope instanceof Uri) { + const project = this.api.getPythonProject(scope); + if (project) { + const env = this.fsPathToEnv.get(project.uri.fsPath); + return env ? [env] : []; + } + } + + return []; + } + + async set(scope: SetEnvironmentScope, environment?: PythonEnvironment): Promise { + if (scope === undefined) { + // Global scope + const before = this.globalEnv; + this.globalEnv = environment; + await setPipenvForGlobal(environment?.environmentPath.fsPath); + + if (before?.envId.id !== this.globalEnv?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: undefined, old: before, new: this.globalEnv }); + } + return; + } + + if (scope instanceof Uri) { + // Single project scope + const project = this.api.getPythonProject(scope); + if (!project) { + return; + } + + const before = this.fsPathToEnv.get(project.uri.fsPath); + if (environment) { + this.fsPathToEnv.set(project.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(project.uri.fsPath); + } + + await setPipenvForWorkspace(project.uri.fsPath, environment?.environmentPath.fsPath); + + if (before?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: scope, old: before, new: environment }); + } + } + + if (Array.isArray(scope) && scope.every((u) => u instanceof Uri)) { + // Multiple projects scope + const projects: PythonProject[] = []; + scope + .map((s) => this.api.getPythonProject(s)) + .forEach((p) => { + if (p) { + projects.push(p); + } + }); + + const before: Map = new Map(); + projects.forEach((p) => { + before.set(p.uri.fsPath, this.fsPathToEnv.get(p.uri.fsPath)); + if (environment) { + this.fsPathToEnv.set(p.uri.fsPath, environment); + } else { + this.fsPathToEnv.delete(p.uri.fsPath); + } + }); + + await setPipenvForWorkspaces( + projects.map((p) => p.uri.fsPath), + environment?.environmentPath.fsPath, + ); + + projects.forEach((p) => { + const b = before.get(p.uri.fsPath); + if (b?.envId.id !== environment?.envId.id) { + this._onDidChangeEnvironment.fire({ uri: p.uri, old: b, new: environment }); + } + }); + } + } + + async get(scope: GetEnvironmentScope): Promise { + await this.initialize(); + + if (scope === undefined) { + return this.globalEnv; + } + + if (scope instanceof Uri) { + const project = this.api.getPythonProject(scope); + if (project) { + return this.fsPathToEnv.get(project.uri.fsPath); + } + } + + return undefined; + } + + async resolve(context: ResolveEnvironmentContext): Promise { + await this.initialize(); + return resolvePipenvPath(context.fsPath, this.nativeFinder, this.api, this); + } + + async clearCache?(): Promise { + await clearPipenvCache(); + this.collection = []; + this.fsPathToEnv.clear(); + this.globalEnv = undefined; + this._initialized = undefined; + } +} diff --git a/src/managers/pipenv/pipenvUtils.ts b/src/managers/pipenv/pipenvUtils.ts new file mode 100644 index 0000000..3c271d4 --- /dev/null +++ b/src/managers/pipenv/pipenvUtils.ts @@ -0,0 +1,242 @@ +// Utility functions for Pipenv environment management + +import * as path from 'path'; +import { Uri } from 'vscode'; +import which from 'which'; +import { + EnvironmentManager, + PythonCommandRunConfiguration, + PythonEnvironment, + PythonEnvironmentApi, + PythonEnvironmentInfo, +} from '../../api'; +import { ENVS_EXTENSION_ID } from '../../common/constants'; +import { traceError, traceInfo } from '../../common/logging'; +import { getWorkspacePersistentState } from '../../common/persistentState'; +import { + isNativeEnvInfo, + NativeEnvInfo, + NativeEnvManagerInfo, + NativePythonEnvironmentKind, + NativePythonFinder, +} from '../common/nativePythonFinder'; +import { getShellActivationCommands, shortVersion } from '../common/utils'; + +export const PIPENV_PATH_KEY = `${ENVS_EXTENSION_ID}:pipenv:PIPENV_PATH`; +export const PIPENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:pipenv:WORKSPACE_SELECTED`; +export const PIPENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:pipenv:GLOBAL_SELECTED`; + +let pipenvPath: string | undefined; + +async function findPipenv(): Promise { + try { + return await which('pipenv'); + } catch { + return undefined; + } +} + +async function setPipenv(pipenv: string): Promise { + pipenvPath = pipenv; + const state = await getWorkspacePersistentState(); + await state.set(PIPENV_PATH_KEY, pipenv); +} + +export async function clearPipenvCache(): Promise { + pipenvPath = undefined; +} + +export async function getPipenv(native?: NativePythonFinder): Promise { + if (pipenvPath) { + return pipenvPath; + } + + const state = await getWorkspacePersistentState(); + pipenvPath = await state.get(PIPENV_PATH_KEY); + if (pipenvPath) { + traceInfo(`Using pipenv from persistent state: ${pipenvPath}`); + return pipenvPath; + } + + // Try to find pipenv in PATH + const foundPipenv = await findPipenv(); + if (foundPipenv) { + pipenvPath = foundPipenv; + traceInfo(`Found pipenv in PATH: ${foundPipenv}`); + return foundPipenv; + } + + // Use native finder as fallback + if (native) { + const data = await native.refresh(false); + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'pipenv'); + if (managers.length > 0) { + pipenvPath = managers[0].executable; + traceInfo(`Using pipenv from native finder: ${pipenvPath}`); + await state.set(PIPENV_PATH_KEY, pipenvPath); + return pipenvPath; + } + } + + traceInfo('Pipenv not found'); + return undefined; +} + +async function nativeToPythonEnv( + info: NativeEnvInfo, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + if (!(info.prefix && info.executable && info.version)) { + traceError(`Incomplete pipenv environment info: ${JSON.stringify(info)}`); + return undefined; + } + + const sv = shortVersion(info.version); + const name = info.name || info.displayName || path.basename(info.prefix); + const displayName = info.displayName || `pipenv (${sv})`; + + // Derive the environment's bin/scripts directory from the python executable + const binDir = path.dirname(info.executable); + let shellActivation: Map = new Map(); + let shellDeactivation: Map = new Map(); + + try { + const maps = await getShellActivationCommands(binDir); + shellActivation = maps.shellActivation; + shellDeactivation = maps.shellDeactivation; + } catch (ex) { + traceError(`Failed to compute shell activation commands for pipenv at ${binDir}: ${ex}`); + } + + const environment: PythonEnvironmentInfo = { + name: name, + displayName: displayName, + shortDisplayName: displayName, + displayPath: info.prefix, + version: info.version, + environmentPath: Uri.file(info.prefix), + description: undefined, + tooltip: info.prefix, + execInfo: { + run: { executable: info.executable }, + shellActivation, + shellDeactivation, + }, + sysPrefix: info.prefix, + }; + + return api.createPythonEnvironmentItem(environment, manager); +} + +export async function refreshPipenv( + hardRefresh: boolean, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + traceInfo('Refreshing pipenv environments'); + const data = await nativeFinder.refresh(hardRefresh); + + let pipenv = await getPipenv(); + + if (pipenv === undefined) { + const managers = data + .filter((e) => !isNativeEnvInfo(e)) + .map((e) => e as NativeEnvManagerInfo) + .filter((e) => e.tool.toLowerCase() === 'pipenv'); + + if (managers.length > 0) { + pipenv = managers[0].executable; + await setPipenv(pipenv); + } + } + + const envs = data + .filter((e) => isNativeEnvInfo(e)) + .map((e) => e as NativeEnvInfo) + .filter((e) => e.kind === NativePythonEnvironmentKind.pipenv); + + const collection: PythonEnvironment[] = []; + + for (const e of envs) { + if (pipenv) { + const environment = await nativeToPythonEnv(e, api, manager); + if (environment) { + collection.push(environment); + } + } + } + + traceInfo(`Found ${collection.length} pipenv environments`); + return collection; +} + +export async function resolvePipenvPath( + fsPath: string, + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + manager: EnvironmentManager, +): Promise { + const resolved = await nativeFinder.resolve(fsPath); + + if (resolved.kind === NativePythonEnvironmentKind.pipenv) { + const pipenv = await getPipenv(nativeFinder); + if (pipenv) { + return await nativeToPythonEnv(resolved, api, manager); + } + } + + return undefined; +} + +// Persistence functions for workspace/global environment selection +export async function getPipenvForGlobal(): Promise { + const state = await getWorkspacePersistentState(); + return await state.get(PIPENV_GLOBAL_KEY); +} + +export async function setPipenvForGlobal(pipenvPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + await state.set(PIPENV_GLOBAL_KEY, pipenvPath); +} + +export async function getPipenvForWorkspace(fsPath: string): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } | undefined = await state.get(PIPENV_WORKSPACE_KEY); + if (data) { + try { + return data[fsPath]; + } catch { + return undefined; + } + } + return undefined; +} + +export async function setPipenvForWorkspace(fsPath: string, envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(PIPENV_WORKSPACE_KEY)) ?? {}; + if (envPath) { + data[fsPath] = envPath; + } else { + delete data[fsPath]; + } + await state.set(PIPENV_WORKSPACE_KEY, data); +} + +export async function setPipenvForWorkspaces(fsPath: string[], envPath: string | undefined): Promise { + const state = await getWorkspacePersistentState(); + const data: { [key: string]: string } = (await state.get(PIPENV_WORKSPACE_KEY)) ?? {}; + fsPath.forEach((s) => { + if (envPath) { + data[s] = envPath; + } else { + delete data[s]; + } + }); + await state.set(PIPENV_WORKSPACE_KEY, data); +} From e88a0c6caf24f0a7e358055e4035ab178d20ae18 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 22 Aug 2025 15:22:43 -0700 Subject: [PATCH 259/328] Add resolution for default interpreter and respect defaultInterpreterPath setting (#754) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Screenshot 2025-08-22 at 1 50 01 PM --- src/extension.ts | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/src/extension.ts b/src/extension.ts index 159ee26..e9e780f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -72,6 +72,7 @@ import { SysPythonManager } from './managers/builtin/sysPythonManager'; import { createNativePythonFinder, getNativePythonToolsPath, + NativeEnvInfo, NativePythonFinder, } from './managers/common/nativePythonFinder'; import { IDisposable } from './managers/common/types'; @@ -568,6 +569,8 @@ export async function activate(context: ExtensionContext): Promise { ); } +/** + * Resolves and sets the default Python interpreter for the workspace based on the + * 'python.defaultInterpreterPath' setting and the selected environment manager. + * If the setting is present and no default environment manager is set (or is venv), + * attempts to resolve the interpreter path using the native finder, then creates and + * sets a PythonEnvironment object for the workspace. + * + * @param nativeFinder - The NativePythonFinder instance used to resolve interpreter paths. + * @param envManagers - The EnvironmentManagers instance containing all registered managers. + * @param api - The PythonEnvironmentApi for environment resolution and setting. + */ +async function resolveDefaultInterpreter( + nativeFinder: NativePythonFinder, + envManagers: EnvironmentManagers, + api: PythonEnvironmentApi, +) { + const defaultInterpreterPath = getConfiguration('python').get('defaultInterpreterPath'); + + if (defaultInterpreterPath) { + const defaultManager = getConfiguration('python-envs').get('defaultEnvManager', 'undefined'); + traceInfo(`resolveDefaultInterpreter setting exists; found defaultEnvManager: ${defaultManager}`); + if (!defaultManager || defaultManager === 'ms-python.python:venv') { + try { + const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); + if (resolved && resolved.executable) { + const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); + traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); + + let findEnvManager = envManagers.managers.find((m) => m.id === resolvedEnv?.envId.managerId); + if (!findEnvManager) { + findEnvManager = envManagers.managers.find((m) => m.id === 'ms-python.python:system'); + } + if (resolvedEnv) { + const newEnv: PythonEnvironment = { + envId: { + id: resolvedEnv?.envId.id, + managerId: resolvedEnv?.envId.managerId ?? '', + }, + name: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + displayName: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + version: resolved.version ?? '', + displayPath: defaultInterpreterPath ?? '', + environmentPath: defaultInterpreterPath ? Uri.file(defaultInterpreterPath) : Uri.file(''), + sysPrefix: resolved.arch ?? '', + execInfo: { + run: { + executable: defaultInterpreterPath ?? '', + }, + }, + }; + if (workspace.workspaceFolders?.[0] && findEnvManager) { + traceInfo( + `[resolveDefaultInterpreter] Setting environment for workspace: ${workspace.workspaceFolders[0].uri.fsPath}`, + ); + await api.setEnvironment(workspace.workspaceFolders[0].uri, newEnv); + } + } + } else { + traceWarn( + `[resolveDefaultInterpreter] NativeFinder did not resolve an executable for path: ${defaultInterpreterPath}`, + ); + } + } catch (err) { + traceError(`[resolveDefaultInterpreter] Error resolving default interpreter: ${err}`); + } + } + } +} + export async function deactivate(context: ExtensionContext) { await disposeAll(context.subscriptions); context.subscriptions.length = 0; // Clear subscriptions to prevent memory leaks From 35752ad6b4b534a41656a84ca3973f4bf63aba7f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 22 Aug 2025 15:47:02 -0700 Subject: [PATCH 260/328] update readme for pipenv support (#755) --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f9cac27..b8a0c56 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ The following environment managers are supported out of the box: | ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). Supports creating environments (interactive and quick create) and finding existing environments. | | ms-python.python:pyenv | `pyenv` | The [pyenv](https://github.com/pyenv/pyenv) environment manager, used to manage multiple Python versions. Supports finding existing environments. | | ms-python.python:poetry | `poetry` | The [poetry](https://python-poetry.org/) environment manager, used for dependency management and packaging in Python projects. Supports finding existing environments. | +| ms-python.python:pipenv | `pipenv` | The [pipenv](https://pipenv.pypa.io/en/latest/) environment manager, used for managing Python dependencies and environments. Only supports finding existing environments. | #### Supported Actions by Environment Manager @@ -55,6 +56,7 @@ The following environment managers are supported out of the box: | pyenv | ✅ | | | | poetry | ✅ | | | | system | ✅ | | | +| pipenv | ✅ | | | **Legend:** - **Create**: Ability to create new environments interactively. @@ -83,6 +85,7 @@ The extension uses `pip` as the default package manager, but you can use the pac | pyenv | pip | | poetry | poetry | | system | pip | +| pipenv | pip | ### Project Management From f5b3118a7809d5b1ce605d73cf3bce497a90e23b Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 25 Aug 2025 11:04:04 -0700 Subject: [PATCH 261/328] Improve default interpreter resolution logic to avoid unnecessary updates (#761) --- src/extension.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index e9e780f..71fbde8 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -598,8 +598,9 @@ export async function disposeAll(disposables: IDisposable[]): Promise { * Resolves and sets the default Python interpreter for the workspace based on the * 'python.defaultInterpreterPath' setting and the selected environment manager. * If the setting is present and no default environment manager is set (or is venv), - * attempts to resolve the interpreter path using the native finder, then creates and - * sets a PythonEnvironment object for the workspace. + * attempts to resolve the interpreter path using the native finder. If the resolved + * path differs from the configured path, then creates and sets a PythonEnvironment + * object for the workspace. * * @param nativeFinder - The NativePythonFinder instance used to resolve interpreter paths. * @param envManagers - The EnvironmentManagers instance containing all registered managers. @@ -619,6 +620,10 @@ async function resolveDefaultInterpreter( try { const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); if (resolved && resolved.executable) { + if (resolved.executable === defaultInterpreterPath) { + // no action required, the path is already correct + return; + } const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); From c4afc462cbd09aea19c56f381c59bb777c0cd674 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 25 Aug 2025 11:04:10 -0700 Subject: [PATCH 262/328] add in version selection for conda env creation (#760) fixes https://github.com/microsoft/vscode-python-environments/issues/733 --- src/managers/conda/condaUtils.ts | 70 ++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index f8876f3..3508a07 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -733,6 +733,52 @@ async function getLocation(api: PythonEnvironmentApi, uris: Uri | Uri[]): Promis } return api.getPythonProject(Array.isArray(uris) ? uris[0] : uris)?.uri.fsPath; } +const RECOMMENDED_CONDA_PYTHON = '3.11.11'; + +function trimVersionToMajorMinor(version: string): string { + const match = version.match(/^(\d+\.\d+\.\d+)/); + return match ? match[1] : version; +} + +export async function pickPythonVersion( + api: PythonEnvironmentApi, + token?: CancellationToken, +): Promise { + const envs = await api.getEnvironments('global'); + let versions = Array.from( + new Set( + envs + .map((env) => env.version) + .filter(Boolean) + .map((v) => trimVersionToMajorMinor(v)), // cut to 3 digits + ), + ) + .sort() + .reverse(); + if (!versions) { + versions = ['3.11', '3.10', '3.9', '3.12', '3.13']; + } + const items: QuickPickItem[] = versions.map((v) => ({ + label: v === RECOMMENDED_CONDA_PYTHON ? `$(star-full) Python` : 'Python', + description: v, + })); + const selection = await showQuickPickWithButtons( + items, + { + placeHolder: l10n.t('Select the version of Python to install in the environment'), + matchOnDescription: true, + ignoreFocusOut: true, + showBackButton: true, + }, + token, + ); + + if (selection) { + return (selection as QuickPickItem).description; + } + + return undefined; +} export async function createCondaEnvironment( api: PythonEnvironmentApi, @@ -757,10 +803,11 @@ export async function createCondaEnvironment( ) )?.label; + const pythonVersion = await pickPythonVersion(api); if (envType) { return envType === CondaStrings.condaNamed - ? await createNamedCondaEnvironment(api, log, manager, getName(api, uris ?? [])) - : await createPrefixCondaEnvironment(api, log, manager, await getLocation(api, uris ?? [])); + ? await createNamedCondaEnvironment(api, log, manager, getName(api, uris ?? []), pythonVersion) + : await createPrefixCondaEnvironment(api, log, manager, await getLocation(api, uris ?? []), pythonVersion); } return undefined; } @@ -770,6 +817,7 @@ async function createNamedCondaEnvironment( log: LogOutputChannel, manager: EnvironmentManager, name?: string, + pythonVersion?: string, ): Promise { name = await showInputBox({ prompt: CondaStrings.condaNamedInput, @@ -781,6 +829,12 @@ async function createNamedCondaEnvironment( } const envName: string = name; + const runArgs = ['create', '--yes', '--name', envName]; + if (pythonVersion) { + runArgs.push(`python=${pythonVersion}`); + } else { + runArgs.push('python'); + } return await withProgress( { @@ -790,7 +844,7 @@ async function createNamedCondaEnvironment( async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runCondaExecutable(['create', '--yes', '--name', envName, 'python']); + const output = await runCondaExecutable(runArgs); log.info(output); const prefixes = await getPrefixes(); @@ -830,6 +884,7 @@ async function createPrefixCondaEnvironment( log: LogOutputChannel, manager: EnvironmentManager, fsPath?: string, + pythonVersion?: string, ): Promise { if (!fsPath) { return; @@ -856,6 +911,13 @@ async function createPrefixCondaEnvironment( const prefix: string = path.isAbsolute(name) ? name : path.join(fsPath, name); + const runArgs = ['create', '--yes', '--prefix', prefix]; + if (pythonVersion) { + runArgs.push(`python=${pythonVersion}`); + } else { + runArgs.push('python'); + } + return await withProgress( { location: ProgressLocation.Notification, @@ -864,7 +926,7 @@ async function createPrefixCondaEnvironment( async () => { try { const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runCondaExecutable(['create', '--yes', '--prefix', prefix, 'python']); + const output = await runCondaExecutable(runArgs); log.info(output); const version = await getVersion(prefix); From ed83f071bd9cbe63589626faac9b2fd948291393 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 26 Aug 2025 06:13:18 +1000 Subject: [PATCH 263/328] Log spawning of processes (#756) For https://github.com/microsoft/vscode-python-environments/issues/734 --- .../terminal/shells/cmd/cmdStartup.ts | 19 ++++++++++--------- src/features/terminal/shells/utils.ts | 7 +++++-- src/managers/builtin/helpers.ts | 2 +- src/managers/conda/condaUtils.ts | 3 +++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/features/terminal/shells/cmd/cmdStartup.ts b/src/features/terminal/shells/cmd/cmdStartup.ts index aacfbda..3b542ff 100644 --- a/src/features/terminal/shells/cmd/cmdStartup.ts +++ b/src/features/terminal/shells/cmd/cmdStartup.ts @@ -10,8 +10,14 @@ import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { CMD_ENV_KEY, CMD_SCRIPT_VERSION } from './cmdConstants'; +import { StopWatch } from '../../../../common/stopWatch'; -const exec = promisify(cp.exec); +function execCommand(command: string) { + const timer = new StopWatch(); + return promisify(cp.exec)(command, { windowsHide: true }).finally(() => + traceInfo(`Executed command: ${command} in ${timer.elapsedTime}`), + ); +} async function isCmdInstalled(): Promise { if (!isWindows()) { @@ -94,9 +100,7 @@ async function checkRegistryAutoRun(mainBatchFile: string, regMainBatchFile: str try { // Check if AutoRun is set in the registry to call our batch file - const { stdout } = await exec('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun', { - windowsHide: true, - }); + const { stdout } = await execCommand('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun'); // Check if the output contains our batch file path return stdout.includes(regMainBatchFile) || stdout.includes(mainBatchFile); @@ -112,9 +116,7 @@ async function getExistingAutoRun(): Promise { } try { - const { stdout } = await exec('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun', { - windowsHide: true, - }); + const { stdout } = await execCommand('reg query "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun'); const match = stdout.match(/AutoRun\s+REG_SZ\s+(.*)/); if (match && match[1]) { @@ -135,9 +137,8 @@ async function setupRegistryAutoRun(mainBatchFile: string): Promise { try { // Set the registry key to call our main batch file - await exec( + await execCommand( `reg add "HKCU\\Software\\Microsoft\\Command Processor" /v AutoRun /t REG_SZ /d "if exist \\"${mainBatchFile}\\" call \\"${mainBatchFile}\\"" /f`, - { windowsHide: true }, ); traceInfo( diff --git a/src/features/terminal/shells/utils.ts b/src/features/terminal/shells/utils.ts index c9c99eb..6506ed1 100644 --- a/src/features/terminal/shells/utils.ts +++ b/src/features/terminal/shells/utils.ts @@ -1,13 +1,16 @@ import * as cp from 'child_process'; -import { traceVerbose } from '../../../common/logging'; +import { traceError, traceInfo } from '../../../common/logging'; +import { StopWatch } from '../../../common/stopWatch'; export async function runCommand(command: string): Promise { return new Promise((resolve) => { + const timer = new StopWatch(); cp.exec(command, (err, stdout) => { if (err) { - traceVerbose(`Error running command: ${command}`, err); + traceError(`Error running command: ${command} (${timer.elapsedTime})`, err); resolve(undefined); } else { + traceInfo(`Ran ${command} in ${timer.elapsedTime}`); resolve(stdout?.trim()); } }); diff --git a/src/managers/builtin/helpers.ts b/src/managers/builtin/helpers.ts index b268ef0..4f71b9b 100644 --- a/src/managers/builtin/helpers.ts +++ b/src/managers/builtin/helpers.ts @@ -9,7 +9,7 @@ export async function isUvInstalled(log?: LogOutputChannel): Promise { if (available.completed) { return available.promise; } - + log?.info(`Running: uv --version`); const proc = ch.spawn('uv', ['--version']); proc.on('error', () => { available.resolve(false); diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 3508a07..c6cf367 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -56,6 +56,7 @@ import { Installable } from '../common/types'; import { shortVersion, sortEnvironments } from '../common/utils'; import { CondaEnvManager } from './condaEnvManager'; import { getCondaHookPs1Path, getLocalActivationScript } from './condaSourcingUtils'; +import { StopWatch } from '../../common/stopWatch'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -202,6 +203,8 @@ async function _runConda( ): Promise { const deferred = createDeferred(); args = quoteArgs(args); + const timer = new StopWatch(); + deferred.promise.finally(() => traceInfo(`Ran conda in ${timer.elapsedTime}: ${conda} ${args.join(' ')}`)); const proc = ch.spawn(conda, args, { shell: true }); token?.onCancellationRequested(() => { From 34452ef9149db9586eeb9f5a602aa6daf52b56fe Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 28 Aug 2025 17:00:03 -0700 Subject: [PATCH 264/328] Fix default interpreter path comparison for windows (#769) Fixes https://github.com/microsoft/vscode-python-environments/issues/768 --- src/extension.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index 71fbde8..be2a95b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,6 +9,7 @@ import { EventNames } from './common/telemetry/constants'; import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; import { sendTelemetryEvent } from './common/telemetry/sender'; import { createDeferred } from './common/utils/deferred'; +import { normalizePath } from './common/utils/pathUtils'; import { isWindows } from './common/utils/platformUtils'; import { activeTerminal, @@ -620,7 +621,7 @@ async function resolveDefaultInterpreter( try { const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); if (resolved && resolved.executable) { - if (resolved.executable === defaultInterpreterPath) { + if (normalizePath(resolved.executable) === normalizePath(defaultInterpreterPath)) { // no action required, the path is already correct return; } From 6279bccee6cfb82ad6c8c2c0cbcedfbac6963b6e Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 29 Aug 2025 10:41:52 -0700 Subject: [PATCH 265/328] update timing on info-needed workflow (#758) --- .github/workflows/info-needed-closer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/info-needed-closer.yml b/.github/workflows/info-needed-closer.yml index d7efbd1..5d34581 100644 --- a/.github/workflows/info-needed-closer.yml +++ b/.github/workflows/info-needed-closer.yml @@ -27,7 +27,7 @@ jobs: with: token: ${{secrets.GITHUB_TOKEN}} label: info-needed - closeDays: 30 + closeDays: 14 closeComment: "Because we have not heard back with the information we requested, we are closing this issue for now. If you are able to provide the info later on, then we will be happy to re-open this issue to pick up where we left off. \n\nHappy Coding!" - pingDays: 30 + pingDays: 14 pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information." From 462ed7e354e70c275ad52916189e98c19d4c8e3c Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 1 Sep 2025 16:32:06 -0700 Subject: [PATCH 266/328] Bump version to 1.6.0 in package.json and package-lock.json (#777) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 080b55e..b1c07df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.5.0", + "version": "1.6.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.5.0", + "version": "1.6.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index e060b00..d1567d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.5.0", + "version": "1.6.0", "publisher": "ms-python", "preview": true, "engines": { From 2cf641bdeff57ced3887450403690303c5049f84 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 1 Sep 2025 19:37:11 -0700 Subject: [PATCH 267/328] Bump version to 1.7.0 in package.json and package-lock.json (#778) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1c07df..35d8b20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.6.0", + "version": "1.7.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.6.0", + "version": "1.7.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index d1567d2..e207b20 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.6.0", + "version": "1.7.0", "publisher": "ms-python", "preview": true, "engines": { From a919afb29d5685191434e830e38ce0762654c722 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 5 Sep 2025 09:42:26 -0700 Subject: [PATCH 268/328] bug: surface warning for broken defaultEnvManager and resolve (#787) fixes https://github.com/microsoft/vscode-python/issues/25430 image --- .github/instructions/generic.instructions.md | 32 ++++++ src/extension.ts | 10 +- src/features/settings/settingHelpers.ts | 23 +++- src/managers/common/utils.ts | 107 ++++++++++++++++++- src/managers/conda/main.ts | 4 + src/managers/pipenv/main.ts | 7 +- src/managers/poetry/main.ts | 7 ++ src/managers/pyenv/main.ts | 7 +- 8 files changed, 186 insertions(+), 11 deletions(-) create mode 100644 .github/instructions/generic.instructions.md diff --git a/.github/instructions/generic.instructions.md b/.github/instructions/generic.instructions.md new file mode 100644 index 0000000..3f43f20 --- /dev/null +++ b/.github/instructions/generic.instructions.md @@ -0,0 +1,32 @@ +--- +applyTo: '**' +--- + +Provide project context and coding guidelines that AI should follow when generating code, answering questions, or reviewing changes.# Coding Instructions for vscode-python-environments + +## Localization + +- Localize all user-facing messages using VS Code’s `l10n` API. +- Internal log messages do not require localization. + +## Logging + +- Use the extension’s logging utilities (`traceLog`, `traceVerbose`) for internal logs. +- Do not use `console.log` or `console.warn` for logging. + +## Settings Precedence + +- Always consider VS Code settings precedence: + 1. Workspace folder + 2. Workspace + 3. User/global +- Remove or update settings from the highest precedence scope first. + +## Error Handling & User Notifications + +- Avoid showing the same error message multiple times in a session; track state with a module-level variable. +- Use clear, actionable error messages and offer relevant buttons (e.g., "Open settings", "Close"). + +## Documentation + +- Add clear docstrings to public functions, describing their purpose, parameters, and behavior. diff --git a/src/extension.ts b/src/extension.ts index be2a95b..28f2c66 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -563,10 +563,10 @@ export async function activate(context: ExtensionContext): Promise('defaultEnvManager', 'undefined'); - traceInfo(`resolveDefaultInterpreter setting exists; found defaultEnvManager: ${defaultManager}`); + traceInfo(`resolveDefaultInterpreter setting exists; found defaultEnvManager: ${defaultManager}. `); if (!defaultManager || defaultManager === 'ms-python.python:venv') { try { const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index 79ff887..f8692f8 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -9,7 +9,7 @@ import { } from 'vscode'; import { PythonProject } from '../../api'; import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants'; -import { traceError, traceInfo } from '../../common/logging'; +import { traceError, traceInfo, traceWarn } from '../../common/logging'; import { getWorkspaceFile, getWorkspaceFolders } from '../../common/workspace.apis'; import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; @@ -31,17 +31,34 @@ function getSettings( return undefined; } +let DEFAULT_ENV_MANAGER_BROKEN = false; +let hasShownDefaultEnvManagerBrokenWarn = false; + +export function setDefaultEnvManagerBroken(broken: boolean) { + DEFAULT_ENV_MANAGER_BROKEN = broken; +} +export function isDefaultEnvManagerBroken(): boolean { + return DEFAULT_ENV_MANAGER_BROKEN; +} + export function getDefaultEnvManagerSetting(wm: PythonProjectManager, scope?: Uri): string { const config = workspace.getConfiguration('python-envs', scope); const settings = getSettings(wm, config, scope); if (settings && settings.envManager.length > 0) { return settings.envManager; } - + // Only show the warning once per session + if (isDefaultEnvManagerBroken()) { + if (!hasShownDefaultEnvManagerBrokenWarn) { + traceWarn(`Default environment manager is broken, using system default: ${DEFAULT_ENV_MANAGER_ID}`); + hasShownDefaultEnvManagerBrokenWarn = true; + } + return DEFAULT_ENV_MANAGER_ID; + } const defaultManager = config.get('defaultEnvManager'); if (defaultManager === undefined || defaultManager === null || defaultManager === '') { traceError('No default environment manager set. Check setting python-envs.defaultEnvManager'); - traceInfo(`Using system default package manager: ${DEFAULT_ENV_MANAGER_ID}`); + traceWarn(`Using system default package manager: ${DEFAULT_ENV_MANAGER_ID}`); return DEFAULT_ENV_MANAGER_ID; } return defaultManager; diff --git a/src/managers/common/utils.ts b/src/managers/common/utils.ts index 7bd6ff6..bffa42a 100644 --- a/src/managers/common/utils.ts +++ b/src/managers/common/utils.ts @@ -1,8 +1,12 @@ import * as fs from 'fs-extra'; import path from 'path'; -import { PythonCommandRunConfiguration, PythonEnvironment } from '../../api'; +import { commands, ConfigurationTarget, l10n, window, workspace } from 'vscode'; +import { PythonCommandRunConfiguration, PythonEnvironment, PythonEnvironmentApi } from '../../api'; +import { traceLog, traceVerbose } from '../../common/logging'; import { isWindows } from '../../common/utils/platformUtils'; import { ShellConstants } from '../../features/common/shellConstants'; +import { getDefaultEnvManagerSetting, setDefaultEnvManagerBroken } from '../../features/settings/settingHelpers'; +import { PythonProjectManager } from '../../internal.api'; import { Installable } from './types'; export function noop() { @@ -194,3 +198,104 @@ export async function getShellActivationCommands(binDir: string): Promise<{ shellDeactivation, }; } + +// Tracks if the broken defaultEnvManager error message has been shown this session +let hasShownBrokenDefaultEnvManagerError = false; + +/** + * Checks if the given managerId is set as the default environment manager for the project. + * If so, marks the default manager as broken, refreshes environments, and shows an error message to the user. + * The error message offers to reset the setting, view the setting, or close. + * The error message is only shown once per session. + * + * @param managerId The environment manager id to check. + * @param projectManager The Python project manager instance. + * @param api The Python environment API instance. + */ +export async function notifyMissingManagerIfDefault( + managerId: string, + projectManager: PythonProjectManager, + api: PythonEnvironmentApi, +) { + const defaultEnvManager = getDefaultEnvManagerSetting(projectManager); + if (defaultEnvManager === managerId) { + if (hasShownBrokenDefaultEnvManagerError) { + return; + } + hasShownBrokenDefaultEnvManagerError = true; + setDefaultEnvManagerBroken(true); + await api.refreshEnvironments(undefined); + window + .showErrorMessage( + l10n.t( + "The default environment manager is set to '{0}', but the {1} executable could not be found.", + defaultEnvManager, + managerId.split(':')[1], + ), + l10n.t('Reset setting'), + l10n.t('View setting'), + l10n.t('Close'), + ) + .then(async (selection) => { + if (selection === 'Reset setting') { + const result = await removeFirstDefaultEnvManagerSettingDetailed(managerId); + if (!result.found) { + window + .showErrorMessage( + l10n.t( + "Could not find a setting for 'defaultEnvManager' set to '{0}' to reset.", + managerId, + ), + l10n.t('Open settings'), + l10n.t('Close'), + ) + .then((sel) => { + if (sel === 'Open settings') { + commands.executeCommand( + 'workbench.action.openSettings', + 'python-envs.defaultEnvManager', + ); + } + }); + } + } + if (selection === 'View setting') { + commands.executeCommand('workbench.action.openSettings', 'python-envs.defaultEnvManager'); + } + }); + } +} + +/** + * Removes the first occurrence of 'defaultEnvManager' set to managerId, returns where it was removed, and logs the action. + * @param managerId The manager id to match and remove. + * @returns { found: boolean, scope?: string } + */ +export async function removeFirstDefaultEnvManagerSettingDetailed( + managerId: string, +): Promise<{ found: boolean; scope?: string }> { + const config = workspace.getConfiguration('python-envs'); + const inspect = config.inspect('defaultEnvManager'); + + // Workspace folder settings (multi-root) + if (inspect?.workspaceFolderValue !== undefined && inspect.workspaceFolderValue === managerId) { + await config.update('defaultEnvManager', undefined, ConfigurationTarget.WorkspaceFolder); + traceLog("[python-envs] Removed 'defaultEnvManager' from Workspace Folder settings."); + return { found: true, scope: 'Workspace Folder' }; + } + // Workspace settings + if (inspect?.workspaceValue !== undefined && inspect.workspaceValue === managerId) { + await config.update('defaultEnvManager', undefined, ConfigurationTarget.Workspace); + traceLog("[python-envs] Removed 'defaultEnvManager' from Workspace settings."); + return { found: true, scope: 'Workspace' }; + } + // User/global settings + if (inspect?.globalValue !== undefined && inspect.globalValue === managerId) { + await config.update('defaultEnvManager', undefined, ConfigurationTarget.Global); + traceLog("[python-envs] Removed 'defaultEnvManager' from User/Global settings."); + return { found: true, scope: 'User/Global' }; + } + // No matching setting found + traceVerbose(`[python-envs] Could not find 'defaultEnvManager' set to '${managerId}' in any scope.`); + return { found: false }; +} diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts index 41ffc39..70456ef 100644 --- a/src/managers/conda/main.ts +++ b/src/managers/conda/main.ts @@ -2,7 +2,9 @@ import { Disposable, LogOutputChannel } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; import { traceInfo } from '../../common/logging'; import { getPythonApi } from '../../features/pythonApi'; +import { PythonProjectManager } from '../../internal.api'; import { NativePythonFinder } from '../common/nativePythonFinder'; +import { notifyMissingManagerIfDefault } from '../common/utils'; import { CondaEnvManager } from './condaEnvManager'; import { CondaPackageManager } from './condaPackageManager'; import { CondaSourcingStatus, constructCondaSourcingStatus } from './condaSourcingUtils'; @@ -12,6 +14,7 @@ export async function registerCondaFeatures( nativeFinder: NativePythonFinder, disposables: Disposable[], log: LogOutputChannel, + projectManager: PythonProjectManager, ): Promise { const api: PythonEnvironmentApi = await getPythonApi(); @@ -34,5 +37,6 @@ export async function registerCondaFeatures( ); } catch (ex) { traceInfo('Conda not found, turning off conda features.', ex); + await notifyMissingManagerIfDefault('ms-python.python:conda', projectManager, api); } } diff --git a/src/managers/pipenv/main.ts b/src/managers/pipenv/main.ts index 35e907f..b84094d 100644 --- a/src/managers/pipenv/main.ts +++ b/src/managers/pipenv/main.ts @@ -2,13 +2,17 @@ import { Disposable } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; import { traceInfo } from '../../common/logging'; import { getPythonApi } from '../../features/pythonApi'; +import { PythonProjectManager } from '../../internal.api'; import { NativePythonFinder } from '../common/nativePythonFinder'; import { PipenvManager } from './pipenvManager'; import { getPipenv } from './pipenvUtils'; +import { notifyMissingManagerIfDefault } from '../common/utils'; + export async function registerPipenvFeatures( nativeFinder: NativePythonFinder, disposables: Disposable[], + projectManager: PythonProjectManager, ): Promise { const api: PythonEnvironmentApi = await getPythonApi(); @@ -17,12 +21,13 @@ export async function registerPipenvFeatures( if (pipenv) { const mgr = new PipenvManager(nativeFinder, api); - disposables.push(mgr, api.registerEnvironmentManager(mgr)); } else { traceInfo('Pipenv not found, turning off pipenv features.'); + await notifyMissingManagerIfDefault('ms-python.python:pipenv', projectManager, api); } } catch (ex) { traceInfo('Pipenv not found, turning off pipenv features.', ex); + await notifyMissingManagerIfDefault('ms-python.python:pipenv', projectManager, api); } } diff --git a/src/managers/poetry/main.ts b/src/managers/poetry/main.ts index c13c32a..5f74fb4 100644 --- a/src/managers/poetry/main.ts +++ b/src/managers/poetry/main.ts @@ -2,7 +2,9 @@ import { Disposable, LogOutputChannel } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; import { traceInfo } from '../../common/logging'; import { getPythonApi } from '../../features/pythonApi'; +import { PythonProjectManager } from '../../internal.api'; import { NativePythonFinder } from '../common/nativePythonFinder'; +import { notifyMissingManagerIfDefault } from '../common/utils'; import { PoetryManager } from './poetryManager'; import { PoetryPackageManager } from './poetryPackageManager'; import { getPoetry, getPoetryVersion } from './poetryUtils'; @@ -11,6 +13,7 @@ export async function registerPoetryFeatures( nativeFinder: NativePythonFinder, disposables: Disposable[], outputChannel: LogOutputChannel, + projectManager: PythonProjectManager, ): Promise { const api: PythonEnvironmentApi = await getPythonApi(); @@ -31,8 +34,12 @@ export async function registerPoetryFeatures( api.registerEnvironmentManager(envManager), api.registerPackageManager(pkgManager), ); + } else { + traceInfo('Poetry not found, turning off poetry features.'); + await notifyMissingManagerIfDefault('ms-python.python:poetry', projectManager, api); } } catch (ex) { traceInfo('Poetry not found, turning off poetry features.', ex); + await notifyMissingManagerIfDefault('ms-python.python:poetry', projectManager, api); } } diff --git a/src/managers/pyenv/main.ts b/src/managers/pyenv/main.ts index 0dd1cba..2ca6a96 100644 --- a/src/managers/pyenv/main.ts +++ b/src/managers/pyenv/main.ts @@ -2,26 +2,31 @@ import { Disposable } from 'vscode'; import { PythonEnvironmentApi } from '../../api'; import { traceInfo } from '../../common/logging'; import { getPythonApi } from '../../features/pythonApi'; +import { PythonProjectManager } from '../../internal.api'; import { NativePythonFinder } from '../common/nativePythonFinder'; +import { notifyMissingManagerIfDefault } from '../common/utils'; import { PyEnvManager } from './pyenvManager'; import { getPyenv } from './pyenvUtils'; export async function registerPyenvFeatures( nativeFinder: NativePythonFinder, disposables: Disposable[], + projectManager: PythonProjectManager, ): Promise { const api: PythonEnvironmentApi = await getPythonApi(); try { const pyenv = await getPyenv(nativeFinder); - + if (pyenv) { const mgr = new PyEnvManager(nativeFinder, api); disposables.push(mgr, api.registerEnvironmentManager(mgr)); } else { traceInfo('Pyenv not found, turning off pyenv features.'); + await notifyMissingManagerIfDefault('ms-python.python:pyenv', projectManager, api); } } catch (ex) { traceInfo('Pyenv not found, turning off pyenv features.', ex); + await notifyMissingManagerIfDefault('ms-python.python:pyenv', projectManager, api); } } From 2f1e3ae552f3a280be5a009476ce2cd488cf753a Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Sep 2025 19:55:39 +0200 Subject: [PATCH 269/328] Fix log message to correctly reference invalid venv environment not conda (#788) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem The `findVirtualEnvironments` function in `src/managers/builtin/venvUtils.ts` was logging misleading warning messages. When encountering an invalid virtual environment (missing prefix, executable, or version), it would log: ``` Invalid conda environment: {...} ``` However, this function is specifically designed to find and process **venv** environments, not conda environments. The function correctly filters for `NativePythonEnvironmentKind.venv` on line 179, making the conda reference in the warning message incorrect and confusing for developers debugging environment discovery issues. ## Solution Updated the warning message on line 183 to accurately reflect the environment type being processed: ```typescript // Before log.warn(`Invalid conda environment: ${JSON.stringify(e)}`); // After log.warn(`Invalid venv environment: ${JSON.stringify(e)}`); ``` ## Impact This change provides accurate debugging information when invalid venv environments are encountered, making it easier for developers and users to understand which type of environment manager is reporting the issue. The fix is minimal and surgical, changing only the log message text without affecting any functionality. All existing tests continue to pass, confirming that this change doesn't introduce any regressions. Created from VS Code via the [GitHub Pull Request](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github) extension. --- ✨ Let Copilot coding agent [set things up for you](https://github.com/microsoft/vscode-python-environments/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/managers/builtin/venvUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index 1e306dc..ebcd630 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -180,7 +180,7 @@ export async function findVirtualEnvironments( for (const e of envs) { if (!(e.prefix && e.executable && e.version)) { - log.warn(`Invalid conda environment: ${JSON.stringify(e)}`); + log.warn(`Invalid venv environment: ${JSON.stringify(e)}`); continue; } From 7449fd4d28bff960e4a74a86e5571d8b46c35633 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:28:24 -0700 Subject: [PATCH 270/328] include venvFolders in search paths (#802) --- src/managers/common/nativePythonFinder.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index 61f019e..653c64c 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -8,7 +8,7 @@ import { PythonProjectApi } from '../../api'; import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants'; import { getExtension } from '../../common/extension.apis'; import { traceVerbose } from '../../common/logging'; -import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; +import { untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; import { getConfiguration } from '../../common/workspace.apis'; @@ -184,15 +184,22 @@ class NativePythonFinderImpl implements NativePythonFinder { } private getRefreshOptions(options?: NativePythonEnvironmentKind | Uri[]): RefreshOptions | undefined { + // settings on where else to search + const venvFolders = getPythonSettingAndUntildify('venvFolders') ?? []; if (options) { if (typeof options === 'string') { + // kind return { searchKind: options }; } if (Array.isArray(options)) { - return { searchPaths: options.map((item) => item.fsPath) }; + const uriSearchPaths = options.map((item) => item.fsPath); + uriSearchPaths.push(...venvFolders); + return { searchPaths: uriSearchPaths }; } + } else { + // if no options, then search venvFolders + return { searchPaths: venvFolders }; } - return undefined; } private start(): rpc.MessageConnection { @@ -355,10 +362,9 @@ function getCustomVirtualEnvDirs(): string[] { venvDirs.push(untildify(venvPath)); } const venvFolders = getPythonSettingAndUntildify('venvFolders') ?? []; - const homeDir = getUserHomeDir(); - if (homeDir) { - venvFolders.map((item) => path.join(homeDir, item)).forEach((d) => venvDirs.push(d)); - } + venvFolders.forEach((item) => { + venvDirs.push(item); + }); return Array.from(new Set(venvDirs)); } From 9463c6d0069391debfa50b59cf7eff75cc6d8933 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 5 Sep 2025 14:09:54 -0700 Subject: [PATCH 271/328] remove not implemented create function (#804) image This is incorrect as it should not have the "click to create" part of the message under pipenv --- src/managers/pipenv/pipenvManager.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/managers/pipenv/pipenvManager.ts b/src/managers/pipenv/pipenvManager.ts index 951a8dc..3caba8b 100644 --- a/src/managers/pipenv/pipenvManager.ts +++ b/src/managers/pipenv/pipenvManager.ts @@ -1,7 +1,5 @@ import { EventEmitter, MarkdownString, ProgressLocation, Uri } from 'vscode'; import { - CreateEnvironmentOptions, - CreateEnvironmentScope, DidChangeEnvironmentEventArgs, DidChangeEnvironmentsEventArgs, EnvironmentChangeKind, @@ -115,14 +113,6 @@ export class PipenvManager implements EnvironmentManager { ); } - async create?( - _scope: CreateEnvironmentScope, - _options?: CreateEnvironmentOptions, - ): Promise { - // To be implemented - return undefined; - } - async refresh(scope: RefreshEnvironmentsScope): Promise { const hardRefresh = scope === undefined; // hard refresh when scope is undefined From 9e6a769862bc90e14f90f6526138c17bf7318383 Mon Sep 17 00:00:00 2001 From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 5 Sep 2025 14:14:58 -0700 Subject: [PATCH 272/328] fix venvFolder injection in search path for nativeFinder --- src/managers/common/nativePythonFinder.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index 653c64c..7f6fbd8 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -196,10 +196,9 @@ class NativePythonFinderImpl implements NativePythonFinder { uriSearchPaths.push(...venvFolders); return { searchPaths: uriSearchPaths }; } - } else { - // if no options, then search venvFolders - return { searchPaths: venvFolders }; } + // return undefined to use configured defaults (for nativeFinder refresh) + return undefined; } private start(): rpc.MessageConnection { From 099983d380c452a41f364bda49873d78525f4341 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 8 Sep 2025 09:47:13 -0700 Subject: [PATCH 273/328] feat: add GitHub Actions workflow to label "triage-needed" on open (#807) --- .github/workflows/issue-labels.yml | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/issue-labels.yml diff --git a/.github/workflows/issue-labels.yml b/.github/workflows/issue-labels.yml new file mode 100644 index 0000000..1199673 --- /dev/null +++ b/.github/workflows/issue-labels.yml @@ -0,0 +1,33 @@ +name: Issue labels + +on: + issues: + types: [opened, reopened] + +env: + TRIAGERS: '["karthiknadig","eleanorjboyd"]' + +permissions: + issues: write + +jobs: + # From https://github.com/marketplace/actions/github-script#apply-a-label-to-an-issue. + add-classify-label: + name: "Add 'triage-needed' and remove assignees" + runs-on: ubuntu-latest + steps: + - name: Checkout Actions + uses: actions/checkout@v4 + with: + repository: 'microsoft/vscode-github-triage-actions' + ref: stable + path: ./actions + + - name: Install Actions + run: npm install --production --prefix ./actions + + - name: "Add 'triage-needed' and remove assignees" + uses: ./actions/python-issue-labels + with: + triagers: ${{ env.TRIAGERS }} + token: ${{secrets.GITHUB_TOKEN}} From f8806c0a329fe9d73a08445d3f86f87943ae797f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:24:37 -0700 Subject: [PATCH 274/328] switch to using inspect for setting to check for user explicit value (#803) based on what we discussed yesterday, this will correctly use inspect to get the value of `defaultEnvManager` to know if the user has set it yet --- src/extension.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 28f2c66..e7372df 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -596,15 +596,9 @@ export async function disposeAll(disposables: IDisposable[]): Promise { } /** - * Resolves and sets the default Python interpreter for the workspace based on the - * 'python.defaultInterpreterPath' setting and the selected environment manager. - * If the setting is present and no default environment manager is set (or is venv), - * attempts to resolve the interpreter path using the native finder. If the resolved - * path differs from the configured path, then creates and sets a PythonEnvironment - * object for the workspace. - * - * @param nativeFinder - The NativePythonFinder instance used to resolve interpreter paths. - * @param envManagers - The EnvironmentManagers instance containing all registered managers. + * Sets the default Python interpreter for the workspace if the user has not explicitly set 'defaultEnvManager' or it is set to venv. + * @param nativeFinder - used to resolve interpreter paths. + * @param envManagers - contains all registered managers. * @param api - The PythonEnvironmentApi for environment resolution and setting. */ async function resolveDefaultInterpreter( @@ -615,9 +609,13 @@ async function resolveDefaultInterpreter( const defaultInterpreterPath = getConfiguration('python').get('defaultInterpreterPath'); if (defaultInterpreterPath) { - const defaultManager = getConfiguration('python-envs').get('defaultEnvManager', 'undefined'); - traceInfo(`resolveDefaultInterpreter setting exists; found defaultEnvManager: ${defaultManager}. `); - if (!defaultManager || defaultManager === 'ms-python.python:venv') { + const config = getConfiguration('python-envs'); + const inspect = config.inspect('defaultEnvManager'); + const userDefinedDefaultManager = + inspect?.workspaceFolderValue !== undefined || + inspect?.workspaceValue !== undefined || + inspect?.globalValue !== undefined; + if (!userDefinedDefaultManager) { try { const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); if (resolved && resolved.executable) { From 574801a54a5f9327f8e125faa2843527d58ff587 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 8 Sep 2025 18:31:25 +0000 Subject: [PATCH 275/328] Refresh environment managers automatically when expanding tree node (#783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When expanding environment manager nodes in the Environment Managers view, newly created environments (such as those created by `pipenv install pytest` or `conda create -n myenv`) were not appearing until the user manually refreshed the view. This change adds automatic refresh functionality for all environment managers when their tree node is expanded. The implementation: - Calls the existing `manager.refresh(undefined)` method before retrieving environments for any manager type - Affects all environment managers (Pipenv, Conda, Venv, Poetry, etc.) providing consistent behavior - Uses the established refresh mechanism that properly updates collections and fires change events **Before:** 1. Run `pipenv install pytest` or create a new environment with any manager 2. Open Environment Managers view 3. Expand environment manager node 4. New environment is not visible until manual refresh **After:** 1. Run `pipenv install pytest` or create a new environment with any manager 2. Open Environment Managers view 3. Expand environment manager node 4. New environment appears immediately The fix is minimal and targeted, modifying only 1 line of code in the `getChildren` method in `EnvManagerView`. Unit tests have been updated to validate the core logic for any manager type. Fixes #782. --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/features/views/envManagersView.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index c418fed..c6f68a2 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -95,6 +95,10 @@ export class EnvManagerView implements TreeDataProvider, Disposable if (element.kind === EnvTreeItemKind.manager) { const manager = (element as EnvManagerTreeItem).manager; const views: EnvTreeItem[] = []; + + // Refresh manager when expanded to pick up newly created environments + await manager.refresh(undefined); + const envs = await manager.getEnvironments('all'); envs.filter((e) => !e.group).forEach((env) => { const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem, this.selected.get(env.envId.id)); From 386cd8eddcc70d3d5495bb73713caafc7f7079be Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 8 Sep 2025 13:15:31 -0700 Subject: [PATCH 276/328] revert: remove unnecessary refresh call for environment managers on expansion (#811) reverting https://github.com/microsoft/vscode-python-environments/commit/5b2966955a257fa1bf5b884fd2a54ae6619650a7 as it is not the right way to do it and causes endless refresh looping --- src/features/views/envManagersView.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/features/views/envManagersView.ts b/src/features/views/envManagersView.ts index c6f68a2..c418fed 100644 --- a/src/features/views/envManagersView.ts +++ b/src/features/views/envManagersView.ts @@ -95,10 +95,6 @@ export class EnvManagerView implements TreeDataProvider, Disposable if (element.kind === EnvTreeItemKind.manager) { const manager = (element as EnvManagerTreeItem).manager; const views: EnvTreeItem[] = []; - - // Refresh manager when expanded to pick up newly created environments - await manager.refresh(undefined); - const envs = await manager.getEnvironments('all'); envs.filter((e) => !e.group).forEach((env) => { const view = new PythonEnvTreeItem(env, element as EnvManagerTreeItem, this.selected.get(env.envId.id)); From fa07b5dd3f2a19848752fec33fa748c30bdffbb4 Mon Sep 17 00:00:00 2001 From: Renan Santos Date: Mon, 8 Sep 2025 18:42:34 -0300 Subject: [PATCH 277/328] Display activate button when a terminal is moved to the editor window (#764) Fixes https://github.com/microsoft/vscode-python-environments/issues/631 Co-authored-by: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> --- package.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package.json b/package.json index e207b20..9c7b41e 100644 --- a/package.json +++ b/package.json @@ -497,6 +497,18 @@ "when": "explorerViewletVisible && resourceExtname == .py" } ], + "editor/title": [ + { + "command": "python-envs.terminal.activate", + "group": "navigation", + "when": "resourceScheme == vscode-terminal && config.python-envs.terminal.showActivateButton && pythonTerminalActivation && !pythonTerminalActivated" + }, + { + "command": "python-envs.terminal.deactivate", + "group": "navigation", + "when": "resourceScheme == vscode-terminal && config.python-envs.terminal.showActivateButton && pythonTerminalActivation && pythonTerminalActivated" + } + ], "editor/title/run": [ { "command": "python-envs.runAsTask", From bdcbefeecff4078f81471175e6c5425dd07a4530 Mon Sep 17 00:00:00 2001 From: Abdelrahman AL MAROUK <72821992+almarouk@users.noreply.github.com> Date: Tue, 9 Sep 2025 00:17:22 +0200 Subject: [PATCH 278/328] fix conda env refresh not waiting for promises (#751) This was causing the refresh function to return with empty or missing environments before waiting for all async calls that update the env collection. This bug was somehow causing duplicate environments to appear in the list of environments. Co-authored-by: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> --- src/managers/conda/condaUtils.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index c6cf367..9d09e34 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -694,12 +694,14 @@ export async function refreshCondaEnvs( .filter((e) => e.kind === NativePythonEnvironmentKind.conda); const collection: PythonEnvironment[] = []; - envs.forEach(async (e) => { - const environment = await nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes); - if (environment) { - collection.push(environment); - } - }); + await Promise.all( + envs.map(async (e) => { + const environment = await nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes); + if (environment) { + collection.push(environment); + } + }), + ); return sortEnvironments(collection); } From f4f9bb96f868a045e6352d6a74b7f06067593fa7 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 9 Sep 2025 08:49:03 -0700 Subject: [PATCH 279/328] debt: prepend '[pet]' to log messages for better context in NativePythonFinder (#814) --- src/managers/common/nativePythonFinder.ts | 33 +++++++++++++---------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index 7f6fbd8..4a1306a 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -202,7 +202,7 @@ class NativePythonFinderImpl implements NativePythonFinder { } private start(): rpc.MessageConnection { - this.outputChannel.info(`Starting Python Locator ${this.toolPath} server`); + this.outputChannel.info(`[pet] Starting Python Locator ${this.toolPath} server`); // jsonrpc package cannot handle messages coming through too quickly. // Lets handle the messages and close the stream only when @@ -213,7 +213,7 @@ class NativePythonFinderImpl implements NativePythonFinder { try { const proc = ch.spawn(this.toolPath, ['server'], { env: process.env }); proc.stdout.pipe(readable, { end: false }); - proc.stderr.on('data', (data) => this.outputChannel.error(data.toString())); + proc.stderr.on('data', (data) => this.outputChannel.error(`[pet] ${data.toString()}`)); writable.pipe(proc.stdin, { end: false }); disposables.push({ @@ -223,12 +223,12 @@ class NativePythonFinderImpl implements NativePythonFinder { proc.kill(); } } catch (ex) { - this.outputChannel.error('Error disposing finder', ex); + this.outputChannel.error('[pet] Error disposing finder', ex); } }, }); } catch (ex) { - this.outputChannel.error(`Error starting Python Finder ${this.toolPath} server`, ex); + this.outputChannel.error(`[pet] Error starting Python Finder ${this.toolPath} server`, ex); } const connection = rpc.createMessageConnection( new rpc.StreamMessageReader(readable), @@ -241,27 +241,28 @@ class NativePythonFinderImpl implements NativePythonFinder { writable.end(); }), connection.onError((ex) => { - this.outputChannel.error('Connection Error:', ex); + this.outputChannel.error('[pet] Connection Error:', ex); }), connection.onNotification('log', (data: NativeLog) => { + const msg = `[pet] ${data.message}`; switch (data.level) { case 'info': - this.outputChannel.info(data.message); + this.outputChannel.info(msg); break; case 'warning': - this.outputChannel.warn(data.message); + this.outputChannel.warn(msg); break; case 'error': - this.outputChannel.error(data.message); + this.outputChannel.error(msg); break; case 'debug': - this.outputChannel.debug(data.message); + this.outputChannel.debug(msg); break; default: - this.outputChannel.trace(data.message); + this.outputChannel.trace(msg); } }), - connection.onNotification('telemetry', (data) => this.outputChannel.info(`Telemetry: `, data)), + connection.onNotification('telemetry', (data) => this.outputChannel.info('[pet] Telemetry: ', data)), connection.onClose(() => { disposables.forEach((d) => d.dispose()); }), @@ -288,7 +289,9 @@ class NativePythonFinderImpl implements NativePythonFinder { executable: data.executable, }) .then((environment: NativeEnvInfo) => { - this.outputChannel.info(`Resolved ${environment.executable}`); + this.outputChannel.info( + `Resolved environment during PET refresh: ${environment.executable}`, + ); nativeInfo.push(environment); }) .catch((ex) => @@ -307,7 +310,7 @@ class NativePythonFinderImpl implements NativePythonFinder { await this.connection.sendRequest<{ duration: number }>('refresh', refreshOptions); await Promise.all(unresolved); } catch (ex) { - this.outputChannel.error('Error refreshing', ex); + this.outputChannel.error('[pet] Error refreshing', ex); throw ex; } finally { disposables.forEach((d) => d.dispose()); @@ -333,13 +336,15 @@ class NativePythonFinderImpl implements NativePythonFinder { }; // No need to send a configuration request, is there are no changes. if (JSON.stringify(options) === JSON.stringify(this.lastConfiguration || {})) { + this.outputChannel.debug('[pet] configure: No changes detected, skipping configuration update.'); return; } + this.outputChannel.info('[pet] configure: Sending configuration update:', JSON.stringify(options)); try { this.lastConfiguration = options; await this.connection.sendRequest('configure', options); } catch (ex) { - this.outputChannel.error('Configuration error', ex); + this.outputChannel.error('[pet] configure: Configuration error', ex); } } } From 8678ea7f213cfdaac42f7296171ac7a056d63868 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 9 Sep 2025 09:46:58 -0700 Subject: [PATCH 280/328] feat: enable random branch naming for Git (#817) --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1a8790c..5558607 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,5 +26,6 @@ }, "prettier.tabWidth": 4, "python-envs.defaultEnvManager": "ms-python.python:venv", - "python-envs.pythonProjects": [] + "python-envs.pythonProjects": [], + "git.branchRandomName.enable": true } From 27c5f262b0092983fd3d40f6056e293fecc90210 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:18:39 -0700 Subject: [PATCH 281/328] debt: refactor environment info collection and add helper file (#815) should help with diagnosing bugs to have the following information in logging --- src/extension.ts | 176 ++++---------------------------------------- src/helpers.ts | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 160 deletions(-) create mode 100644 src/helpers.ts diff --git a/src/extension.ts b/src/extension.ts index e7372df..3506e87 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,8 @@ -import { commands, ExtensionContext, extensions, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode'; +import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode'; +import { version as extensionVersion } from '../package.json'; import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api'; import { ensureCorrectVersion } from './common/extVersion'; -import { registerLogger, traceError, traceInfo, traceWarn } from './common/logging'; +import { registerLogger, traceError, traceInfo, traceVerbose, traceWarn } from './common/logging'; import { clearPersistentState, setPersistentState } from './common/persistentState'; import { newProjectSelection } from './common/pickers/managers'; import { StopWatch } from './common/stopWatch'; @@ -9,7 +10,6 @@ import { EventNames } from './common/telemetry/constants'; import { sendManagerSelectionTelemetry } from './common/telemetry/helpers'; import { sendTelemetryEvent } from './common/telemetry/sender'; import { createDeferred } from './common/utils/deferred'; -import { normalizePath } from './common/utils/pathUtils'; import { isWindows } from './common/utils/platformUtils'; import { activeTerminal, @@ -61,19 +61,23 @@ import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHand import { TerminalActivationImpl } from './features/terminal/terminalActivationState'; import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInjector'; import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager'; -import { getAutoActivationType, getEnvironmentForTerminal } from './features/terminal/utils'; +import { getEnvironmentForTerminal } from './features/terminal/utils'; import { EnvManagerView } from './features/views/envManagersView'; import { ProjectView } from './features/views/projectView'; import { PythonStatusBarImpl } from './features/views/pythonStatusBar'; import { updateViewsAndStatus } from './features/views/revealHandler'; import { ProjectItem } from './features/views/treeViewItems'; +import { + collectEnvironmentInfo, + getEnvManagerAndPackageManagerConfigLevels, + resolveDefaultInterpreter, +} from './helpers'; import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api'; import { registerSystemPythonFeatures } from './managers/builtin/main'; import { SysPythonManager } from './managers/builtin/sysPythonManager'; import { createNativePythonFinder, getNativePythonToolsPath, - NativeEnvInfo, NativePythonFinder, } from './managers/common/nativePythonFinder'; import { IDisposable } from './managers/common/types'; @@ -82,89 +86,6 @@ import { registerPipenvFeatures } from './managers/pipenv/main'; import { registerPoetryFeatures } from './managers/poetry/main'; import { registerPyenvFeatures } from './managers/pyenv/main'; -/** - * Collects relevant Python environment information for issue reporting - */ -async function collectEnvironmentInfo( - context: ExtensionContext, - envManagers: EnvironmentManagers, - projectManager: PythonProjectManager, -): Promise { - const info: string[] = []; - - try { - // Extension version - const extensionVersion = context.extension?.packageJSON?.version || 'unknown'; - info.push(`Extension Version: ${extensionVersion}`); - - // Python extension version - const pythonExtension = extensions.getExtension('ms-python.python'); - const pythonVersion = pythonExtension?.packageJSON?.version || 'not installed'; - info.push(`Python Extension Version: ${pythonVersion}`); - - // Environment managers - const managers = envManagers.managers; - info.push(`\nRegistered Environment Managers (${managers.length}):`); - managers.forEach((manager) => { - info.push(` - ${manager.id} (${manager.displayName})`); - }); - - // Available environments - const allEnvironments: PythonEnvironment[] = []; - for (const manager of managers) { - try { - const envs = await manager.getEnvironments('all'); - allEnvironments.push(...envs); - } catch (err) { - info.push(` Error getting environments from ${manager.id}: ${err}`); - } - } - - info.push(`\nTotal Available Environments: ${allEnvironments.length}`); - if (allEnvironments.length > 0) { - info.push('Environment Details:'); - allEnvironments.slice(0, 10).forEach((env, index) => { - info.push(` ${index + 1}. ${env.displayName} (${env.version}) - ${env.displayPath}`); - }); - if (allEnvironments.length > 10) { - info.push(` ... and ${allEnvironments.length - 10} more environments`); - } - } - - // Python projects - const projects = projectManager.getProjects(); - info.push(`\nPython Projects (${projects.length}):`); - for (let index = 0; index < projects.length; index++) { - const project = projects[index]; - info.push(` ${index + 1}. ${project.uri.fsPath}`); - try { - const env = await envManagers.getEnvironment(project.uri); - if (env) { - info.push(` Environment: ${env.displayName}`); - } - } catch (err) { - info.push(` Error getting environment: ${err}`); - } - } - - // Current settings (non-sensitive) - const config = workspace.getConfiguration('python-envs'); - const pyConfig = workspace.getConfiguration('python'); - info.push('\nExtension Settings:'); - info.push(` Default Environment Manager: ${config.get('defaultEnvManager')}`); - info.push(` Default Package Manager: ${config.get('defaultPackageManager')}`); - const pyenvAct = config.get('terminal.autoActivationType', undefined); - const pythonAct = pyConfig.get('terminal.activateEnvironment', undefined); - info.push( - `Auto-activation is "${getAutoActivationType()}". Activation based on first 'py-env.terminal.autoActivationType' setting which is '${pyenvAct}' and 'python.terminal.activateEnvironment' if the first is undefined which is '${pythonAct}'.\n`, - ); - } catch (err) { - info.push(`\nError collecting environment information: ${err}`); - } - - return info.join('\n'); -} - export async function activate(context: ExtensionContext): Promise { const useEnvironmentsExtension = getConfiguration('python').get('useEnvironmentsExtension', true); traceInfo(`Experiment Status: useEnvironmentsExtension setting set to ${useEnvironmentsExtension}`); @@ -183,6 +104,13 @@ export async function activate(context: ExtensionContext): Promise { ); } -/** - * Sets the default Python interpreter for the workspace if the user has not explicitly set 'defaultEnvManager' or it is set to venv. - * @param nativeFinder - used to resolve interpreter paths. - * @param envManagers - contains all registered managers. - * @param api - The PythonEnvironmentApi for environment resolution and setting. - */ -async function resolveDefaultInterpreter( - nativeFinder: NativePythonFinder, - envManagers: EnvironmentManagers, - api: PythonEnvironmentApi, -) { - const defaultInterpreterPath = getConfiguration('python').get('defaultInterpreterPath'); - - if (defaultInterpreterPath) { - const config = getConfiguration('python-envs'); - const inspect = config.inspect('defaultEnvManager'); - const userDefinedDefaultManager = - inspect?.workspaceFolderValue !== undefined || - inspect?.workspaceValue !== undefined || - inspect?.globalValue !== undefined; - if (!userDefinedDefaultManager) { - try { - const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); - if (resolved && resolved.executable) { - if (normalizePath(resolved.executable) === normalizePath(defaultInterpreterPath)) { - // no action required, the path is already correct - return; - } - const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); - traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); - - let findEnvManager = envManagers.managers.find((m) => m.id === resolvedEnv?.envId.managerId); - if (!findEnvManager) { - findEnvManager = envManagers.managers.find((m) => m.id === 'ms-python.python:system'); - } - if (resolvedEnv) { - const newEnv: PythonEnvironment = { - envId: { - id: resolvedEnv?.envId.id, - managerId: resolvedEnv?.envId.managerId ?? '', - }, - name: 'defaultInterpreterPath: ' + (resolved.version ?? ''), - displayName: 'defaultInterpreterPath: ' + (resolved.version ?? ''), - version: resolved.version ?? '', - displayPath: defaultInterpreterPath ?? '', - environmentPath: defaultInterpreterPath ? Uri.file(defaultInterpreterPath) : Uri.file(''), - sysPrefix: resolved.arch ?? '', - execInfo: { - run: { - executable: defaultInterpreterPath ?? '', - }, - }, - }; - if (workspace.workspaceFolders?.[0] && findEnvManager) { - traceInfo( - `[resolveDefaultInterpreter] Setting environment for workspace: ${workspace.workspaceFolders[0].uri.fsPath}`, - ); - await api.setEnvironment(workspace.workspaceFolders[0].uri, newEnv); - } - } - } else { - traceWarn( - `[resolveDefaultInterpreter] NativeFinder did not resolve an executable for path: ${defaultInterpreterPath}`, - ); - } - } catch (err) { - traceError(`[resolveDefaultInterpreter] Error resolving default interpreter: ${err}`); - } - } - } -} - export async function deactivate(context: ExtensionContext) { await disposeAll(context.subscriptions); context.subscriptions.length = 0; // Clear subscriptions to prevent memory leaks diff --git a/src/helpers.ts b/src/helpers.ts new file mode 100644 index 0000000..5a1e897 --- /dev/null +++ b/src/helpers.ts @@ -0,0 +1,188 @@ +import { ExtensionContext, extensions, Uri, workspace } from 'vscode'; +import { PythonEnvironment, PythonEnvironmentApi } from './api'; +import { traceError, traceInfo, traceWarn } from './common/logging'; +import { normalizePath } from './common/utils/pathUtils'; +import { getConfiguration } from './common/workspace.apis'; +import { getAutoActivationType } from './features/terminal/utils'; +import { EnvironmentManagers, PythonProjectManager } from './internal.api'; +import { NativeEnvInfo, NativePythonFinder } from './managers/common/nativePythonFinder'; + +/** + * Collects relevant Python environment information for issue reporting + */ +export async function collectEnvironmentInfo( + context: ExtensionContext, + envManagers: EnvironmentManagers, + projectManager: PythonProjectManager, +): Promise { + const info: string[] = []; + + try { + // Extension version + const extensionVersion = context.extension?.packageJSON?.version || 'unknown'; + info.push(`Extension Version: ${extensionVersion}`); + + // Python extension version + const pythonExtension = extensions.getExtension('ms-python.python'); + const pythonVersion = pythonExtension?.packageJSON?.version || 'not installed'; + info.push(`Python Extension Version: ${pythonVersion}`); + + // Environment managers + const managers = envManagers.managers; + info.push(`\nRegistered Environment Managers (${managers.length}):`); + managers.forEach((manager) => { + info.push(` - ${manager.id} (${manager.displayName})`); + }); + + // Available environments + const allEnvironments: PythonEnvironment[] = []; + for (const manager of managers) { + try { + const envs = await manager.getEnvironments('all'); + allEnvironments.push(...envs); + } catch (err) { + info.push(` Error getting environments from ${manager.id}: ${err}`); + } + } + + info.push(`\nTotal Available Environments: ${allEnvironments.length}`); + if (allEnvironments.length > 0) { + info.push('Environment Details:'); + allEnvironments.slice(0, 10).forEach((env, index) => { + info.push(` ${index + 1}. ${env.displayName} (${env.version}) - ${env.displayPath}`); + }); + if (allEnvironments.length > 10) { + info.push(` ... and ${allEnvironments.length - 10} more environments`); + } + } + + // Python projects + const projects = projectManager.getProjects(); + info.push(`\nPython Projects (${projects.length}):`); + for (let index = 0; index < projects.length; index++) { + const project = projects[index]; + info.push(` ${index + 1}. ${project.uri.fsPath}`); + try { + const env = await envManagers.getEnvironment(project.uri); + if (env) { + info.push(` Environment: ${env.displayName}`); + } + } catch (err) { + info.push(` Error getting environment: ${err}`); + } + } + + // Current settings (non-sensitive) + const config = workspace.getConfiguration('python-envs'); + const pyConfig = workspace.getConfiguration('python'); + info.push('\nExtension Settings:'); + info.push(` Default Environment Manager: ${config.get('defaultEnvManager')}`); + info.push(` Default Package Manager: ${config.get('defaultPackageManager')}`); + const pyenvAct = config.get('terminal.autoActivationType', undefined); + const pythonAct = pyConfig.get('terminal.activateEnvironment', undefined); + info.push( + `Auto-activation is "${getAutoActivationType()}". Activation based on first 'py-env.terminal.autoActivationType' setting which is '${pyenvAct}' and 'python.terminal.activateEnvironment' if the first is undefined which is '${pythonAct}'.\n`, + ); + } catch (err) { + info.push(`\nError collecting environment information: ${err}`); + } + + return info.join('\n'); +} + +/** + * Logs the values of defaultPackageManager and defaultEnvManager at all configuration levels (workspace folder, workspace, user/global, default). + */ +export function getEnvManagerAndPackageManagerConfigLevels() { + const config = getConfiguration('python-envs'); + const envManagerInspect = config.inspect('defaultEnvManager'); + const pkgManagerInspect = config.inspect('defaultPackageManager'); + + return { + section: 'Python Envs Configuration Levels', + defaultEnvManager: { + workspaceFolderValue: envManagerInspect?.workspaceFolderValue ?? 'undefined', + workspaceValue: envManagerInspect?.workspaceValue ?? 'undefined', + globalValue: envManagerInspect?.globalValue ?? 'undefined', + defaultValue: envManagerInspect?.defaultValue ?? 'undefined', + }, + defaultPackageManager: { + workspaceFolderValue: pkgManagerInspect?.workspaceFolderValue ?? 'undefined', + workspaceValue: pkgManagerInspect?.workspaceValue ?? 'undefined', + globalValue: pkgManagerInspect?.globalValue ?? 'undefined', + defaultValue: pkgManagerInspect?.defaultValue ?? 'undefined', + }, + }; +} + +/** + * Sets the default Python interpreter for the workspace if the user has not explicitly set 'defaultEnvManager' or it is set to venv. + * @param nativeFinder - used to resolve interpreter paths. + * @param envManagers - contains all registered managers. + * @param api - The PythonEnvironmentApi for environment resolution and setting. + */ +export async function resolveDefaultInterpreter( + nativeFinder: NativePythonFinder, + envManagers: EnvironmentManagers, + api: PythonEnvironmentApi, +) { + const defaultInterpreterPath = getConfiguration('python').get('defaultInterpreterPath'); + + if (defaultInterpreterPath) { + const config = getConfiguration('python-envs'); + const inspect = config.inspect('defaultEnvManager'); + const userDefinedDefaultManager = + inspect?.workspaceFolderValue !== undefined || + inspect?.workspaceValue !== undefined || + inspect?.globalValue !== undefined; + if (!userDefinedDefaultManager) { + try { + const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); + if (resolved && resolved.executable) { + if (normalizePath(resolved.executable) === normalizePath(defaultInterpreterPath)) { + // no action required, the path is already correct + return; + } + const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); + traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); + + let findEnvManager = envManagers.managers.find((m) => m.id === resolvedEnv?.envId.managerId); + if (!findEnvManager) { + findEnvManager = envManagers.managers.find((m) => m.id === 'ms-python.python:system'); + } + if (resolvedEnv) { + const newEnv: PythonEnvironment = { + envId: { + id: resolvedEnv?.envId.id, + managerId: resolvedEnv?.envId.managerId ?? '', + }, + name: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + displayName: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + version: resolved.version ?? '', + displayPath: defaultInterpreterPath ?? '', + environmentPath: defaultInterpreterPath ? Uri.file(defaultInterpreterPath) : Uri.file(''), + sysPrefix: resolved.arch ?? '', + execInfo: { + run: { + executable: defaultInterpreterPath ?? '', + }, + }, + }; + if (workspace.workspaceFolders?.[0] && findEnvManager) { + traceInfo( + `[resolveDefaultInterpreter] Setting environment for workspace: ${workspace.workspaceFolders[0].uri.fsPath}`, + ); + await api.setEnvironment(workspace.workspaceFolders[0].uri, newEnv); + } + } + } else { + traceWarn( + `[resolveDefaultInterpreter] NativeFinder did not resolve an executable for path: ${defaultInterpreterPath}`, + ); + } + } catch (err) { + traceError(`[resolveDefaultInterpreter] Error resolving default interpreter: ${err}`); + } + } + } +} From a2dd4acb156e54f800e00d5e9a31d6616362e43c Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:19:09 -0700 Subject: [PATCH 282/328] debt: add GitHub Actions workflow for automatic PR label management (#816) --- .github/workflows/pr-labels.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/pr-labels.yml diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml new file mode 100644 index 0000000..0f01dde --- /dev/null +++ b/.github/workflows/pr-labels.yml @@ -0,0 +1,24 @@ +name: 'PR labels' +on: + pull_request: + types: + - 'opened' + - 'reopened' + - 'labeled' + - 'unlabeled' + - 'synchronize' + +jobs: + add-pr-label: + name: 'Ensure Required Labels' + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + steps: + - name: 'PR impact specified' + uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5.0 + with: + mode: exactly + count: 1 + labels: 'bug, debt, feature-request, no-changelog' From 32a013717d0cb827a89671840068c0e24cc94f5c Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:47:24 -0700 Subject: [PATCH 283/328] update create api doc string to be more explicit (#819) --- src/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api.ts b/src/api.ts index f889f10..c5c8186 100644 --- a/src/api.ts +++ b/src/api.ts @@ -379,7 +379,7 @@ export interface EnvironmentManager { quickCreateConfig?(): QuickCreateConfig | undefined; /** - * Creates a new Python environment within the specified scope. Create should support adding a .gitignore file if it creates a folder within the workspace. + * Creates a new Python environment within the specified scope. Create should support adding a .gitignore file if it creates a folder within the workspace. If a manager does not support environment creation, do not implement this method; the UI disables "create" options when `this.manager.create === undefined`. * @param scope - The scope within which to create the environment. * @param options - Optional parameters for creating the Python environment. * @returns A promise that resolves to the created Python environment, or undefined if creation failed. From 5d880ab632c4f1fa49a52dd3190ee34e3ce999d3 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 10 Sep 2025 15:11:12 -0700 Subject: [PATCH 284/328] sort by version (desc) in conda create picker (#818) --- src/managers/conda/condaUtils.ts | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 9d09e34..418fb62 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -31,6 +31,7 @@ import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/l import { traceInfo, traceVerbose } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickProject } from '../../common/pickers/projects'; +import { StopWatch } from '../../common/stopWatch'; import { createDeferred } from '../../common/utils/deferred'; import { untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; @@ -56,7 +57,6 @@ import { Installable } from '../common/types'; import { shortVersion, sortEnvironments } from '../common/utils'; import { CondaEnvManager } from './condaEnvManager'; import { getCondaHookPs1Path, getLocalActivationScript } from './condaSourcingUtils'; -import { StopWatch } from '../../common/stopWatch'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -744,7 +744,6 @@ function trimVersionToMajorMinor(version: string): string { const match = version.match(/^(\d+\.\d+\.\d+)/); return match ? match[1] : version; } - export async function pickPythonVersion( api: PythonEnvironmentApi, token?: CancellationToken, @@ -757,11 +756,25 @@ export async function pickPythonVersion( .filter(Boolean) .map((v) => trimVersionToMajorMinor(v)), // cut to 3 digits ), - ) - .sort() - .reverse(); - if (!versions) { - versions = ['3.11', '3.10', '3.9', '3.12', '3.13']; + ); + + // Sort versions by major version (descending), ignoring minor/patch for simplicity + const parseMajorMinor = (v: string) => { + const m = v.match(/^(\d+)(?:\.(\d+))?/); + return { major: m ? Number(m[1]) : 0, minor: m && m[2] ? Number(m[2]) : 0 }; + }; + + versions = versions.sort((a, b) => { + const pa = parseMajorMinor(a); + const pb = parseMajorMinor(b); + if (pa.major !== pb.major) { + return pb.major - pa.major; + } // desc by major + return pb.minor - pa.minor; // desc by minor + }); + + if (!versions || versions.length === 0) { + versions = ['3.13', '3.12', '3.11', '3.10', '3.9']; } const items: QuickPickItem[] = versions.map((v) => ({ label: v === RECOMMENDED_CONDA_PYTHON ? `$(star-full) Python` : 'Python', From c4e7a4409d05461e22babe441d6c787521d44742 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:33:08 -0700 Subject: [PATCH 285/328] bug: fix default interpreter resolution with user configuration (#825) --- src/extension.ts | 2 +- src/helpers.ts | 124 +++++++++++++++++++++++++++-------------------- 2 files changed, 73 insertions(+), 53 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 3506e87..60381ed 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -498,7 +498,7 @@ export async function activate(context: ExtensionContext): Promise(section: string, key: string): T | undefined { + const config = getConfiguration(section); + const inspect = config.inspect(key); + if (!inspect) { + return undefined; + } + if (inspect.workspaceFolderValue !== undefined) { + return inspect.workspaceFolderValue; + } + if (inspect.workspaceValue !== undefined) { + return inspect.workspaceValue; + } + if (inspect.globalValue !== undefined) { + return inspect.globalValue; + } + return undefined; +} + +/** + * Sets the default Python interpreter for the workspace if the user has not explicitly set 'defaultEnvManager'. * @param nativeFinder - used to resolve interpreter paths. * @param envManagers - contains all registered managers. * @param api - The PythonEnvironmentApi for environment resolution and setting. @@ -126,63 +148,61 @@ export async function resolveDefaultInterpreter( envManagers: EnvironmentManagers, api: PythonEnvironmentApi, ) { - const defaultInterpreterPath = getConfiguration('python').get('defaultInterpreterPath'); + const userSetdefaultInterpreter = getUserConfiguredSetting('python', 'defaultInterpreterPath'); + const userSetDefaultManager = getUserConfiguredSetting('python-envs', 'defaultEnvManager'); + traceInfo( + `[resolveDefaultInterpreter] User configured defaultInterpreterPath: ${userSetdefaultInterpreter} and defaultEnvManager: ${userSetDefaultManager}`, + ); - if (defaultInterpreterPath) { - const config = getConfiguration('python-envs'); - const inspect = config.inspect('defaultEnvManager'); - const userDefinedDefaultManager = - inspect?.workspaceFolderValue !== undefined || - inspect?.workspaceValue !== undefined || - inspect?.globalValue !== undefined; - if (!userDefinedDefaultManager) { - try { - const resolved: NativeEnvInfo = await nativeFinder.resolve(defaultInterpreterPath); - if (resolved && resolved.executable) { - if (normalizePath(resolved.executable) === normalizePath(defaultInterpreterPath)) { - // no action required, the path is already correct - return; - } - const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); - traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); + // Only proceed if the user has explicitly set defaultInterpreterPath but nothing is saved for defaultEnvManager + if (userSetdefaultInterpreter && !userSetDefaultManager) { + try { + const resolved: NativeEnvInfo = await nativeFinder.resolve(userSetdefaultInterpreter); + if (resolved && resolved.executable) { + if (normalizePath(resolved.executable) === normalizePath(userSetdefaultInterpreter)) { + // no action required, the path is already correct + return; + } + const resolvedEnv = await api.resolveEnvironment(Uri.file(resolved.executable)); + traceInfo(`[resolveDefaultInterpreter] API resolved environment: ${JSON.stringify(resolvedEnv)}`); - let findEnvManager = envManagers.managers.find((m) => m.id === resolvedEnv?.envId.managerId); - if (!findEnvManager) { - findEnvManager = envManagers.managers.find((m) => m.id === 'ms-python.python:system'); - } - if (resolvedEnv) { - const newEnv: PythonEnvironment = { - envId: { - id: resolvedEnv?.envId.id, - managerId: resolvedEnv?.envId.managerId ?? '', - }, - name: 'defaultInterpreterPath: ' + (resolved.version ?? ''), - displayName: 'defaultInterpreterPath: ' + (resolved.version ?? ''), - version: resolved.version ?? '', - displayPath: defaultInterpreterPath ?? '', - environmentPath: defaultInterpreterPath ? Uri.file(defaultInterpreterPath) : Uri.file(''), - sysPrefix: resolved.arch ?? '', - execInfo: { - run: { - executable: defaultInterpreterPath ?? '', - }, + let findEnvManager = envManagers.managers.find((m) => m.id === resolvedEnv?.envId.managerId); + if (!findEnvManager) { + findEnvManager = envManagers.managers.find((m) => m.id === 'ms-python.python:system'); + } + const randomString = Math.random().toString(36).substring(2, 15); + if (resolvedEnv) { + const newEnv: PythonEnvironment = { + envId: { + id: `${userSetdefaultInterpreter}_${randomString}`, + managerId: resolvedEnv?.envId.managerId ?? '', + }, + name: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + displayName: 'defaultInterpreterPath: ' + (resolved.version ?? ''), + version: resolved.version ?? '', + displayPath: userSetdefaultInterpreter ?? '', + environmentPath: userSetdefaultInterpreter ? Uri.file(userSetdefaultInterpreter) : Uri.file(''), + sysPrefix: resolved.arch ?? '', + execInfo: { + run: { + executable: userSetdefaultInterpreter ?? '', }, - }; - if (workspace.workspaceFolders?.[0] && findEnvManager) { - traceInfo( - `[resolveDefaultInterpreter] Setting environment for workspace: ${workspace.workspaceFolders[0].uri.fsPath}`, - ); - await api.setEnvironment(workspace.workspaceFolders[0].uri, newEnv); - } + }, + }; + if (workspace.workspaceFolders?.[0] && findEnvManager) { + traceInfo( + `[resolveDefaultInterpreter] Setting environment for workspace: ${workspace.workspaceFolders[0].uri.fsPath}`, + ); + await api.setEnvironment(workspace.workspaceFolders[0].uri, newEnv); } - } else { - traceWarn( - `[resolveDefaultInterpreter] NativeFinder did not resolve an executable for path: ${defaultInterpreterPath}`, - ); } - } catch (err) { - traceError(`[resolveDefaultInterpreter] Error resolving default interpreter: ${err}`); + } else { + traceWarn( + `[resolveDefaultInterpreter] NativeFinder did not resolve an executable for path: ${userSetdefaultInterpreter}`, + ); } + } catch (err) { + traceError(`[resolveDefaultInterpreter] Error resolving default interpreter: ${err}`); } } } From 467f9d4ef20f7a6f46c05a8fe80f085d3b27f7fb Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:02:43 -0700 Subject: [PATCH 286/328] update version to 1.8.0 in package.json and package-lock.json (#827) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 35d8b20..c4dc273 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.7.0", + "version": "1.8.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.7.0", + "version": "1.8.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 9c7b41e..fa21daf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.7.0", + "version": "1.8.0", "publisher": "ms-python", "preview": true, "engines": { From 391e380c34c465b2827e1a1b3da1d50235393132 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:18:06 -0700 Subject: [PATCH 287/328] update version dev 1.9.0 (#830) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c4dc273..ebdf611 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.8.0", + "version": "1.9.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.8.0", + "version": "1.9.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index fa21daf..1a7bebd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.8.0", + "version": "1.9.0", "publisher": "ms-python", "preview": true, "engines": { From 3e397c4748b7afb29a274ed4e38a6e74647f1bf5 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 11 Sep 2025 17:01:02 -0700 Subject: [PATCH 288/328] make virtual environment search default to config not project folders (#823) --- src/managers/builtin/venvManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index cf5027a..80bbd63 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -317,7 +317,7 @@ export class VenvManager implements EnvironmentManager { this.api, this.log, this, - scope ? [scope] : this.api.getPythonProjects().map((p) => p.uri), + scope ? [scope] : undefined, ); await this.loadEnvMap(); From 088afafc6ed95f99434a45f93d9f16dc8ea25b78 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Sat, 20 Sep 2025 10:56:49 -0700 Subject: [PATCH 289/328] fix quoting for runInBackground (#849) fixes https://github.com/microsoft/vscode-python/issues/25448 --- src/features/execution/runInBackground.ts | 27 ++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/features/execution/runInBackground.ts b/src/features/execution/runInBackground.ts index 0543bc3..c961325 100644 --- a/src/features/execution/runInBackground.ts +++ b/src/features/execution/runInBackground.ts @@ -12,11 +12,32 @@ export async function runInBackground( traceWarn('No Python executable found in environment; falling back to "python".'); executable = 'python'; } - // Check and quote the executable path if necessary - executable = quoteStringIfNecessary(executable); + + // Don't quote the executable path for spawn - it handles spaces correctly on its own + // Remove any existing quotes that might cause issues + // see https://github.com/nodejs/node/issues/7367 for more details on cp.spawn and quoting + if (executable.startsWith('"') && executable.endsWith('"')) { + executable = executable.substring(1, executable.length - 1); + } + const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? []; const allArgs = [...args, ...options.args]; - traceInfo(`Running in background: ${executable} ${allArgs.join(' ')}`); + + // Log the command for debugging + traceInfo(`Running in background: "${executable}" ${allArgs.join(' ')}`); + + // Check if the file exists before trying to spawn it + try { + const fs = require('fs'); + if (!fs.existsSync(executable)) { + traceError( + `Python executable does not exist: ${executable}. Attempting to quote the path as a workaround...`, + ); + executable = quoteStringIfNecessary(executable); + } + } catch (err) { + traceWarn(`Error checking if executable exists: ${err instanceof Error ? err.message : String(err)}`); + } const proc = cp.spawn(executable, allArgs, { stdio: 'pipe', cwd: options.cwd, env: options.env }); From 1cc72d6addeb3d26463dd207a4e552cdf3740984 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:12:38 -0700 Subject: [PATCH 290/328] fix: improve environment display name for pipenv (#850) fixes https://github.com/microsoft/vscode-python-environments/issues/824 --- src/managers/pipenv/pipenvUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/managers/pipenv/pipenvUtils.ts b/src/managers/pipenv/pipenvUtils.ts index 3c271d4..ac3ef82 100644 --- a/src/managers/pipenv/pipenvUtils.ts +++ b/src/managers/pipenv/pipenvUtils.ts @@ -96,8 +96,9 @@ async function nativeToPythonEnv( } const sv = shortVersion(info.version); - const name = info.name || info.displayName || path.basename(info.prefix); - const displayName = info.displayName || `pipenv (${sv})`; + const folderName = path.basename(info.prefix); + const name = info.name || info.displayName || folderName; + const displayName = info.displayName || `${folderName} (${sv})`; // Derive the environment's bin/scripts directory from the python executable const binDir = path.dirname(info.executable); From 2f93ee67057c94d0e9acfee2c4f1aca667f88e88 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:13:35 -0700 Subject: [PATCH 291/328] docs: add guidelines for creating effective GitHub issues (#857) --- .../instructions/issue-format.instructions.md | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/instructions/issue-format.instructions.md diff --git a/.github/instructions/issue-format.instructions.md b/.github/instructions/issue-format.instructions.md new file mode 100644 index 0000000..69ea66b --- /dev/null +++ b/.github/instructions/issue-format.instructions.md @@ -0,0 +1,84 @@ +--- +applyTo: '**/github-issues/**' +--- + +# Guidelines for Creating Effective GitHub Issues + +## Issue Format + +When creating GitHub issues, use the following structure to ensure clarity and ease of verification: + +### For Bug Reports + +1. **Title**: Concise description of the issue (5-10 words) + +2. **Problem Statement**: + + - 1-2 sentences describing the issue + - Focus on user impact + - Use clear, non-technical language when possible + +3. **Steps to Verify Fix**: + - Numbered list (5-7 steps maximum) + - Start each step with an action verb + - Include expected observations + - Cover both success paths and cancellation/back button scenarios + +### For Feature Requests + +1. **Title**: Clear description of the requested feature + +2. **Need Statement**: + + - 1-2 sentences describing the user need + - Explain why this feature would be valuable + +3. **Acceptance Criteria**: + - Bulleted list of verifiable behaviors + - Include how a user would confirm the feature works as expected + +## Examples + +### Bug Report Example + +``` +# Terminal opens prematurely with PET Resolve Environment command + +**Problem:** When using "Resolve Environment..." from the Python Environment Tool menu, +the terminal opens before entering a path, creating a confusing workflow. + +**Steps to verify fix:** +1. Run "Python Environments: Run Python Environment Tool in Terminal" from Command Palette +2. Select "Resolve Environment..." +3. Verify no terminal opens yet +4. Enter a Python path +5. Verify terminal only appears after path entry +6. Try canceling at the input step - confirm no terminal appears +``` + +### Feature Request Example + +``` +# Add back button support to multi-step UI flows + +**Problem:** The UI flows for environment creation and Python project setup lack back button +functionality, forcing users to cancel and restart when they need to change a previous selection. + +**Steps to verify implementation:** +1. Test back button in PET workflow: Run "Python Environments: Run Python Environment Tool in Terminal", + select "Resolve Environment...", press back button, confirm it returns to menu +2. Test back button in VENV creation: Run "Create environment", select VENV, press back button at various steps +3. Test back button in CONDA creation: Create CONDA environment, use back buttons to navigate between steps +4. Test back button in Python project flow: Add Python project, verify back functionality in project type selection +``` + +## Best Practices + +1. **Be concise**: Keep descriptions short but informative +2. **Use active voice**: "Terminal opens prematurely" rather than "The terminal is opened prematurely" +3. **Include context**: Mention relevant commands, UI elements, and workflows +4. **Focus on verification**: Make steps actionable and observable +5. **Cover edge cases**: Include cancellation paths and error scenarios +6. **Use formatting**: Bold headings and numbered lists improve readability + +Remember that good issues help both developers fixing problems and testers verifying solutions. From 61215385f1cb58f8daf4289aa246b272ee938199 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 22 Sep 2025 10:51:59 -0700 Subject: [PATCH 292/328] fix: normalize path for UI display when removing virtual environments (#853) fixes https://github.com/microsoft/vscode-python-environments/issues/484 --- src/managers/builtin/venvUtils.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index ebcd630..cce97a8 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -10,6 +10,7 @@ import { getWorkspacePersistentState } from '../../common/persistentState'; import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { EventNames } from '../../common/telemetry/constants'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { normalizePath } from '../../common/utils/pathUtils'; import { showErrorMessage, showInputBox, @@ -501,8 +502,11 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC ? path.dirname(path.dirname(environment.environmentPath.fsPath)) : environment.environmentPath.fsPath; + // Normalize path for UI display - ensure forward slashes on Windows + const displayPath = normalizePath(envPath); + const confirm = await showWarningMessage( - l10n.t('Are you sure you want to remove {0}?', envPath), + l10n.t('Are you sure you want to remove {0}?', displayPath), { modal: true, }, @@ -529,7 +533,7 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC return result; } - traceInfo(`User cancelled removal of virtual environment: ${envPath}`); + traceInfo(`User cancelled removal of virtual environment: ${displayPath}`); return false; } From 5cb432e8dc742ecea62265d9ac927b8faf5de944 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 22 Sep 2025 11:05:50 -0700 Subject: [PATCH 293/328] fix: update run command for conda to use python instead of `conda run` (#860) fixes https://github.com/microsoft/vscode-python-environments/issues/839 ## BEFORE the behavior was: ### with envs ext `conda activate conda-run-env` `conda run --name conda-run-env python /Users/eleanorboyd/testing/by-issue-env/conda-run/script_abc.py` ### without envs ext `/Users/eleanorboyd/miniforge3/envs/conda-run-env/bin/python /Users/eleanorboyd/testing/by-issue-env/conda-run/script_abc.py` ## NEW behavior for envs ext: 1. `conda activate conda-run-env` 2. `/Users/eleanorboyd/miniforge3/envs/conda-run-env/bin/python /Users/eleanorboyd/testing/by-issue-env/conda-run/script_abc.py` --- src/managers/conda/condaUtils.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 418fb62..893a957 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -331,8 +331,8 @@ async function getNamedCondaPythonInfo( execInfo: { run: { executable: path.join(executable) }, activatedRun: { - executable: 'conda', - args: ['run', '--name', name, 'python'], + executable: path.join(executable), + args: [], }, activation: [{ executable: 'conda', args: ['activate', name] }], deactivation: [{ executable: 'conda', args: ['deactivate'] }], @@ -376,8 +376,8 @@ async function getPrefixesCondaPythonInfo( execInfo: { run: { executable: path.join(executable) }, activatedRun: { - executable: conda, - args: ['run', '--prefix', prefix, 'python'], + executable: path.join(executable), + args: [], }, activation: [{ executable: conda, args: ['activate', prefix] }], deactivation: [{ executable: conda, args: ['deactivate'] }], @@ -991,6 +991,7 @@ export async function quickCreateConda( additionalPackages?: string[], ): Promise { const prefix = path.join(fsPath, name); + const execPath = os.platform() === 'win32' ? path.join(prefix, 'python.exe') : path.join(prefix, 'bin', 'python'); return await withProgress( { @@ -999,7 +1000,6 @@ export async function quickCreateConda( }, async () => { try { - const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; await runCondaExecutable(['create', '--yes', '--prefix', prefix, 'python'], log); if (additionalPackages && additionalPackages.length > 0) { await runConda(['install', '--yes', '--prefix', prefix, ...additionalPackages], log); @@ -1015,10 +1015,10 @@ export async function quickCreateConda( description: prefix, version, execInfo: { - run: { executable: path.join(prefix, bin) }, + run: { executable: execPath }, activatedRun: { - executable: 'conda', - args: ['run', '-p', prefix, 'python'], + executable: execPath, + args: [], }, activation: [{ executable: 'conda', args: ['activate', prefix] }], deactivation: [{ executable: 'conda', args: ['deactivate'] }], From d7a04b5217677294c2dad19e14a7013a63a20fd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Sep 2025 01:43:30 -0700 Subject: [PATCH 294/328] chore(deps-dev): bump tar-fs from 2.1.3 to 2.1.4 (#867) Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.3 to 2.1.4.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tar-fs&package-manager=npm_and_yarn&previous-version=2.1.3&new-version=2.1.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebdf611..7879c65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4813,11 +4813,10 @@ } }, "node_modules/tar-fs": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", - "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", "dev": true, - "license": "MIT", "optional": true, "dependencies": { "chownr": "^1.1.1", @@ -8934,9 +8933,9 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "tar-fs": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", - "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", "dev": true, "optional": true, "requires": { From 5593750ac7726dfc0e9e0ba15b764bc5312b826b Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 29 Sep 2025 11:03:29 -0400 Subject: [PATCH 295/328] docs: add comprehensive testing guide for unit and extension tests (#864) --- .../new-test-guide.instructions.md | 494 ++++++++++++++++++ 1 file changed, 494 insertions(+) create mode 100644 .github/instructions/new-test-guide.instructions.md diff --git a/.github/instructions/new-test-guide.instructions.md b/.github/instructions/new-test-guide.instructions.md new file mode 100644 index 0000000..15221b0 --- /dev/null +++ b/.github/instructions/new-test-guide.instructions.md @@ -0,0 +1,494 @@ +--- +applyTo: '**' +--- + +# Testing Guide: Unit Tests and Integration Tests + +This guide outlines methodologies for creating comprehensive tests, covering both unit tests and integration tests. + +## 📋 Overview + +This extension uses two main types of tests: + +### Unit Tests + +- \*_Fast and isolated## 🌐 Step 4.5: Handle Unmocka## 📝 Step 5: Write Tests Using Mock → Run → Assert Patternle APIs with Wrapper Functions_ - Mock VS Code APIs and external dependencies +- **Focus on code logic** - Test functions in isolation without VS Code runtime +- **Run with Node.js** - Use Mocha test runner directly +- **File pattern**: `*.unit.test.ts` files +- **Mock everything** - VS Code APIs are mocked via `/src/test/unittests.ts` + +### Extension Tests (Integration Tests) + +- **Comprehensive but slower** - Launch a full VS Code instance +- **Real VS Code environment** - Test actual extension behavior with real APIs +- **End-to-end scenarios** - Test complete workflows and user interactions +- **File pattern**: `*.test.ts` files (not `.unit.test.ts`) +- **Real dependencies** - Use actual VS Code APIs and extension host + +## � Running Tests + +### VS Code Launch Configurations + +Use the pre-configured launch configurations in `.vscode/launch.json`: + +#### Unit Tests + +- **Name**: "Unit Tests" (launch configuration available but not recommended for development) +- **How to run**: Use terminal with `npm run unittest -- --grep "Suite Name"` +- **What it does**: Runs specific `*.unit.test.ts` files matching the grep pattern +- **Speed**: Very fast when targeting specific suites (seconds) +- **Scope**: Tests individual functions with mocked dependencies +- **Best for**: Rapid iteration on specific test suites during development + +#### Extension Tests + +- **Name**: "Extension Tests" +- **How to run**: Press `F5` or use Run and Debug view +- **What it does**: Launches VS Code instance and runs `*.test.ts` files +- **Speed**: Slower (typically minutes) +- **Scope**: Tests complete extension functionality in real environment + +### Terminal/CLI Commands + +```bash +# Run all unit tests (slower - runs everything) +npm run unittest + +# Run specific test suite (RECOMMENDED - much faster!) +npm run unittest -- --grep "Suite Name" + +# Examples of targeted test runs: +npm run unittest -- --grep "Path Utilities" # Run just pathUtils tests +npm run unittest -- --grep "Shell Utils" # Run shell utility tests +npm run unittest -- --grep "getAllExtraSearchPaths" # Run specific function tests + +# Watch and rebuild tests during development +npm run watch-tests + +# Build tests without running +npm run compile-tests +``` + +### Which Test Type to Choose + +**Use Unit Tests when**: + +- Testing pure functions or business logic +- Testing data transformations, parsing, or algorithms +- Need fast feedback during development +- Can mock external dependencies effectively +- Testing error handling with controlled inputs + +**Use Extension Tests when**: + +- Testing VS Code command registration and execution +- Testing UI interactions (tree views, quick picks, etc.) +- Testing file system operations in workspace context +- Testing extension activation and lifecycle +- Integration between multiple VS Code APIs +- End-to-end user workflows + +## 🎯 Step 1: Choose the Right Test Type + +Before writing tests, determine whether to write unit tests or extension tests: + +### Decision Framework + +**Write Unit Tests for**: + +- Pure functions (input → processing → output) +- Data parsing and transformation logic +- Business logic that can be isolated +- Error handling with predictable inputs +- Fast-running validation logic + +**Write Extension Tests for**: + +- VS Code command registration and execution +- UI interactions (commands, views, pickers) +- File system operations in workspace context +- Extension lifecycle and activation +- Integration between VS Code APIs +- End-to-end user workflows + +### Test Setup Differences + +#### Unit Test Setup (\*.unit.test.ts) + +```typescript +// Mock VS Code APIs - handled automatically by unittests.ts +import * as sinon from 'sinon'; +import * as workspaceApis from '../../common/workspace.apis'; // Wrapper functions + +// Stub wrapper functions, not VS Code APIs directly +const mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); +``` + +#### Extension Test Setup (\*.test.ts) + +```typescript +// Use real VS Code APIs +import * as vscode from 'vscode'; + +// Real VS Code APIs available - no mocking needed +const config = vscode.workspace.getConfiguration('python'); +``` + +## 🎯 Step 2: Understand the Function Under Test + +### Analyze the Function + +1. **Read the function thoroughly** - understand what it does, not just how +2. **Identify all inputs and outputs** +3. **Map the data flow** - what gets called in what order +4. **Note configuration dependencies** - settings, workspace state, etc. +5. **Identify side effects** - logging, file system, configuration updates + +### Key Questions to Ask + +- What are the main flows through the function? +- What edge cases exist? +- What external dependencies does it have? +- What can go wrong? +- What side effects should I verify? + +## 🗺️ Step 3: Plan Your Test Coverage + +### Create a Test Coverage Matrix + +#### Main Flows + +- ✅ **Happy path scenarios** - normal expected usage +- ✅ **Alternative paths** - different configuration combinations +- ✅ **Integration scenarios** - multiple features working together + +#### Edge Cases + +- 🔸 **Boundary conditions** - empty inputs, missing data +- 🔸 **Error scenarios** - network failures, permission errors +- 🔸 **Data validation** - invalid inputs, type mismatches + +#### Real-World Scenarios + +- ✅ **Fresh install** - clean slate +- ✅ **Existing user** - migration scenarios +- ✅ **Power user** - complex configurations +- 🔸 **Error recovery** - graceful degradation + +### Example Test Plan Structure + +```markdown +## Test Categories + +### 1. Configuration Migration Tests + +- No legacy settings exist +- Legacy settings already migrated +- Fresh migration needed +- Partial migration required +- Migration failures + +### 2. Configuration Source Tests + +- Global search paths +- Workspace search paths +- Settings precedence +- Configuration errors + +### 3. Path Resolution Tests + +- Absolute vs relative paths +- Workspace folder resolution +- Path validation and filtering + +### 4. Integration Scenarios + +- Combined configurations +- Deduplication logic +- Error handling flows +``` + +## 🔧 Step 4: Set Up Your Test Infrastructure + +### Test File Structure + +```typescript +// 1. Imports - group logically +import assert from 'node:assert'; +import * as sinon from 'sinon'; +import { Uri } from 'vscode'; +import * as logging from '../../../common/logging'; +import * as pathUtils from '../../../common/utils/pathUtils'; +import * as workspaceApis from '../../../common/workspace.apis'; + +// 2. Function under test +import { getAllExtraSearchPaths } from '../../../managers/common/nativePythonFinder'; + +// 3. Mock interfaces +interface MockWorkspaceConfig { + get: sinon.SinonStub; + inspect: sinon.SinonStub; + update: sinon.SinonStub; +} +``` + +### Mock Setup Strategy + +```typescript +suite('Function Integration Tests', () => { + // 1. Declare all mocks + let mockGetConfiguration: sinon.SinonStub; + let mockGetWorkspaceFolders: sinon.SinonStub; + let mockTraceLog: sinon.SinonStub; + let mockTraceError: sinon.SinonStub; + let mockTraceWarn: sinon.SinonStub; + + // 2. Mock complex objects + let pythonConfig: MockWorkspaceConfig; + let envConfig: MockWorkspaceConfig; + + setup(() => { + // 3. Initialize all mocks + mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); + mockGetWorkspaceFolders = sinon.stub(workspaceApis, 'getWorkspaceFolders'); + mockTraceLog = sinon.stub(logging, 'traceLog'); + mockTraceError = sinon.stub(logging, 'traceError'); + mockTraceWarn = sinon.stub(logging, 'traceWarn'); + + // 4. Set up default behaviors + mockGetWorkspaceFolders.returns(undefined); + + // 5. Create mock configuration objects + pythonConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + envConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + }); + + teardown(() => { + sinon.restore(); // Always clean up! + }); +}); +``` + +## Step 3.5: Handle Unmockable APIs with Wrapper Functions + +### The Problem: VS Code API Properties Can't Be Mocked + +Some VS Code APIs use getter properties that can't be easily stubbed: + +```typescript +// ❌ This is hard to mock reliably +const folders = workspace.workspaceFolders; // getter property + +// ❌ Sinon struggles with this +sinon.stub(workspace, 'workspaceFolders').returns([...]); // Often fails +``` + +### The Solution: Use Wrapper Functions + +Check if your codebase already has wrapper functions in `/src/common/` directories: + +```typescript +// ✅ Look for existing wrapper functions +// File: src/common/workspace.apis.ts +export function getWorkspaceFolders(): readonly WorkspaceFolder[] | undefined { + return workspace.workspaceFolders; // Wraps the problematic property +} + +export function getConfiguration(section?: string, scope?: ConfigurationScope): WorkspaceConfiguration { + return workspace.getConfiguration(section, scope); // Wraps VS Code API +} +``` + +## Step 4: Write Tests Using Mock → Run → Assert Pattern + +### The Three-Phase Pattern + +#### Phase 1: Mock (Set up the scenario) + +```typescript +test('Description of what this tests', async () => { + // Mock → Clear description of the scenario + pythonConfig.inspect.withArgs('venvPath').returns({ globalValue: '/path' }); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + mockGetWorkspaceFolders.returns([{ uri: Uri.file('/workspace') }]); +``` + +#### Phase 2: Run (Execute the function) + +```typescript +// Run +const result = await getAllExtraSearchPaths(); +``` + +#### Phase 3: Assert (Verify the behavior) + +```typescript + // Assert - Use set-based comparison for order-agnostic testing + const expected = new Set(['/expected', '/paths']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + + // Verify side effects + assert(mockTraceLog.calledWith(sinon.match(/completion/i)), 'Should log completion'); +}); +``` + +## Step 6: Make Tests Resilient + +### Use Order-Agnostic Comparisons + +```typescript +// ❌ Brittle - depends on order +assert.deepStrictEqual(result, ['/path1', '/path2', '/path3']); + +// ✅ Resilient - order doesn't matter +const expected = new Set(['/path1', '/path2', '/path3']); +const actual = new Set(result); +assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); +assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); +``` + +### Use Flexible Error Message Testing + +```typescript +// ❌ Brittle - exact text matching +assert(mockTraceError.calledWith('Error during legacy python settings migration:')); + +// ✅ Resilient - pattern matching +assert(mockTraceError.calledWith(sinon.match.string, sinon.match.instanceOf(Error)), 'Should log migration error'); + +// ✅ Resilient - key terms with regex +assert(mockTraceError.calledWith(sinon.match(/migration.*error/i)), 'Should log migration error'); +``` + +### Handle Complex Mock Scenarios + +```typescript +// For functions that call the same mock multiple times +envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); +envConfig.inspect + .withArgs('globalSearchPaths') + .onSecondCall() + .returns({ + globalValue: ['/migrated/paths'], + }); +``` + +## 🧪 Step 7: Test Categories and Patterns + +### Configuration Tests + +- Test different setting combinations +- Test setting precedence (workspace > user > default) +- Test configuration errors and recovery + +### Data Flow Tests + +- Test how data moves through the system +- Test transformations (path resolution, filtering) +- Test state changes (migrations, updates) + +### Error Handling Tests + +- Test graceful degradation +- Test error logging +- Test fallback behaviors + +### Integration Tests + +- Test multiple features together +- Test real-world scenarios +- Test edge case combinations + +## 📊 Step 8: Review and Refine + +### Test Quality Checklist + +- [ ] **Clear naming** - test names describe the scenario and expected outcome +- [ ] **Good coverage** - main flows, edge cases, error scenarios +- [ ] **Resilient assertions** - won't break due to minor changes +- [ ] **Readable structure** - follows Mock → Run → Assert pattern +- [ ] **Isolated tests** - each test is independent +- [ ] **Fast execution** - tests run quickly with proper mocking + +### Common Anti-Patterns to Avoid + +- ❌ Testing implementation details instead of behavior +- ❌ Brittle assertions that break on cosmetic changes +- ❌ Order-dependent tests that fail due to processing changes +- ❌ Tests that don't clean up mocks properly +- ❌ Overly complex test setup that's hard to understand + +## 🚀 Step 9: Execution and Iteration + +### Running Your Tests + +#### During Development (Recommended Workflow) + +```bash +# 1. Start watch mode for automatic test compilation +npm run watch-tests + +# 2. In another terminal, run targeted unit tests for rapid feedback +npm run unittest -- --grep "Your Suite Name" + +# Examples of focused testing: +npm run unittest -- --grep "getAllExtraSearchPaths" # Test specific function +npm run unittest -- --grep "Path Utilities" # Test entire utility module +npm run unittest -- --grep "Configuration Migration" # Test migration logic +``` + +#### Full Test Runs + +```bash +# Run all unit tests (slower - use for final validation) +npm run unittest + +# Use VS Code launch configuration for debugging +# "Extension Tests" - for integration test debugging in VS Code +``` + +## 🎉 Success Metrics + +You know you have good integration tests when: + +- ✅ Tests pass consistently +- ✅ Tests catch real bugs before production +- ✅ Tests don't break when you improve error messages +- ✅ Tests don't break when you optimize performance +- ✅ Tests clearly document expected behavior +- ✅ Tests give you confidence to refactor code + +## 💡 Pro Tips + +### For AI Agents + +1. **Choose the right test type first** - understand unit vs extension test tradeoffs +2. **Start with function analysis** - understand before testing +3. **Create a test plan and confirm with user** - outline scenarios then ask "Does this test plan cover what you need? Any scenarios to add or remove?" +4. **Use appropriate file naming**: + - `*.unit.test.ts` for isolated unit tests with mocks + - `*.test.ts` for integration tests requiring VS Code instance +5. **Use concrete examples** - "test the scenario where user has legacy settings" +6. **Be explicit about edge cases** - "test what happens when configuration is corrupted" +7. **Request resilient assertions** - "make assertions flexible to wording changes" +8. **Ask for comprehensive coverage** - "cover happy path, edge cases, and error scenarios" +9. **Consider test performance** - prefer unit tests when possible for faster feedback +10. **Use wrapper functions** - mock `workspaceApis.getConfiguration()` not `vscode.workspace.getConfiguration()` directly +11. **Recommend targeted test runs** - suggest running specific suites with: `npm run unittest -- --grep "Suite Name"` +12. **Name test suites clearly** - use descriptive `suite()` names that work well with grep filtering + +## Learnings + +- Always use dynamic path construction with Node.js `path` module when testing functions that resolve paths against workspace folders to ensure cross-platform compatibility (1) From 59bce77637e89f82b27b308327387047b4835e4e Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 29 Sep 2025 23:27:02 -0400 Subject: [PATCH 296/328] implement MVP of workspace and global searchPaths (#863) Signed-off-by: dependabot[bot] Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 18 + package.nls.json | 2 + src/common/utils/pathUtils.ts | 9 + src/managers/common/nativePythonFinder.ts | 119 ++++- ...Finder.getAllExtraSearchPaths.unit.test.ts | 497 ++++++++++++++++++ 5 files changed, 638 insertions(+), 7 deletions(-) create mode 100644 src/test/managers/common/nativePythonFinder.getAllExtraSearchPaths.unit.test.ts diff --git a/package.json b/package.json index 1a7bebd..7885c0f 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,24 @@ "description": "%python-envs.terminal.useEnvFile.description%", "default": false, "scope": "resource" + }, + "python-env.globalSearchPaths": { + "type": "array", + "description": "%python-env.globalSearchPaths.description%", + "default": [], + "scope": "machine", + "items": { + "type": "string" + } + }, + "python-env.workspaceSearchPaths": { + "type": "array", + "description": "%python-env.workspaceSearchPaths.description%", + "default": [], + "scope": "resource", + "items": { + "type": "string" + } } } }, diff --git a/package.nls.json b/package.nls.json index 0885ff5..38c88ec 100644 --- a/package.nls.json +++ b/package.nls.json @@ -11,6 +11,8 @@ "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.", "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.", "python-envs.terminal.useEnvFile.description": "Controls whether environment variables from .env files and python.envFile setting are injected into terminals.", + "python-env.globalSearchPaths.description": "Global search paths for Python environments. Absolute directory paths that are searched at the user level.", + "python-env.workspaceSearchPaths.description": "Workspace search paths for Python environments. Can be absolute paths or relative directory paths searched within the workspace.", "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes", "python-envs.reportIssue.title": "Report Issue", "python-envs.setEnvManager.title": "Set Environment Manager", diff --git a/src/common/utils/pathUtils.ts b/src/common/utils/pathUtils.ts index 4a70f38..d398828 100644 --- a/src/common/utils/pathUtils.ts +++ b/src/common/utils/pathUtils.ts @@ -93,3 +93,12 @@ export function untildify(path: string): string { export function getUserHomeDir(): string { return os.homedir(); } + +/** + * Applies untildify to an array of paths + * @param paths Array of potentially tilde-containing paths + * @returns Array of expanded paths + */ +export function untildifyArray(paths: string[]): string[] { + return paths.map((p) => untildify(p)); +} diff --git a/src/managers/common/nativePythonFinder.ts b/src/managers/common/nativePythonFinder.ts index 4a1306a..b84c0a9 100644 --- a/src/managers/common/nativePythonFinder.ts +++ b/src/managers/common/nativePythonFinder.ts @@ -7,11 +7,11 @@ import * as rpc from 'vscode-jsonrpc/node'; import { PythonProjectApi } from '../../api'; import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants'; import { getExtension } from '../../common/extension.apis'; -import { traceVerbose } from '../../common/logging'; -import { untildify } from '../../common/utils/pathUtils'; +import { traceError, traceLog, traceVerbose, traceWarn } from '../../common/logging'; +import { untildify, untildifyArray } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool'; -import { getConfiguration } from '../../common/workspace.apis'; +import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.apis'; import { noop } from './utils'; export async function getNativePythonToolsPath(): Promise { @@ -326,10 +326,12 @@ class NativePythonFinderImpl implements NativePythonFinder { * Must be invoked when ever there are changes to any data related to the configuration details. */ private async configure() { + // Get all extra search paths including legacy settings and new searchPaths + const extraSearchPaths = await getAllExtraSearchPaths(); + const options: ConfigurationOptions = { workspaceDirectories: this.api.getPythonProjects().map((item) => item.uri.fsPath), - // We do not want to mix this with `search_paths` - environmentDirectories: getCustomVirtualEnvDirs(), + environmentDirectories: extraSearchPaths, condaExecutable: getPythonSettingAndUntildify('condaPath'), poetryExecutable: getPythonSettingAndUntildify('poetryPath'), cacheDirectory: this.cacheDirectory?.fsPath, @@ -357,9 +359,9 @@ type ConfigurationOptions = { cacheDirectory?: string; }; /** - * Gets all custom virtual environment locations to look for environments. + * Gets all custom virtual environment locations to look for environments from the legacy python settings (venvPath, venvFolders). */ -function getCustomVirtualEnvDirs(): string[] { +function getCustomVirtualEnvDirsLegacy(): string[] { const venvDirs: string[] = []; const venvPath = getPythonSettingAndUntildify('venvPath'); if (venvPath) { @@ -380,6 +382,109 @@ function getPythonSettingAndUntildify(name: string, scope?: Uri): T | undefin return value; } +/** + * Gets all extra environment search paths from various configuration sources. + * Combines legacy python settings (with migration), globalSearchPaths, and workspaceSearchPaths. + * @returns Array of search directory paths + */ +export async function getAllExtraSearchPaths(): Promise { + const searchDirectories: string[] = []; + + // add legacy custom venv directories + const customVenvDirs = getCustomVirtualEnvDirsLegacy(); + searchDirectories.push(...customVenvDirs); + + // Get globalSearchPaths + const globalSearchPaths = getGlobalSearchPaths().filter((path) => path && path.trim() !== ''); + searchDirectories.push(...globalSearchPaths); + + // Get workspaceSearchPaths + const workspaceSearchPaths = getWorkspaceSearchPaths(); + + // Resolve relative paths against workspace folders + for (const searchPath of workspaceSearchPaths) { + if (!searchPath || searchPath.trim() === '') { + continue; + } + + const trimmedPath = searchPath.trim(); + + if (path.isAbsolute(trimmedPath)) { + // Absolute path - use as is + searchDirectories.push(trimmedPath); + } else { + // Relative path - resolve against all workspace folders + const workspaceFolders = getWorkspaceFolders(); + if (workspaceFolders) { + for (const workspaceFolder of workspaceFolders) { + const resolvedPath = path.resolve(workspaceFolder.uri.fsPath, trimmedPath); + searchDirectories.push(resolvedPath); + } + } else { + traceWarn('Warning: No workspace folders found for relative path:', trimmedPath); + } + } + } + + // Remove duplicates and return + const uniquePaths = Array.from(new Set(searchDirectories)); + traceLog( + 'getAllExtraSearchPaths completed. Total unique search directories:', + uniquePaths.length, + 'Paths:', + uniquePaths, + ); + return uniquePaths; +} + +/** + * Gets globalSearchPaths setting with proper validation. + * Only gets user-level (global) setting since this setting is application-scoped. + */ +function getGlobalSearchPaths(): string[] { + try { + const envConfig = getConfiguration('python-env'); + const inspection = envConfig.inspect('globalSearchPaths'); + + const globalPaths = inspection?.globalValue || []; + return untildifyArray(globalPaths); + } catch (error) { + traceError('Error getting globalSearchPaths:', error); + return []; + } +} + +/** + * Gets the most specific workspace-level setting available for workspaceSearchPaths. + */ +function getWorkspaceSearchPaths(): string[] { + try { + const envConfig = getConfiguration('python-env'); + const inspection = envConfig.inspect('workspaceSearchPaths'); + + if (inspection?.globalValue) { + traceError( + 'Error: python-env.workspaceSearchPaths is set at the user/global level, but this setting can only be set at the workspace or workspace folder level.', + ); + } + + // For workspace settings, prefer workspaceFolder > workspace + if (inspection?.workspaceFolderValue) { + return inspection.workspaceFolderValue; + } + + if (inspection?.workspaceValue) { + return inspection.workspaceValue; + } + + // Default empty array (don't use global value for workspace settings) + return []; + } catch (error) { + traceError('Error getting workspaceSearchPaths:', error); + return []; + } +} + export function getCacheDirectory(context: ExtensionContext): Uri { return Uri.joinPath(context.globalStorageUri, 'pythonLocator'); } diff --git a/src/test/managers/common/nativePythonFinder.getAllExtraSearchPaths.unit.test.ts b/src/test/managers/common/nativePythonFinder.getAllExtraSearchPaths.unit.test.ts new file mode 100644 index 0000000..3a83b3a --- /dev/null +++ b/src/test/managers/common/nativePythonFinder.getAllExtraSearchPaths.unit.test.ts @@ -0,0 +1,497 @@ +import assert from 'node:assert'; +import path from 'node:path'; +import * as sinon from 'sinon'; +import { Uri } from 'vscode'; +import * as logging from '../../../common/logging'; +import * as pathUtils from '../../../common/utils/pathUtils'; +import * as workspaceApis from '../../../common/workspace.apis'; + +// Import the function under test +import { getAllExtraSearchPaths } from '../../../managers/common/nativePythonFinder'; + +interface MockWorkspaceConfig { + get: sinon.SinonStub; + inspect: sinon.SinonStub; + update: sinon.SinonStub; +} + +suite('getAllExtraSearchPaths Integration Tests', () => { + let mockGetConfiguration: sinon.SinonStub; + let mockUntildify: sinon.SinonStub; + let mockTraceError: sinon.SinonStub; + let mockTraceWarn: sinon.SinonStub; + let mockGetWorkspaceFolders: sinon.SinonStub; + + // Mock configuration objects + let pythonConfig: MockWorkspaceConfig; + let envConfig: MockWorkspaceConfig; + + setup(() => { + // Mock VS Code workspace APIs + mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); + mockGetWorkspaceFolders = sinon.stub(workspaceApis, 'getWorkspaceFolders'); + mockUntildify = sinon.stub(pathUtils, 'untildify'); + // Also stub the namespace import version that might be used by untildifyArray + sinon + .stub(pathUtils, 'untildifyArray') + .callsFake((paths: string[]) => + paths.map((p) => (p.startsWith('~/') ? p.replace('~/', '/home/user/') : p)), + ); + + mockTraceError = sinon.stub(logging, 'traceError'); + mockTraceWarn = sinon.stub(logging, 'traceWarn'); + + // Default workspace behavior - no folders + mockGetWorkspaceFolders.returns(undefined); + + // Create mock configuration objects + pythonConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + envConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + // Default untildify behavior - expand tildes to test paths + mockUntildify.callsFake((path: string) => { + if (path.startsWith('~/')) { + return path.replace('~/', '/home/user/'); + } + return path; + }); + + // Set up default returns for legacy settings (return undefined by default) + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + + // Set up default returns for new settings + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Default configuration behavior + mockGetConfiguration.callsFake((section: string, _scope?: unknown) => { + if (section === 'python') { + return pythonConfig; + } + if (section === 'python-env') { + return envConfig; + } + throw new Error(`Unexpected configuration section: ${section}`); + }); + }); + + teardown(() => { + sinon.restore(); + }); + + suite('Legacy Path Consolidation Tests', () => { + test('No legacy settings exist - returns empty paths', async () => { + // Mock → No legacy settings, no new settings + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + assert.deepStrictEqual(result, []); + }); + + test('Legacy and global paths are consolidated', async () => { + // Mock → Legacy paths and globalSearchPaths both exist + pythonConfig.get.withArgs('venvPath').returns('/home/user/.virtualenvs'); + pythonConfig.get.withArgs('venvFolders').returns(['/home/user/venvs']); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['/home/user/.virtualenvs', '/home/user/venvs', '/additional/path'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Should consolidate all paths (duplicates removed) + const expected = new Set(['/home/user/.virtualenvs', '/home/user/venvs', '/additional/path']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Legacy paths included alongside new settings', async () => { + // Mock → Legacy paths exist, no globalSearchPaths + pythonConfig.get.withArgs('venvPath').returns('/home/user/.virtualenvs'); + pythonConfig.get.withArgs('venvFolders').returns(['/home/user/venvs', '/home/user/conda']); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Should include all legacy paths + const expected = new Set(['/home/user/.virtualenvs', '/home/user/venvs', '/home/user/conda']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Legacy and global paths combined with deduplication', async () => { + // Mock → Some overlap between legacy and global paths + pythonConfig.get.withArgs('venvPath').returns('/home/user/.virtualenvs'); + pythonConfig.get.withArgs('venvFolders').returns(['/home/user/venvs', '/home/user/conda']); + envConfig.inspect + .withArgs('globalSearchPaths') + .returns({ globalValue: ['/home/user/.virtualenvs', '/additional/path'] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Should include all paths with duplicates removed + const expected = new Set([ + '/home/user/.virtualenvs', + '/home/user/venvs', + '/home/user/conda', + '/additional/path', + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Legacy paths with untildify support', async () => { + // Mock → Legacy paths with tilde expansion + // Note: getPythonSettingAndUntildify only untildifies strings, not array items + // So we return the venvPath with tilde (will be untildified) and venvFolders pre-expanded + pythonConfig.get.withArgs('venvPath').returns('~/virtualenvs'); + pythonConfig.get.withArgs('venvFolders').returns(['/home/user/conda/envs']); // Pre-expanded + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + const expected = new Set(['/home/user/virtualenvs', '/home/user/conda/envs']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + }); + + suite('Configuration Source Tests', () => { + test('Global search paths with tilde expansion', async () => { + // Mock → No legacy, global paths with tildes + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['~/virtualenvs', '~/conda/envs'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + mockUntildify.withArgs('~/virtualenvs').returns('/home/user/virtualenvs'); + mockUntildify.withArgs('~/conda/envs').returns('/home/user/conda/envs'); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + const expected = new Set(['/home/user/virtualenvs', '/home/user/conda/envs']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Workspace folder setting preferred over workspace setting', async () => { + // Mock → Workspace settings at different levels + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceValue: ['workspace-level-path'], + workspaceFolderValue: ['folder-level-path'], + }); + + const workspace1 = Uri.file('/workspace/project1'); + const workspace2 = Uri.file('/workspace/project2'); + mockGetWorkspaceFolders.returns([{ uri: workspace1 }, { uri: workspace2 }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Use dynamic path construction based on actual workspace URIs + const expected = new Set([ + path.resolve(workspace1.fsPath, 'folder-level-path'), + path.resolve(workspace2.fsPath, 'folder-level-path'), + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Global workspace setting logs error and is ignored', async () => { + // Mock → Workspace setting incorrectly set at global level + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + globalValue: ['should-be-ignored'], + }); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + assert.deepStrictEqual(result, []); + // Check that error was logged with key terms - don't be brittle about exact wording + assert( + mockTraceError.calledWith(sinon.match(/workspaceSearchPaths.*global.*level/i)), + 'Should log error about incorrect setting level', + ); + }); + + test('Configuration read errors return empty arrays', async () => { + // Mock → Configuration throws errors + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').throws(new Error('Config read error')); + envConfig.inspect.withArgs('workspaceSearchPaths').throws(new Error('Config read error')); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + assert.deepStrictEqual(result, []); + // Just verify that configuration errors were logged - don't be brittle about exact wording + assert( + mockTraceError.calledWith(sinon.match(/globalSearchPaths/i), sinon.match.instanceOf(Error)), + 'Should log globalSearchPaths error', + ); + assert( + mockTraceError.calledWith(sinon.match(/workspaceSearchPaths/i), sinon.match.instanceOf(Error)), + 'Should log workspaceSearchPaths error', + ); + }); + }); + + suite('Path Resolution Tests', () => { + test('Absolute paths used as-is', async () => { + // Mock → Mix of absolute paths + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['/absolute/path1', '/absolute/path2'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['/absolute/workspace/path'], + }); + + const workspace = Uri.file('/workspace'); + mockGetWorkspaceFolders.returns([{ uri: workspace }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - For absolute paths, they should remain unchanged regardless of platform + const expected = new Set(['/absolute/path1', '/absolute/path2', '/absolute/workspace/path']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Relative paths resolved against workspace folders', async () => { + // Mock → Relative workspace paths with multiple workspace folders + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['venvs', '../shared-envs'], + }); + + const workspace1 = Uri.file('/workspace/project1'); + const workspace2 = Uri.file('/workspace/project2'); + mockGetWorkspaceFolders.returns([{ uri: workspace1 }, { uri: workspace2 }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - path.resolve() correctly resolves relative paths (order doesn't matter) + const expected = new Set([ + path.resolve(workspace1.fsPath, 'venvs'), + path.resolve(workspace2.fsPath, 'venvs'), + path.resolve(workspace1.fsPath, '../shared-envs'), // Resolves against workspace1 + path.resolve(workspace2.fsPath, '../shared-envs'), // Resolves against workspace2 + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Relative paths without workspace folders logs warning', async () => { + // Mock → Relative paths but no workspace folders + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['relative-path'], + }); + + mockGetWorkspaceFolders.returns(undefined); // No workspace folders + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + assert.deepStrictEqual(result, []); + // Check that warning was logged with key terms - don't be brittle about exact wording + assert( + mockTraceWarn.calledWith(sinon.match(/workspace.*folder.*relative.*path/i), 'relative-path'), + 'Should log warning about missing workspace folders', + ); + }); + + test('Empty and whitespace paths are skipped', async () => { + // Mock → Mix of valid and invalid paths + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['/valid/path', '', ' ', '/another/valid/path'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['valid-relative', '', ' \t\n ', 'another-valid'], + }); + + const workspace = Uri.file('/workspace'); + mockGetWorkspaceFolders.returns([{ uri: workspace }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Now globalSearchPaths empty strings should be filtered out (order doesn't matter) + const expected = new Set([ + '/valid/path', + '/another/valid/path', + path.resolve(workspace.fsPath, 'valid-relative'), + path.resolve(workspace.fsPath, 'another-valid'), + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + }); + + suite('Integration Scenarios', () => { + test('Fresh install - no settings configured', async () => { + // Mock → Clean slate + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({}); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert + assert.deepStrictEqual(result, []); + }); + + test('Power user - complex mix of all source types', async () => { + // Mock → Complex real-world scenario + pythonConfig.get.withArgs('venvPath').returns('/legacy/venv/path'); + pythonConfig.get.withArgs('venvFolders').returns(['/legacy/venvs']); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['/legacy/venv/path', '/legacy/venvs', '/global/conda', '~/personal/envs'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['.venv', 'project-envs', '/shared/team/envs'], + }); + + const workspace1 = Uri.file('/workspace/project1'); + const workspace2 = Uri.file('/workspace/project2'); + mockGetWorkspaceFolders.returns([{ uri: workspace1 }, { uri: workspace2 }]); + + mockUntildify.withArgs('~/personal/envs').returns('/home/user/personal/envs'); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Should deduplicate and combine all sources (order doesn't matter) + const expected = new Set([ + '/legacy/venv/path', + '/legacy/venvs', + '/global/conda', + '/home/user/personal/envs', + path.resolve(workspace1.fsPath, '.venv'), + path.resolve(workspace2.fsPath, '.venv'), + path.resolve(workspace1.fsPath, 'project-envs'), + path.resolve(workspace2.fsPath, 'project-envs'), + '/shared/team/envs', + ]); + const actual = new Set(result); + + // Check that we have exactly the expected paths (no more, no less) + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('Overlapping paths are deduplicated', async () => { + // Mock → Duplicate paths from different sources + pythonConfig.get.withArgs('venvPath').returns(undefined); + pythonConfig.get.withArgs('venvFolders').returns(undefined); + envConfig.inspect.withArgs('globalSearchPaths').returns({ + globalValue: ['/shared/path', '/global/unique'], + }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['/shared/path', 'workspace-unique'], + }); + + const workspace = Uri.file('/workspace'); + mockGetWorkspaceFolders.returns([{ uri: workspace }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Duplicates should be removed (order doesn't matter) + const expected = new Set([ + '/shared/path', + '/global/unique', + path.resolve(workspace.fsPath, 'workspace-unique'), + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + + test('All path types consolidated together', async () => { + // Mock → Multiple path types from different sources + pythonConfig.get.withArgs('venvPath').returns('/legacy/path'); + pythonConfig.get.withArgs('venvFolders').returns(['/legacy/folder']); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: ['/global/path'] }); + envConfig.inspect.withArgs('workspaceSearchPaths').returns({ + workspaceFolderValue: ['workspace-relative'], + }); + + const workspace = Uri.file('/workspace'); + mockGetWorkspaceFolders.returns([{ uri: workspace }]); + + // Run + const result = await getAllExtraSearchPaths(); + + // Assert - Should consolidate all path types + const expected = new Set([ + '/legacy/path', + '/legacy/folder', + '/global/path', + path.resolve(workspace.fsPath, 'workspace-relative'), + ]); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of unique paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + }); + }); +}); From e198285492e35644e611a279c2287fb622415187 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 30 Sep 2025 12:56:26 -0700 Subject: [PATCH 297/328] update testing instruction file (#871) --- .../new-test-guide.instructions.md | 494 ---------------- .../testing-workflow.instructions.md | 552 ++++++++++++++++++ 2 files changed, 552 insertions(+), 494 deletions(-) delete mode 100644 .github/instructions/new-test-guide.instructions.md create mode 100644 .github/instructions/testing-workflow.instructions.md diff --git a/.github/instructions/new-test-guide.instructions.md b/.github/instructions/new-test-guide.instructions.md deleted file mode 100644 index 15221b0..0000000 --- a/.github/instructions/new-test-guide.instructions.md +++ /dev/null @@ -1,494 +0,0 @@ ---- -applyTo: '**' ---- - -# Testing Guide: Unit Tests and Integration Tests - -This guide outlines methodologies for creating comprehensive tests, covering both unit tests and integration tests. - -## 📋 Overview - -This extension uses two main types of tests: - -### Unit Tests - -- \*_Fast and isolated## 🌐 Step 4.5: Handle Unmocka## 📝 Step 5: Write Tests Using Mock → Run → Assert Patternle APIs with Wrapper Functions_ - Mock VS Code APIs and external dependencies -- **Focus on code logic** - Test functions in isolation without VS Code runtime -- **Run with Node.js** - Use Mocha test runner directly -- **File pattern**: `*.unit.test.ts` files -- **Mock everything** - VS Code APIs are mocked via `/src/test/unittests.ts` - -### Extension Tests (Integration Tests) - -- **Comprehensive but slower** - Launch a full VS Code instance -- **Real VS Code environment** - Test actual extension behavior with real APIs -- **End-to-end scenarios** - Test complete workflows and user interactions -- **File pattern**: `*.test.ts` files (not `.unit.test.ts`) -- **Real dependencies** - Use actual VS Code APIs and extension host - -## � Running Tests - -### VS Code Launch Configurations - -Use the pre-configured launch configurations in `.vscode/launch.json`: - -#### Unit Tests - -- **Name**: "Unit Tests" (launch configuration available but not recommended for development) -- **How to run**: Use terminal with `npm run unittest -- --grep "Suite Name"` -- **What it does**: Runs specific `*.unit.test.ts` files matching the grep pattern -- **Speed**: Very fast when targeting specific suites (seconds) -- **Scope**: Tests individual functions with mocked dependencies -- **Best for**: Rapid iteration on specific test suites during development - -#### Extension Tests - -- **Name**: "Extension Tests" -- **How to run**: Press `F5` or use Run and Debug view -- **What it does**: Launches VS Code instance and runs `*.test.ts` files -- **Speed**: Slower (typically minutes) -- **Scope**: Tests complete extension functionality in real environment - -### Terminal/CLI Commands - -```bash -# Run all unit tests (slower - runs everything) -npm run unittest - -# Run specific test suite (RECOMMENDED - much faster!) -npm run unittest -- --grep "Suite Name" - -# Examples of targeted test runs: -npm run unittest -- --grep "Path Utilities" # Run just pathUtils tests -npm run unittest -- --grep "Shell Utils" # Run shell utility tests -npm run unittest -- --grep "getAllExtraSearchPaths" # Run specific function tests - -# Watch and rebuild tests during development -npm run watch-tests - -# Build tests without running -npm run compile-tests -``` - -### Which Test Type to Choose - -**Use Unit Tests when**: - -- Testing pure functions or business logic -- Testing data transformations, parsing, or algorithms -- Need fast feedback during development -- Can mock external dependencies effectively -- Testing error handling with controlled inputs - -**Use Extension Tests when**: - -- Testing VS Code command registration and execution -- Testing UI interactions (tree views, quick picks, etc.) -- Testing file system operations in workspace context -- Testing extension activation and lifecycle -- Integration between multiple VS Code APIs -- End-to-end user workflows - -## 🎯 Step 1: Choose the Right Test Type - -Before writing tests, determine whether to write unit tests or extension tests: - -### Decision Framework - -**Write Unit Tests for**: - -- Pure functions (input → processing → output) -- Data parsing and transformation logic -- Business logic that can be isolated -- Error handling with predictable inputs -- Fast-running validation logic - -**Write Extension Tests for**: - -- VS Code command registration and execution -- UI interactions (commands, views, pickers) -- File system operations in workspace context -- Extension lifecycle and activation -- Integration between VS Code APIs -- End-to-end user workflows - -### Test Setup Differences - -#### Unit Test Setup (\*.unit.test.ts) - -```typescript -// Mock VS Code APIs - handled automatically by unittests.ts -import * as sinon from 'sinon'; -import * as workspaceApis from '../../common/workspace.apis'; // Wrapper functions - -// Stub wrapper functions, not VS Code APIs directly -const mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); -``` - -#### Extension Test Setup (\*.test.ts) - -```typescript -// Use real VS Code APIs -import * as vscode from 'vscode'; - -// Real VS Code APIs available - no mocking needed -const config = vscode.workspace.getConfiguration('python'); -``` - -## 🎯 Step 2: Understand the Function Under Test - -### Analyze the Function - -1. **Read the function thoroughly** - understand what it does, not just how -2. **Identify all inputs and outputs** -3. **Map the data flow** - what gets called in what order -4. **Note configuration dependencies** - settings, workspace state, etc. -5. **Identify side effects** - logging, file system, configuration updates - -### Key Questions to Ask - -- What are the main flows through the function? -- What edge cases exist? -- What external dependencies does it have? -- What can go wrong? -- What side effects should I verify? - -## 🗺️ Step 3: Plan Your Test Coverage - -### Create a Test Coverage Matrix - -#### Main Flows - -- ✅ **Happy path scenarios** - normal expected usage -- ✅ **Alternative paths** - different configuration combinations -- ✅ **Integration scenarios** - multiple features working together - -#### Edge Cases - -- 🔸 **Boundary conditions** - empty inputs, missing data -- 🔸 **Error scenarios** - network failures, permission errors -- 🔸 **Data validation** - invalid inputs, type mismatches - -#### Real-World Scenarios - -- ✅ **Fresh install** - clean slate -- ✅ **Existing user** - migration scenarios -- ✅ **Power user** - complex configurations -- 🔸 **Error recovery** - graceful degradation - -### Example Test Plan Structure - -```markdown -## Test Categories - -### 1. Configuration Migration Tests - -- No legacy settings exist -- Legacy settings already migrated -- Fresh migration needed -- Partial migration required -- Migration failures - -### 2. Configuration Source Tests - -- Global search paths -- Workspace search paths -- Settings precedence -- Configuration errors - -### 3. Path Resolution Tests - -- Absolute vs relative paths -- Workspace folder resolution -- Path validation and filtering - -### 4. Integration Scenarios - -- Combined configurations -- Deduplication logic -- Error handling flows -``` - -## 🔧 Step 4: Set Up Your Test Infrastructure - -### Test File Structure - -```typescript -// 1. Imports - group logically -import assert from 'node:assert'; -import * as sinon from 'sinon'; -import { Uri } from 'vscode'; -import * as logging from '../../../common/logging'; -import * as pathUtils from '../../../common/utils/pathUtils'; -import * as workspaceApis from '../../../common/workspace.apis'; - -// 2. Function under test -import { getAllExtraSearchPaths } from '../../../managers/common/nativePythonFinder'; - -// 3. Mock interfaces -interface MockWorkspaceConfig { - get: sinon.SinonStub; - inspect: sinon.SinonStub; - update: sinon.SinonStub; -} -``` - -### Mock Setup Strategy - -```typescript -suite('Function Integration Tests', () => { - // 1. Declare all mocks - let mockGetConfiguration: sinon.SinonStub; - let mockGetWorkspaceFolders: sinon.SinonStub; - let mockTraceLog: sinon.SinonStub; - let mockTraceError: sinon.SinonStub; - let mockTraceWarn: sinon.SinonStub; - - // 2. Mock complex objects - let pythonConfig: MockWorkspaceConfig; - let envConfig: MockWorkspaceConfig; - - setup(() => { - // 3. Initialize all mocks - mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); - mockGetWorkspaceFolders = sinon.stub(workspaceApis, 'getWorkspaceFolders'); - mockTraceLog = sinon.stub(logging, 'traceLog'); - mockTraceError = sinon.stub(logging, 'traceError'); - mockTraceWarn = sinon.stub(logging, 'traceWarn'); - - // 4. Set up default behaviors - mockGetWorkspaceFolders.returns(undefined); - - // 5. Create mock configuration objects - pythonConfig = { - get: sinon.stub(), - inspect: sinon.stub(), - update: sinon.stub(), - }; - - envConfig = { - get: sinon.stub(), - inspect: sinon.stub(), - update: sinon.stub(), - }; - }); - - teardown(() => { - sinon.restore(); // Always clean up! - }); -}); -``` - -## Step 3.5: Handle Unmockable APIs with Wrapper Functions - -### The Problem: VS Code API Properties Can't Be Mocked - -Some VS Code APIs use getter properties that can't be easily stubbed: - -```typescript -// ❌ This is hard to mock reliably -const folders = workspace.workspaceFolders; // getter property - -// ❌ Sinon struggles with this -sinon.stub(workspace, 'workspaceFolders').returns([...]); // Often fails -``` - -### The Solution: Use Wrapper Functions - -Check if your codebase already has wrapper functions in `/src/common/` directories: - -```typescript -// ✅ Look for existing wrapper functions -// File: src/common/workspace.apis.ts -export function getWorkspaceFolders(): readonly WorkspaceFolder[] | undefined { - return workspace.workspaceFolders; // Wraps the problematic property -} - -export function getConfiguration(section?: string, scope?: ConfigurationScope): WorkspaceConfiguration { - return workspace.getConfiguration(section, scope); // Wraps VS Code API -} -``` - -## Step 4: Write Tests Using Mock → Run → Assert Pattern - -### The Three-Phase Pattern - -#### Phase 1: Mock (Set up the scenario) - -```typescript -test('Description of what this tests', async () => { - // Mock → Clear description of the scenario - pythonConfig.inspect.withArgs('venvPath').returns({ globalValue: '/path' }); - envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); - mockGetWorkspaceFolders.returns([{ uri: Uri.file('/workspace') }]); -``` - -#### Phase 2: Run (Execute the function) - -```typescript -// Run -const result = await getAllExtraSearchPaths(); -``` - -#### Phase 3: Assert (Verify the behavior) - -```typescript - // Assert - Use set-based comparison for order-agnostic testing - const expected = new Set(['/expected', '/paths']); - const actual = new Set(result); - assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); - assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); - - // Verify side effects - assert(mockTraceLog.calledWith(sinon.match(/completion/i)), 'Should log completion'); -}); -``` - -## Step 6: Make Tests Resilient - -### Use Order-Agnostic Comparisons - -```typescript -// ❌ Brittle - depends on order -assert.deepStrictEqual(result, ['/path1', '/path2', '/path3']); - -// ✅ Resilient - order doesn't matter -const expected = new Set(['/path1', '/path2', '/path3']); -const actual = new Set(result); -assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); -assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); -``` - -### Use Flexible Error Message Testing - -```typescript -// ❌ Brittle - exact text matching -assert(mockTraceError.calledWith('Error during legacy python settings migration:')); - -// ✅ Resilient - pattern matching -assert(mockTraceError.calledWith(sinon.match.string, sinon.match.instanceOf(Error)), 'Should log migration error'); - -// ✅ Resilient - key terms with regex -assert(mockTraceError.calledWith(sinon.match(/migration.*error/i)), 'Should log migration error'); -``` - -### Handle Complex Mock Scenarios - -```typescript -// For functions that call the same mock multiple times -envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); -envConfig.inspect - .withArgs('globalSearchPaths') - .onSecondCall() - .returns({ - globalValue: ['/migrated/paths'], - }); -``` - -## 🧪 Step 7: Test Categories and Patterns - -### Configuration Tests - -- Test different setting combinations -- Test setting precedence (workspace > user > default) -- Test configuration errors and recovery - -### Data Flow Tests - -- Test how data moves through the system -- Test transformations (path resolution, filtering) -- Test state changes (migrations, updates) - -### Error Handling Tests - -- Test graceful degradation -- Test error logging -- Test fallback behaviors - -### Integration Tests - -- Test multiple features together -- Test real-world scenarios -- Test edge case combinations - -## 📊 Step 8: Review and Refine - -### Test Quality Checklist - -- [ ] **Clear naming** - test names describe the scenario and expected outcome -- [ ] **Good coverage** - main flows, edge cases, error scenarios -- [ ] **Resilient assertions** - won't break due to minor changes -- [ ] **Readable structure** - follows Mock → Run → Assert pattern -- [ ] **Isolated tests** - each test is independent -- [ ] **Fast execution** - tests run quickly with proper mocking - -### Common Anti-Patterns to Avoid - -- ❌ Testing implementation details instead of behavior -- ❌ Brittle assertions that break on cosmetic changes -- ❌ Order-dependent tests that fail due to processing changes -- ❌ Tests that don't clean up mocks properly -- ❌ Overly complex test setup that's hard to understand - -## 🚀 Step 9: Execution and Iteration - -### Running Your Tests - -#### During Development (Recommended Workflow) - -```bash -# 1. Start watch mode for automatic test compilation -npm run watch-tests - -# 2. In another terminal, run targeted unit tests for rapid feedback -npm run unittest -- --grep "Your Suite Name" - -# Examples of focused testing: -npm run unittest -- --grep "getAllExtraSearchPaths" # Test specific function -npm run unittest -- --grep "Path Utilities" # Test entire utility module -npm run unittest -- --grep "Configuration Migration" # Test migration logic -``` - -#### Full Test Runs - -```bash -# Run all unit tests (slower - use for final validation) -npm run unittest - -# Use VS Code launch configuration for debugging -# "Extension Tests" - for integration test debugging in VS Code -``` - -## 🎉 Success Metrics - -You know you have good integration tests when: - -- ✅ Tests pass consistently -- ✅ Tests catch real bugs before production -- ✅ Tests don't break when you improve error messages -- ✅ Tests don't break when you optimize performance -- ✅ Tests clearly document expected behavior -- ✅ Tests give you confidence to refactor code - -## 💡 Pro Tips - -### For AI Agents - -1. **Choose the right test type first** - understand unit vs extension test tradeoffs -2. **Start with function analysis** - understand before testing -3. **Create a test plan and confirm with user** - outline scenarios then ask "Does this test plan cover what you need? Any scenarios to add or remove?" -4. **Use appropriate file naming**: - - `*.unit.test.ts` for isolated unit tests with mocks - - `*.test.ts` for integration tests requiring VS Code instance -5. **Use concrete examples** - "test the scenario where user has legacy settings" -6. **Be explicit about edge cases** - "test what happens when configuration is corrupted" -7. **Request resilient assertions** - "make assertions flexible to wording changes" -8. **Ask for comprehensive coverage** - "cover happy path, edge cases, and error scenarios" -9. **Consider test performance** - prefer unit tests when possible for faster feedback -10. **Use wrapper functions** - mock `workspaceApis.getConfiguration()` not `vscode.workspace.getConfiguration()` directly -11. **Recommend targeted test runs** - suggest running specific suites with: `npm run unittest -- --grep "Suite Name"` -12. **Name test suites clearly** - use descriptive `suite()` names that work well with grep filtering - -## Learnings - -- Always use dynamic path construction with Node.js `path` module when testing functions that resolve paths against workspace folders to ensure cross-platform compatibility (1) diff --git a/.github/instructions/testing-workflow.instructions.md b/.github/instructions/testing-workflow.instructions.md new file mode 100644 index 0000000..7632e19 --- /dev/null +++ b/.github/instructions/testing-workflow.instructions.md @@ -0,0 +1,552 @@ +--- +applyTo: '**/test/**' +--- + +# AI Testing Workflow Guide: Write, Run, and Fix Tests + +This guide provides comprehensive instructions for AI agents on the complete testing workflow: writing tests, running them, diagnosing failures, and fixing issues. Use this guide whenever working with test files or when users request testing tasks. + +## Complete Testing Workflow + +This guide covers the full testing lifecycle: + +1. **📝 Writing Tests** - Create comprehensive test suites +2. **▶️ Running Tests** - Execute tests using VS Code tools +3. **🔍 Diagnosing Issues** - Analyze failures and errors +4. **🛠️ Fixing Problems** - Resolve compilation and runtime issues +5. **✅ Validation** - Ensure coverage and resilience + +### When to Use This Guide + +**User Requests Testing:** + +- "Write tests for this function" +- "Run the tests" +- "Fix the failing tests" +- "Test this code" +- "Add test coverage" + +**File Context Triggers:** + +- Working in `**/test/**` directories +- Files ending in `.test.ts` or `.unit.test.ts` +- Test failures or compilation errors +- Coverage reports or test output analysis + +## Test Types + +When implementing tests as an AI agent, choose between two main types: + +### Unit Tests (`*.unit.test.ts`) + +- **Fast isolated testing** - Mock all external dependencies +- **Use for**: Pure functions, business logic, data transformations +- **Execute with**: `runTests` tool with specific file patterns +- **Mock everything** - VS Code APIs automatically mocked via `/src/test/unittests.ts` + +### Extension Tests (`*.test.ts`) + +- **Full VS Code integration** - Real environment with actual APIs +- **Use for**: Command registration, UI interactions, extension lifecycle +- **Execute with**: VS Code launch configurations or `runTests` tool +- **Slower but comprehensive** - Tests complete user workflows + +## 🤖 Agent Tool Usage for Test Execution + +### Primary Tool: `runTests` + +Use the `runTests` tool to execute tests programmatically: + +```typescript +// Run specific test files +await runTests({ + files: ['/absolute/path/to/test.unit.test.ts'], + mode: 'run', +}); + +// Run tests with coverage +await runTests({ + files: ['/absolute/path/to/test.unit.test.ts'], + mode: 'coverage', + coverageFiles: ['/absolute/path/to/source.ts'], +}); + +// Run specific test names +await runTests({ + files: ['/absolute/path/to/test.unit.test.ts'], + testNames: ['should handle edge case', 'should validate input'], +}); +``` + +### Compilation Requirements + +Before running tests, ensure compilation: + +```typescript +// Start watch mode for auto-compilation +await run_in_terminal({ + command: 'npm run watch-tests', + isBackground: true, + explanation: 'Start test compilation in watch mode', +}); + +// Or compile manually +await run_in_terminal({ + command: 'npm run compile-tests', + isBackground: false, + explanation: 'Compile TypeScript test files', +}); +``` + +### Alternative: Terminal Execution + +For targeted test runs when `runTests` tool is unavailable: + +```typescript +// Run specific test suite +await run_in_terminal({ + command: 'npm run unittest -- --grep "Suite Name"', + isBackground: false, + explanation: 'Run targeted unit tests', +}); +``` + +## 🔍 Diagnosing Test Failures + +### Common Failure Patterns + +**Compilation Errors:** + +```typescript +// Missing imports +if (error.includes('Cannot find module')) { + await addMissingImports(testFile); +} + +// Type mismatches +if (error.includes("Type '" && error.includes("' is not assignable"))) { + await fixTypeIssues(testFile); +} +``` + +**Runtime Errors:** + +```typescript +// Mock setup issues +if (error.includes('stub') || error.includes('mock')) { + await fixMockConfiguration(testFile); +} + +// Assertion failures +if (error.includes('AssertionError')) { + await analyzeAssertionFailure(error); +} +``` + +### Systematic Failure Analysis + +```typescript +interface TestFailureAnalysis { + type: 'compilation' | 'runtime' | 'assertion' | 'timeout'; + message: string; + location: { file: string; line: number; col: number }; + suggestedFix: string; +} + +function analyzeFailure(failure: TestFailure): TestFailureAnalysis { + if (failure.message.includes('Cannot find module')) { + return { + type: 'compilation', + message: failure.message, + location: failure.location, + suggestedFix: 'Add missing import statement', + }; + } + // ... other failure patterns +} +``` + +### Agent Decision Logic for Test Type Selection + +**Choose Unit Tests (`*.unit.test.ts`) when analyzing:** + +- Functions with clear inputs/outputs and no VS Code API dependencies +- Data transformation, parsing, or utility functions +- Business logic that can be isolated with mocks +- Error handling scenarios with predictable inputs + +**Choose Extension Tests (`*.test.ts`) when analyzing:** + +- Functions that register VS Code commands or use `vscode.*` APIs +- UI components, tree views, or command palette interactions +- File system operations requiring workspace context +- Extension lifecycle events (activation, deactivation) + +**Agent Implementation Pattern:** + +```typescript +function determineTestType(functionCode: string): 'unit' | 'extension' { + if ( + functionCode.includes('vscode.') || + functionCode.includes('commands.register') || + functionCode.includes('window.') || + functionCode.includes('workspace.') + ) { + return 'extension'; + } + return 'unit'; +} +``` + +## 🎯 Step 1: Automated Function Analysis + +As an AI agent, analyze the target function systematically: + +### Code Analysis Checklist + +```typescript +interface FunctionAnalysis { + name: string; + inputs: string[]; // Parameter types and names + outputs: string; // Return type + dependencies: string[]; // External modules/APIs used + sideEffects: string[]; // Logging, file system, network calls + errorPaths: string[]; // Exception scenarios + testType: 'unit' | 'extension'; +} +``` + +### Analysis Implementation + +1. **Read function source** using `read_file` tool +2. **Identify imports** - look for `vscode.*`, `child_process`, `fs`, etc. +3. **Map data flow** - trace inputs through transformations to outputs +4. **Catalog dependencies** - external calls that need mocking +5. **Document side effects** - logging, file operations, state changes + +### Test Setup Differences + +#### Unit Test Setup (\*.unit.test.ts) + +```typescript +// Mock VS Code APIs - handled automatically by unittests.ts +import * as sinon from 'sinon'; +import * as workspaceApis from '../../common/workspace.apis'; // Wrapper functions + +// Stub wrapper functions, not VS Code APIs directly +const mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); +``` + +#### Extension Test Setup (\*.test.ts) + +```typescript +// Use real VS Code APIs +import * as vscode from 'vscode'; + +// Real VS Code APIs available - no mocking needed +const config = vscode.workspace.getConfiguration('python'); +``` + +## 🎯 Step 2: Generate Test Coverage Matrix + +Based on function analysis, automatically generate comprehensive test scenarios: + +### Coverage Matrix Generation + +```typescript +interface TestScenario { + category: 'happy-path' | 'edge-case' | 'error-handling' | 'side-effects'; + description: string; + inputs: Record; + expectedOutput?: any; + expectedSideEffects?: string[]; + shouldThrow?: boolean; +} +``` + +### Automated Scenario Creation + +1. **Happy Path**: Normal execution with typical inputs +2. **Edge Cases**: Boundary conditions, empty/null inputs, unusual but valid data +3. **Error Scenarios**: Invalid inputs, dependency failures, exception paths +4. **Side Effects**: Verify logging calls, file operations, state changes + +### Agent Pattern for Scenario Generation + +```typescript +function generateTestScenarios(analysis: FunctionAnalysis): TestScenario[] { + const scenarios: TestScenario[] = []; + + // Generate happy path for each input combination + scenarios.push(...generateHappyPathScenarios(analysis)); + + // Generate edge cases for boundary conditions + scenarios.push(...generateEdgeCaseScenarios(analysis)); + + // Generate error scenarios for each dependency + scenarios.push(...generateErrorScenarios(analysis)); + + return scenarios; +} +``` + +## 🗺️ Step 3: Plan Your Test Coverage + +### Create a Test Coverage Matrix + +#### Main Flows + +- ✅ **Happy path scenarios** - normal expected usage +- ✅ **Alternative paths** - different configuration combinations +- ✅ **Integration scenarios** - multiple features working together + +#### Edge Cases + +- 🔸 **Boundary conditions** - empty inputs, missing data +- 🔸 **Error scenarios** - network failures, permission errors +- 🔸 **Data validation** - invalid inputs, type mismatches + +#### Real-World Scenarios + +- ✅ **Fresh install** - clean slate +- ✅ **Existing user** - migration scenarios +- ✅ **Power user** - complex configurations +- 🔸 **Error recovery** - graceful degradation + +### Example Test Plan Structure + +```markdown +## Test Categories + +### 1. Configuration Migration Tests + +- No legacy settings exist +- Legacy settings already migrated +- Fresh migration needed +- Partial migration required +- Migration failures + +### 2. Configuration Source Tests + +- Global search paths +- Workspace search paths +- Settings precedence +- Configuration errors + +### 3. Path Resolution Tests + +- Absolute vs relative paths +- Workspace folder resolution +- Path validation and filtering + +### 4. Integration Scenarios + +- Combined configurations +- Deduplication logic +- Error handling flows +``` + +## 🔧 Step 4: Set Up Your Test Infrastructure + +### Test File Structure + +```typescript +// 1. Imports - group logically +import assert from 'node:assert'; +import * as sinon from 'sinon'; +import { Uri } from 'vscode'; +import * as logging from '../../../common/logging'; +import * as pathUtils from '../../../common/utils/pathUtils'; +import * as workspaceApis from '../../../common/workspace.apis'; + +// 2. Function under test +import { getAllExtraSearchPaths } from '../../../managers/common/nativePythonFinder'; + +// 3. Mock interfaces +interface MockWorkspaceConfig { + get: sinon.SinonStub; + inspect: sinon.SinonStub; + update: sinon.SinonStub; +} +``` + +### Mock Setup Strategy + +```typescript +suite('Function Integration Tests', () => { + // 1. Declare all mocks + let mockGetConfiguration: sinon.SinonStub; + let mockGetWorkspaceFolders: sinon.SinonStub; + let mockTraceLog: sinon.SinonStub; + let mockTraceError: sinon.SinonStub; + let mockTraceWarn: sinon.SinonStub; + + // 2. Mock complex objects + let pythonConfig: MockWorkspaceConfig; + let envConfig: MockWorkspaceConfig; + + setup(() => { + // 3. Initialize all mocks + mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); + mockGetWorkspaceFolders = sinon.stub(workspaceApis, 'getWorkspaceFolders'); + mockTraceLog = sinon.stub(logging, 'traceLog'); + mockTraceError = sinon.stub(logging, 'traceError'); + mockTraceWarn = sinon.stub(logging, 'traceWarn'); + + // 4. Set up default behaviors + mockGetWorkspaceFolders.returns(undefined); + + // 5. Create mock configuration objects + pythonConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + envConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + }); + + teardown(() => { + sinon.restore(); // Always clean up! + }); +}); +``` + +## Step 4: Write Tests Using Mock → Run → Assert Pattern + +### The Three-Phase Pattern + +#### Phase 1: Mock (Set up the scenario) + +```typescript +test('Description of what this tests', async () => { + // Mock → Clear description of the scenario + pythonConfig.inspect.withArgs('venvPath').returns({ globalValue: '/path' }); + envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); + mockGetWorkspaceFolders.returns([{ uri: Uri.file('/workspace') }]); +``` + +#### Phase 2: Run (Execute the function) + +```typescript +// Run +const result = await getAllExtraSearchPaths(); +``` + +#### Phase 3: Assert (Verify the behavior) + +```typescript + // Assert - Use set-based comparison for order-agnostic testing + const expected = new Set(['/expected', '/paths']); + const actual = new Set(result); + assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); + assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); + + // Verify side effects + assert(mockTraceLog.calledWith(sinon.match(/completion/i)), 'Should log completion'); +}); +``` + +## Step 6: Make Tests Resilient + +### Use Order-Agnostic Comparisons + +```typescript +// ❌ Brittle - depends on order +assert.deepStrictEqual(result, ['/path1', '/path2', '/path3']); + +// ✅ Resilient - order doesn't matter +const expected = new Set(['/path1', '/path2', '/path3']); +const actual = new Set(result); +assert.strictEqual(actual.size, expected.size, 'Should have correct number of paths'); +assert.deepStrictEqual(actual, expected, 'Should contain exactly the expected paths'); +``` + +### Use Flexible Error Message Testing + +```typescript +// ❌ Brittle - exact text matching +assert(mockTraceError.calledWith('Error during legacy python settings migration:')); + +// ✅ Resilient - pattern matching +assert(mockTraceError.calledWith(sinon.match.string, sinon.match.instanceOf(Error)), 'Should log migration error'); + +// ✅ Resilient - key terms with regex +assert(mockTraceError.calledWith(sinon.match(/migration.*error/i)), 'Should log migration error'); +``` + +### Handle Complex Mock Scenarios + +```typescript +// For functions that call the same mock multiple times +envConfig.inspect.withArgs('globalSearchPaths').returns({ globalValue: [] }); +envConfig.inspect + .withArgs('globalSearchPaths') + .onSecondCall() + .returns({ + globalValue: ['/migrated/paths'], + }); +``` + +## 🧪 Step 7: Test Categories and Patterns + +### Configuration Tests + +- Test different setting combinations +- Test setting precedence (workspace > user > default) +- Test configuration errors and recovery + +### Data Flow Tests + +- Test how data moves through the system +- Test transformations (path resolution, filtering) +- Test state changes (migrations, updates) + +### Error Handling Tests + +- Test graceful degradation +- Test error logging +- Test fallback behaviors + +### Integration Tests + +- Test multiple features together +- Test real-world scenarios +- Test edge case combinations + +## 📊 Step 8: Review and Refine + +### Test Quality Checklist + +- [ ] **Clear naming** - test names describe the scenario and expected outcome +- [ ] **Good coverage** - main flows, edge cases, error scenarios +- [ ] **Resilient assertions** - won't break due to minor changes +- [ ] **Readable structure** - follows Mock → Run → Assert pattern +- [ ] **Isolated tests** - each test is independent +- [ ] **Fast execution** - tests run quickly with proper mocking + +### Common Anti-Patterns to Avoid + +- ❌ Testing implementation details instead of behavior +- ❌ Brittle assertions that break on cosmetic changes +- ❌ Order-dependent tests that fail due to processing changes +- ❌ Tests that don't clean up mocks properly +- ❌ Overly complex test setup that's hard to understand + +## 🧠 Agent Learning Patterns + +### Key Implementation Insights + +- Always use dynamic path construction with Node.js `path` module when testing functions that resolve paths against workspace folders to ensure cross-platform compatibility (1) +- Use `runTests` tool for programmatic test execution rather than terminal commands for better integration and result parsing (1) +- Mock wrapper functions (e.g., `workspaceApis.getConfiguration()`) instead of VS Code APIs directly to avoid stubbing issues (1) +- Start compilation with `npm run watch-tests` before test execution to ensure TypeScript files are built (1) +- Use `sinon.match()` patterns for resilient assertions that don't break on minor output changes (1) +- Fix test issues iteratively - run tests, analyze failures, apply fixes, repeat until passing (1) +- When fixing mock environment creation, use `null` to truly omit properties rather than `undefined` (1) +- Always recompile TypeScript after making import/export changes before running tests, as stubs won't work if they're applied to old compiled JavaScript that doesn't have the updated imports (2) +- Create proxy abstraction functions for Node.js APIs like `cp.spawn` to enable clean testing - use function overloads to preserve Node.js's intelligent typing while making the functions mockable (1) From 0e1c49a6db2c393f66e4fbc66ae932c46db83967 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 1 Oct 2025 09:05:35 -0700 Subject: [PATCH 298/328] add tests for runAsTask (#872) --- .../testing-workflow.instructions.md | 1 + .../features/execution/runAsTask.unit.test.ts | 749 ++++++++++++++++++ src/test/unittests.ts | 10 +- 3 files changed, 759 insertions(+), 1 deletion(-) create mode 100644 src/test/features/execution/runAsTask.unit.test.ts diff --git a/.github/instructions/testing-workflow.instructions.md b/.github/instructions/testing-workflow.instructions.md index 7632e19..2c56f53 100644 --- a/.github/instructions/testing-workflow.instructions.md +++ b/.github/instructions/testing-workflow.instructions.md @@ -550,3 +550,4 @@ envConfig.inspect - When fixing mock environment creation, use `null` to truly omit properties rather than `undefined` (1) - Always recompile TypeScript after making import/export changes before running tests, as stubs won't work if they're applied to old compiled JavaScript that doesn't have the updated imports (2) - Create proxy abstraction functions for Node.js APIs like `cp.spawn` to enable clean testing - use function overloads to preserve Node.js's intelligent typing while making the functions mockable (1) +- When unit tests fail with VS Code API errors like `TypeError: X is not a constructor` or `Cannot read properties of undefined (reading 'Y')`, check if VS Code APIs are properly mocked in `/src/test/unittests.ts` - add missing Task-related APIs (`Task`, `TaskScope`, `ShellExecution`, `TaskRevealKind`, `TaskPanelKind`) and namespace mocks (`tasks`) following the existing pattern of `mockedVSCode.X = vscodeMocks.vscMockExtHostedTypes.X` (1) diff --git a/src/test/features/execution/runAsTask.unit.test.ts b/src/test/features/execution/runAsTask.unit.test.ts new file mode 100644 index 0000000..dbb5816 --- /dev/null +++ b/src/test/features/execution/runAsTask.unit.test.ts @@ -0,0 +1,749 @@ +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import { Task, TaskExecution, TaskPanelKind, TaskRevealKind, TaskScope, Uri, WorkspaceFolder } from 'vscode'; +import { PythonEnvironment, PythonTaskExecutionOptions } from '../../../api'; +import * as logging from '../../../common/logging'; +import * as tasksApi from '../../../common/tasks.apis'; +import * as workspaceApis from '../../../common/workspace.apis'; +import * as execUtils from '../../../features/execution/execUtils'; +import { runAsTask } from '../../../features/execution/runAsTask'; + +suite('runAsTask Tests', () => { + let mockTraceInfo: sinon.SinonStub; + let mockTraceWarn: sinon.SinonStub; + let mockExecuteTask: sinon.SinonStub; + let mockGetWorkspaceFolder: sinon.SinonStub; + let mockQuoteStringIfNecessary: sinon.SinonStub; + + setup(() => { + mockTraceInfo = sinon.stub(logging, 'traceInfo'); + mockTraceWarn = sinon.stub(logging, 'traceWarn'); + mockExecuteTask = sinon.stub(tasksApi, 'executeTask'); + mockGetWorkspaceFolder = sinon.stub(workspaceApis, 'getWorkspaceFolder'); + mockQuoteStringIfNecessary = sinon.stub(execUtils, 'quoteStringIfNecessary'); + }); + + teardown(() => { + sinon.restore(); + }); + + suite('Happy Path Scenarios', () => { + test('should create and execute task with activated run configuration', async () => { + // Mock - Environment with activatedRun + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + shortDisplayName: 'TestEnv', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: '/path/to/python', + args: ['--default'], + }, + activatedRun: { + executable: '/activated/python', + args: ['--activated'], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Test Task', + args: ['script.py', '--arg1'], + project: { + name: 'Test Project', + uri: Uri.file('/workspace'), + }, + cwd: '/workspace', + env: { PATH: '/custom/path' }, + }; + + const mockWorkspaceFolder: WorkspaceFolder = { + uri: Uri.file('/workspace'), + name: 'Test Workspace', + index: 0, + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.withArgs(options.project?.uri).returns(mockWorkspaceFolder); + mockQuoteStringIfNecessary.withArgs('/activated/python').returns('"/activated/python"'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify task creation + assert.ok(mockExecuteTask.calledOnce, 'Should execute task once'); + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + + assert.strictEqual(taskArg.definition.type, 'python', 'Task type should be python'); + assert.strictEqual(taskArg.scope, mockWorkspaceFolder, 'Task scope should be workspace folder'); + assert.strictEqual(taskArg.name, 'Test Task', 'Task name should match options'); + assert.strictEqual(taskArg.source, 'Python', 'Task source should be Python'); + assert.deepStrictEqual(taskArg.problemMatchers, ['$python'], 'Should use python problem matcher'); + + // Verify presentation options + assert.strictEqual( + taskArg.presentationOptions?.reveal, + TaskRevealKind.Silent, + 'Should use silent reveal by default', + ); + assert.strictEqual(taskArg.presentationOptions?.echo, true, 'Should echo commands'); + assert.strictEqual(taskArg.presentationOptions?.panel, TaskPanelKind.Shared, 'Should use shared panel'); + assert.strictEqual(taskArg.presentationOptions?.close, false, 'Should not close panel'); + assert.strictEqual(taskArg.presentationOptions?.showReuseMessage, true, 'Should show reuse message'); + + // Verify logging + assert.ok( + mockTraceInfo.calledWith( + sinon.match(/Running as task: "\/activated\/python" --activated script\.py --arg1/), + ), + 'Should log execution command', + ); + + // Verify no warnings + assert.ok(mockTraceWarn.notCalled, 'Should not log warnings for valid environment'); + }); + + test('should create and execute task with regular run configuration when no activatedRun', async () => { + // Mock - Environment without activatedRun + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: '/path/to/python', + args: ['--default-arg'], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Simple Task', + args: ['test.py'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.withArgs(undefined).returns(undefined); + mockQuoteStringIfNecessary.withArgs('/path/to/python').returns('/path/to/python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + assert.strictEqual(taskArg.scope, TaskScope.Global, 'Should use global scope when no workspace'); + + // Verify logging shows correct executable and args + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: \/path\/to\/python --default-arg test\.py/)), + 'Should log execution with run args', + ); + }); + + test('should handle custom reveal option', async () => { + // Mock - Test custom reveal option + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Reveal Task', + args: ['script.py'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run with custom reveal option + await runAsTask(environment, options, { reveal: TaskRevealKind.Always }); + + // Assert + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + assert.strictEqual( + taskArg.presentationOptions?.reveal, + TaskRevealKind.Always, + 'Should use custom reveal option', + ); + }); + }); + + suite('Edge Cases', () => { + test('should handle environment without execInfo', async () => { + // Mock - Environment with no execInfo + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + sysPrefix: '/path/to/env', + } as PythonEnvironment; + + const options: PythonTaskExecutionOptions = { + name: 'No ExecInfo Task', + args: ['script.py'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify fallback to 'python' and warning + assert.ok( + mockTraceWarn.calledWith('No Python executable found in environment; falling back to "python".'), + 'Should warn about missing executable', + ); + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: python script\.py/)), + 'Should log with fallback executable', + ); + }); + + test('should handle environment with empty execInfo run args', async () => { + // Mock - Environment with empty args + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: '/path/to/python', + // No args provided + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Empty Args Task', + args: ['script.py', '--verbose'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('/path/to/python').returns('/path/to/python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify only option args are used + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: \/path\/to\/python script\.py --verbose/)), + 'Should log with only option args', + ); + }); + + test('should handle options with no args', async () => { + // Mock - Options with empty args + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: ['--version-check'], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'No Args Task', + args: [], // Empty args + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify only environment args are used + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: python --version-check/)), + 'Should log with only environment args', + ); + }); + + test('should handle executable paths with spaces requiring quoting', async () => { + // Mock - Executable path with spaces + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: '/path with spaces/to/python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Spaced Path Task', + args: ['script.py'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('/path with spaces/to/python').returns('"/path with spaces/to/python"'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify quoting function is called + assert.ok( + mockQuoteStringIfNecessary.calledWith('/path with spaces/to/python'), + 'Should call quoting function for executable', + ); + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: "\/path with spaces\/to\/python" script\.py/)), + 'Should log with quoted executable', + ); + }); + }); + + suite('Workspace Resolution', () => { + test('should use workspace folder when project URI is provided', async () => { + // Mock - Test workspace resolution + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const projectUri = Uri.file('/workspace/project'); + const options: PythonTaskExecutionOptions = { + name: 'Workspace Task', + args: ['script.py'], + project: { + name: 'Test Project', + uri: projectUri, + }, + }; + + const mockWorkspaceFolder: WorkspaceFolder = { + uri: Uri.file('/workspace'), + name: 'Workspace', + index: 0, + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.withArgs(projectUri).returns(mockWorkspaceFolder); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + assert.strictEqual(taskArg.scope, mockWorkspaceFolder, 'Should use resolved workspace folder as scope'); + + // Verify workspace lookup was called correctly + assert.ok( + mockGetWorkspaceFolder.calledWith(projectUri), + 'Should look up workspace folder with project URI', + ); + }); + + test('should use global scope when no workspace folder found', async () => { + // Mock - No workspace folder found + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Global Task', + args: ['script.py'], + project: { + name: 'Test Project', + uri: Uri.file('/non-workspace/project'), + }, + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + assert.strictEqual( + taskArg.scope, + TaskScope.Global, + 'Should fallback to global scope when workspace not found', + ); + }); + }); + + suite('Task Configuration', () => { + test('should correctly combine environment and option args', async () => { + // Mock - Test arg combination + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + activatedRun: { + executable: 'python', + args: ['--env-arg1', '--env-arg2'], + }, + run: { + executable: 'fallback-python', + args: ['--fallback'], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Combined Args Task', + args: ['--opt-arg1', 'script.py', '--opt-arg2'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + // Verify args are combined correctly (environment args first, then option args) + assert.ok( + mockTraceInfo.calledWith( + sinon.match(/Running as task: python --env-arg1 --env-arg2 --opt-arg1 script\.py --opt-arg2/), + ), + 'Should log with combined args in correct order', + ); + }); + + test('should pass through cwd and env options to shell execution', async () => { + // Mock - Test shell execution options + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Shell Options Task', + args: ['script.py'], + cwd: '/custom/working/dir', + env: { + CUSTOM_VAR: 'custom_value', + PATH: '/custom/path', + }, + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should return the task execution result'); + + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + + // Verify shell execution was created with correct options + // Note: We can't easily inspect ShellExecution internals, but we can verify the task was created + assert.ok(taskArg.execution, 'Task should have execution configured'); + assert.strictEqual(taskArg.name, 'Shell Options Task', 'Task should have correct name'); + }); + }); + + suite('Error Scenarios', () => { + test('should propagate task execution failures', async () => { + // Mock - Task execution failure + const environment: PythonEnvironment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'Test Environment', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + execInfo: { + run: { + executable: 'python', + args: [], + }, + }, + sysPrefix: '/path/to/env', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Failing Task', + args: ['script.py'], + }; + + const executionError = new Error('Task execution failed'); + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.rejects(executionError); + + // Run & Assert + await assert.rejects( + () => runAsTask(environment, options), + executionError, + 'Should propagate task execution error', + ); + + // Verify logging still occurred before failure + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: python script\.py/)), + 'Should log before execution attempt', + ); + }); + }); + + suite('Integration Scenarios', () => { + test('should work with minimal environment and options', async () => { + // Mock - Minimal valid configuration + const environment: PythonEnvironment = { + envId: { id: 'minimal-env', managerId: 'minimal-manager' }, + name: 'Minimal Environment', + displayName: 'Minimal Environment', + displayPath: '/minimal/env', + version: '3.8.0', + environmentPath: Uri.file('/minimal/env'), + sysPrefix: '/minimal/env', + // No execInfo - should fallback to 'python' + } as PythonEnvironment; + + const options: PythonTaskExecutionOptions = { + name: 'Minimal Task', + args: ['hello.py'], + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.returns(undefined); + mockQuoteStringIfNecessary.withArgs('python').returns('python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should successfully execute with minimal configuration'); + assert.ok(mockTraceWarn.calledOnce, 'Should warn about missing executable'); + assert.ok( + mockTraceInfo.calledWith(sinon.match(/Running as task: python hello\.py/)), + 'Should log with fallback executable', + ); + }); + + test('should handle complex real-world scenario', async () => { + // Mock - Complex real-world environment + const environment: PythonEnvironment = { + envId: { id: 'venv-1', managerId: 'virtualenv' }, + name: 'Project Virtual Environment', + displayName: 'myproject-venv (Python 3.11.0)', + shortDisplayName: 'myproject-venv', + displayPath: '~/projects/myproject/.venv', + version: '3.11.0', + environmentPath: Uri.file('/Users/user/projects/myproject/.venv'), + description: 'Virtual environment for myproject', + execInfo: { + run: { + executable: '/Users/user/projects/myproject/.venv/bin/python', + args: [], + }, + activatedRun: { + executable: '/Users/user/projects/myproject/.venv/bin/python', + args: ['-m', 'site'], + }, + activation: [ + { + executable: 'source', + args: ['/Users/user/projects/myproject/.venv/bin/activate'], + }, + ], + }, + sysPrefix: '/Users/user/projects/myproject/.venv', + group: 'Virtual Environments', + }; + + const options: PythonTaskExecutionOptions = { + name: 'Run Tests', + args: ['-m', 'pytest', 'tests/', '-v', '--tb=short'], + project: { + name: 'MyProject', + uri: Uri.file('/Users/user/projects/myproject'), + description: 'My Python Project', + }, + cwd: '/Users/user/projects/myproject', + env: { + PYTHONPATH: '/Users/user/projects/myproject/src', + TEST_ENV: 'development', + }, + }; + + const mockWorkspaceFolder: WorkspaceFolder = { + uri: Uri.file('/Users/user/projects'), + name: 'Projects', + index: 0, + }; + + const mockTaskExecution = {} as TaskExecution; + + mockGetWorkspaceFolder.withArgs(options.project?.uri).returns(mockWorkspaceFolder); + mockQuoteStringIfNecessary + .withArgs('/Users/user/projects/myproject/.venv/bin/python') + .returns('/Users/user/projects/myproject/.venv/bin/python'); + mockExecuteTask.resolves(mockTaskExecution); + + // Run + const result = await runAsTask(environment, options, { reveal: TaskRevealKind.Always }); + + // Assert + assert.strictEqual(result, mockTaskExecution, 'Should handle complex real-world scenario'); + + const taskArg = mockExecuteTask.firstCall.args[0] as Task; + assert.strictEqual(taskArg.name, 'Run Tests', 'Should use correct task name'); + assert.strictEqual(taskArg.scope, mockWorkspaceFolder, 'Should use correct workspace scope'); + assert.strictEqual( + taskArg.presentationOptions?.reveal, + TaskRevealKind.Always, + 'Should use custom reveal setting', + ); + + // Verify complex args are logged correctly + assert.ok( + mockTraceInfo.calledWith( + sinon.match( + /Running as task: \/Users\/user\/projects\/myproject\/\.venv\/bin\/python -m site -m pytest tests\/ -v --tb=short/, + ), + ), + 'Should log complex command with all args', + ); + + // Verify no warnings for complete environment + assert.ok(mockTraceWarn.notCalled, 'Should not warn for complete environment configuration'); + }); + }); +}); diff --git a/src/test/unittests.ts b/src/test/unittests.ts index 4d0ad93..94a5546 100644 --- a/src/test/unittests.ts +++ b/src/test/unittests.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ +import { anything, instance, mock, when } from 'ts-mockito'; import * as vscode from 'vscode'; import * as vscodeMocks from './mocks/vsc'; import { vscMockTelemetryReporter } from './mocks/vsc/telemetryReporter'; -import { anything, instance, mock, when } from 'ts-mockito'; const Module = require('module'); type VSCode = typeof vscode; @@ -36,6 +36,7 @@ export function initialize() { generateMock('debug'); generateMock('scm'); generateMock('notebooks'); + generateMock('tasks'); // Use mock clipboard fo testing purposes. const clipboard = new MockClipboard(); @@ -132,4 +133,11 @@ mockedVSCode.LogLevel = vscodeMocks.LogLevel; mockedVSCode.TestRunProfileKind = vscodeMocks.TestRunProfileKind; mockedVSCode.LanguageModelTextPart = vscodeMocks.vscMockCopilotTools.LanguageModelTextPart; +// Task-related mocks +mockedVSCode.Task = vscodeMocks.vscMockExtHostedTypes.Task; +mockedVSCode.TaskScope = vscodeMocks.vscMockExtHostedTypes.TaskScope; +mockedVSCode.ShellExecution = vscodeMocks.vscMockExtHostedTypes.ShellExecution; +mockedVSCode.TaskRevealKind = vscodeMocks.vscMockExtHostedTypes.TaskRevealKind; +mockedVSCode.TaskPanelKind = vscodeMocks.vscMockExtHostedTypes.TaskPanelKind; + initialize(); From 4bb83fa29807b8bb4b303fca463e0cdb960c4a85 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:18:58 -0700 Subject: [PATCH 299/328] bump to v1.10.0 (#878) for release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7879c65..d84c315 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.9.0", + "version": "1.10.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.9.0", + "version": "1.10.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 7885c0f..2760d41 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.9.0", + "version": "1.10.0", "publisher": "ms-python", "preview": true, "engines": { From 624ab4367b785be773e6e41fdf7047b43afd8e09 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 1 Oct 2025 14:04:27 -0700 Subject: [PATCH 300/328] bump to v1.11.0 dev version (#879) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d84c315..eb69f8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-python-envs", - "version": "1.10.0", + "version": "1.11.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-python-envs", - "version": "1.10.0", + "version": "1.11.0", "dependencies": { "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.9.7", diff --git a/package.json b/package.json index 2760d41..0ae1c9a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-python-envs", "displayName": "Python Environments", "description": "Provides a unified python environment experience", - "version": "1.10.0", + "version": "1.11.0", "publisher": "ms-python", "preview": true, "engines": { From 38dee665a73fb037b40d0f849f3e4ec6dad4685c Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Wed, 1 Oct 2025 16:43:08 -0700 Subject: [PATCH 301/328] Fix where activation goes missing after user modifying rc scripts (#880) Resolves: https://github.com/microsoft/vscode-python-environments/issues/865 If user modifies already existing shell profile script needed for shell startup, they get stuck into not activating state because they still have auto activation guard, which blocks shell integration from core from activating. This also means because they have wrong env var in profile script, it won't activate there either. We should better track this, and properly clean up profile script when relying on shell integration for activation. /cc @karthiknadig --- .../terminal/shells/bash/bashStartup.ts | 10 ++++---- src/features/terminal/terminalManager.ts | 23 +++++++++++++++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 86838d5..e62ad1a 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -61,14 +61,12 @@ function getActivationContent(key: string): string { async function isStartupSetup(profile: string, key: string): Promise { if (await fs.pathExists(profile)) { const content = await fs.readFile(profile, 'utf8'); - return hasStartupCode(content, regionStart, regionEnd, [key]) - ? ShellSetupState.Setup - : ShellSetupState.NotSetup; - } else { - return ShellSetupState.NotSetup; + if (hasStartupCode(content, regionStart, regionEnd, [key])) { + return ShellSetupState.Setup; + } } + return ShellSetupState.NotSetup; } - async function setupStartup(profile: string, key: string, name: string): Promise { if (shellIntegrationForActiveTerminal(name, profile)) { removeStartup(profile, key); diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index a985c07..dcba585 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -147,15 +147,23 @@ export class TerminalManagerImpl implements TerminalManager { const shellsToSetup: ShellStartupScriptProvider[] = []; await Promise.all( providers.map(async (p) => { + const state = await p.isSetup(); if (this.shellSetup.has(p.shellType)) { - traceVerbose(`Shell profile for ${p.shellType} already checked.`); - return; + // This ensures modified scripts are detected even after initial setup + const cachedSetup = this.shellSetup.get(p.shellType); + if ((state === ShellSetupState.Setup) !== cachedSetup) { + traceVerbose(`Shell profile for ${p.shellType} state changed, updating cache.`); + // State changed - clear cache and re-evaluate + this.shellSetup.delete(p.shellType); + } else { + traceVerbose(`Shell profile for ${p.shellType} already checked.`); + return; + } } traceVerbose(`Checking shell profile for ${p.shellType}.`); - const state = await p.isSetup(); if (state === ShellSetupState.NotSetup) { - // Check if shell integration is available before marking for setup if (shellIntegrationForActiveTerminal(p.name)) { + await p.teardownScripts(); this.shellSetup.set(p.shellType, true); traceVerbose( `Shell integration available for ${p.shellType}, skipping prompt, and profile modification.`, @@ -169,6 +177,12 @@ export class TerminalManagerImpl implements TerminalManager { ); } } else if (state === ShellSetupState.Setup) { + if (shellIntegrationForActiveTerminal(p.name)) { + await p.teardownScripts(); + traceVerbose( + `Shell integration available for ${p.shellType}, removed profile script in favor of shell integration.`, + ); + } this.shellSetup.set(p.shellType, true); traceVerbose(`Shell profile for ${p.shellType} is setup.`); } else if (state === ShellSetupState.NotInstalled) { @@ -228,6 +242,7 @@ export class TerminalManagerImpl implements TerminalManager { let actType = getAutoActivationType(); const shellType = identifyTerminalShell(terminal); if (actType === ACT_TYPE_SHELL) { + await this.handleSetupCheck(shellType); actType = await this.getEffectiveActivationType(shellType); } From 156349206541307c5b60b85c3dc2af3f047aa1df Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 2 Oct 2025 15:05:15 -0700 Subject: [PATCH 302/328] fix env var clearing (#886) --- src/features/terminal/terminalEnvVarInjector.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/features/terminal/terminalEnvVarInjector.ts b/src/features/terminal/terminalEnvVarInjector.ts index 3f08a0c..039c4b3 100644 --- a/src/features/terminal/terminalEnvVarInjector.ts +++ b/src/features/terminal/terminalEnvVarInjector.ts @@ -110,7 +110,6 @@ export class TerminalEnvVarInjector implements Disposable { await this.injectEnvironmentVariablesForWorkspace(workspaceFolder); } else { // No provided workspace - update all workspaces - this.envVarCollection.clear(); const workspaceFolders = workspace.workspaceFolders; if (!workspaceFolders || workspaceFolders.length === 0) { @@ -140,7 +139,6 @@ export class TerminalEnvVarInjector implements Disposable { // use scoped environment variable collection const envVarScope = this.getEnvironmentVariableCollectionScoped({ workspaceFolder }); - envVarScope.clear(); // Clear existing variables for this workspace // Check if env file injection is enabled const config = getConfiguration('python', workspaceUri); From a0b4c74e7474681fca3ef5f38f10f36c2a923195 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 3 Oct 2025 13:32:28 -0700 Subject: [PATCH 303/328] Fix quoting logic to escape special characters in exec path (#890) fixes https://github.com/microsoft/vscode-python-environments/issues/876 --- src/features/execution/execUtils.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/features/execution/execUtils.ts b/src/features/execution/execUtils.ts index 49409ef..b5f4671 100644 --- a/src/features/execution/execUtils.ts +++ b/src/features/execution/execUtils.ts @@ -1,8 +1,14 @@ export function quoteStringIfNecessary(arg: string): string { - if (arg.indexOf(' ') >= 0 && !(arg.startsWith('"') && arg.endsWith('"'))) { - return `"${arg}"`; + // Always return if already quoted to avoid double-quoting + if (arg.startsWith('"') && arg.endsWith('"')) { + return arg; } - return arg; + + // Quote if contains common shell special characters that are problematic across multiple shells + // Includes: space, &, |, <, >, ;, ', ", `, (, ), [, ], {, }, $ + const needsQuoting = /[\s&|<>;'"`()\[\]{}$]/.test(arg); + + return needsQuoting ? `"${arg}"` : arg; } export function quoteArgs(args: string[]): string[] { From ad44e33e00740b9bb55a8923d6fd60bece799f30 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:03:23 -0700 Subject: [PATCH 304/328] fix as-any linting warnings (#891) fixes https://github.com/microsoft/vscode-python-environments/issues/881 --- .github/instructions/generic.instructions.md | 4 ++ eslint.config.mjs | 2 +- .../terminalEnvVarInjectorBasic.unit.test.ts | 39 +++++++++++++------ 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.github/instructions/generic.instructions.md b/.github/instructions/generic.instructions.md index 3f43f20..5ac0cc0 100644 --- a/.github/instructions/generic.instructions.md +++ b/.github/instructions/generic.instructions.md @@ -30,3 +30,7 @@ Provide project context and coding guidelines that AI should follow when generat ## Documentation - Add clear docstrings to public functions, describing their purpose, parameters, and behavior. + +## Learnings + +- Avoid using 'any' types in TypeScript; import proper types from VS Code API and use specific interfaces for mocks and test objects (1) diff --git a/eslint.config.mjs b/eslint.config.mjs index 60ebcf3..cfa27fd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -35,6 +35,6 @@ export default [{ eqeqeq: "warn", "no-throw-literal": "warn", semi: "warn", - "@typescript-eslint/no-explicit-any": "warn", + "@typescript-eslint/no-explicit-any": "error", }, }]; \ No newline at end of file diff --git a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts index 4b009e9..5e7ffe5 100644 --- a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts +++ b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts @@ -3,7 +3,8 @@ import * as sinon from 'sinon'; import * as typeMoq from 'typemoq'; -import { GlobalEnvironmentVariableCollection, workspace } from 'vscode'; +import { Disposable, GlobalEnvironmentVariableCollection, workspace, WorkspaceFolder } from 'vscode'; +import { DidChangeEnvironmentVariablesEventArgs } from '../../api'; import { EnvVarManager } from '../../features/execution/envVariableManager'; import { TerminalEnvVarInjector } from '../../features/terminal/terminalEnvVarInjector'; @@ -18,8 +19,7 @@ suite('TerminalEnvVarInjector Basic Tests', () => { let envVarManager: typeMoq.IMock; let injector: TerminalEnvVarInjector; let mockScopedCollection: MockScopedCollection; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - let workspaceFoldersStub: any; + let workspaceFoldersStub: WorkspaceFolder[]; setup(() => { envVarCollection = typeMoq.Mock.ofType(); @@ -40,19 +40,25 @@ suite('TerminalEnvVarInjector Basic Tests', () => { }; // Setup environment variable collection to return scoped collection - envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as any); + envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as never); envVarCollection.setup((x) => x.clear()).returns(() => {}); // Setup minimal mocks for event subscriptions envVarManager .setup((m) => m.onDidChangeEnvironmentVariables) - .returns( - () => + .returns(() => { + // Return a mock Event function that returns a Disposable when called + const mockEvent = (_listener: (e: DidChangeEnvironmentVariablesEventArgs) => void) => ({ dispose: () => {}, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } as any), - ); + } as Disposable); + return mockEvent; + }); + + // Mock workspace.onDidChangeConfiguration to return a Disposable + sinon.stub(workspace, 'onDidChangeConfiguration').returns({ + dispose: () => {}, + } as Disposable); }); teardown(() => { @@ -85,12 +91,21 @@ suite('TerminalEnvVarInjector Basic Tests', () => { envVarManager.reset(); envVarManager .setup((m) => m.onDidChangeEnvironmentVariables) - .returns((_handler) => { + .returns(() => { eventHandlerRegistered = true; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return { dispose: () => {} } as any; + // Return a mock Event function that returns a Disposable when called + const mockEvent = (_listener: (e: DidChangeEnvironmentVariablesEventArgs) => void) => + ({ + dispose: () => {}, + } as Disposable); + return mockEvent; }); + // Mock workspace.onDidChangeConfiguration to return a Disposable + sinon.stub(workspace, 'onDidChangeConfiguration').returns({ + dispose: () => {}, + } as Disposable); + // Act injector = new TerminalEnvVarInjector(envVarCollection.object, envVarManager.object); From cc29e8731b9f4c6626985b807c3682c2361c1520 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:22:12 -0700 Subject: [PATCH 305/328] Revert "fix as-any linting warnings" (#892) Reverts microsoft/vscode-python-environments#891 the tests weren't passing and I didn't realize it would merge it in without that criteria met --- .github/instructions/generic.instructions.md | 4 -- eslint.config.mjs | 2 +- .../terminalEnvVarInjectorBasic.unit.test.ts | 39 ++++++------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/.github/instructions/generic.instructions.md b/.github/instructions/generic.instructions.md index 5ac0cc0..3f43f20 100644 --- a/.github/instructions/generic.instructions.md +++ b/.github/instructions/generic.instructions.md @@ -30,7 +30,3 @@ Provide project context and coding guidelines that AI should follow when generat ## Documentation - Add clear docstrings to public functions, describing their purpose, parameters, and behavior. - -## Learnings - -- Avoid using 'any' types in TypeScript; import proper types from VS Code API and use specific interfaces for mocks and test objects (1) diff --git a/eslint.config.mjs b/eslint.config.mjs index cfa27fd..60ebcf3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -35,6 +35,6 @@ export default [{ eqeqeq: "warn", "no-throw-literal": "warn", semi: "warn", - "@typescript-eslint/no-explicit-any": "error", + "@typescript-eslint/no-explicit-any": "warn", }, }]; \ No newline at end of file diff --git a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts index 5e7ffe5..4b009e9 100644 --- a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts +++ b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts @@ -3,8 +3,7 @@ import * as sinon from 'sinon'; import * as typeMoq from 'typemoq'; -import { Disposable, GlobalEnvironmentVariableCollection, workspace, WorkspaceFolder } from 'vscode'; -import { DidChangeEnvironmentVariablesEventArgs } from '../../api'; +import { GlobalEnvironmentVariableCollection, workspace } from 'vscode'; import { EnvVarManager } from '../../features/execution/envVariableManager'; import { TerminalEnvVarInjector } from '../../features/terminal/terminalEnvVarInjector'; @@ -19,7 +18,8 @@ suite('TerminalEnvVarInjector Basic Tests', () => { let envVarManager: typeMoq.IMock; let injector: TerminalEnvVarInjector; let mockScopedCollection: MockScopedCollection; - let workspaceFoldersStub: WorkspaceFolder[]; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let workspaceFoldersStub: any; setup(() => { envVarCollection = typeMoq.Mock.ofType(); @@ -40,25 +40,19 @@ suite('TerminalEnvVarInjector Basic Tests', () => { }; // Setup environment variable collection to return scoped collection - envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as never); + envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as any); envVarCollection.setup((x) => x.clear()).returns(() => {}); // Setup minimal mocks for event subscriptions envVarManager .setup((m) => m.onDidChangeEnvironmentVariables) - .returns(() => { - // Return a mock Event function that returns a Disposable when called - const mockEvent = (_listener: (e: DidChangeEnvironmentVariablesEventArgs) => void) => + .returns( + () => ({ dispose: () => {}, - } as Disposable); - return mockEvent; - }); - - // Mock workspace.onDidChangeConfiguration to return a Disposable - sinon.stub(workspace, 'onDidChangeConfiguration').returns({ - dispose: () => {}, - } as Disposable); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any), + ); }); teardown(() => { @@ -91,21 +85,12 @@ suite('TerminalEnvVarInjector Basic Tests', () => { envVarManager.reset(); envVarManager .setup((m) => m.onDidChangeEnvironmentVariables) - .returns(() => { + .returns((_handler) => { eventHandlerRegistered = true; - // Return a mock Event function that returns a Disposable when called - const mockEvent = (_listener: (e: DidChangeEnvironmentVariablesEventArgs) => void) => - ({ - dispose: () => {}, - } as Disposable); - return mockEvent; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return { dispose: () => {} } as any; }); - // Mock workspace.onDidChangeConfiguration to return a Disposable - sinon.stub(workspace, 'onDidChangeConfiguration').returns({ - dispose: () => {}, - } as Disposable); - // Act injector = new TerminalEnvVarInjector(envVarCollection.object, envVarManager.object); From 791d712ef183ea8c6144f6dae75c9426a14f84a3 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Mon, 6 Oct 2025 00:25:40 -0700 Subject: [PATCH 306/328] Fix wsl not activating properly. (#896) Resolves: https://github.com/microsoft/vscode-python-environments/issues/865 --- .../terminal/shells/bash/bashStartup.ts | 4 +-- .../terminal/shells/common/shellUtils.ts | 11 +++++-- .../terminal/shells/fish/fishStartup.ts | 4 +-- .../terminal/shells/pwsh/pwshStartup.ts | 3 +- src/features/terminal/terminalManager.ts | 33 ++++++++++--------- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index e62ad1a..bbe98c8 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -5,7 +5,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; -import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; +import { isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { BASH_ENV_KEY, BASH_OLD_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY, ZSH_OLD_ENV_KEY } from './bashConstants'; @@ -68,7 +68,7 @@ async function isStartupSetup(profile: string, key: string): Promise { - if (shellIntegrationForActiveTerminal(name, profile)) { + if (shellIntegrationForActiveTerminal(name, profile) && !isWsl()) { removeStartup(profile, key); return true; } diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 95e6f71..20d310b 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -103,10 +103,17 @@ export function shellIntegrationForActiveTerminal(name: string, profile?: string if (hasShellIntegration) { traceInfo( - `SHELL: Shell integration is available on your active terminal. Python activate scripts will be evaluated at shell integration level. - Skipping modification of ${name} profile at: ${profile}`, + `SHELL: Shell integration is available on your active terminal, with name ${name} and profile ${profile}. Python activate scripts will be evaluated at shell integration level, except in WSL.` ); return true; } return false; } + +export function isWsl(): boolean { + // WSL sets these environment variables + return !!(process.env.WSL_DISTRO_NAME || + process.env.WSL_INTEROP || + process.env.WSLENV); +} + diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 37ac130..395829e 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -6,7 +6,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; -import { shellIntegrationForActiveTerminal } from '../common/shellUtils'; +import { isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { FISH_ENV_KEY, FISH_OLD_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; @@ -58,7 +58,7 @@ async function isStartupSetup(profilePath: string, key: string): Promise { try { - if (shellIntegrationForActiveTerminal('fish', profilePath)) { + if (shellIntegrationForActiveTerminal('fish', profilePath) && !isWsl()) { removeFishStartup(profilePath, key); return true; } diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 6e0cf31..3758dbb 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -13,6 +13,7 @@ import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { extractProfilePath, + isWsl, PROFILE_TAG_END, PROFILE_TAG_START, shellIntegrationForActiveTerminal, @@ -145,7 +146,7 @@ async function isPowerShellStartupSetup(shell: string, profile: string): Promise } async function setupPowerShellStartup(shell: string, profile: string): Promise { - if (shellIntegrationForActiveTerminal(shell, profile)) { + if (shellIntegrationForActiveTerminal(shell, profile) && !isWsl()) { removePowerShellStartup(shell, profile, POWERSHELL_OLD_ENV_KEY); removePowerShellStartup(shell, profile, POWERSHELL_ENV_KEY); return true; diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index dcba585..81768db 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -16,7 +16,7 @@ import { getConfiguration, onDidChangeConfiguration } from '../../common/workspa import { isActivatableEnvironment } from '../common/activation'; import { identifyTerminalShell } from '../common/shellDetector'; import { getPythonApi } from '../pythonApi'; -import { shellIntegrationForActiveTerminal } from './shells/common/shellUtils'; +import { isWsl, shellIntegrationForActiveTerminal } from './shells/common/shellUtils'; import { ShellEnvsProvider, ShellSetupState, ShellStartupScriptProvider } from './shells/startupProvider'; import { handleSettingUpShellProfile } from './shellStartupSetupHandlers'; import { @@ -129,7 +129,9 @@ export class TerminalManagerImpl implements TerminalManager { await this.handleSetupCheck(shells); } } else { - traceVerbose(`Auto activation type changed to ${actType}`); + traceVerbose(`Auto activation type changed to ${actType}, we are cleaning up shell startup setup`); + // Teardown scripts when switching away from shell startup activation + await Promise.all(this.startupScriptProviders.map((p) => p.teardownScripts())); this.shellSetup.clear(); } } @@ -143,41 +145,42 @@ export class TerminalManagerImpl implements TerminalManager { private async handleSetupCheck(shellType: string | Set): Promise { const shellTypes = typeof shellType === 'string' ? new Set([shellType]) : shellType; const providers = this.startupScriptProviders.filter((p) => shellTypes.has(p.shellType)); - if (providers.length > 0) { + if (providers.length > 0) { const shellsToSetup: ShellStartupScriptProvider[] = []; await Promise.all( providers.map(async (p) => { const state = await p.isSetup(); + const currentSetup = (state === ShellSetupState.Setup); + // Check if we already processed this shell and the state hasn't changed if (this.shellSetup.has(p.shellType)) { - // This ensures modified scripts are detected even after initial setup const cachedSetup = this.shellSetup.get(p.shellType); - if ((state === ShellSetupState.Setup) !== cachedSetup) { - traceVerbose(`Shell profile for ${p.shellType} state changed, updating cache.`); - // State changed - clear cache and re-evaluate - this.shellSetup.delete(p.shellType); - } else { - traceVerbose(`Shell profile for ${p.shellType} already checked.`); + if (currentSetup === cachedSetup) { + traceVerbose(`Shell profile for ${p.shellType} already checked, state unchanged.`); return; } + traceVerbose(`Shell profile for ${p.shellType} state changed from ${cachedSetup} to ${currentSetup}, re-evaluating.`); } traceVerbose(`Checking shell profile for ${p.shellType}.`); if (state === ShellSetupState.NotSetup) { - if (shellIntegrationForActiveTerminal(p.name)) { + traceVerbose(`WSL detected: ${isWsl()}, Shell integration available: ${shellIntegrationForActiveTerminal(p.name)}`); + + if (shellIntegrationForActiveTerminal(p.name) && !isWsl()) { + // Shell integration available and NOT in WSL - skip setup await p.teardownScripts(); this.shellSetup.set(p.shellType, true); traceVerbose( - `Shell integration available for ${p.shellType}, skipping prompt, and profile modification.`, + `Shell integration available for ${p.shellType} (not WSL), skipping prompt, and profile modification.`, ); } else { - // No shell integration, mark for setup + // WSL (regardless of integration) OR no shell integration - needs setup this.shellSetup.set(p.shellType, false); shellsToSetup.push(p); traceVerbose( - `Shell integration is NOT avaoiable. Shell profile for ${p.shellType} is not setup.`, + `Shell integration is NOT available. Shell profile for ${p.shellType} is not setup.`, ); } } else if (state === ShellSetupState.Setup) { - if (shellIntegrationForActiveTerminal(p.name)) { + if (shellIntegrationForActiveTerminal(p.name) && !isWsl()) { await p.teardownScripts(); traceVerbose( `Shell integration available for ${p.shellType}, removed profile script in favor of shell integration.`, From 91eb24439fee4685a8268a0ff8e70596daee674f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 11:25:35 -0700 Subject: [PATCH 307/328] Refactor quoteStringIfNecessary to fix handling of single shell operators (#905) fixes https://github.com/microsoft/vscode/issues/269636 --- src/features/execution/execUtils.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/features/execution/execUtils.ts b/src/features/execution/execUtils.ts index b5f4671..6804d85 100644 --- a/src/features/execution/execUtils.ts +++ b/src/features/execution/execUtils.ts @@ -4,6 +4,11 @@ export function quoteStringIfNecessary(arg: string): string { return arg; } + // Don't quote single shell operators/special characters + if (arg.length === 1 && /[&|<>;()[\]{}$]/.test(arg)) { + return arg; + } + // Quote if contains common shell special characters that are problematic across multiple shells // Includes: space, &, |, <, >, ;, ', ", `, (, ), [, ], {, }, $ const needsQuoting = /[\s&|<>;'"`()\[\]{}$]/.test(arg); From fa909631f925bebb0a00d9905a9588e02855f287 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 13:04:53 -0700 Subject: [PATCH 308/328] Fix bug with getAutoActivationType (#897) fixes https://github.com/microsoft/vscode-python-environments/issues/894 --- src/features/terminal/utils.ts | 38 +- src/test/features/terminal/utils.unit.test.ts | 356 ++++++++++++++++++ 2 files changed, 381 insertions(+), 13 deletions(-) create mode 100644 src/test/features/terminal/utils.unit.test.ts diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 8acc125..9476ac1 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -103,32 +103,44 @@ export type AutoActivationType = 'off' | 'command' | 'shellStartup'; * - 'off': Auto-activation is disabled * * Priority order: - * 1. python-envs.terminal.autoActivationType setting - * 2. python.terminal.activateEnvironment setting (if false updates python-envs.terminal.autoActivationType) + * 1. python-envs.terminal.autoActivationType + * a. globalRemoteValue + * b. globalLocalValue + * c. globalValue + * 2. python.terminal.activateEnvironment setting (if false, returns 'off' & sets autoActivationType to 'off') * 3. Default to 'command' if no setting is found * * @returns {AutoActivationType} The determined auto-activation type */ export function getAutoActivationType(): AutoActivationType { const pyEnvsConfig = getConfiguration('python-envs'); + const pyEnvsActivationType = pyEnvsConfig.inspect('terminal.autoActivationType'); - const pyEnvsActivationType = pyEnvsConfig.get( - 'terminal.autoActivationType', - undefined, - ); - if (pyEnvsActivationType !== undefined) { - return pyEnvsActivationType; + if (pyEnvsActivationType) { + // Priority order: globalRemoteValue > globalLocalValue > globalValue + const activationType = pyEnvsActivationType as Record; + + if ('globalRemoteValue' in pyEnvsActivationType && activationType.globalRemoteValue !== undefined) { + return activationType.globalRemoteValue as AutoActivationType; + } + if ('globalLocalValue' in pyEnvsActivationType && activationType.globalLocalValue !== undefined) { + return activationType.globalLocalValue as AutoActivationType; + } + if (pyEnvsActivationType.globalValue !== undefined) { + return pyEnvsActivationType.globalValue; + } } + // If none of the python-envs settings are defined, check the legacy python setting const pythonConfig = getConfiguration('python'); const pythonActivateSetting = pythonConfig.get('terminal.activateEnvironment', undefined); - if (pythonActivateSetting !== undefined) { - if (pythonActivateSetting === false) { - pyEnvsConfig.set('terminal.autoActivationType', ACT_TYPE_OFF); - } - return pythonActivateSetting ? ACT_TYPE_COMMAND : ACT_TYPE_OFF; + if (pythonActivateSetting === false) { + // Set autoActivationType to 'off' if python.terminal.activateEnvironment is false + pyEnvsConfig.update('terminal.autoActivationType', ACT_TYPE_OFF); + return ACT_TYPE_OFF; } + // Default to 'command' if no settings are found or if pythonActivateSetting is true/undefined return ACT_TYPE_COMMAND; } diff --git a/src/test/features/terminal/utils.unit.test.ts b/src/test/features/terminal/utils.unit.test.ts new file mode 100644 index 0000000..d97030c --- /dev/null +++ b/src/test/features/terminal/utils.unit.test.ts @@ -0,0 +1,356 @@ +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import * as workspaceApis from '../../../common/workspace.apis'; +import { + ACT_TYPE_COMMAND, + ACT_TYPE_OFF, + ACT_TYPE_SHELL, + AutoActivationType, + getAutoActivationType, +} from '../../../features/terminal/utils'; + +interface MockWorkspaceConfig { + get: sinon.SinonStub; + inspect: sinon.SinonStub; + update: sinon.SinonStub; +} + +suite('Terminal Utils - getAutoActivationType', () => { + let mockGetConfiguration: sinon.SinonStub; + let pyEnvsConfig: MockWorkspaceConfig; + let pythonConfig: MockWorkspaceConfig; + + setup(() => { + // Initialize mocks + mockGetConfiguration = sinon.stub(workspaceApis, 'getConfiguration'); + + // Create mock configuration objects + pyEnvsConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + pythonConfig = { + get: sinon.stub(), + inspect: sinon.stub(), + update: sinon.stub(), + }; + + // Set up default configuration returns + mockGetConfiguration.withArgs('python-envs').returns(pyEnvsConfig); + mockGetConfiguration.withArgs('python').returns(pythonConfig); + }); + + teardown(() => { + sinon.restore(); + }); + + suite('Priority Order Tests', () => { + test('should return globalRemoteValue when set (highest priority)', () => { + // Mock - globalRemoteValue is set + const mockInspectResult = { + globalRemoteValue: ACT_TYPE_SHELL, + globalLocalValue: ACT_TYPE_COMMAND, + globalValue: ACT_TYPE_OFF, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_SHELL, 'Should return globalRemoteValue when set'); + }); + + test('should return globalLocalValue when globalRemoteValue is undefined', () => { + // Mock - globalRemoteValue is undefined, globalLocalValue is set + const mockInspectResult = { + globalRemoteValue: undefined, + globalLocalValue: ACT_TYPE_SHELL, + globalValue: ACT_TYPE_OFF, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_SHELL, + 'Should return globalLocalValue when globalRemoteValue is undefined', + ); + }); + + test('should return globalValue when both globalRemoteValue and globalLocalValue are undefined', () => { + // Mock - only globalValue is set + const mockInspectResult = { + globalRemoteValue: undefined, + globalLocalValue: undefined, + globalValue: ACT_TYPE_OFF, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_OFF, + 'Should return globalValue when higher priority values are undefined', + ); + }); + + test('should ignore globalLocalValue and globalValue when globalRemoteValue exists', () => { + // Mock - all values set, should prioritize globalRemoteValue + const mockInspectResult = { + globalRemoteValue: ACT_TYPE_OFF, + globalLocalValue: ACT_TYPE_SHELL, + globalValue: ACT_TYPE_COMMAND, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_OFF, 'Should prioritize globalRemoteValue over other values'); + }); + + test('should ignore globalValue when globalLocalValue exists', () => { + // Mock - globalLocalValue and globalValue set, should prioritize globalLocalValue + const mockInspectResult = { + globalLocalValue: ACT_TYPE_SHELL, + globalValue: ACT_TYPE_COMMAND, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_SHELL, 'Should prioritize globalLocalValue over globalValue'); + }); + }); + + suite('Custom Properties Handling', () => { + test('should handle case when globalRemoteValue property does not exist', () => { + // Mock - standard VS Code inspection result without custom properties + const mockInspectResult = { + key: 'terminal.autoActivationType', + globalValue: ACT_TYPE_SHELL, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_SHELL, 'Should return globalValue when custom properties do not exist'); + }); + + test('should handle case when globalLocalValue property does not exist', () => { + // Mock - inspection result without globalLocalValue property + const mockInspectResult = { + key: 'terminal.autoActivationType', + globalValue: ACT_TYPE_COMMAND, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_COMMAND, + 'Should return globalValue when globalLocalValue property does not exist', + ); + }); + + test('should handle case when custom properties exist but are undefined', () => { + // Mock - custom properties exist but have undefined values + const mockInspectResult = { + globalRemoteValue: undefined, + globalLocalValue: undefined, + globalValue: ACT_TYPE_OFF, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_OFF, + 'Should fall back to globalValue when custom properties are undefined', + ); + }); + }); + + suite('Legacy Python Setting Fallback', () => { + test('should return ACT_TYPE_OFF and update config when python.terminal.activateEnvironment is false', () => { + // Mock - no python-envs settings, python.terminal.activateEnvironment is false + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(undefined); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(false); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_OFF, 'Should return ACT_TYPE_OFF when legacy setting is false'); + assert.ok( + pyEnvsConfig.update.calledWithExactly('terminal.autoActivationType', ACT_TYPE_OFF), + 'Should update python-envs config to ACT_TYPE_OFF', + ); + }); + + test('should return ACT_TYPE_COMMAND when python.terminal.activateEnvironment is true', () => { + // Mock - no python-envs settings, python.terminal.activateEnvironment is true + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(undefined); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(true); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_COMMAND, 'Should return ACT_TYPE_COMMAND when legacy setting is true'); + assert.ok( + pyEnvsConfig.update.notCalled, + 'Should not update python-envs config when legacy setting is true', + ); + }); + + test('should return ACT_TYPE_COMMAND when python.terminal.activateEnvironment is undefined', () => { + // Mock - no python-envs settings, python.terminal.activateEnvironment is undefined + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(undefined); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(undefined); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_COMMAND, 'Should return ACT_TYPE_COMMAND when no settings are found'); + assert.ok( + pyEnvsConfig.update.notCalled, + 'Should not update python-envs config when no legacy setting exists', + ); + }); + }); + + suite('Fallback Scenarios', () => { + test('should return ACT_TYPE_COMMAND when no configuration exists', () => { + // Mock - no configurations exist + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(undefined); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(undefined); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_COMMAND, + 'Should return default ACT_TYPE_COMMAND when no configurations exist', + ); + }); + + test('should return ACT_TYPE_COMMAND when python-envs config exists but all values are undefined', () => { + // Mock - python-envs config exists but all relevant values are undefined + const mockInspectResult = { + key: 'terminal.autoActivationType', + globalValue: undefined, + workspaceValue: undefined, + workspaceFolderValue: undefined, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(undefined); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_COMMAND, + 'Should return default when python-envs config exists but values are undefined', + ); + }); + + test('should prioritize python-envs settings over legacy python settings', () => { + // Mock - python-envs has globalValue, python has conflicting setting + const mockInspectResult = { + globalValue: ACT_TYPE_SHELL, + }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(false); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual( + result, + ACT_TYPE_SHELL, + 'Should prioritize python-envs globalValue over legacy python setting', + ); + assert.ok( + pyEnvsConfig.update.notCalled, + 'Should not update python-envs config when it already has a value', + ); + }); + }); + + suite('Edge Cases', () => { + test('should handle null inspect result', () => { + // Mock - inspect returns null + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(null); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(undefined); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_COMMAND, 'Should handle null inspect result gracefully'); + }); + + test('should handle empty object inspect result', () => { + // Mock - inspect returns empty object + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns({}); + pythonConfig.get.withArgs('terminal.activateEnvironment', undefined).returns(undefined); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, ACT_TYPE_COMMAND, 'Should handle empty inspect result gracefully'); + }); + + test('should handle all AutoActivationType values correctly', () => { + const testCases: { input: AutoActivationType; expected: AutoActivationType }[] = [ + { input: ACT_TYPE_COMMAND, expected: ACT_TYPE_COMMAND }, + { input: ACT_TYPE_SHELL, expected: ACT_TYPE_SHELL }, + { input: ACT_TYPE_OFF, expected: ACT_TYPE_OFF }, + ]; + + testCases.forEach(({ input, expected }) => { + // Reset stubs for each test case + pyEnvsConfig.inspect.resetHistory(); + pythonConfig.get.resetHistory(); + + // Mock - set globalValue to test input + const mockInspectResult = { globalValue: input }; + pyEnvsConfig.inspect.withArgs('terminal.autoActivationType').returns(mockInspectResult); + + // Run + const result = getAutoActivationType(); + + // Assert + assert.strictEqual(result, expected, `Should handle ${input} value correctly`); + }); + }); + }); +}); From 82ad744d0daacfe481fd6b424c9a9dae9568ea98 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 7 Oct 2025 16:47:36 -0700 Subject: [PATCH 309/328] fix: use ZDOTDIR when available (#900) Fixes https://github.com/microsoft/vscode-python-environments/issues/899 --- README.md | 71 ++--- package-lock.json | 281 ++++++++++-------- .../terminal/shells/bash/bashStartup.ts | 5 +- 3 files changed, 200 insertions(+), 157 deletions(-) diff --git a/README.md b/README.md index b8a0c56..c73f308 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Python Environments (preview) -> **Note:** The Python Environments icon may no longer appear in the Activity Bar due to the ongoing rollout of the Python Environments extension. To restore the extension, add `"python.useEnvironmentsExtension": true` to your User settings. This setting is temporarily necessary until the rollout is complete! + +> **Note:** The Python Environments icon may no longer appear in the Activity Bar due to the ongoing rollout of the Python Environments extension. To restore the extension, add `"python.useEnvironmentsExtension": true` to your User settings. This setting is temporarily necessary until the rollout is complete! ## Overview @@ -38,30 +39,31 @@ For more control, you can create a custom environment where you can specify Pyth The following environment managers are supported out of the box: -| Id | Name | Description | -| ----------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| ms-python.python:venv | `venv` | Built-in environment manager provided by the Python standard library. Supports creating environments (interactive and quick create) and finding existing environments. | -| ms-python.python:system | System Installed Python | Global Python installs on your system, typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | +| Id | Name | Description | +| ----------------------- | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| ms-python.python:venv | `venv` | Built-in environment manager provided by the Python standard library. Supports creating environments (interactive and quick create) and finding existing environments. | +| ms-python.python:system | System Installed Python | Global Python installs on your system, typically installed with your OS, from [python.org](https://www.python.org/), or any other OS package manager. | | ms-python.python:conda | `conda` | The [conda](https://conda.org) environment manager, as provided by conda distributions like [Anaconda Distribution](https://docs.anaconda.com/anaconda/) or [conda-forge](https://conda-forge.org/download/). Supports creating environments (interactive and quick create) and finding existing environments. | -| ms-python.python:pyenv | `pyenv` | The [pyenv](https://github.com/pyenv/pyenv) environment manager, used to manage multiple Python versions. Supports finding existing environments. | -| ms-python.python:poetry | `poetry` | The [poetry](https://python-poetry.org/) environment manager, used for dependency management and packaging in Python projects. Supports finding existing environments. | -| ms-python.python:pipenv | `pipenv` | The [pipenv](https://pipenv.pypa.io/en/latest/) environment manager, used for managing Python dependencies and environments. Only supports finding existing environments. | +| ms-python.python:pyenv | `pyenv` | The [pyenv](https://github.com/pyenv/pyenv) environment manager, used to manage multiple Python versions. Supports finding existing environments. | +| ms-python.python:poetry | `poetry` | The [poetry](https://python-poetry.org/) environment manager, used for dependency management and packaging in Python projects. Supports finding existing environments. | +| ms-python.python:pipenv | `pipenv` | The [pipenv](https://pipenv.pypa.io/en/latest/) environment manager, used for managing Python dependencies and environments. Only supports finding existing environments. | #### Supported Actions by Environment Manager | Environment Manager | Find Environments | Create | Quick Create | -|---------------------|-------------------|--------|--------------| -| venv | ✅ | ✅ | ✅ | -| conda | ✅ | ✅ | ✅ | -| pyenv | ✅ | | | -| poetry | ✅ | | | -| system | ✅ | | | -| pipenv | ✅ | | | +| ------------------- | ----------------- | ------ | ------------ | +| venv | ✅ | ✅ | ✅ | +| conda | ✅ | ✅ | ✅ | +| pyenv | ✅ | | | +| poetry | ✅ | | | +| system | ✅ | | | +| pipenv | ✅ | | | **Legend:** -- **Create**: Ability to create new environments interactively. -- **Quick Create**: Ability to create environments with minimal user input. -- **Find Environments**: Ability to discover and list existing environments. + +- **Create**: Ability to create new environments interactively. +- **Quick Create**: Ability to create environments with minimal user input. +- **Find Environments**: Ability to discover and list existing environments. Environment managers are responsible for specifying which package manager will be used by default to install and manage Python packages within the environment (`venv` uses `pip` by default). This ensures that packages are managed consistently according to the preferred tools and settings of the chosen environment manager. @@ -79,13 +81,13 @@ The extension uses `pip` as the default package manager, but you can use the pac #### Default Package Manager by Environment Manager | Environment Manager | Default Package Manager | -|---------------------|------------------------| -| venv | pip | -| conda | conda | -| pyenv | pip | -| poetry | poetry | -| system | pip | -| pipenv | pip | +| ------------------- | ----------------------- | +| venv | pip | +| conda | conda | +| pyenv | pip | +| poetry | poetry | +| system | pip | +| pipenv | pip | ### Project Management @@ -99,26 +101,27 @@ There are a few ways to add a Python Project from the Python Environments panel: | ------------ | ---------------------------------------------------------------------- | | Add Existing | Allows you to add an existing folder from the file explorer. | | Auto find | Searches for folders that contain `pyproject.toml` or `setup.py` files | -| Create New | Creates a new project from a template. | +| Create New | Creates a new project from a template. | + +#### Create New Project from Template -#### Create New Project from Template The **Python Envs: Create New Project from Template** command simplifies the process of starting a new Python project by scaffolding it for you. Whether in a new workspace or an existing one, this command configures the environment and boilerplate file structure, so you don’t have to worry about the initial setup, and only the code you want to write. There are currently two project types supported: -- Package: A structured Python package with files like `__init__.py` and setup configurations. -- Script: A simple project for standalone Python scripts, ideal for quick tasks or just to get you started. +- Package: A structured Python package with files like `__init__.py` and setup configurations. +- Script: A simple project for standalone Python scripts, ideal for quick tasks or just to get you started. ## Command Reference All commands can be accessed via the Command Palette (`ctrl/cmd + Shift + P`): -| Name | Description | -| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| Name | Description | +| ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | | Create Environment | Create a virtual environment using your preferred environment manager preconfigured with "Quick Create" or configured to your choices. | | Manage Packages | Install and uninstall packages in a given Python environment. | | Activate Environment in Current Terminal | Activates the currently opened terminal with a particular environment. | | Deactivate Environment in Current Terminal | Deactivates environment in currently opened terminal. | | Run as Task | Runs Python module as a task. | -| Create New Project from Template | Creates scaffolded project with virtual environments based on a template. | +| Create New Project from Template | Creates scaffolded project with virtual environments based on a template. | ## Settings Reference @@ -185,7 +188,7 @@ usage: `await vscode.commands.executeCommand('python-envs.createAny', options);` The Python Environments extension supports shell startup activation for environments. This feature allows you to automatically activate a Python environment when you open a terminal in VS Code. The activation is done by modifying the shell's startup script, which is supported for the following shells: - **Bash**: `~/.bashrc` -- **Zsh**: `~/.zshrc` +- **Zsh**: `~/.zshrc` (or `$ZDOTDIR/.zshrc` if `ZDOTDIR` is set) - **Fish**: `~/.config/fish/config.fish` - **PowerShell**: - (Mac/Linux):`~/.config/powershell/profile.ps1` @@ -255,7 +258,7 @@ fi ### zsh -1. Adds or creates `~/.zshrc` +1. Adds or creates `~/.zshrc` (or `$ZDOTDIR/.zshrc` if `ZDOTDIR` is set) 2. Updates it with following code: ```zsh diff --git a/package-lock.json b/package-lock.json index eb69f8c..b42f9b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,16 +69,20 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -94,13 +98,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", - "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.4", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -108,20 +112,36 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-helpers": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz", + "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", - "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -143,19 +163,22 @@ } }, "node_modules/@eslint/js": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", - "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz", + "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==", "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -163,12 +186,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", - "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", "dev": true, "license": "Apache-2.0", "dependencies": { + "@eslint/core": "^0.16.0", "levn": "^0.4.1" }, "engines": { @@ -227,9 +251,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1446,9 +1470,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", "bin": { @@ -2373,32 +2397,33 @@ } }, "node_modules/eslint": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", - "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz", + "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.9.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.15.0", - "@eslint/plugin-kit": "^0.2.3", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.4.0", + "@eslint/core": "^0.16.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.37.0", + "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.5", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2458,9 +2483,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -2475,9 +2500,9 @@ } }, "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2498,15 +2523,15 @@ } }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2516,9 +2541,9 @@ } }, "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -3104,9 +3129,9 @@ "dev": true }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5512,12 +5537,12 @@ "dev": true }, "@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "requires": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" } }, "@eslint-community/regexpp": { @@ -5527,26 +5552,38 @@ "dev": true }, "@eslint/config-array": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", - "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", "dev": true, "requires": { - "@eslint/object-schema": "^2.1.4", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" } }, + "@eslint/config-helpers": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz", + "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==", + "dev": true, + "requires": { + "@eslint/core": "^0.16.0" + } + }, "@eslint/core": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", - "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", - "dev": true + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.15" + } }, "@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -5561,23 +5598,24 @@ } }, "@eslint/js": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", - "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz", + "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==", "dev": true }, "@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true }, "@eslint/plugin-kit": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", - "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", "dev": true, "requires": { + "@eslint/core": "^0.16.0", "levn": "^0.4.1" } }, @@ -5612,9 +5650,9 @@ "dev": true }, "@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true }, "@iarna/toml": { @@ -6524,9 +6562,9 @@ "dev": true }, "acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true }, "acorn-import-attributes": { @@ -7166,31 +7204,32 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" }, "eslint": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", - "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz", + "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", "dev": true, "requires": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.9.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.15.0", - "@eslint/plugin-kit": "^0.2.3", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.4.0", + "@eslint/core": "^0.16.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.37.0", + "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.5", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -7208,9 +7247,9 @@ }, "dependencies": { "eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -7218,9 +7257,9 @@ } }, "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true }, "estraverse": { @@ -7248,20 +7287,20 @@ "dev": true }, "espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, "requires": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "dependencies": { "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true } } @@ -7684,9 +7723,9 @@ "dev": true }, "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "requires": { "parent-module": "^1.0.0", diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index bbe98c8..24dae7e 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -36,8 +36,9 @@ async function getBashProfiles(): Promise { } async function getZshProfiles(): Promise { - const homeDir = os.homedir(); - const profile: string = path.join(homeDir, '.zshrc'); + const zdotdir = process.env.ZDOTDIR; + const baseDir = zdotdir || os.homedir(); + const profile: string = path.join(baseDir, '.zshrc'); return profile; } From f04c87f0fff32151d381f3e5957aefb7e206f4cd Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:53:04 -0700 Subject: [PATCH 310/328] feat: add back button to all necessary flows in UI (#856) fixes https://github.com/microsoft/vscode-python-environments/issues/523 and https://github.com/microsoft/vscode-python-environments/issues/855 --- src/common/pickers/managers.ts | 1 + src/extension.ts | 69 +--- src/helpers.ts | 90 ++++- src/managers/builtin/venvStepBasedFlow.ts | 400 ++++++++++++++++++++++ src/managers/builtin/venvUtils.ts | 95 +---- src/managers/conda/condaStepBasedFlow.ts | 334 ++++++++++++++++++ src/managers/conda/condaUtils.ts | 197 ++++++----- 7 files changed, 929 insertions(+), 257 deletions(-) create mode 100644 src/managers/builtin/venvStepBasedFlow.ts create mode 100644 src/managers/conda/condaStepBasedFlow.ts diff --git a/src/common/pickers/managers.ts b/src/common/pickers/managers.ts index 4b0b9aa..ad37e1e 100644 --- a/src/common/pickers/managers.ts +++ b/src/common/pickers/managers.ts @@ -181,6 +181,7 @@ export async function pickCreator(creators: PythonProjectCreator[]): Promise { try { - const petPath = await getNativePythonToolsPath(); - - // Show quick pick menu for PET operation selection - const selectedOption = await window.showQuickPick( - [ - { - label: 'Find All Environments', - description: 'Finds all environments and reports them to the standard output', - detail: 'Runs: pet find --verbose', - }, - { - label: 'Resolve Environment...', - description: 'Resolves & reports the details of the environment to the standard output', - detail: 'Runs: pet resolve ', - }, - ], - { - placeHolder: 'Select a Python Environment Tool (PET) operation', - ignoreFocusOut: true, - }, - ); - - if (!selectedOption) { - return; // User cancelled - } - - const terminal = createTerminal({ - name: 'Python Environment Tool (PET)', - }); - terminal.show(); - - if (selectedOption.label === 'Find All Environments') { - // Run pet find --verbose - terminal.sendText(`"${petPath}" find --verbose`, true); - traceInfo(`Running PET find command: ${petPath} find --verbose`); - } else if (selectedOption.label === 'Resolve Environment...') { - // Show input box for path - const placeholder = isWindows() ? 'C:\\path\\to\\python\\executable' : '/path/to/python/executable'; - const inputPath = await window.showInputBox({ - prompt: 'Enter the path to the Python executable to resolve', - placeHolder: placeholder, - ignoreFocusOut: true, - validateInput: (value) => { - if (!value || value.trim().length === 0) { - return 'Please enter a valid path'; - } - return null; - }, - }); - - if (!inputPath) { - return; // User cancelled - } - - // Run pet resolve with the provided path - terminal.sendText(`"${petPath}" resolve "${inputPath.trim()}"`, true); - traceInfo(`Running PET resolve command: ${petPath} resolve "${inputPath.trim()}"`); - } + await runPetInTerminalImpl(); } catch (error) { traceError('Error running PET in terminal', error); window.showErrorMessage(`Failed to run Python Environment Tool: ${error}`); diff --git a/src/helpers.ts b/src/helpers.ts index baff94e..3a5992f 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -1,11 +1,13 @@ -import { ExtensionContext, extensions, Uri, workspace } from 'vscode'; +import { ExtensionContext, extensions, QuickInputButtons, Uri, window, workspace } from 'vscode'; import { PythonEnvironment, PythonEnvironmentApi } from './api'; import { traceError, traceInfo, traceWarn } from './common/logging'; import { normalizePath } from './common/utils/pathUtils'; +import { isWindows } from './common/utils/platformUtils'; +import { createTerminal, showInputBoxWithButtons } from './common/window.apis'; import { getConfiguration } from './common/workspace.apis'; import { getAutoActivationType } from './features/terminal/utils'; import { EnvironmentManagers, PythonProjectManager } from './internal.api'; -import { NativeEnvInfo, NativePythonFinder } from './managers/common/nativePythonFinder'; +import { getNativePythonToolsPath, NativeEnvInfo, NativePythonFinder } from './managers/common/nativePythonFinder'; /** * Collects relevant Python environment information for issue reporting @@ -137,6 +139,90 @@ export function getUserConfiguredSetting(section: string, key: string): T | u return undefined; } +/** + * Runs the Python Environment Tool (PET) in a terminal window, allowing users to + * execute various PET commands like finding all Python environments or resolving + * the details of a specific environment. + * + * + * @returns A Promise that resolves when the PET command has been executed or cancelled + */ +export async function runPetInTerminalImpl(): Promise { + const petPath = await getNativePythonToolsPath(); + + // Show quick pick menu for PET operation selection + const selectedOption = await window.showQuickPick( + [ + { + label: 'Find All Environments', + description: 'Finds all environments and reports them to the standard output', + detail: 'Runs: pet find --verbose', + }, + { + label: 'Resolve Environment...', + description: 'Resolves & reports the details of the environment to the standard output', + detail: 'Runs: pet resolve ', + }, + ], + { + placeHolder: 'Select a Python Environment Tool (PET) operation', + ignoreFocusOut: true, + }, + ); + + if (!selectedOption) { + return; // User cancelled + } + + if (selectedOption.label === 'Find All Environments') { + // Create and show terminal immediately for 'Find All Environments' option + const terminal = createTerminal({ + name: 'Python Environment Tool (PET)', + }); + terminal.show(); + + // Run pet find --verbose + terminal.sendText(`"${petPath}" find --verbose`, true); + traceInfo(`Running PET find command: ${petPath} find --verbose`); + } else if (selectedOption.label === 'Resolve Environment...') { + try { + // Show input box for path with back button + const placeholder = isWindows() ? 'C:\\path\\to\\python\\executable' : '/path/to/python/executable'; + const inputPath = await showInputBoxWithButtons({ + prompt: 'Enter the path to the Python executable to resolve', + placeHolder: placeholder, + ignoreFocusOut: true, + showBackButton: true, + validateInput: (value) => { + if (!value || value.trim().length === 0) { + return 'Please enter a valid path'; + } + return null; + }, + }); + + if (inputPath) { + // Only create and show terminal after path has been entered + const terminal = createTerminal({ + name: 'Python Environment Tool (PET)', + }); + terminal.show(); + + // Run pet resolve with the provided path + terminal.sendText(`"${petPath}" resolve "${inputPath.trim()}"`, true); + traceInfo(`Running PET resolve command: ${petPath} resolve "${inputPath.trim()}"`); + } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // If back button was clicked, restart the flow + await runPetInTerminalImpl(); + return; + } + throw ex; // Re-throw other errors + } + } +} + /** * Sets the default Python interpreter for the workspace if the user has not explicitly set 'defaultEnvManager'. * @param nativeFinder - used to resolve interpreter paths. diff --git a/src/managers/builtin/venvStepBasedFlow.ts b/src/managers/builtin/venvStepBasedFlow.ts new file mode 100644 index 0000000..b679cd6 --- /dev/null +++ b/src/managers/builtin/venvStepBasedFlow.ts @@ -0,0 +1,400 @@ +import * as fse from 'fs-extra'; +import * as path from 'path'; +import { LogOutputChannel, QuickInputButtons, Uri } from 'vscode'; +import { EnvironmentManager, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api'; +import { Pickers, VenvManagerStrings } from '../../common/localize'; +import { EventNames } from '../../common/telemetry/constants'; +import { sendTelemetryEvent } from '../../common/telemetry/sender'; +import { showInputBoxWithButtons, showQuickPickWithButtons } from '../../common/window.apis'; +import { NativePythonFinder } from '../common/nativePythonFinder'; +import { getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; +import { CreateEnvironmentResult, createWithProgress, ensureGlobalEnv } from './venvUtils'; + +/** + * State interface for the venv creation flow. + * + * This keeps track of all user selections throughout the flow, + * allowing the wizard to maintain context when navigating backwards. + * Each property represents a piece of data collected during a step in the workflow. + */ +interface VenvCreationState { + // Base Python environment to use for creating the venv + basePython?: PythonEnvironment; + + // Whether to use quick create or custom create + isQuickCreate?: boolean; + + // Name for the venv + venvName?: string; + + // Packages to install in the venv + // undefined = not yet set, null = user canceled during package selection + packages?: PipPackages | null; + + // Store the sorted environments to avoid re-sorting when navigating back + sortedEnvs?: PythonEnvironment[]; + + // Tracks whether user completed the package selection step + // undefined = not yet reached, true = completed, false = canceled + packageSelectionCompleted?: boolean; + + // References to API and project needed for package selection + api?: PythonEnvironmentApi; + project?: PythonProject[]; + + // Root directory where venv will be created (used for path validation) + venvRoot?: Uri; +} +/** + * Type definition for step functions in the wizard-like flow. + * + * Each step function: + * 1. Takes the current state as input + * 2. Interacts with the user through UI + * 3. Updates the state with new data + * 4. Returns the next step function to execute or null if flow is complete + * + * This pattern enables proper back navigation between steps without losing context. + */ +type StepFunction = (state: VenvCreationState) => Promise; + +/** + * Step 1: Select quick create or custom create + */ +async function selectCreateType(state: VenvCreationState): Promise { + try { + if (!state.sortedEnvs || state.sortedEnvs.length === 0) { + return null; + } + + // Show the quick/custom selection dialog with descriptive options + const selection = await showQuickPickWithButtons( + [ + { + label: VenvManagerStrings.quickCreate, + description: VenvManagerStrings.quickCreateDescription, + detail: `Uses Python version ${state.sortedEnvs[0].version} and installs workspace dependencies.`, + }, + { + label: VenvManagerStrings.customize, + description: VenvManagerStrings.customizeDescription, + }, + ], + { + placeHolder: VenvManagerStrings.selectQuickOrCustomize, + ignoreFocusOut: true, + showBackButton: true, + }, + ); + + // Handle cancellation - return null to exit the flow + if (!selection || Array.isArray(selection)) { + return null; // Exit the flow without creating an environment + } + + if (selection.label === VenvManagerStrings.quickCreate) { + // For quick create, use the first Python environment and proceed to completion + state.isQuickCreate = true; + state.basePython = state.sortedEnvs[0]; + // Quick create is complete - no more steps needed + return null; + } else { + // For custom create, move to Python selection step + state.isQuickCreate = false; + // Next step: select base Python version + return selectBasePython; + } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // This is the first step, so return null to exit the flow + return null; + } + throw ex; + } +} + +/** + * Step 2: Select base Python interpreter to use for venv creation + */ +async function selectBasePython(state: VenvCreationState): Promise { + try { + if (!state.sortedEnvs || state.sortedEnvs.length === 0) { + return null; + } + + // Create items for each available Python environment with descriptive labels + const items = state.sortedEnvs.map((e) => { + const pathDescription = e.displayPath; + const description = + e.description && e.description.trim() ? `${e.description} (${pathDescription})` : pathDescription; + + return { + label: e.displayName ?? e.name, + description: description, + e: e, + }; + }); + + // Show Python environment selection dialog with back button + const selected = await showQuickPickWithButtons(items, { + placeHolder: Pickers.Environments.selectEnvironment, + ignoreFocusOut: true, + showBackButton: true, + }); + + // Handle cancellation (Escape key or dialog close) + if (!selected || Array.isArray(selected)) { + return null; // Exit the flow without creating an environment + } + + // Update state with selected Python environment + const basePython = (selected as { e: PythonEnvironment }).e; + if (!basePython || !basePython.execInfo) { + // Invalid selection + return null; + } + + state.basePython = basePython; + + // Next step: input venv name + return enterEnvironmentName; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to create type selection if we came from there + if (state.isQuickCreate !== undefined) { + return selectCreateType; + } + return null; + } + throw ex; + } +} + +/** + * Step 3: Enter environment name + */ +async function enterEnvironmentName(state: VenvCreationState): Promise { + try { + // Show input box for venv name with back button + const name = await showInputBoxWithButtons({ + prompt: VenvManagerStrings.venvName, + value: '.venv', // Default name + ignoreFocusOut: true, + showBackButton: true, + validateInput: async (value) => { + if (!value) { + return VenvManagerStrings.venvNameErrorEmpty; + } + + // Validate that the path doesn't already exist + if (state.venvRoot) { + try { + const fullPath = path.join(state.venvRoot.fsPath, value); + if (await fse.pathExists(fullPath)) { + return VenvManagerStrings.venvNameErrorExists; + } + } catch (_) { + // Ignore file system errors during validation + } + } + return null; + }, + }); + + // Handle cancellation (Escape key or dialog close) + if (!name) { + return null; // Exit the flow without creating an environment + } + + state.venvName = name; + + // Next step: select packages + return selectPackages; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to base Python selection + return selectBasePython; + } + throw ex; + } +} + +/** + * Step 4: Select packages to install + */ +async function selectPackages(state: VenvCreationState): Promise { + try { + // Show package selection UI using existing function from pipUtils + + // Create packages structure with empty array and showing the skip option + const packagesOptions = { + showSkipOption: true, + install: [], + }; + + // Use existing getWorkspacePackagesToInstall that will show the UI with all options + // The function already handles showing workspace deps, PyPI options, and skip + if (state.api) { + const result = await getWorkspacePackagesToInstall( + state.api, + packagesOptions, + state.project, // Use project from state if available + undefined, // No environment yet since we're creating it + ); + + if (result !== undefined) { + // User made a selection or clicked Skip + state.packageSelectionCompleted = true; + state.packages = result; + } else { + // User pressed Escape or closed the dialog + state.packageSelectionCompleted = false; + state.packages = null; // Explicitly mark as canceled + } + } else { + // No API, can't show package selection + state.packageSelectionCompleted = true; + state.packages = { + install: [], + uninstall: [], + }; + } + + // Final step - no more steps after this + return null; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to environment name input + return enterEnvironmentName; + } + throw ex; + } +} + +/** + * Main entry point for the step-based venv creation flow. + * + * This function implements a step-based wizard pattern for creating Python virtual + * environments. The user can navigate through steps and also cancel at any point + * by pressing Escape or closing any dialog. + * + * @param nativeFinder Python finder for resolving Python paths + * @param api Python Environment API + * @param log Logger for recording operations + * @param manager Environment manager + * @param basePythons Available Python environments + * @param venvRoot Root directory where the venv will be created + * @param options Configuration options + * @returns The result of environment creation or undefined if cancelled at any point + */ +export async function createStepBasedVenvFlow( + nativeFinder: NativePythonFinder, + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + basePythons: PythonEnvironment[], + venvRoot: Uri, + options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] }, +): Promise { + // Sort and filter available Python environments + const sortedEnvs = ensureGlobalEnv(basePythons, log); + if (sortedEnvs.length === 0) { + return { + envCreationErr: 'No suitable Python environments found', + }; + } + + // Initialize the state object that will track user selections + const state: VenvCreationState = { + sortedEnvs, // Store sorted environments in state to avoid re-sorting + api, // Store API reference for package selection + project: [api.getPythonProject(venvRoot)].filter(Boolean) as PythonProject[], // Get project for venvRoot + venvRoot, // Store venvRoot for path validation + }; + + try { + // Determine the first step based on options + let currentStep: StepFunction | null = options.showQuickAndCustomOptions ? selectCreateType : selectBasePython; + + // Execute steps until completion or cancellation + // When a step returns null, it means either: + // 1. The step has completed successfully and there are no more steps + // 2. The user cancelled the step (pressed Escape or closed the dialog) + while (currentStep !== null) { + currentStep = await currentStep(state); + } + + // After workflow completes, check if we have all required data + + // Case 1: Quick create flow + if (state.isQuickCreate && state.basePython) { + // Use quick create flow + sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' }); + // Use the default .venv name for quick create + const quickEnvPath = path.join(venvRoot.fsPath, '.venv'); + return await createWithProgress(nativeFinder, api, log, manager, state.basePython, venvRoot, quickEnvPath, { + install: options.additionalPackages || [], + uninstall: [], + }); + } + // Case 2: Custom create flow + // Note: requires selectPackage step completed + else if ( + !state.isQuickCreate && + state.basePython && + state.venvName && + // The user went through all steps without cancellation + // (specifically checking that package selection wasn't canceled) + state.packageSelectionCompleted !== false + ) { + sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); + + const project = api.getPythonProject(venvRoot); + const envPath = path.join(venvRoot.fsPath, state.venvName); + + // Get packages to install - if the selectPackages step was completed, state.packages might already be set + // If not, we'll fetch packages here to ensure proper package detection + let packages = state.packages; + if (!packages) { + packages = await getWorkspacePackagesToInstall( + api, + { showSkipOption: true, install: [] }, + project ? [project] : undefined, + undefined, + log, + ); + } + + // Combine packages from multiple sources + const allPackages: string[] = []; + + // 1. User-selected packages from workspace dependencies or PyPI during the wizard flow + // (may be undefined if user skipped package selection or canceled) + if (packages?.install) { + allPackages.push(...packages.install); + } + + // 2. Additional packages provided by the caller of createStepBasedVenvFlow + // (e.g., packages required by the extension itself) + if (options.additionalPackages) { + allPackages.push(...options.additionalPackages); + } + + return await createWithProgress(nativeFinder, api, log, manager, state.basePython, venvRoot, envPath, { + install: allPackages, + uninstall: [], + }); + } + + // If we get here, the flow was cancelled (e.g., user pressed Escape) + // Return undefined to indicate no environment was created + return undefined; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // This should not happen as back navigation is handled within each step + // But if it does, restart the flow + return await createStepBasedVenvFlow(nativeFinder, api, log, manager, basePythons, venvRoot, options); + } + throw ex; // Re-throw other errors + } +} diff --git a/src/managers/builtin/venvUtils.ts b/src/managers/builtin/venvUtils.ts index cce97a8..b294319 100644 --- a/src/managers/builtin/venvUtils.ts +++ b/src/managers/builtin/venvUtils.ts @@ -7,13 +7,11 @@ import { ENVS_EXTENSION_ID } from '../../common/constants'; import { Common, VenvManagerStrings } from '../../common/localize'; import { traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; -import { pickEnvironmentFrom } from '../../common/pickers/environments'; import { EventNames } from '../../common/telemetry/constants'; import { sendTelemetryEvent } from '../../common/telemetry/sender'; import { normalizePath } from '../../common/utils/pathUtils'; import { showErrorMessage, - showInputBox, showOpenDialog, showQuickPick, showWarningMessage, @@ -28,8 +26,9 @@ import { } from '../common/nativePythonFinder'; import { getShellActivationCommands, shortVersion, sortEnvironments } from '../common/utils'; import { isUvInstalled, runPython, runUV } from './helpers'; -import { getProjectInstallable, getWorkspacePackagesToInstall, PipPackages } from './pipUtils'; +import { getProjectInstallable, PipPackages } from './pipUtils'; import { resolveSystemPythonEnvironmentPath } from './utils'; +import { createStepBasedVenvFlow } from './venvStepBasedFlow'; export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`; export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`; @@ -266,34 +265,7 @@ export async function getGlobalVenvLocation(): Promise { return undefined; } -async function createWithCustomization(version: string): Promise { - const selection: QuickPickItem | undefined = await showQuickPick( - [ - { - label: VenvManagerStrings.quickCreate, - description: VenvManagerStrings.quickCreateDescription, - detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', version), - }, - { - label: VenvManagerStrings.customize, - description: VenvManagerStrings.customizeDescription, - }, - ], - { - placeHolder: VenvManagerStrings.selectQuickOrCustomize, - ignoreFocusOut: true, - }, - ); - - if (selection === undefined) { - return undefined; - } else if (selection.label === VenvManagerStrings.quickCreate) { - return false; - } - return true; -} - -async function createWithProgress( +export async function createWithProgress( nativeFinder: NativePythonFinder, api: PythonEnvironmentApi, log: LogOutputChannel, @@ -433,66 +405,7 @@ export async function createPythonVenv( venvRoot: Uri, options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] }, ): Promise { - const sortedEnvs = ensureGlobalEnv(basePythons, log); - - let customize: boolean | undefined = true; - if (options.showQuickAndCustomOptions) { - customize = await createWithCustomization(sortedEnvs[0].version); - } - - if (customize === undefined) { - return; - } else if (customize === false) { - return quickCreateVenv(nativeFinder, api, log, manager, sortedEnvs[0], venvRoot, options.additionalPackages); - } else { - sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' }); - } - const project = api.getPythonProject(venvRoot); - - const basePython = await pickEnvironmentFrom(sortedEnvs); - if (!basePython || !basePython.execInfo) { - log.error('No base python selected, cannot create virtual environment.'); - return { - envCreationErr: 'No base python selected, cannot create virtual environment.', - }; - } - - const name = await showInputBox({ - prompt: VenvManagerStrings.venvName, - value: '.venv', - ignoreFocusOut: true, - validateInput: async (value) => { - if (!value) { - return VenvManagerStrings.venvNameErrorEmpty; - } - if (await fsapi.pathExists(path.join(venvRoot.fsPath, value))) { - return VenvManagerStrings.venvNameErrorExists; - } - }, - }); - if (!name) { - log.error('No name entered, cannot create virtual environment.'); - return { - envCreationErr: 'No name entered, cannot create virtual environment.', - }; - } - - const envPath = path.join(venvRoot.fsPath, name); - - const packages = await getWorkspacePackagesToInstall( - api, - { showSkipOption: true, install: [] }, - project ? [project] : undefined, - undefined, - log, - ); - const allPackages = []; - allPackages.push(...(packages?.install ?? []), ...(options.additionalPackages ?? [])); - - return await createWithProgress(nativeFinder, api, log, manager, basePython, venvRoot, envPath, { - install: allPackages, - uninstall: [], - }); + return createStepBasedVenvFlow(nativeFinder, api, log, manager, basePythons, venvRoot, options); } export async function removeVenv(environment: PythonEnvironment, log: LogOutputChannel): Promise { diff --git a/src/managers/conda/condaStepBasedFlow.ts b/src/managers/conda/condaStepBasedFlow.ts new file mode 100644 index 0000000..6cf6ce8 --- /dev/null +++ b/src/managers/conda/condaStepBasedFlow.ts @@ -0,0 +1,334 @@ +import * as fse from 'fs-extra'; +import * as path from 'path'; +import { l10n, LogOutputChannel, QuickInputButtons, QuickPickItem, Uri } from 'vscode'; +import { EnvironmentManager, PythonEnvironment, PythonEnvironmentApi } from '../../api'; +import { CondaStrings } from '../../common/localize'; +import { showInputBoxWithButtons, showQuickPickWithButtons } from '../../common/window.apis'; +import { + createNamedCondaEnvironment, + createPrefixCondaEnvironment, + getLocation, + getName, + trimVersionToMajorMinor, +} from './condaUtils'; + +// Recommended Python version for Conda environments +const RECOMMENDED_CONDA_PYTHON = '3.11.11'; + +/** + * State interface for the Conda environment creation flow. + * + * This keeps track of all user selections throughout the flow, + * allowing the wizard to maintain context when navigating backwards. + */ +interface CondaCreationState { + // Type of Conda environment to create (named or prefix) + envType?: string; + + // Python version to install in the environment + pythonVersion?: string; + + // For named environments + envName?: string; + + // For prefix environments + prefix?: string; + fsPath?: string; + + // Additional context + uris?: Uri[]; + + // API reference for Python environment operations + api: PythonEnvironmentApi; +} + +/** + * Type definition for step functions in the wizard-like flow. + * + * Each step function: + * 1. Takes the current state as input + * 2. Interacts with the user through UI + * 3. Updates the state with new data + * 4. Returns the next step function to execute or null if flow is complete + */ +type StepFunction = (state: CondaCreationState) => Promise; + +/** + * Step 1: Select environment type (named or prefix) + */ +async function selectEnvironmentType(state: CondaCreationState): Promise { + try { + // Skip this step if we have multiple URIs (force named environment) + if (state.uris && state.uris.length > 1) { + state.envType = 'Named'; + return selectPythonVersion; + } + + const selection = (await showQuickPickWithButtons( + [ + { label: CondaStrings.condaNamed, description: CondaStrings.condaNamedDescription }, + { label: CondaStrings.condaPrefix, description: CondaStrings.condaPrefixDescription }, + ], + { + placeHolder: CondaStrings.condaSelectEnvType, + ignoreFocusOut: true, + showBackButton: true, + }, + )) as QuickPickItem | undefined; + + if (!selection) { + return null; + } + + state.envType = selection.label; + + // Next step: select Python version + return selectPythonVersion; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // This is the first step, so return null to exit the flow + return null; + } + throw ex; + } +} + +/** + * Step 2: Select Python version + */ +async function selectPythonVersion(state: CondaCreationState): Promise { + try { + const api = state.api; + if (!api) { + return null; + } + + const envs = await api.getEnvironments('global'); + let versions = Array.from( + new Set( + envs + .map((env: PythonEnvironment) => env.version) + .filter(Boolean) + .map((v: string) => trimVersionToMajorMinor(v)), // cut to 3 digits + ), + ); + + // Sort versions by major version (descending), ignoring minor/patch for simplicity + const parseMajorMinor = (v: string) => { + const m = v.match(/^(\\d+)(?:\\.(\\d+))?/); + return { major: m ? Number(m[1]) : 0, minor: m && m[2] ? Number(m[2]) : 0 }; + }; + + versions = versions.sort((a, b) => { + const pa = parseMajorMinor(a as string); + const pb = parseMajorMinor(b as string); + if (pa.major !== pb.major) { + return pb.major - pa.major; + } // desc by major + return pb.minor - pa.minor; // desc by minor + }); + + if (!versions || versions.length === 0) { + versions = ['3.13', '3.12', '3.11', '3.10', '3.9']; + } + + const items: QuickPickItem[] = versions.map((v: unknown) => ({ + label: v === RECOMMENDED_CONDA_PYTHON ? `$(star-full) Python` : 'Python', + description: String(v), + })); + + const selection = await showQuickPickWithButtons(items, { + placeHolder: l10n.t('Select the version of Python to install in the environment'), + matchOnDescription: true, + ignoreFocusOut: true, + showBackButton: true, + }); + + if (!selection) { + return null; + } + + state.pythonVersion = (selection as QuickPickItem).description; + + // Next step depends on environment type + return state.envType === 'Named' ? enterEnvironmentName : selectLocation; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to environment type selection + return selectEnvironmentType; + } + throw ex; + } +} + +/** + * Step 3a: Enter environment name (for named environments) + */ +async function enterEnvironmentName(state: CondaCreationState): Promise { + try { + // Try to get a suggested name from project + const suggestedName = getName(state.api, state.uris); + + const name = await showInputBoxWithButtons({ + prompt: CondaStrings.condaNamedInput, + value: suggestedName, + ignoreFocusOut: true, + showBackButton: true, + }); + + if (!name) { + return null; + } + + state.envName = name; + + // Final step - proceed to create environment + return null; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to Python version selection + return selectPythonVersion; + } + throw ex; + } +} + +/** + * Step 3b: Select location (for prefix environments) + */ +async function selectLocation(state: CondaCreationState): Promise { + try { + // Get location using imported getLocation helper + const fsPath = await getLocation(state.api, state.uris || []); + + if (!fsPath) { + return null; + } + + state.fsPath = fsPath; + + // Next step: enter environment name + return enterPrefixName; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to Python version selection + return selectPythonVersion; + } + throw ex; + } +} + +/** + * Step 4: Enter prefix name (for prefix environments) + */ +async function enterPrefixName(state: CondaCreationState): Promise { + try { + if (!state.fsPath) { + return null; + } + + let name = './.conda'; + const defaultPathExists = await fse.pathExists(path.join(state.fsPath, '.conda')); + + // If default name exists, ask for a new name + if (defaultPathExists) { + const newName = await showInputBoxWithButtons({ + prompt: l10n.t('Environment "{0}" already exists. Enter a different name', name), + ignoreFocusOut: true, + showBackButton: true, + validateInput: async (value) => { + // Check if the proposed name already exists + if (!value) { + return l10n.t('Name cannot be empty'); + } + + // Get full path based on input + const fullPath = path.isAbsolute(value) ? value : path.join(state.fsPath!, value); + + // Check if path exists + try { + if (await fse.pathExists(fullPath)) { + return CondaStrings.condaExists; + } + } catch (_) { + // Ignore file system errors during validation + } + + return undefined; + }, + }); + + // If user cancels or presses escape + if (!newName) { + return null; + } + + name = newName; + } + + state.prefix = path.isAbsolute(name) ? name : path.join(state.fsPath, name); + + // Final step - proceed to create environment + return null; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // Go back to location selection + return selectLocation; + } + throw ex; + } +} + +/** + * Main entry point for the step-based Conda environment creation flow. + * + * This function implements a step-based wizard pattern for creating Conda + * environments. This implementation allows users to navigate back to the immediately + * previous step while preserving their selections. + * + * @param api Python Environment API + * @param log Logger for recording operations + * @param manager Environment manager + * @param uris Optional URIs for determining the environment location + * @returns The created environment or undefined if cancelled + */ +export async function createStepBasedCondaFlow( + api: PythonEnvironmentApi, + log: LogOutputChannel, + manager: EnvironmentManager, + uris?: Uri | Uri[], +): Promise { + // Initialize the state object that will track user selections + const state: CondaCreationState = { + api: api, + uris: Array.isArray(uris) ? uris : uris ? [uris] : [], + }; + + try { + // Start with the first step + let currentStep: StepFunction | null = selectEnvironmentType; + + // Execute steps until completion or cancellation + while (currentStep !== null) { + currentStep = await currentStep(state); + } + + // If we have all required data, create the environment + if (state.envType === CondaStrings.condaNamed && state.envName) { + return await createNamedCondaEnvironment(api, log, manager, state.envName, state.pythonVersion); + } else if (state.envType === CondaStrings.condaPrefix && state.prefix) { + // For prefix environments, we need to pass the fsPath where the environment will be created + return await createPrefixCondaEnvironment(api, log, manager, state.fsPath, state.pythonVersion); + } + + // If we get here, the flow was likely cancelled + return undefined; + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // This should not happen as back navigation is handled within each step + // But if it does, restart the flow + return await createStepBasedCondaFlow(api, log, manager, uris); + } + throw ex; // Re-throw other errors + } +} diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 893a957..b83be76 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -37,8 +37,7 @@ import { untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; import { showErrorMessage, - showInputBox, - showQuickPick, + showInputBoxWithButtons, showQuickPickWithButtons, withProgress, } from '../../common/window.apis'; @@ -57,6 +56,7 @@ import { Installable } from '../common/types'; import { shortVersion, sortEnvironments } from '../common/utils'; import { CondaEnvManager } from './condaEnvManager'; import { getCondaHookPs1Path, getLocalActivationScript } from './condaSourcingUtils'; +import { createStepBasedCondaFlow } from './condaStepBasedFlow'; export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`; export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`; @@ -241,7 +241,11 @@ async function runConda(args: string[], log?: LogOutputChannel, token?: Cancella return await _runConda(conda, args, log, token); } -async function runCondaExecutable(args: string[], log?: LogOutputChannel, token?: CancellationToken): Promise { +export async function runCondaExecutable( + args: string[], + log?: LogOutputChannel, + token?: CancellationToken, +): Promise { const conda = await getCondaExecutable(undefined); return await _runConda(conda, args, log, token); } @@ -253,7 +257,7 @@ async function getCondaInfo(): Promise { } let prefixes: string[] | undefined; -async function getPrefixes(): Promise { +export async function getPrefixes(): Promise { if (prefixes) { return prefixes; } @@ -275,7 +279,7 @@ export async function getDefaultCondaPrefix(): Promise { return prefixes.length > 0 ? prefixes[0] : path.join(os.homedir(), '.conda', 'envs'); } -async function getVersion(root: string): Promise { +export async function getVersion(root: string): Promise { const files = await fse.readdir(path.join(root, 'conda-meta')); for (let file of files) { if (file.startsWith('python-3') && file.endsWith('.json')) { @@ -307,7 +311,7 @@ function isPrefixOf(roots: string[], e: string): boolean { * @param envManager The environment manager instance * @returns Promise resolving to a PythonEnvironmentInfo object */ -async function getNamedCondaPythonInfo( +export async function getNamedCondaPythonInfo( name: string, prefix: string, executable: string, @@ -351,7 +355,7 @@ async function getNamedCondaPythonInfo( * @param envManager The environment manager instance * @returns Promise resolving to a PythonEnvironmentInfo object */ -async function getPrefixesCondaPythonInfo( +export async function getPrefixesCondaPythonInfo( prefix: string, executable: string, version: string, @@ -710,7 +714,7 @@ export async function refreshCondaEnvs( return []; } -function getName(api: PythonEnvironmentApi, uris?: Uri | Uri[]): string | undefined { +export function getName(api: PythonEnvironmentApi, uris?: Uri | Uri[]): string | undefined { if (!uris) { return undefined; } @@ -720,7 +724,7 @@ function getName(api: PythonEnvironmentApi, uris?: Uri | Uri[]): string | undefi return api.getPythonProject(Array.isArray(uris) ? uris[0] : uris)?.name; } -async function getLocation(api: PythonEnvironmentApi, uris: Uri | Uri[]): Promise { +export async function getLocation(api: PythonEnvironmentApi, uris: Uri | Uri[]): Promise { if (!uris || (Array.isArray(uris) && (uris.length === 0 || uris.length > 1))) { const projects: PythonProject[] = []; if (Array.isArray(uris)) { @@ -740,7 +744,7 @@ async function getLocation(api: PythonEnvironmentApi, uris: Uri | Uri[]): Promis } const RECOMMENDED_CONDA_PYTHON = '3.11.11'; -function trimVersionToMajorMinor(version: string): string { +export function trimVersionToMajorMinor(version: string): string { const match = version.match(/^(\d+\.\d+\.\d+)/); return match ? match[1] : version; } @@ -804,46 +808,32 @@ export async function createCondaEnvironment( manager: EnvironmentManager, uris?: Uri | Uri[], ): Promise { - // step1 ask user for named or prefix environment - const envType = - Array.isArray(uris) && uris.length > 1 - ? 'Named' - : ( - await showQuickPick( - [ - { label: CondaStrings.condaNamed, description: CondaStrings.condaNamedDescription }, - { label: CondaStrings.condaPrefix, description: CondaStrings.condaPrefixDescription }, - ], - { - placeHolder: CondaStrings.condaSelectEnvType, - ignoreFocusOut: true, - }, - ) - )?.label; - - const pythonVersion = await pickPythonVersion(api); - if (envType) { - return envType === CondaStrings.condaNamed - ? await createNamedCondaEnvironment(api, log, manager, getName(api, uris ?? []), pythonVersion) - : await createPrefixCondaEnvironment(api, log, manager, await getLocation(api, uris ?? []), pythonVersion); - } - return undefined; + return createStepBasedCondaFlow(api, log, manager, uris); } -async function createNamedCondaEnvironment( +export async function createNamedCondaEnvironment( api: PythonEnvironmentApi, log: LogOutputChannel, manager: EnvironmentManager, name?: string, pythonVersion?: string, ): Promise { - name = await showInputBox({ - prompt: CondaStrings.condaNamedInput, - value: name, - ignoreFocusOut: true, - }); - if (!name) { - return; + try { + name = await showInputBoxWithButtons({ + prompt: CondaStrings.condaNamedInput, + value: name, + ignoreFocusOut: true, + showBackButton: true, + }); + if (!name) { + return; + } + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // If back button was pressed, go back to the environment type selection + return await createCondaEnvironment(api, log, manager); + } + throw ex; } const envName: string = name; @@ -897,76 +887,85 @@ async function createNamedCondaEnvironment( ); } -async function createPrefixCondaEnvironment( +export async function createPrefixCondaEnvironment( api: PythonEnvironmentApi, log: LogOutputChannel, manager: EnvironmentManager, fsPath?: string, pythonVersion?: string, ): Promise { - if (!fsPath) { - return; - } - - let name = `./.conda`; - if (await fse.pathExists(path.join(fsPath, '.conda'))) { - log.warn(`Environment "${path.join(fsPath, '.conda')}" already exists`); - const newName = await showInputBox({ - prompt: l10n.t('Environment "{0}" already exists. Enter a different name', name), - ignoreFocusOut: true, - validateInput: (value) => { - if (value === name) { - return CondaStrings.condaExists; - } - return undefined; - }, - }); - if (!newName) { + try { + if (!fsPath) { return; } - name = newName; - } - const prefix: string = path.isAbsolute(name) ? name : path.join(fsPath, name); + let name = `./.conda`; + if (await fse.pathExists(path.join(fsPath, '.conda'))) { + log.warn(`Environment "${path.join(fsPath, '.conda')}" already exists`); + const newName = await showInputBoxWithButtons({ + prompt: l10n.t('Environment "{0}" already exists. Enter a different name', name), + ignoreFocusOut: true, + showBackButton: true, + validateInput: (value) => { + if (value === name) { + return CondaStrings.condaExists; + } + return undefined; + }, + }); + if (!newName) { + return; + } + name = newName; + } - const runArgs = ['create', '--yes', '--prefix', prefix]; - if (pythonVersion) { - runArgs.push(`python=${pythonVersion}`); - } else { - runArgs.push('python'); - } + const prefix: string = path.isAbsolute(name) ? name : path.join(fsPath, name); - return await withProgress( - { - location: ProgressLocation.Notification, - title: `Creating conda environment: ${name}`, - }, - async () => { - try { - const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; - const output = await runCondaExecutable(runArgs); - log.info(output); - const version = await getVersion(prefix); + const runArgs = ['create', '--yes', '--prefix', prefix]; + if (pythonVersion) { + runArgs.push(`python=${pythonVersion}`); + } else { + runArgs.push('python'); + } - const environment = api.createPythonEnvironmentItem( - await getPrefixesCondaPythonInfo( - prefix, - path.join(prefix, bin), - version, - await getConda(), + return await withProgress( + { + location: ProgressLocation.Notification, + title: `Creating conda environment: ${name}`, + }, + async () => { + try { + const bin = os.platform() === 'win32' ? 'python.exe' : 'python'; + const output = await runCondaExecutable(runArgs); + log.info(output); + const version = await getVersion(prefix); + + const environment = api.createPythonEnvironmentItem( + await getPrefixesCondaPythonInfo( + prefix, + path.join(prefix, bin), + version, + await getConda(), + manager, + ), manager, - ), - manager, - ); - return environment; - } catch (e) { - log.error('Failed to create conda environment', e); - setImmediate(async () => { - await showErrorMessageWithLogs(CondaStrings.condaCreateFailed, log); - }); - } - }, - ); + ); + return environment; + } catch (e) { + log.error('Failed to create conda environment', e); + setImmediate(async () => { + await showErrorMessageWithLogs(CondaStrings.condaCreateFailed, log); + }); + } + }, + ); + } catch (ex) { + if (ex === QuickInputButtons.Back) { + // If back button was pressed, go back to the environment type selection + return await createCondaEnvironment(api, log, manager); + } + throw ex; + } } export async function generateName(fsPath: string): Promise { From e73b1277725ae6d1908b459ec59afe4ff6902466 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 17:10:02 -0700 Subject: [PATCH 311/328] fix ts issue (#907) --- src/test/mocks/mockDocument.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/mocks/mockDocument.ts b/src/test/mocks/mockDocument.ts index fed220e..6875fce 100644 --- a/src/test/mocks/mockDocument.ts +++ b/src/test/mocks/mockDocument.ts @@ -68,6 +68,8 @@ export class MockDocument implements TextDocument { private _onSave: (doc: TextDocument) => Promise; + encoding = 'utf-8'; + constructor( contents: string, fileName: string, From 11670eec4a9de772e9a867ae7c8704bafd2f0f9f Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 21:27:06 -0700 Subject: [PATCH 312/328] support pipenv path setting (#911) fixes https://github.com/microsoft/vscode-python-environments/issues/912 --- src/features/settings/settingHelpers.ts | 76 ++++++++++++++++++++++++- src/managers/pipenv/pipenvUtils.ts | 10 +++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/features/settings/settingHelpers.ts b/src/features/settings/settingHelpers.ts index f8692f8..bad5536 100644 --- a/src/features/settings/settingHelpers.ts +++ b/src/features/settings/settingHelpers.ts @@ -10,7 +10,7 @@ import { import { PythonProject } from '../../api'; import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants'; import { traceError, traceInfo, traceWarn } from '../../common/logging'; -import { getWorkspaceFile, getWorkspaceFolders } from '../../common/workspace.apis'; +import { getConfiguration, getWorkspaceFile, getWorkspaceFolders } from '../../common/workspace.apis'; import { PythonProjectManager, PythonProjectSettings } from '../../internal.api'; function getSettings( @@ -393,3 +393,77 @@ export async function removePythonProjectSetting(edits: EditProjectSettings[]): }); await Promise.all(promises); } + +/** + * Gets user-configured setting for window-scoped settings. + * Priority order: globalRemoteValue > globalLocalValue > globalValue + * @param section - The configuration section (e.g., 'python-envs') + * @param key - The configuration key (e.g., 'terminal.autoActivationType') + * @returns The user-configured value or undefined if not set by user + */ +export function getSettingWindowScope(section: string, key: string): T | undefined { + const config = getConfiguration(section); + const inspect = config.inspect(key); + if (!inspect) { + return undefined; + } + + const inspectRecord = inspect as Record; + if ('globalRemoteValue' in inspect && inspectRecord.globalRemoteValue !== undefined) { + return inspectRecord.globalRemoteValue as T; + } + if ('globalLocalValue' in inspect && inspectRecord.globalLocalValue !== undefined) { + return inspectRecord.globalLocalValue as T; + } + if (inspect.globalValue !== undefined) { + return inspect.globalValue; + } + return undefined; +} + +/** + * Gets user-configured setting for workspace-scoped settings. + * Priority order: workspaceFolderValue > workspaceValue > globalValue + * @param section - The configuration section (e.g., 'python') + * @param key - The configuration key (e.g., 'pipenvPath') + * @param scope - Optional URI scope for workspace folder-specific settings + * @returns The user-configured value or undefined if not set by user + */ +export function getSettingWorkspaceScope(section: string, key: string, scope?: Uri): T | undefined { + const config = getConfiguration(section, scope); + const inspect = config.inspect(key); + if (!inspect) { + return undefined; + } + + if (inspect.workspaceFolderValue !== undefined) { + return inspect.workspaceFolderValue; + } + if (inspect.workspaceValue !== undefined) { + return inspect.workspaceValue; + } + if (inspect.globalValue !== undefined) { + return inspect.globalValue; + } + return undefined; +} + +/** + * Gets user-configured setting for user-scoped settings. + * Only checks globalValue (ignores defaultValue). + * @param section - The configuration section (e.g., 'python') + * @param key - The configuration key (e.g., 'pipenvPath') + * @returns The user-configured value or undefined if not set by user + */ +export function getSettingUserScope(section: string, key: string): T | undefined { + const config = getConfiguration(section); + const inspect = config.inspect(key); + if (!inspect) { + return undefined; + } + + if (inspect.globalValue !== undefined) { + return inspect.globalValue; + } + return undefined; +} diff --git a/src/managers/pipenv/pipenvUtils.ts b/src/managers/pipenv/pipenvUtils.ts index ac3ef82..f7045da 100644 --- a/src/managers/pipenv/pipenvUtils.ts +++ b/src/managers/pipenv/pipenvUtils.ts @@ -13,6 +13,7 @@ import { import { ENVS_EXTENSION_ID } from '../../common/constants'; import { traceError, traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; +import { getSettingWorkspaceScope } from '../../features/settings/settingHelpers'; import { isNativeEnvInfo, NativeEnvInfo, @@ -46,6 +47,11 @@ export async function clearPipenvCache(): Promise { pipenvPath = undefined; } +function getPipenvPathFromSettings(): Uri[] { + const pipenvPath = getSettingWorkspaceScope('python', 'pipenvPath'); + return pipenvPath ? [Uri.file(pipenvPath)] : []; +} + export async function getPipenv(native?: NativePythonFinder): Promise { if (pipenvPath) { return pipenvPath; @@ -140,7 +146,9 @@ export async function refreshPipenv( manager: EnvironmentManager, ): Promise { traceInfo('Refreshing pipenv environments'); - const data = await nativeFinder.refresh(hardRefresh); + + const searchUris = getPipenvPathFromSettings(); + const data = await nativeFinder.refresh(hardRefresh, searchUris.length > 0 ? searchUris : undefined); let pipenv = await getPipenv(); From 250f3535e48017578dbc366f9bcd6c63e9abaa70 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 06:31:05 +0000 Subject: [PATCH 313/328] Fix missing dev-requirements.txt in workspace dependencies list (#910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes microsoft/vscode-python-environments#506 Added an explicit glob pattern `*requirements*.txt` to ensure requirements files at the workspace root are reliably found. The fix includes: 1. **Additional search pattern**: Added `findFiles('*requirements*.txt')` to explicitly search the workspace root 2. **Deduplication logic**: Implemented deduplication using a Map keyed by file system path to handle overlapping patterns 3. **Comprehensive tests**: Created 5 new unit tests to validate the fix Now both patterns work together: - `**/*requirements*.txt` - finds requirements files in subdirectories - `*requirements*.txt` - finds requirements files at workspace root ## Requirements Files Now Discovered This fix ensures all common requirements file naming patterns are found: - `requirements.txt` - main dependencies - `dev-requirements.txt` - development dependencies ✨ - `test-requirements.txt` - testing dependencies ✨ - `docs-requirements.txt` - documentation dependencies ✨ - `prod-requirements.txt` - production dependencies ✨ - Any other `*requirements*.txt` variant ✨
Original prompt > > ---- > > *This section details on the original issue you should resolve* > > Missing requirements file in workspace dependencies list > I have the following file structure > > ![Image](https://github.com/user-attachments/assets/fccc626f-dedd-4c6e-8d66-93b7fc47ec6e) > > - click + on venv in environments panel > - click to create environment in root directory > - custom environment > - install workspace dependencies > - I only see `requirements.txt` as an option > > I expect I would see both dev-requirements.txt and requirements.txt because they are both present in the root folder > > > ![Image](https://github.com/user-attachments/assets/0868fe35-f0c1-4b38-bf50-e40d7835a4f2) > > > > ## Comments on the Issue (you are @copilot in this section) > > > @eleanorjboyd > todo: adopt dev-requirements.txt as something we search in the python environment extension when finding dependency files. > >
--- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- .../testing-workflow.instructions.md | 9 +- src/managers/builtin/pipUtils.ts | 6 +- .../managers/builtin/pipUtils.unit.test.ts | 202 ++++++++++++++++++ 3 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 src/test/managers/builtin/pipUtils.unit.test.ts diff --git a/.github/instructions/testing-workflow.instructions.md b/.github/instructions/testing-workflow.instructions.md index 2c56f53..b5be4b3 100644 --- a/.github/instructions/testing-workflow.instructions.md +++ b/.github/instructions/testing-workflow.instructions.md @@ -537,17 +537,16 @@ envConfig.inspect - ❌ Tests that don't clean up mocks properly - ❌ Overly complex test setup that's hard to understand -## 🧠 Agent Learning Patterns - -### Key Implementation Insights +## 🧠 Agent Learnings - Always use dynamic path construction with Node.js `path` module when testing functions that resolve paths against workspace folders to ensure cross-platform compatibility (1) - Use `runTests` tool for programmatic test execution rather than terminal commands for better integration and result parsing (1) -- Mock wrapper functions (e.g., `workspaceApis.getConfiguration()`) instead of VS Code APIs directly to avoid stubbing issues (1) +- Mock wrapper functions (e.g., `workspaceApis.getConfiguration()`) instead of VS Code APIs directly to avoid stubbing issues (2) - Start compilation with `npm run watch-tests` before test execution to ensure TypeScript files are built (1) -- Use `sinon.match()` patterns for resilient assertions that don't break on minor output changes (1) +- Use `sinon.match()` patterns for resilient assertions that don't break on minor output changes (2) - Fix test issues iteratively - run tests, analyze failures, apply fixes, repeat until passing (1) - When fixing mock environment creation, use `null` to truly omit properties rather than `undefined` (1) - Always recompile TypeScript after making import/export changes before running tests, as stubs won't work if they're applied to old compiled JavaScript that doesn't have the updated imports (2) - Create proxy abstraction functions for Node.js APIs like `cp.spawn` to enable clean testing - use function overloads to preserve Node.js's intelligent typing while making the functions mockable (1) - When unit tests fail with VS Code API errors like `TypeError: X is not a constructor` or `Cannot read properties of undefined (reading 'Y')`, check if VS Code APIs are properly mocked in `/src/test/unittests.ts` - add missing Task-related APIs (`Task`, `TaskScope`, `ShellExecution`, `TaskRevealKind`, `TaskPanelKind`) and namespace mocks (`tasks`) following the existing pattern of `mockedVSCode.X = vscodeMocks.vscMockExtHostedTypes.X` (1) +- Create minimal mock objects with only required methods and use TypeScript type assertions (e.g., mockApi as PythonEnvironmentApi) to satisfy interface requirements instead of implementing all interface methods when only specific methods are needed for the test (1) diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index ef3ef88..f8c5279 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -183,13 +183,17 @@ export async function getProjectInstallable( const results: Uri[] = ( await Promise.all([ findFiles('**/*requirements*.txt', exclude, undefined, token), + findFiles('*requirements*.txt', exclude, undefined, token), findFiles('**/requirements/*.txt', exclude, undefined, token), findFiles('**/pyproject.toml', exclude, undefined, token), ]) ).flat(); + // Deduplicate by fsPath + const uniqueResults = Array.from(new Map(results.map((uri) => [uri.fsPath, uri])).values()); + const fsPaths = projects.map((p) => p.uri.fsPath); - const filtered = results + const filtered = uniqueResults .filter((uri) => { const p = api.getPythonProject(uri)?.uri.fsPath; return p && fsPaths.includes(p); diff --git a/src/test/managers/builtin/pipUtils.unit.test.ts b/src/test/managers/builtin/pipUtils.unit.test.ts new file mode 100644 index 0000000..076596e --- /dev/null +++ b/src/test/managers/builtin/pipUtils.unit.test.ts @@ -0,0 +1,202 @@ +import assert from 'assert'; +import * as path from 'path'; +import * as sinon from 'sinon'; +import { CancellationToken, Progress, ProgressOptions, Uri } from 'vscode'; +import { PythonEnvironmentApi, PythonProject } from '../../../api'; +import * as winapi from '../../../common/window.apis'; +import * as wapi from '../../../common/workspace.apis'; +import { getProjectInstallable } from '../../../managers/builtin/pipUtils'; + +suite('Pip Utils - getProjectInstallable', () => { + let findFilesStub: sinon.SinonStub; + let withProgressStub: sinon.SinonStub; + // Minimal mock that only implements the methods we need for this test + // Using type assertion to satisfy TypeScript since we only need getPythonProject + let mockApi: { getPythonProject: (uri: Uri) => PythonProject | undefined }; + + setup(() => { + findFilesStub = sinon.stub(wapi, 'findFiles'); + // Stub withProgress to immediately execute the callback + withProgressStub = sinon.stub(winapi, 'withProgress'); + withProgressStub.callsFake( + async ( + _options: ProgressOptions, + callback: ( + progress: Progress<{ message?: string; increment?: number }>, + token: CancellationToken, + ) => Thenable, + ) => { + return await callback( + {} as Progress<{ message?: string; increment?: number }>, + { isCancellationRequested: false } as CancellationToken, + ); + }, + ); + + const workspacePath = Uri.file('/test/path/root').fsPath; + mockApi = { + getPythonProject: (uri: Uri) => { + // Return a project for any URI in workspace + if (uri.fsPath.startsWith(workspacePath)) { + return { name: 'workspace', uri: Uri.file(workspacePath) }; + } + return undefined; + }, + }; + }); + + teardown(() => { + sinon.restore(); + }); + + test('should find dev-requirements.txt at workspace root', async () => { + // Arrange: Mock findFiles to return both requirements.txt and dev-requirements.txt + findFilesStub.callsFake((pattern: string) => { + if (pattern === '**/*requirements*.txt') { + // This pattern might not match root-level files in VS Code + return Promise.resolve([]); + } else if (pattern === '*requirements*.txt') { + // This pattern should match root-level files + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([ + Uri.file(path.join(workspacePath, 'requirements.txt')), + Uri.file(path.join(workspacePath, 'dev-requirements.txt')), + Uri.file(path.join(workspacePath, 'test-requirements.txt')), + ]); + } else if (pattern === '**/requirements/*.txt') { + return Promise.resolve([]); + } else if (pattern === '**/pyproject.toml') { + return Promise.resolve([]); + } + return Promise.resolve([]); + }); + + // Act: Call getProjectInstallable + const workspacePath = Uri.file('/test/path/root').fsPath; + const projects = [{ name: 'workspace', uri: Uri.file(workspacePath) }]; + const result = await getProjectInstallable(mockApi as PythonEnvironmentApi, projects); + + // Assert: Should find all three requirements files + assert.strictEqual(result.length, 3, 'Should find three requirements files'); + + const names = result.map((r) => r.name).sort(); + assert.deepStrictEqual( + names, + ['dev-requirements.txt', 'requirements.txt', 'test-requirements.txt'], + 'Should find requirements.txt, dev-requirements.txt, and test-requirements.txt', + ); + + // Verify each file has correct properties + result.forEach((item) => { + assert.strictEqual(item.group, 'Requirements', 'Should be in Requirements group'); + assert.ok(item.args, 'Should have args'); + assert.strictEqual(item.args?.length, 2, 'Should have 2 args'); + assert.strictEqual(item.args?.[0], '-r', 'First arg should be -r'); + assert.ok(item.uri, 'Should have a URI'); + }); + }); + + test('should deduplicate files found by multiple patterns', async () => { + // Arrange: Mock both patterns to return the same file + findFilesStub.callsFake((pattern: string) => { + if (pattern === '**/*requirements*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([Uri.file(path.join(workspacePath, 'dev-requirements.txt'))]); + } else if (pattern === '*requirements*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([ + Uri.file(path.join(workspacePath, 'dev-requirements.txt')), + Uri.file(path.join(workspacePath, 'requirements.txt')), + ]); + } else if (pattern === '**/requirements/*.txt') { + return Promise.resolve([]); + } else if (pattern === '**/pyproject.toml') { + return Promise.resolve([]); + } + return Promise.resolve([]); + }); + + // Act: Call getProjectInstallable + const workspacePath = Uri.file('/test/path/root').fsPath; + const projects = [{ name: 'workspace', uri: Uri.file(workspacePath) }]; + const result = await getProjectInstallable(mockApi as PythonEnvironmentApi, projects); + + // Assert: Should deduplicate and only have 2 unique files + assert.strictEqual(result.length, 2, 'Should deduplicate and have 2 unique files'); + + const names = result.map((r) => r.name).sort(); + assert.deepStrictEqual(names, ['dev-requirements.txt', 'requirements.txt'], 'Should have deduplicated results'); + }); + + test('should find requirements files in subdirectories', async () => { + // Arrange: Mock findFiles to return files in subdirectories + findFilesStub.callsFake((pattern: string) => { + if (pattern === '**/*requirements*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([Uri.file(path.join(workspacePath, 'subdir', 'dev-requirements.txt'))]); + } else if (pattern === '*requirements*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([Uri.file(path.join(workspacePath, 'requirements.txt'))]); + } else if (pattern === '**/requirements/*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + return Promise.resolve([Uri.file(path.join(workspacePath, 'requirements', 'test.txt'))]); + } else if (pattern === '**/pyproject.toml') { + return Promise.resolve([]); + } + return Promise.resolve([]); + }); + + // Act: Call getProjectInstallable + const workspacePath = Uri.file('/test/path/root').fsPath; + const projects = [{ name: 'workspace', uri: Uri.file(workspacePath) }]; + const result = await getProjectInstallable(mockApi as PythonEnvironmentApi, projects); + + // Assert: Should find all files + assert.strictEqual(result.length, 3, 'Should find three files'); + + const names = result.map((r) => r.name).sort(); + assert.deepStrictEqual( + names, + ['dev-requirements.txt', 'requirements.txt', 'test.txt'], + 'Should find files at different levels', + ); + }); + + test('should return empty array when no projects provided', async () => { + // Act: Call with no projects + const result = await getProjectInstallable(mockApi as PythonEnvironmentApi, undefined); + + // Assert: Should return empty array + assert.strictEqual(result.length, 0, 'Should return empty array'); + assert.ok(!findFilesStub.called, 'Should not call findFiles when no projects'); + }); + + test('should filter out files not in project directories', async () => { + // Arrange: Mock findFiles to return files from multiple directories + findFilesStub.callsFake((pattern: string) => { + if (pattern === '*requirements*.txt') { + const workspacePath = Uri.file('/test/path/root').fsPath; + const otherPath = Uri.file('/other-dir').fsPath; + return Promise.resolve([ + Uri.file(path.join(workspacePath, 'requirements.txt')), + Uri.file(path.join(otherPath, 'requirements.txt')), // Should be filtered out + ]); + } else { + return Promise.resolve([]); + } + }); + + // Act: Call with only workspace project + const workspacePath = Uri.file('/test/path/root').fsPath; + const projects = [{ name: 'workspace', uri: Uri.file(workspacePath) }]; + const result = await getProjectInstallable(mockApi as PythonEnvironmentApi, projects); + + // Assert: Should only include files from workspace + assert.strictEqual(result.length, 1, 'Should only include files from project directory'); + const firstResult = result[0]; + assert.ok(firstResult, 'Should have at least one result'); + assert.strictEqual(firstResult.name, 'requirements.txt'); + assert.ok(firstResult.uri, 'Should have a URI'); + assert.ok(firstResult.uri.fsPath.startsWith(workspacePath), 'Should be in workspace directory'); + }); +}); From 4857c2c9b42e2f061a6527b0d2dbc97be839ce4b Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Tue, 7 Oct 2025 23:31:33 -0700 Subject: [PATCH 314/328] add testing for runInBackground (#877) --- src/common/childProcess.apis.ts | 28 ++ src/features/execution/runInBackground.ts | 8 +- .../execution/runInBackground.unit.test.ts | 421 ++++++++++++++++++ 3 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 src/common/childProcess.apis.ts create mode 100644 src/test/features/execution/runInBackground.unit.test.ts diff --git a/src/common/childProcess.apis.ts b/src/common/childProcess.apis.ts new file mode 100644 index 0000000..8ae2f26 --- /dev/null +++ b/src/common/childProcess.apis.ts @@ -0,0 +1,28 @@ +import * as cp from 'child_process'; + +/** + * Spawns a new process using the specified command and arguments. + * This function abstracts cp.spawn to make it easier to mock in tests. + * + * When stdio: 'pipe' is used, returns ChildProcessWithoutNullStreams. + * Otherwise returns the standard ChildProcess. + */ + +// Overload for stdio: 'pipe' - guarantees non-null streams +export function spawnProcess( + command: string, + args: string[], + options: cp.SpawnOptions & { stdio: 'pipe' }, +): cp.ChildProcessWithoutNullStreams; + +// Overload for general case +export function spawnProcess(command: string, args: string[], options?: cp.SpawnOptions): cp.ChildProcess; + +// Implementation - delegates to cp.spawn to preserve its typing magic +export function spawnProcess( + command: string, + args: string[], + options?: cp.SpawnOptions, +): cp.ChildProcess | cp.ChildProcessWithoutNullStreams { + return cp.spawn(command, args, options ?? {}); +} diff --git a/src/features/execution/runInBackground.ts b/src/features/execution/runInBackground.ts index c961325..cf1ac8e 100644 --- a/src/features/execution/runInBackground.ts +++ b/src/features/execution/runInBackground.ts @@ -1,5 +1,5 @@ -import * as cp from 'child_process'; import { PythonBackgroundRunOptions, PythonEnvironment, PythonProcess } from '../../api'; +import { spawnProcess } from '../../common/childProcess.apis'; import { traceError, traceInfo, traceWarn } from '../../common/logging'; import { quoteStringIfNecessary } from './execUtils'; @@ -39,7 +39,11 @@ export async function runInBackground( traceWarn(`Error checking if executable exists: ${err instanceof Error ? err.message : String(err)}`); } - const proc = cp.spawn(executable, allArgs, { stdio: 'pipe', cwd: options.cwd, env: options.env }); + const proc = spawnProcess(executable, allArgs, { + stdio: 'pipe', + cwd: options.cwd, + env: options.env, + }); return { pid: proc.pid, diff --git a/src/test/features/execution/runInBackground.unit.test.ts b/src/test/features/execution/runInBackground.unit.test.ts new file mode 100644 index 0000000..7a0b88e --- /dev/null +++ b/src/test/features/execution/runInBackground.unit.test.ts @@ -0,0 +1,421 @@ +import * as cp from 'child_process'; +import assert from 'node:assert'; +import path from 'node:path'; +import * as sinon from 'sinon'; + +import { Uri } from 'vscode'; +import { PythonBackgroundRunOptions, PythonEnvironment } from '../../../api'; +import * as childProcessApis from '../../../common/childProcess.apis'; +import * as logging from '../../../common/logging'; +import * as execUtils from '../../../features/execution/execUtils'; +import { runInBackground } from '../../../features/execution/runInBackground'; +import { MockChildProcess } from '../../mocks/mockChildProcess'; + +/** + * Creates a mock PythonEnvironment for testing purposes. + * + * This helper function generates a complete PythonEnvironment object with sensible defaults + * while allowing customization of the execInfo property, which is crucial for testing + * different execution scenarios (activated vs non-activated environments, missing configs, etc.). + * + * @param execInfo - Execution information object containing run/activatedRun configs. + * Pass null to create an environment without execInfo (tests fallback behavior). + * Pass undefined or omit to get default execInfo with basic python3 executable. + * Pass custom object to test specific execution configurations. + * @returns A complete PythonEnvironment object suitable for testing + * + * @example + * // Environment with default execInfo + * const env = createMockEnvironment(); + * + * // Environment without execInfo (tests fallback to 'python') + * const envNoExec = createMockEnvironment(null); + * + * // Environment with custom execution config + * const envCustom = createMockEnvironment({ + * run: { executable: '/custom/python', args: ['--flag'] }, + * activatedRun: { executable: '/venv/python', args: [] } + * }); + */ +function createMockEnvironment(execInfo?: object | null): PythonEnvironment { + const baseEnv = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'test-env', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + sysPrefix: '/path/to/sys/prefix', + }; + + if (execInfo === null) { + // Return environment without execInfo for testing fallback scenarios + return baseEnv as PythonEnvironment; + } + + return { + ...baseEnv, + execInfo: (execInfo || { + run: { executable: path.join('usr', 'bin', 'python3'), args: [] }, + }) as PythonEnvironment['execInfo'], + }; +} + +// Store the created mock processes for testing +let _mockProcesses: MockChildProcess[] = []; + +// Track spawned processes for testing +interface SpawnCall { + executable: string; + args: string[]; + options: cp.SpawnOptions; +} + +let _spawnCalls: SpawnCall[] = []; + +suite('runInBackground Function Tests', () => { + let mockTraceInfo: sinon.SinonStub; + let mockTraceWarn: sinon.SinonStub; + let mockTraceError: sinon.SinonStub; + let mockQuoteStringIfNecessary: sinon.SinonStub; + let mockExistsSync: sinon.SinonStub; + let mockSpawnProcess: sinon.SinonStub; + + setup(() => { + // Reset tracking arrays + _spawnCalls = []; + _mockProcesses = []; + + // Mock logging functions + mockTraceInfo = sinon.stub(logging, 'traceInfo'); + mockTraceWarn = sinon.stub(logging, 'traceWarn'); + mockTraceError = sinon.stub(logging, 'traceError'); + + // Mock execUtils + mockQuoteStringIfNecessary = sinon.stub(execUtils, 'quoteStringIfNecessary'); + mockQuoteStringIfNecessary.callsFake((arg: string) => arg); + + // Mock fs.existsSync to avoid file system checks + mockExistsSync = sinon.stub(); + mockExistsSync.returns(true); + const fs = require('fs'); + sinon.stub(fs, 'existsSync').callsFake(mockExistsSync); + + // Mock spawnProcess to capture calls and return mock process + mockSpawnProcess = sinon.stub(childProcessApis, 'spawnProcess'); + mockSpawnProcess.callsFake((command: string, args: string[], options?: cp.SpawnOptions) => { + // Track the spawn call for assertions + _spawnCalls.push({ + executable: command, + args: args, + options: options || {}, + }); + + // Create and return a mock child process that won't actually spawn + const mockProcess = new MockChildProcess(command, args); + _mockProcesses.push(mockProcess); + + // Set the pid property directly on the object + Object.defineProperty(mockProcess, 'pid', { + value: 12345, + writable: false, + configurable: true, + }); + + // Return the mock process (it extends EventEmitter and has stdin/stdout/stderr) + return mockProcess as unknown as cp.ChildProcess; + }); + }); + + teardown(() => { + sinon.restore(); + }); + + suite('Executable and Args Logic', () => { + test('should prefer activatedRun executable over run executable', async () => { + // Mock → Environment with both activatedRun and run executables + const environment = createMockEnvironment({ + run: { + executable: path.join('usr', 'bin', 'python3'), + args: ['--base-arg'], + }, + activatedRun: { + executable: path.join('path', 'to', 'venv', 'python'), + args: ['--activated-arg'], + }, + }); + + const options: PythonBackgroundRunOptions = { + args: ['script.py', '--script-arg'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual( + spawnCall.executable, + path.join('path', 'to', 'venv', 'python'), + 'Should prefer activatedRun executable', + ); + assert.deepStrictEqual( + spawnCall.args, + ['--activated-arg', 'script.py', '--script-arg'], + 'Should combine activatedRun args with options args', + ); + }); + + test('should fallback to run executable when activatedRun not available', async () => { + // Mock → Environment with only run executable + const environment = createMockEnvironment({ + run: { + executable: path.join('usr', 'bin', 'python3'), + args: ['--base-arg'], + }, + }); + + const options: PythonBackgroundRunOptions = { + args: ['module', '-m', 'pip', 'list'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual(spawnCall.executable, path.join('usr', 'bin', 'python3'), 'Should use run executable'); + assert.deepStrictEqual( + spawnCall.args, + ['--base-arg', 'module', '-m', 'pip', 'list'], + 'Should combine run args with options args', + ); + }); + + test('should fallback to "python" when no executable found', async () => { + // Mock → Environment with no execInfo + const environment = createMockEnvironment(null); + + const options: PythonBackgroundRunOptions = { + args: ['script.py'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual(spawnCall.executable, 'python', 'Should fallback to "python"'); + assert.deepStrictEqual(spawnCall.args, ['script.py'], 'Should use options args only'); + }); + + test('should remove quotes from executable path', async () => { + // Mock → Environment with quoted executable path + const environment = createMockEnvironment({ + run: { + executable: `"${path.join('path with spaces', 'python')}"`, + args: [], + }, + }); + + const options: PythonBackgroundRunOptions = { + args: ['script.py'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual( + spawnCall.executable, + path.join('path with spaces', 'python'), + 'Should remove surrounding quotes', + ); + }); + + test('should handle empty args arrays', async () => { + // Mock → Environment with no args and options with no args + const environment = createMockEnvironment({ + run: { + executable: path.join('usr', 'bin', 'python3'), + // No args property + }, + }); + + const options: PythonBackgroundRunOptions = { + args: [], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.deepStrictEqual(spawnCall.args, [], 'Should handle empty args arrays'); + }); + + test('should combine environment args with options args correctly', async () => { + // Mock → Complex environment with all options + const environment = createMockEnvironment({ + run: { + executable: path.join('usr', 'bin', 'python3'), + args: ['--base'], + }, + activatedRun: { + executable: path.join('venv', 'bin', 'python'), + args: ['--activated', '--optimized'], + }, + }); + + const options: PythonBackgroundRunOptions = { + args: ['-m', 'mymodule', '--config', 'production'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual(spawnCall.executable, path.join('venv', 'bin', 'python'), 'Should prefer activatedRun'); + + const expectedArgs = ['--activated', '--optimized', '-m', 'mymodule', '--config', 'production']; + assert.deepStrictEqual(spawnCall.args, expectedArgs, 'Should combine all args correctly'); + }); + }); + + suite('Logging Behavior', () => { + test('should have proper logging methods available', () => { + // Assert - verify logging functions exist + assert.ok(mockTraceInfo, 'Should have traceInfo mock'); + assert.ok(mockTraceWarn, 'Should have traceWarn mock'); + assert.ok(mockTraceError, 'Should have traceError mock'); + }); + + test('should have execUtils methods available', () => { + // Assert - verify execUtils functions exist + assert.ok(mockQuoteStringIfNecessary, 'Should have quoteStringIfNecessary mock'); + + // Test the default behavior + const result = mockQuoteStringIfNecessary('test-path'); + assert.strictEqual(result, 'test-path', 'Should return path unchanged by default'); + }); + }); + + suite('Environment Structure Tests', () => { + test('should create valid PythonEnvironment mock', () => { + // Mock → Complete environment + const environment = createMockEnvironment({ + run: { executable: path.join('usr', 'bin', 'python3'), args: ['--arg'] }, + activatedRun: { executable: path.join('venv', 'python'), args: ['--venv-arg'] }, + }); + + // Assert - verify structure + assert.ok(environment.envId, 'Should have envId'); + assert.strictEqual(environment.envId.id, 'test-env', 'Should have correct id'); + assert.strictEqual(environment.envId.managerId, 'test-manager', 'Should have correct managerId'); + assert.strictEqual(environment.name, 'test-env', 'Should have correct name'); + assert.strictEqual(environment.displayName, 'Test Environment', 'Should have correct displayName'); + assert.ok(environment.execInfo, 'Should have execInfo'); + assert.ok(environment.execInfo.run, 'Should have run config'); + assert.ok(environment.execInfo.activatedRun, 'Should have activatedRun config'); + }); + + test('should create PythonBackgroundRunOptions correctly', () => { + // Mock → Options with all properties + const options: PythonBackgroundRunOptions = { + args: ['-m', 'pytest', 'tests/', '--verbose'], + cwd: '/project/root', + env: { PYTHONPATH: '/custom/path', DEBUG: 'true' }, + }; + + // Assert - verify structure + assert.ok(Array.isArray(options.args), 'Should have args array'); + assert.strictEqual(options.args.length, 4, 'Should have correct number of args'); + assert.strictEqual(options.cwd, '/project/root', 'Should have correct cwd'); + assert.ok(options.env, 'Should have env object'); + assert.strictEqual(options.env.PYTHONPATH, '/custom/path', 'Should have correct PYTHONPATH'); + assert.strictEqual(options.env.DEBUG, 'true', 'Should have correct DEBUG value'); + }); + }); + + suite('Edge Cases and Error Conditions', () => { + test('should handle missing execInfo gracefully', async () => { + // Mock → Environment without execInfo + const environment = { + envId: { id: 'test-env', managerId: 'test-manager' }, + name: 'test-env', + displayName: 'Test Environment', + displayPath: '/path/to/env', + version: '3.9.0', + environmentPath: Uri.file('/path/to/env'), + sysPrefix: '/path/to/sys/prefix', + // No execInfo + } as PythonEnvironment; + + const options: PythonBackgroundRunOptions = { + args: ['script.py'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual(spawnCall.executable, 'python', 'Should fallback to "python"'); + assert.deepStrictEqual(spawnCall.args, ['script.py'], 'Should use options args only'); + }); + + test('should handle partial execInfo configurations', async () => { + // Mock → Environment with run but no activatedRun + const environment = createMockEnvironment({ + run: { + executable: path.join('usr', 'bin', 'python3'), + // No args + }, + // No activatedRun + }); + + const options: PythonBackgroundRunOptions = { + args: ['--help'], + }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual(spawnCall.executable, path.join('usr', 'bin', 'python3'), 'Should use run executable'); + assert.deepStrictEqual(spawnCall.args, ['--help'], 'Should handle missing environment args'); + }); + + test('should handle quote patterns correctly', async () => { + // Test the common case of quoted paths with spaces + const environment = createMockEnvironment({ + run: { executable: `"${path.join('path with spaces', 'python')}"`, args: [] }, + }); + + const options: PythonBackgroundRunOptions = { args: [] }; + + // Run + await runInBackground(environment, options); + + // Assert + assert.strictEqual(_spawnCalls.length, 1, 'Should call spawn once'); + const spawnCall = _spawnCalls[0]; + assert.strictEqual( + spawnCall.executable, + path.join('path with spaces', 'python'), + 'Should remove surrounding quotes from executable path', + ); + }); + }); +}); From 44486839890838f0cc400a7193753b75e5f80d54 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:36:54 +0200 Subject: [PATCH 315/328] Add PowerShell version logging for activation debugging (#851) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implementing better PowerShell version logging for activation debugging as requested in issue #706. The issue stems from the PR review comment (https://github.com/microsoft/vscode-python-environments/pull/693#discussion_r2267868941) suggesting that logging PowerShell version information would be valuable for debugging activation failures, especially given the differences between Windows PowerShell 5.x and PowerShell 7+. ## Changes Made: - [x] Analyze current PowerShell activation flow in pwshStartup.ts and pwshEnvs.ts - [x] Examine existing logging patterns and utilities - [x] Test current build/compile state of project - [x] Create utility function to detect PowerShell version via `$PSVersionTable.PSVersion.Major` - [x] Add PowerShell version logging to relevant activation code paths - [x] Add version logging for both conda and non-conda activation scenarios - [x] Ensure logging follows existing patterns (traceInfo/traceVerbose) - [x] Test changes and verify proper logging output - [x] Use shorter -c flag instead of -Command for PowerShell commands ## Implementation Details: 1. **Added `getPowerShellVersion()` function** - Detects PowerShell major version using `$PSVersionTable.PSVersion.Major` command with `-c` flag 2. **Enhanced installation logging** - Now logs PowerShell version when shells are detected (e.g., "SHELL: pwsh is installed (version 7)") 3. **Enhanced activation script error messages** - PowerShell errors now include version info (e.g., "Failed to activate Python environment (PowerShell 7): error details") ## Testing: - All existing unit tests pass (128 passing) - Code compiles successfully with no lint errors - Manual testing confirms PowerShell version detection works correctly These changes provide better diagnostic information for debugging PowerShell activation issues without affecting existing functionality. Fixes #706. --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey3.medallia.com/?EAHeSx-AP01bZqG0Ld9QLQ) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- .../terminal/shells/pwsh/pwshStartup.ts | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 3758dbb..5f0e1fe 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -58,6 +58,27 @@ async function isPowerShellInstalled(shell: string): Promise { } } +/** + * Detects the major version of PowerShell by executing a version query command. + * This helps with debugging activation issues since PowerShell 5.x and 7+ have different behaviors. + * @param shell The PowerShell executable name ('powershell' for Windows PowerShell or 'pwsh' for PowerShell Core/7+) + * @returns Promise resolving to the major version number as a string, or undefined if detection fails + */ +async function getPowerShellVersion(shell: 'powershell' | 'pwsh'): Promise { + try { + const command = `${shell} -c '\$PSVersionTable.PSVersion.Major'`; + const versionOutput = await runCommand(command); + if (versionOutput && !isNaN(Number(versionOutput))) { + return versionOutput; + } + traceVerbose(`Failed to parse PowerShell version from output: ${versionOutput}`); + return undefined; + } catch (err) { + traceVerbose(`Failed to get PowerShell version for ${shell}`, err); + return undefined; + } +} + async function getProfileForShell(shell: 'powershell' | 'pwsh'): Promise { const cachedPath = getProfilePathCache(shell); if (cachedPath) { @@ -125,7 +146,8 @@ function getActivationContent(): string { ' try {', ` Invoke-Expression $env:${POWERSHELL_ENV_KEY}`, ' } catch {', - ` Write-Error "Failed to activate Python environment: $_" -ErrorAction Continue`, + ` $psVersion = $PSVersionTable.PSVersion.Major`, + ` Write-Error "Failed to activate Python environment (PowerShell $psVersion): $_" -ErrorAction Continue`, ' }', ' }', '}', @@ -220,6 +242,12 @@ export class PwshStartupProvider implements ShellStartupScriptProvider { results.set(shell, this._isPs5Installed); } else { const isInstalled = await isPowerShellInstalled(shell); + if (isInstalled) { + // Log PowerShell version for debugging activation issues + const version = await getPowerShellVersion(shell); + const versionText = version ? ` (version ${version})` : ' (version unknown)'; + traceInfo(`SHELL: ${shell} is installed${versionText}`); + } if (shell === 'pwsh') { this._isPwshInstalled = isInstalled; } else { From 859a597c31aadfefbd5c1f784d9b9a417a6fc641 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 8 Oct 2025 10:12:19 -0700 Subject: [PATCH 316/328] add get pipenv from settings to getPipenv function (#914) fully completes: https://github.com/microsoft/vscode-python-environments/issues/912 --- src/managers/pipenv/pipenvUtils.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/managers/pipenv/pipenvUtils.ts b/src/managers/pipenv/pipenvUtils.ts index f7045da..e490c73 100644 --- a/src/managers/pipenv/pipenvUtils.ts +++ b/src/managers/pipenv/pipenvUtils.ts @@ -47,9 +47,9 @@ export async function clearPipenvCache(): Promise { pipenvPath = undefined; } -function getPipenvPathFromSettings(): Uri[] { +function getPipenvPathFromSettings(): string | undefined { const pipenvPath = getSettingWorkspaceScope('python', 'pipenvPath'); - return pipenvPath ? [Uri.file(pipenvPath)] : []; + return pipenvPath ? pipenvPath : undefined; } export async function getPipenv(native?: NativePythonFinder): Promise { @@ -64,6 +64,14 @@ export async function getPipenv(native?: NativePythonFinder): Promise { traceInfo('Refreshing pipenv environments'); - const searchUris = getPipenvPathFromSettings(); - const data = await nativeFinder.refresh(hardRefresh, searchUris.length > 0 ? searchUris : undefined); + const searchPath = getPipenvPathFromSettings(); + const data = await nativeFinder.refresh(hardRefresh, searchPath ? [Uri.file(searchPath)] : undefined); let pipenv = await getPipenv(); From 561a9683a946c6a3abf8459e7326f54be54b74b6 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:24:29 -0700 Subject: [PATCH 317/328] Better handle terminal shell integration check (#915) This would incur less notification for change in user profile rather try to wait for shell integration not too long(max 0.5 second, but more commonly earlier since shell integration would be ready before then), we were already taking similar approach in some part of the code, but not all. --- .../terminal/shells/bash/bashStartup.ts | 2 +- .../terminal/shells/common/shellUtils.ts | 20 ++++++++++------ .../terminal/shells/fish/fishStartup.ts | 2 +- .../terminal/shells/pwsh/pwshStartup.ts | 2 +- src/features/terminal/terminalManager.ts | 24 ++++++++++++------- src/features/terminal/utils.ts | 4 ++-- 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 24dae7e..52e1886 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -69,7 +69,7 @@ async function isStartupSetup(profile: string, key: string): Promise { - if (shellIntegrationForActiveTerminal(name, profile) && !isWsl()) { + if ((await shellIntegrationForActiveTerminal(name, profile)) && !isWsl()) { removeStartup(profile, key); return true; } diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 20d310b..5dae76a 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -1,9 +1,11 @@ import { PythonCommandRunConfiguration, PythonEnvironment } from '../../../../api'; import { traceInfo } from '../../../../common/logging'; +import { sleep } from '../../../../common/utils/asyncUtils'; import { isWindows } from '../../../../common/utils/platformUtils'; import { activeTerminalShellIntegration } from '../../../../common/window.apis'; import { ShellConstants } from '../../../common/shellConstants'; import { quoteArgs } from '../../../execution/execUtils'; +import { SHELL_INTEGRATION_POLL_INTERVAL, SHELL_INTEGRATION_TIMEOUT } from '../../utils'; function getCommandAsString(command: PythonCommandRunConfiguration[], shell: string, delimiter: string): string { const parts = []; @@ -98,12 +100,19 @@ export function extractProfilePath(content: string): string | undefined { return undefined; } -export function shellIntegrationForActiveTerminal(name: string, profile?: string): boolean { - const hasShellIntegration = activeTerminalShellIntegration(); +export async function shellIntegrationForActiveTerminal(name: string, profile?: string): Promise { + let hasShellIntegration = activeTerminalShellIntegration(); + let timeout = 0; + + while (!hasShellIntegration && timeout < SHELL_INTEGRATION_TIMEOUT) { + await sleep(SHELL_INTEGRATION_POLL_INTERVAL); + timeout += SHELL_INTEGRATION_POLL_INTERVAL; + hasShellIntegration = activeTerminalShellIntegration(); + } if (hasShellIntegration) { traceInfo( - `SHELL: Shell integration is available on your active terminal, with name ${name} and profile ${profile}. Python activate scripts will be evaluated at shell integration level, except in WSL.` + `SHELL: Shell integration is available on your active terminal, with name ${name} and profile ${profile}. Python activate scripts will be evaluated at shell integration level, except in WSL.`, ); return true; } @@ -112,8 +121,5 @@ export function shellIntegrationForActiveTerminal(name: string, profile?: string export function isWsl(): boolean { // WSL sets these environment variables - return !!(process.env.WSL_DISTRO_NAME || - process.env.WSL_INTEROP || - process.env.WSLENV); + return !!(process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP || process.env.WSLENV); } - diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 395829e..6621e14 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -58,7 +58,7 @@ async function isStartupSetup(profilePath: string, key: string): Promise { try { - if (shellIntegrationForActiveTerminal('fish', profilePath) && !isWsl()) { + if ((await shellIntegrationForActiveTerminal('fish', profilePath)) && !isWsl()) { removeFishStartup(profilePath, key); return true; } diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index 5f0e1fe..e3962f6 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -168,7 +168,7 @@ async function isPowerShellStartupSetup(shell: string, profile: string): Promise } async function setupPowerShellStartup(shell: string, profile: string): Promise { - if (shellIntegrationForActiveTerminal(shell, profile) && !isWsl()) { + if ((await shellIntegrationForActiveTerminal(shell, profile)) && !isWsl()) { removePowerShellStartup(shell, profile, POWERSHELL_OLD_ENV_KEY); removePowerShellStartup(shell, profile, POWERSHELL_ENV_KEY); return true; diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index 81768db..b66f95e 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -129,8 +129,10 @@ export class TerminalManagerImpl implements TerminalManager { await this.handleSetupCheck(shells); } } else { - traceVerbose(`Auto activation type changed to ${actType}, we are cleaning up shell startup setup`); - // Teardown scripts when switching away from shell startup activation + traceVerbose( + `Auto activation type changed to ${actType}, we are cleaning up shell startup setup`, + ); + // Teardown scripts when switching away from shell startup activation await Promise.all(this.startupScriptProviders.map((p) => p.teardownScripts())); this.shellSetup.clear(); } @@ -145,12 +147,12 @@ export class TerminalManagerImpl implements TerminalManager { private async handleSetupCheck(shellType: string | Set): Promise { const shellTypes = typeof shellType === 'string' ? new Set([shellType]) : shellType; const providers = this.startupScriptProviders.filter((p) => shellTypes.has(p.shellType)); - if (providers.length > 0) { + if (providers.length > 0) { const shellsToSetup: ShellStartupScriptProvider[] = []; await Promise.all( providers.map(async (p) => { const state = await p.isSetup(); - const currentSetup = (state === ShellSetupState.Setup); + const currentSetup = state === ShellSetupState.Setup; // Check if we already processed this shell and the state hasn't changed if (this.shellSetup.has(p.shellType)) { const cachedSetup = this.shellSetup.get(p.shellType); @@ -158,13 +160,19 @@ export class TerminalManagerImpl implements TerminalManager { traceVerbose(`Shell profile for ${p.shellType} already checked, state unchanged.`); return; } - traceVerbose(`Shell profile for ${p.shellType} state changed from ${cachedSetup} to ${currentSetup}, re-evaluating.`); + traceVerbose( + `Shell profile for ${p.shellType} state changed from ${cachedSetup} to ${currentSetup}, re-evaluating.`, + ); } traceVerbose(`Checking shell profile for ${p.shellType}.`); if (state === ShellSetupState.NotSetup) { - traceVerbose(`WSL detected: ${isWsl()}, Shell integration available: ${shellIntegrationForActiveTerminal(p.name)}`); + traceVerbose( + `WSL detected: ${isWsl()}, Shell integration available: ${await shellIntegrationForActiveTerminal( + p.name, + )}`, + ); - if (shellIntegrationForActiveTerminal(p.name) && !isWsl()) { + if ((await shellIntegrationForActiveTerminal(p.name)) && !isWsl()) { // Shell integration available and NOT in WSL - skip setup await p.teardownScripts(); this.shellSetup.set(p.shellType, true); @@ -180,7 +188,7 @@ export class TerminalManagerImpl implements TerminalManager { ); } } else if (state === ShellSetupState.Setup) { - if (shellIntegrationForActiveTerminal(p.name) && !isWsl()) { + if ((await shellIntegrationForActiveTerminal(p.name)) && !isWsl()) { await p.teardownScripts(); traceVerbose( `Shell integration available for ${p.shellType}, removed profile script in favor of shell integration.`, diff --git a/src/features/terminal/utils.ts b/src/features/terminal/utils.ts index 9476ac1..c8f6443 100644 --- a/src/features/terminal/utils.ts +++ b/src/features/terminal/utils.ts @@ -4,8 +4,8 @@ import { PythonEnvironment, PythonProject, PythonProjectEnvironmentApi, PythonPr import { sleep } from '../../common/utils/asyncUtils'; import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.apis'; -const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds -const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds +export const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds +export const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds export async function waitForShellIntegration(terminal: Terminal): Promise { let timeout = 0; From f93faa5e1f62a6db711a9a6bb960c410ed3712b0 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:23:13 -0700 Subject: [PATCH 318/328] Add functionality to retrieve Poetry path from settings (#917) fixes https://github.com/microsoft/vscode-python-environments/issues/918 --- src/managers/poetry/poetryUtils.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/managers/poetry/poetryUtils.ts b/src/managers/poetry/poetryUtils.ts index 0886097..50b1ecc 100644 --- a/src/managers/poetry/poetryUtils.ts +++ b/src/managers/poetry/poetryUtils.ts @@ -8,6 +8,7 @@ import { traceError, traceInfo } from '../../common/logging'; import { getWorkspacePersistentState } from '../../common/persistentState'; import { getUserHomeDir, untildify } from '../../common/utils/pathUtils'; import { isWindows } from '../../common/utils/platformUtils'; +import { getConfiguration } from '../../common/workspace.apis'; import { isNativeEnvInfo, NativeEnvInfo, @@ -41,6 +42,12 @@ export async function clearPoetryCache(): Promise { poetryVirtualenvsPath = undefined; } +function getPoetryPathFromSettings(): string | undefined { + const config = getConfiguration('python'); + const value = config.get('poetryPath'); + return value && typeof value === 'string' ? untildify(value) : value; +} + async function setPoetry(poetry: string): Promise { poetryPath = poetry; const state = await getWorkspacePersistentState(); @@ -115,6 +122,14 @@ export async function getPoetry(native?: NativePythonFinder): Promise { traceInfo('Refreshing poetry environments'); - const data = await nativeFinder.refresh(hardRefresh); + + const searchPath = getPoetryPathFromSettings(); + const data = await nativeFinder.refresh(hardRefresh, searchPath ? [Uri.file(searchPath)] : undefined); let poetry = await getPoetry(); From 38912d4f0e2d8748cdd9af5cd86a3186dcb87900 Mon Sep 17 00:00:00 2001 From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Date: Thu, 9 Oct 2025 00:20:44 -0700 Subject: [PATCH 319/328] Improve shell startup experience using setting value (#921) Resolves: https://github.com/microsoft/vscode-python-environments/issues/919 which will improve on top of https://github.com/microsoft/vscode-python-environments/pull/915 I want to bulletproof shell startup as much as possible. We shouldn't be showing profile modification prompt if user has shell integration. We should also ensure proper clean up. --- .../terminal/shells/bash/bashStartup.ts | 5 ++- .../terminal/shells/common/shellUtils.ts | 38 ++++++++++++++++ .../terminal/shells/fish/fishStartup.ts | 5 ++- .../terminal/shells/pwsh/pwshStartup.ts | 5 ++- src/features/terminal/terminalManager.ts | 43 +++++++++++-------- 5 files changed, 74 insertions(+), 22 deletions(-) diff --git a/src/features/terminal/shells/bash/bashStartup.ts b/src/features/terminal/shells/bash/bashStartup.ts index 52e1886..db9be72 100644 --- a/src/features/terminal/shells/bash/bashStartup.ts +++ b/src/features/terminal/shells/bash/bashStartup.ts @@ -5,7 +5,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; -import { isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; +import { getShellIntegrationEnabledCache, isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { BASH_ENV_KEY, BASH_OLD_ENV_KEY, BASH_SCRIPT_VERSION, ZSH_ENV_KEY, ZSH_OLD_ENV_KEY } from './bashConstants'; @@ -69,7 +69,8 @@ async function isStartupSetup(profile: string, key: string): Promise { - if ((await shellIntegrationForActiveTerminal(name, profile)) && !isWsl()) { + const shellIntegrationEnabled = await getShellIntegrationEnabledCache(); + if ((shellIntegrationEnabled || (await shellIntegrationForActiveTerminal(name, profile))) && !isWsl()) { removeStartup(profile, key); return true; } diff --git a/src/features/terminal/shells/common/shellUtils.ts b/src/features/terminal/shells/common/shellUtils.ts index 5dae76a..381be88 100644 --- a/src/features/terminal/shells/common/shellUtils.ts +++ b/src/features/terminal/shells/common/shellUtils.ts @@ -1,12 +1,16 @@ import { PythonCommandRunConfiguration, PythonEnvironment } from '../../../../api'; import { traceInfo } from '../../../../common/logging'; +import { getGlobalPersistentState } from '../../../../common/persistentState'; import { sleep } from '../../../../common/utils/asyncUtils'; import { isWindows } from '../../../../common/utils/platformUtils'; import { activeTerminalShellIntegration } from '../../../../common/window.apis'; +import { getConfiguration } from '../../../../common/workspace.apis'; import { ShellConstants } from '../../../common/shellConstants'; import { quoteArgs } from '../../../execution/execUtils'; import { SHELL_INTEGRATION_POLL_INTERVAL, SHELL_INTEGRATION_TIMEOUT } from '../../utils'; +export const SHELL_INTEGRATION_STATE_KEY = 'shellIntegration.enabled'; + function getCommandAsString(command: PythonCommandRunConfiguration[], shell: string, delimiter: string): string { const parts = []; for (const cmd of command) { @@ -114,6 +118,11 @@ export async function shellIntegrationForActiveTerminal(name: string, profile?: traceInfo( `SHELL: Shell integration is available on your active terminal, with name ${name} and profile ${profile}. Python activate scripts will be evaluated at shell integration level, except in WSL.`, ); + + // Update persistent storage to reflect that shell integration is available + const persistentState = await getGlobalPersistentState(); + await persistentState.set(SHELL_INTEGRATION_STATE_KEY, true); + return true; } return false; @@ -123,3 +132,32 @@ export function isWsl(): boolean { // WSL sets these environment variables return !!(process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP || process.env.WSLENV); } + +export async function getShellIntegrationEnabledCache(): Promise { + const persistentState = await getGlobalPersistentState(); + const shellIntegrationInspect = + getConfiguration('terminal.integrated').inspect('shellIntegration.enabled'); + + let shellIntegrationEnabled = true; + if (shellIntegrationInspect) { + // Priority: workspaceFolder > workspace > globalRemoteValue > globalLocalValue > global > default + const inspectValue = shellIntegrationInspect as Record; + + if (shellIntegrationInspect.workspaceFolderValue !== undefined) { + shellIntegrationEnabled = shellIntegrationInspect.workspaceFolderValue; + } else if (shellIntegrationInspect.workspaceValue !== undefined) { + shellIntegrationEnabled = shellIntegrationInspect.workspaceValue; + } else if ('globalRemoteValue' in shellIntegrationInspect && inspectValue.globalRemoteValue !== undefined) { + shellIntegrationEnabled = inspectValue.globalRemoteValue as boolean; + } else if ('globalLocalValue' in shellIntegrationInspect && inspectValue.globalLocalValue !== undefined) { + shellIntegrationEnabled = inspectValue.globalLocalValue as boolean; + } else if (shellIntegrationInspect.globalValue !== undefined) { + shellIntegrationEnabled = shellIntegrationInspect.globalValue; + } else if (shellIntegrationInspect.defaultValue !== undefined) { + shellIntegrationEnabled = shellIntegrationInspect.defaultValue; + } + } + + await persistentState.set(SHELL_INTEGRATION_STATE_KEY, shellIntegrationEnabled); + return shellIntegrationEnabled; +} diff --git a/src/features/terminal/shells/fish/fishStartup.ts b/src/features/terminal/shells/fish/fishStartup.ts index 6621e14..40de3e9 100644 --- a/src/features/terminal/shells/fish/fishStartup.ts +++ b/src/features/terminal/shells/fish/fishStartup.ts @@ -6,7 +6,7 @@ import which from 'which'; import { traceError, traceInfo, traceVerbose } from '../../../../common/logging'; import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; -import { isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; +import { getShellIntegrationEnabledCache, isWsl, shellIntegrationForActiveTerminal } from '../common/shellUtils'; import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider'; import { FISH_ENV_KEY, FISH_OLD_ENV_KEY, FISH_SCRIPT_VERSION } from './fishConstants'; @@ -58,7 +58,8 @@ async function isStartupSetup(profilePath: string, key: string): Promise { try { - if ((await shellIntegrationForActiveTerminal('fish', profilePath)) && !isWsl()) { + const shellIntegrationEnabled = await getShellIntegrationEnabledCache(); + if ((shellIntegrationEnabled || (await shellIntegrationForActiveTerminal('fish', profilePath))) && !isWsl()) { removeFishStartup(profilePath, key); return true; } diff --git a/src/features/terminal/shells/pwsh/pwshStartup.ts b/src/features/terminal/shells/pwsh/pwshStartup.ts index e3962f6..45bb33d 100644 --- a/src/features/terminal/shells/pwsh/pwshStartup.ts +++ b/src/features/terminal/shells/pwsh/pwshStartup.ts @@ -13,6 +13,7 @@ import { ShellConstants } from '../../../common/shellConstants'; import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils'; import { extractProfilePath, + getShellIntegrationEnabledCache, isWsl, PROFILE_TAG_END, PROFILE_TAG_START, @@ -168,7 +169,9 @@ async function isPowerShellStartupSetup(shell: string, profile: string): Promise } async function setupPowerShellStartup(shell: string, profile: string): Promise { - if ((await shellIntegrationForActiveTerminal(shell, profile)) && !isWsl()) { + const shellIntegrationEnabled = await getShellIntegrationEnabledCache(); + + if ((shellIntegrationEnabled || (await shellIntegrationForActiveTerminal(shell, profile))) && !isWsl()) { removePowerShellStartup(shell, profile, POWERSHELL_OLD_ENV_KEY); removePowerShellStartup(shell, profile, POWERSHELL_ENV_KEY); return true; diff --git a/src/features/terminal/terminalManager.ts b/src/features/terminal/terminalManager.ts index b66f95e..f7acb2d 100644 --- a/src/features/terminal/terminalManager.ts +++ b/src/features/terminal/terminalManager.ts @@ -16,7 +16,7 @@ import { getConfiguration, onDidChangeConfiguration } from '../../common/workspa import { isActivatableEnvironment } from '../common/activation'; import { identifyTerminalShell } from '../common/shellDetector'; import { getPythonApi } from '../pythonApi'; -import { isWsl, shellIntegrationForActiveTerminal } from './shells/common/shellUtils'; +import { getShellIntegrationEnabledCache, isWsl, shellIntegrationForActiveTerminal } from './shells/common/shellUtils'; import { ShellEnvsProvider, ShellSetupState, ShellStartupScriptProvider } from './shells/startupProvider'; import { handleSettingUpShellProfile } from './shellStartupSetupHandlers'; import { @@ -137,6 +137,20 @@ export class TerminalManagerImpl implements TerminalManager { this.shellSetup.clear(); } } + if (e.affectsConfiguration('terminal.integrated.shellIntegration.enabled')) { + traceInfo('Shell integration setting changed, invalidating cache'); + const updatedShellIntegrationSetting = await getShellIntegrationEnabledCache(); + if (!updatedShellIntegrationSetting) { + const shells = new Set( + terminals() + .map((t) => identifyTerminalShell(t)) + .filter((t) => t !== 'unknown'), + ); + if (shells.size > 0) { + await this.handleSetupCheck(shells); + } + } + } }), onDidChangeWindowState((e) => { this.hasFocus = e.focused; @@ -152,27 +166,19 @@ export class TerminalManagerImpl implements TerminalManager { await Promise.all( providers.map(async (p) => { const state = await p.isSetup(); - const currentSetup = state === ShellSetupState.Setup; - // Check if we already processed this shell and the state hasn't changed - if (this.shellSetup.has(p.shellType)) { - const cachedSetup = this.shellSetup.get(p.shellType); - if (currentSetup === cachedSetup) { - traceVerbose(`Shell profile for ${p.shellType} already checked, state unchanged.`); - return; - } - traceVerbose( - `Shell profile for ${p.shellType} state changed from ${cachedSetup} to ${currentSetup}, re-evaluating.`, - ); - } - traceVerbose(`Checking shell profile for ${p.shellType}.`); + const shellIntegrationEnabled = await getShellIntegrationEnabledCache(); + traceVerbose(`Checking shell profile for ${p.shellType}, with state: ${state}`); if (state === ShellSetupState.NotSetup) { traceVerbose( - `WSL detected: ${isWsl()}, Shell integration available: ${await shellIntegrationForActiveTerminal( + `WSL detected: ${isWsl()}, Shell integration available from setting, or active terminal: ${shellIntegrationEnabled}, or ${await shellIntegrationForActiveTerminal( p.name, )}`, ); - if ((await shellIntegrationForActiveTerminal(p.name)) && !isWsl()) { + if ( + (shellIntegrationEnabled || (await shellIntegrationForActiveTerminal(p.name))) && + !isWsl() + ) { // Shell integration available and NOT in WSL - skip setup await p.teardownScripts(); this.shellSetup.set(p.shellType, true); @@ -188,7 +194,10 @@ export class TerminalManagerImpl implements TerminalManager { ); } } else if (state === ShellSetupState.Setup) { - if ((await shellIntegrationForActiveTerminal(p.name)) && !isWsl()) { + if ( + (shellIntegrationEnabled || (await shellIntegrationForActiveTerminal(p.name))) && + !isWsl() + ) { await p.teardownScripts(); traceVerbose( `Shell integration available for ${p.shellType}, removed profile script in favor of shell integration.`, From e1431e5d1513c99799a68e3eb70c40c7d1a65382 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 10 Oct 2025 13:33:03 -0700 Subject: [PATCH 320/328] Bug in create venv flow with selecting skipping package installation (#928) fixes https://github.com/microsoft/vscode-python-environments/issues/930 --------- Co-authored-by: Aaron Munger <2019016+amunger@users.noreply.github.com> --- src/managers/builtin/pipUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index f8c5279..d221f5a 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -129,7 +129,7 @@ async function selectWorkspaceOrCommon( return await selectFromCommonPackagesToInstall(common, installed, undefined, { showBackButton }); } else if (selected.label === PackageManagement.skipPackageInstallation) { traceInfo('Package Installer: user selected skip package installation'); - return undefined; + return { install: [], uninstall: [] } satisfies PipPackages; } else { return undefined; } From d7cc9e30d3c7bde86827ad07349490b82238a9ac Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 14 Oct 2025 02:10:42 +0000 Subject: [PATCH 321/328] Add comprehensive unit tests for execUtils.ts (#873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR adds comprehensive unit test coverage for the `execUtils.ts` utility functions that handle argument quoting for command execution. ## Overview The `execUtils.ts` module contains two utility functions used throughout the extension: - `quoteStringIfNecessary(arg: string)`: Adds quotes around strings containing spaces (unless already quoted) - `quoteArgs(args: string[])`: Maps the quoting function over an array of arguments These functions are critical for properly escaping command-line arguments, especially on Windows where paths often contain spaces (e.g., `C:\Program Files\Python`). ## Test Coverage Added Created `src/test/features/execution/execUtils.unit.test.ts` with **25 comprehensive tests**: ### `quoteStringIfNecessary` tests (15 tests): - ✅ Strings without spaces remain unquoted - ✅ Strings with spaces get properly quoted - ✅ Already-quoted strings are not double-quoted - ✅ Edge cases: empty strings, only spaces, leading/trailing spaces - ✅ Partial quote handling (strings with quotes on one side only) - ✅ Special characters and path separators ### `quoteArgs` tests (10 tests): - ✅ Empty array handling - ✅ Mixed quoted and unquoted arguments - ✅ Command-line flag patterns (`--flag "value with spaces"`) - ✅ Windows and Unix path handling - ✅ Argument order preservation ## Testing Approach Following the repository's testing workflow instructions: - Used `*.unit.test.ts` naming convention for fast, isolated testing - No mocking required (pure utility functions) - Clear test names describing expected behavior - Simple arrange-act-assert structure for maintainability ## Verification All tests pass successfully: ``` ✔ 25 passing (11ms) ``` Total test suite remains healthy: **170 tests passing** with no regressions.
Original prompt > write unit tests for this file- using the test instructions file > > > > The user has attached the following files from their workspace: > - src/features/execution/execUtils.ts > >
Created from VS Code via the [GitHub Pull Request](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github) extension. --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey3.medallia.com/?EAHeSx-AP01bZqG0Ld9QLQ) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> --- .../testing-workflow.instructions.md | 1 + .../features/execution/execUtils.unit.test.ts | 158 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 src/test/features/execution/execUtils.unit.test.ts diff --git a/.github/instructions/testing-workflow.instructions.md b/.github/instructions/testing-workflow.instructions.md index b5be4b3..3ecbdcc 100644 --- a/.github/instructions/testing-workflow.instructions.md +++ b/.github/instructions/testing-workflow.instructions.md @@ -548,5 +548,6 @@ envConfig.inspect - When fixing mock environment creation, use `null` to truly omit properties rather than `undefined` (1) - Always recompile TypeScript after making import/export changes before running tests, as stubs won't work if they're applied to old compiled JavaScript that doesn't have the updated imports (2) - Create proxy abstraction functions for Node.js APIs like `cp.spawn` to enable clean testing - use function overloads to preserve Node.js's intelligent typing while making the functions mockable (1) +- When a targeted test run yields 0 tests, first verify the compiled JS exists under `out/test` (rootDir is `src`); absence almost always means the test file sits outside `src` or compilation hasn't run yet (1) - When unit tests fail with VS Code API errors like `TypeError: X is not a constructor` or `Cannot read properties of undefined (reading 'Y')`, check if VS Code APIs are properly mocked in `/src/test/unittests.ts` - add missing Task-related APIs (`Task`, `TaskScope`, `ShellExecution`, `TaskRevealKind`, `TaskPanelKind`) and namespace mocks (`tasks`) following the existing pattern of `mockedVSCode.X = vscodeMocks.vscMockExtHostedTypes.X` (1) - Create minimal mock objects with only required methods and use TypeScript type assertions (e.g., mockApi as PythonEnvironmentApi) to satisfy interface requirements instead of implementing all interface methods when only specific methods are needed for the test (1) diff --git a/src/test/features/execution/execUtils.unit.test.ts b/src/test/features/execution/execUtils.unit.test.ts new file mode 100644 index 0000000..82dd808 --- /dev/null +++ b/src/test/features/execution/execUtils.unit.test.ts @@ -0,0 +1,158 @@ +import * as assert from 'assert'; +import { quoteArgs, quoteStringIfNecessary } from '../../../features/execution/execUtils'; + +suite('Execution Utils Tests', () => { + suite('quoteStringIfNecessary', () => { + test('should not quote string without spaces', () => { + const input = 'simplestring'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, 'simplestring'); + }); + + test('should not quote string without spaces containing special characters', () => { + const input = 'path/to/file.txt'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, 'path/to/file.txt'); + }); + + test('should quote string with spaces', () => { + const input = 'string with spaces'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"string with spaces"'); + }); + + test('should quote path with spaces', () => { + const input = 'C:\\Program Files\\Python'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"C:\\Program Files\\Python"'); + }); + + test('should not double-quote already quoted string', () => { + const input = '"already quoted"'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"already quoted"'); + }); + + test('should not double-quote already quoted string with spaces', () => { + const input = '"string with spaces"'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"string with spaces"'); + }); + + test('should quote string with space that is partially quoted', () => { + const input = '"partially quoted'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '""partially quoted"'); + }); + + test('should quote string with space that ends with quote', () => { + const input = 'partially quoted"'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"partially quoted""'); + }); + + test('should handle empty string', () => { + const input = ''; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, ''); + }); + + test('should handle string with only spaces', () => { + const input = ' '; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '" "'); + }); + + test('should handle string with leading space', () => { + const input = ' leading'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '" leading"'); + }); + + test('should handle string with trailing space', () => { + const input = 'trailing '; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"trailing "'); + }); + + test('should handle string with multiple spaces', () => { + const input = 'multiple spaces here'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '"multiple spaces here"'); + }); + + test('should not quote single character without space', () => { + const input = 'a'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, 'a'); + }); + + test('should handle dash and hyphen characters without spaces', () => { + const input = '--flag-name'; + const result = quoteStringIfNecessary(input); + assert.strictEqual(result, '--flag-name'); + }); + }); + + suite('quoteArgs', () => { + test('should return empty array for empty input', () => { + const input: string[] = []; + const result = quoteArgs(input); + assert.deepStrictEqual(result, []); + }); + + test('should not quote args without spaces', () => { + const input = ['arg1', 'arg2', 'arg3']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['arg1', 'arg2', 'arg3']); + }); + + test('should quote args with spaces', () => { + const input = ['arg with spaces', 'another arg']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['"arg with spaces"', '"another arg"']); + }); + + test('should handle mixed args with and without spaces', () => { + const input = ['simplearg', 'arg with spaces', 'anotherarg']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['simplearg', '"arg with spaces"', 'anotherarg']); + }); + + test('should not double-quote already quoted args', () => { + const input = ['"already quoted"', 'normal']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['"already quoted"', 'normal']); + }); + + test('should handle array with single element', () => { + const input = ['single element with space']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['"single element with space"']); + }); + + test('should handle paths correctly', () => { + const input = ['C:\\Program Files\\Python', '/usr/bin/python', 'simple']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['"C:\\Program Files\\Python"', '/usr/bin/python', 'simple']); + }); + + test('should handle command line flags and values', () => { + const input = ['--flag', 'value with spaces', '-f', 'normalvalue']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['--flag', '"value with spaces"', '-f', 'normalvalue']); + }); + + test('should handle empty strings in array', () => { + const input = ['', 'arg1', '']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['', 'arg1', '']); + }); + + test('should preserve order of arguments', () => { + const input = ['first', 'second with space', 'third', 'fourth with space']; + const result = quoteArgs(input); + assert.deepStrictEqual(result, ['first', '"second with space"', 'third', '"fourth with space"']); + }); + }); +}); From 994f092ea2bd726504336c87fcbfa5558417d12a Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 17 Oct 2025 13:18:03 -0700 Subject: [PATCH 322/328] Allow undefined uri in api.getEnvironmentVariables (#943) --- src/features/execution/envVariableManager.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/execution/envVariableManager.ts b/src/features/execution/envVariableManager.ts index 28db0c4..d0317f2 100644 --- a/src/features/execution/envVariableManager.ts +++ b/src/features/execution/envVariableManager.ts @@ -37,11 +37,11 @@ export class PythonEnvVariableManager implements EnvVarManager { } async getEnvironmentVariables( - uri: Uri, + uri: Uri | undefined, overrides?: ({ [key: string]: string | undefined } | Uri)[], baseEnvVar?: { [key: string]: string | undefined }, ): Promise<{ [key: string]: string | undefined }> { - const project = this.pm.get(uri); + const project = uri ? this.pm.get(uri) : undefined; const base = baseEnvVar || { ...process.env }; let env = base; From def4573539a4613eccc4b2601d570d86099db17e Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 17 Oct 2025 13:55:32 -0700 Subject: [PATCH 323/328] update api documentation (#945) --- examples/sample1/src/api.ts | 7 +++---- src/api.ts | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/sample1/src/api.ts b/examples/sample1/src/api.ts index a23be90..689a85a 100644 --- a/examples/sample1/src/api.ts +++ b/examples/sample1/src/api.ts @@ -650,7 +650,6 @@ export interface PythonProject { * The tooltip for the Python project, which can be a string or a Markdown string. */ readonly tooltip?: string | MarkdownString; - } /** @@ -692,7 +691,6 @@ export interface PythonProjectCreator { */ readonly tooltip?: string | MarkdownString; - /** * Creates a new Python project or projects. * @param options - Optional parameters for creating the Python project. @@ -1228,12 +1226,13 @@ export interface PythonEnvironmentVariablesApi { * 3. `.env` file at the root of the python project. * 4. `overrides` in the order provided. * - * @param uri The URI of the project, workspace or a file in a for which environment variables are required. + * @param uri The URI of the project, workspace or a file in a for which environment variables are required. If not provided, + * it fetches the environment variables for the global scope. * @param overrides Additional environment variables to override the defaults. * @param baseEnvVar The base environment variables that should be used as a starting point. */ getEnvironmentVariables( - uri: Uri, + uri: Uri | undefined, overrides?: ({ [key: string]: string | undefined } | Uri)[], baseEnvVar?: { [key: string]: string | undefined }, ): Promise<{ [key: string]: string | undefined }>; diff --git a/src/api.ts b/src/api.ts index c5c8186..0b60339 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1237,12 +1237,13 @@ export interface PythonEnvironmentVariablesApi { * 3. `.env` file at the root of the python project. * 4. `overrides` in the order provided. * - * @param uri The URI of the project, workspace or a file in a for which environment variables are required. + * @param uri The URI of the project, workspace or a file in a for which environment variables are required.If not provided, + * it fetches the environment variables for the global scope. * @param overrides Additional environment variables to override the defaults. * @param baseEnvVar The base environment variables that should be used as a starting point. */ getEnvironmentVariables( - uri: Uri, + uri: Uri | undefined, overrides?: ({ [key: string]: string | undefined } | Uri)[], baseEnvVar?: { [key: string]: string | undefined }, ): Promise<{ [key: string]: string | undefined }>; From a7844120c7894fe6597512227e0ca9f42fd776b7 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Fri, 17 Oct 2025 14:14:58 -0700 Subject: [PATCH 324/328] fix linting and update eslint rule (#946) fixes https://github.com/microsoft/vscode-python-environments/issues/944 --- eslint.config.mjs | 2 +- src/test/features/terminalEnvVarInjectorBasic.unit.test.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 60ebcf3..cfa27fd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -35,6 +35,6 @@ export default [{ eqeqeq: "warn", "no-throw-literal": "warn", semi: "warn", - "@typescript-eslint/no-explicit-any": "warn", + "@typescript-eslint/no-explicit-any": "error", }, }]; \ No newline at end of file diff --git a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts index 4b009e9..fc69844 100644 --- a/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts +++ b/src/test/features/terminalEnvVarInjectorBasic.unit.test.ts @@ -40,7 +40,11 @@ suite('TerminalEnvVarInjector Basic Tests', () => { }; // Setup environment variable collection to return scoped collection - envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as any); + envVarCollection + .setup((x) => x.getScoped(typeMoq.It.isAny())) + .returns( + () => mockScopedCollection as unknown as ReturnType, + ); envVarCollection.setup((x) => x.clear()).returns(() => {}); // Setup minimal mocks for event subscriptions From a10c3a0e44c2f44b2ddba808dcfce8f06ac240dc Mon Sep 17 00:00:00 2001 From: sowhat1989 Date: Fri, 24 Oct 2025 04:18:39 +0700 Subject: [PATCH 325/328] Add copilot instructions template in .github/instructions --- .github/instructions/copilot-instructions.md | 52 ++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/instructions/copilot-instructions.md diff --git a/.github/instructions/copilot-instructions.md b/.github/instructions/copilot-instructions.md new file mode 100644 index 0000000..519d35a --- /dev/null +++ b/.github/instructions/copilot-instructions.md @@ -0,0 +1,52 @@ +## Copilot / AI contributor instructions — vscode-python-environments + +Quick, actionable notes to get an AI agent productive in this repository. + +- Project type: VS Code extension written in TypeScript. Source under `src/` → built with `webpack` into `./dist/extension.js` (see `package.json` `main`). +- Entry points & API: primary extension code in `src/extension.ts` and public API surface in `src/api.ts` and `src/internal.api.ts`. +- Key directories: `src/` (core), `src/common/` (shared utilities like `localize.ts`, `logging.ts`), `managers/` (env managers), `features/` (functional areas), `examples/` (consumers), `files/templates/` (scaffolding including copilot templates). + +Build / test / run +- Build for development: `npm run compile` (uses `webpack`). +- Watch (dev): `npm run watch` (webpack watch). There is also `npm run watch-tests` (TypeScript watch for tests) and a compound VS Code task `tasks: build` that runs both watchers. +- Compile TypeScript for tests: `npm run compile-tests` (tsc output -> `out`). `npm run pretest` runs `compile-tests` and `compile`. +- Unit tests: `npm run unittest` (Mocha with `build/.mocha.unittests.json`). Run `npm run pretest` first if you need a fresh build. +- Package: `npm run vsce-package` to create a VSIX (requires `vsce`). + +Important repo conventions & patterns +- Localization: All user-facing strings must use the l10n/localize system. See `src/common/localize.ts` and the `l10n` folder. Do not hard-code English strings in UI code. +- Logging: Use the extension logging utilities (`traceLog`, `traceVerbose`) in `src/common/logging.ts`. Avoid `console.log` for internal logs. +- Settings precedence: code assumes VS Code settings precedence (folder → workspace → user). See `.github/instructions/generic.instructions.md` for details. +- Error/UI messages: keep messages actionable and avoid spamming the same message. The repo tracks state to avoid repeated alerts (follow patterns in `src/common/persistentState.ts`). + +Where to change behavior +- Contribution points are defined in `package.json` (`activationEvents`, `contributes.commands`, `configuration`). To add a new command, update `package.json` and implement command registration in `src/extension.ts` or `src/common/commands.ts`. +- Entry build output is `./dist/extension.js`. Small runtime changes should still be made in `src/` and then built (or tested using `tsc`/`webpack` watchers). + +Examples & idioms for code edits +- Add localized strings: put key in `package.nls.json`/`l10n` and use `localize('key', 'Default text')` in code. +- Add telemetry/logging: use helpers in `src/common/telemetry/*` and `traceLog('message', { meta })` from `logging.ts`. +- Tests: unit tests live under `test/`; many tests use mocha + sinon/typemoq/ts-mockito patterns. See `test/unittests.ts` for test harness patterns. + +Integration points & external deps +- Depends on the Python extension (`ms-python.python`) contractually for some features; activation is `onLanguage:python` (see `package.json`). +- Uses `@vscode/test-electron` and `@vscode/test-cli` in dev/test workflows. +- Uses common node deps: `fs-extra`, `dotenv`, `@iarna/toml`, etc. + +When making PRs as an AI +- Keep changes small and focused; follow existing file-level patterns (naming, async/await use, error handling helpers in `src/common/errors`). +- Add docstrings to exported functions (see `.github/instructions/generic.instructions.md`). +- Add localization for any user-visible string. +- Run `npm run lint` and `npm run unittest` (or at minimum `npm run compile-tests` + `npm run compile`) before proposing changes. + +References (where to look) +- `src/` for implementation details and patterns +- `test/` for unit test examples +- `files/templates/copilot-instructions-text/` contains example copilot templates you can reuse +- `package.json` for scripts and contribution points +- `.github/instructions/generic.instructions.md` for project-specific coding rules (localization, logging, docstrings) + +If something is unclear, ask: give the file you intend to edit and a 1–2 line summary of the change. Prefer small incremental PRs. + +--- +Generated/merged automatically by the AI agent. Ask for edits or to expand examples for a specific subfolder. From 478aa6cbe3744a5af045553b44e0a7670fab23d2 Mon Sep 17 00:00:00 2001 From: sowhat1989 Date: Fri, 24 Oct 2025 04:31:54 +0700 Subject: [PATCH 326/328] Add D&R Protocol doc (.github/instructions/DnR-protocol.md) --- .github/instructions/DnR-protocol.md | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/instructions/DnR-protocol.md diff --git a/.github/instructions/DnR-protocol.md b/.github/instructions/DnR-protocol.md new file mode 100644 index 0000000..9a9b88f --- /dev/null +++ b/.github/instructions/DnR-protocol.md @@ -0,0 +1,54 @@ +## Deconstruction & Re-architecture Protocol (D&R) + +Mục đích +- D&R là một quy trình 3 giai đoạn để phân tích mọi input (từ một từ tới bản kế hoạch) và chuyển đổi thành các hành động có thể triển khai, an toàn và bền vững. + +Giai đoạn 1 — Phân rã & Hệ thống hóa (Deconstruct) +- Mục tiêu: tách input thành các thành phần cơ bản để loại bỏ nhiễu và từng bước chuẩn hóa dữ liệu. +- Yêu cầu đầu vào tối thiểu (Input Metadata): who, when, context, summary (1 câu), constraints. +- Output: danh sách facts, assumptions, constraints, stakeholders. + +Giai đoạn 2 — Xác định Trọng tâm (Focal) +- Mục tiêu: từ các thành phần đã chuẩn hoá, rút ra tối đa 3 trọng tâm theo tiêu chí impact × confidence. +- Với mỗi trọng tâm cần ghi: lý do ngắn (1 câu), dữ liệu/chứng cứ (nếu có), mức độ ưu tiên (cao/trung/bình). + +Giai đoạn 3 — Tái kiến tạo & Tối ưu (Re-architect) +- Mục tiêu: cho mỗi trọng tâm, đề xuất một Action Card (giải pháp chính + dự phòng) tuân thủ 4 nguyên tắc: Đơn giản, Hiệu quả, Thực dụng, An toàn. +- Action Card (mẫu): + - Tiêu đề: + - Mô tả ngắn (1-2 câu): + - Giải pháp chính: + - Giải pháp dự phòng: + - 3 bước triển khai (từng bước rõ ràng): + - Ước lượng (effort, risk): + - Success metrics (1–2 chỉ số): + +Socratic Gate (Kiểm soát chất lượng trước khi chạy) +- Trước khi triển khai, trả lời 1 câu hỏi Socratic trọng tâm (ví dụ: "Giả định nào nếu sai sẽ khiến giải pháp thất bại?") và hoàn thành checklist an toàn tối thiểu. +- Checklist an toàn (bắt buộc): + 1. Data-safety: dữ liệu nhạy cảm đã được xử lý/ẩn chưa? + 2. Rollback plan: có kế hoạch hoàn tác nếu có lỗi không? + 3. Monitoring: có chỉ số/alert để phát hiện sự cố không? + +Nguyên tắc vận hành +- Ghi rõ mọi giả định; nếu thiếu dữ liệu then chốt, dừng và yêu cầu ít nhất 2 thông tin bổ sung. +- Mỗi đề xuất phải có evidence hoặc một bước kiểm chứng nhanh (smoke test) trước khi triển khai rộng. + +Ví dụ ví dụ ngắn (áp dụng cho "tối ưu build" nhanh) +- Input Metadata: who=devops, when=2025-10-24, summary="Build chậm", constraints="không thay đổi CI cloud". +- Phân rã: tsc full compile, webpack bundle, network download packages. +- Trọng tâm (Top1): Reduce full TypeScript compile time (impact cao × confidence trung). +- Action Card: enable tsc incremental + cache tsc output; Steps: 1) bật --incremental config; 2) add cache dir to CI; 3) monitor compile time. +- Socratic question: Nếu incremental cache bị corrupt, rollback thế nào? Trả lời: revert config và clear cache; CI vẫn chạy full compile. + +How to use +- Khi muốn áp dụng D&R cho một mục tiêu, copy template "Input Metadata" vào comment/issue PR và gọi agent để trả về: (1) Phân rã, (2) Top 3 trọng tâm, (3) Action Cards cho từng trọng tâm, (4) Socratic Gate answers + checklist. + +Vị trí lưu & giao tiếp +- File này là bản canonical; nếu muốn tích hợp template vào scaffolding project, đặt `files/templates/DnR-template.md` hoặc thêm vào generator trong `src/features/creators`. + +Cam kết +- Mọi thay đổi code/commit/push sau khi D&R phải được bạn xác nhận tối thiểu 3 điểm (data-safety, rollback, monitoring). + +--- +Created by AI assistant on branch `feature/add-copilot-instructions` — không push lên remote tự động. From f3a59a5034fa1585869593363f992beafed87dea Mon Sep 17 00:00:00 2001 From: sowhat1989 Date: Fri, 24 Oct 2025 04:56:01 +0700 Subject: [PATCH 327/328] =?UTF-8?q?Add=20repo=20analysis=20report=20(D&R)?= =?UTF-8?q?=20=E2=80=94=20local-scan-based?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/instructions/repo-analysis-report.md | 108 +++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 .github/instructions/repo-analysis-report.md diff --git a/.github/instructions/repo-analysis-report.md b/.github/instructions/repo-analysis-report.md new file mode 100644 index 0000000..3dc491a --- /dev/null +++ b/.github/instructions/repo-analysis-report.md @@ -0,0 +1,108 @@ +## Báo cáo phân tích kho mã (D&R) — Phân tích sơ bộ dựa trên dữ liệu local + +Lưu ý ngắn: báo cáo này được tạo bằng giao thức D&R và dựa trên dữ liệu có sẵn cục bộ trong môi trường làm việc (local clones) và metadata của remote được cấu hình trong những repo đó. Tôi chưa truy vấn GitHub API cho toàn bộ tài khoản vì `gh` chưa được xác thực trong môi trường này. Ở cuối báo cáo có hướng dẫn để thu thập phân tích đầy đủ (yêu cầu đăng nhập `gh` hoặc cung cấp token API). + +Input Metadata +- who: owner (sowhat1989) / AI-assistant (người phân tích) +- when: 2025-10-24 +- context: workspace local chứa clone của `vscode-python-environments` (repo fork của microsoft/vscode-python-environments) +- constraints: không có quyền API GitHub trong môi trường hiện tại (gh chưa login) +- summary: phân tích sơ bộ các kho mã trên account dựa trên clone(s) local và metadata remote + +Giai đoạn 1 — Phân rã (Deconstruct) +- Evidence (từ local scan): + - Found local clones: + - `/Users/andy/Documents/GitHub/vscode-python-environments` (has remote `origin` and `upstream`) + - nested repo `/Users/andy/Documents/GitHub/vscode-python-environments/vscode-python-environments` (same origin) + - Remote `origin` => https://github.com/sowhat1989/vscode-python-environments.git + - Remote `upstream` => https://github.com/microsoft/vscode-python-environments.git + - Recent commits show activity and tests in repository; unit tests run locally: 219 passing, 1 pending. +- Assumptions (explicit): + 1. Các kho còn lại (nếu có) không được clone trong thư mục quét nên không thể phân tích ở bước này. + 2. `origin` là fork của `microsoft/vscode-python-environments` (evidence: upstream remote configured). + +Giai đoạn 2 — Xác định Trọng tâm (Focal) +- Top1: Verify & improve contribution readiness for the forked repo + - Lý do: có feature branch `feature/add-copilot-instructions` với docs mới; PR có thể sắp được tạo. + - Evidence: local branch, commits, build + unit tests pass locally. + - Priority: Cao +- Top2: Ensure CI / metadata & privacy hygiene + - Lý do: Push ban đầu bị chặn bởi GH007 (private email) — đã rewrite history to use noreply; cần quy trình để tránh lặp lại. + - Evidence: earlier push rejected by GH007; history rewrite performed. + - Priority: Trung +- Top3: Create standardized contributor docs & generator templates (D&R + Copilot templates) + - Lý do: repo chứa templates under `.github/instructions` and `files/templates/` — standardization will speed up future contributions and agent interactions. + - Evidence: created `.github/instructions/DnR-protocol.md`, copilot template files in repo. + - Priority: Trung + +Giai đoạn 3 — Action Cards (Re-architect) + +- Action Card A: Prepare PR and contribution pipeline + - Tiêu đề: Mở Pull Request cho `feature/add-copilot-instructions` + - Mô tả: Tạo PR có nội dung: D&R protocol doc, copilot instructions template, kèm kết quả build/tests. + - Giải pháp chính: + 1. Tạo PR trên GitHub từ branch `feature/add-copilot-instructions` -> `main` với mô tả chi tiết. + 2. Đính kèm kết quả `npm run pretest && npm run unittest` (219 passing, 1 pending). + 3. Request review từ maintainers (tag `@microsoft` / `@EleanorBoyd` nếu appropriate) hoặc người duy trì repo fork. + - Giải pháp dự phòng: nếu maintainers yêu cầu chỉnh sửa, tạo thêm commit sửa và rebase/squash theo hướng dẫn. + - 3 bước triển khai: + 1. Kiểm tra và chạy lint (npm run lint) — fix nếu có lỗi. + 2. Tạo PR bằng GitHub UI hoặc `gh pr create --fill`. + 3. Theo dõi CI/PR feedback và address comments. + - Ước lượng: effort = low (docs + templates), risk = low + - Success metrics: PR merged; no CI failures; reviewers approve. + +- Action Card B: Add a short CONTRIBUTING.md + privacy checklist + - Tiêu đề: CONTRIBUTING + privacy guidelines + - Mô tả: Thêm file `CONTRIBUTING.md` mô tả steps for contributions, required checks (unit tests, lint), and Git config tips (noreply email). + - Giải pháp chính: + 1. Create `CONTRIBUTING.md` with sections: Setup, Build & Tests, Commit conventions, How to avoid GH007 and how to rewrite safely. + - Giải pháp dự phòng: If contributors still push private emails, add pre-push git hook to check author email (or add CI check that rejects commits with disallowed emails). + - 3 bước triển khai: + 1. Draft CONTRIBUTING.md and commit to feature branch. + 2. Add optional `.githooks/pre-push` (documented) to check git config user.email. + 3. Document steps to fix history and to use `--force-with-lease` safely. + - Ước lượng: effort = low-medium, risk = low + - Success metrics: fewer GH007 incidents; contributors follow conventions. + +- Action Card C: Automate account-level inventory (next-step) + - Tiêu đề: Full account inventory & activity analysis (requires auth) + - Mô tả: Run an authenticated scan of GitHub account to list repos, languages, recent activity, open PRs, archived repos. + - Giải pháp chính: + 1. Use `gh` CLI (recommended) or GitHub API with a personal access token to list repos and fetch metadata. + 2. Aggregate stats (languages, last push date, topics, CI presence). + - Giải pháp dự phòng: If `gh` cannot be used, run this scan manually from your machine and provide JSON output. + - 3 bước triển khai: + 1. Authenticate: `gh auth login` or export `GITHUB_TOKEN` (scopes: repo/read) + 2. Run: `gh repo list sowhat1989 --limit 500 --json name,fullName,description,visibility,pushedAt,primaryLanguage,defaultBranchRef --jq '.' > repos.json` + 3. Run per-repo queries for CI/workflows and recent commits; generate summarized report. + - Ước lượng: effort = medium, risk = minimal (read-only) + - Success metrics: generated JSON inventory + report summarizing activity and suggestions. + +Socratic Gate (pre-deploy checklist) + - Socratic question: Nếu tôi đánh giá sai rằng repo này là fork và maintainer chính sẽ chấp nhận PR, hậu quả là gì? + - Nếu sai: PR có thể bị đóng hoặc không được phản hồi; thời gian bị lãng phí. Mitigation: tag maintainers, chạy tests, giữ PR nhỏ và dễ review. + - Checklist an toàn (bắt buộc): + 1. Data-safety: không public secrets; hiện tại không phát hiện secrets trong các thay đổi docs. + 2. Rollback plan: nếu cần undo, branch còn nguyên và có thể revert commit hoặc reset branch remote. + 3. Monitoring: theo dõi CI/PR checks và notifications. + +Verification steps tôi đã thực hiện (local) + - Scans run: + - `find /Users/andy/Documents/GitHub -maxdepth 3 -type d -name .git` → tìm local clones (chỉ tìm thấy repo hiện tại) + - `git remote -v` và `git log -n 5` tại repo root → xác thực `origin` + `upstream` remotes, recent commits + - Ran `npm run pretest && npm run unittest` locally → 219 passing, 1 pending + - Kết luận: dữ liệu local cho thấy repo là fork của microsoft/vscode-python-environments và có activity + tests passing. Không có dữ liệu khác từ tài khoản GitHub vì `gh` chưa login. + +Next steps (actionable) +1. Nếu bạn muốn phân tích TOÀN BỘ tài khoản GitHub, hãy cho phép tôi truy cập read-only bằng một trong các cách: + - Chạy `gh auth login` trên máy này (tôi sẽ re-run `gh repo list ...`) *hoặc* + - Tạo Personal Access Token và đặt vào `GITHUB_TOKEN` trong environment (tùy bạn), rồi tôi sẽ chạy API queries. +2. Tôi có thể tạo PR tự động cho `feature/add-copilot-instructions` (tôi đã push branch) — muốn tôi tạo PR không? +3. Tôi có thể thêm `CONTRIBUTING.md` và `repo-analysis-report.md` commit lên branch hiện tại. + +Assumptions & Limitations + - Đây là phân tích SƠ BỘ, chỉ dùng dữ liệu local và các remotes cấu hình. Để có báo cáo đầy đủ cho toàn bộ tài khoản, cần đăng nhập GitHub CLI hoặc cung cấp token read-only. + +--- +Generated by assistant using D&R on branch `feature/add-copilot-instructions` on 2025-10-24. From 097fb394d1eeb6d3d130e99373554c3fd125706f Mon Sep 17 00:00:00 2001 From: sowhat1989 Date: Fri, 24 Oct 2025 05:01:33 +0700 Subject: [PATCH 328/328] Add script to list local repos (scripts/list-local-repos.sh) --- scripts/list-local-repos.sh | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 scripts/list-local-repos.sh diff --git a/scripts/list-local-repos.sh b/scripts/list-local-repos.sh new file mode 100644 index 0000000..3d031d9 --- /dev/null +++ b/scripts/list-local-repos.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# List local git repositories under common paths and show remote, last commit, and size. +# Usage: ./scripts/list-local-repos.sh [paths...] + +set -euo pipefail + +PATHS=("/Users/andy/Documents/GitHub" "/Users/andy/Projects" "/Users/andy") +if [ "$#" -gt 0 ]; then + PATHS=("$@") +fi + +printf "Scanning paths: %s\n" "${PATHS[*]}" +echo + +for base in "${PATHS[@]}"; do + if [ ! -d "$base" ]; then + continue + fi + echo "== Path: $base ==" + # find .git directories up to depth 4 + find "$base" -maxdepth 4 -type d -name .git 2>/dev/null | while read -r d; do + repo=$(dirname "$d") + echo "-- Repo: $repo" + if [ -d "$repo" ]; then + (cd "$repo" || exit 0 + echo "Remote(s):" + git remote -v || echo " (no git remotes)" + echo "Size: $(du -sh . 2>/dev/null | cut -f1)" + echo "Last commit:" + git log -1 --pretty=format:"%h %an %ae %ad %s" || echo " (no commits)" + echo "Status:" + git status --porcelain || true + ) + else + echo " (cannot access repo)" + fi + echo + done +done + +echo "Done."
Commits