diff --git a/package-lock.json b/package-lock.json index 5a97cea01..e3e3ccf8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6908,7 +6908,8 @@ "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "peer": true }, "node_modules/tunnel": { "version": "0.0.6", @@ -12353,7 +12354,8 @@ "tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "peer": true }, "tunnel": { "version": "0.0.6", diff --git a/src/managers/base/commands/availableVersions.ts b/src/managers/base/commands/availableVersions.ts new file mode 100644 index 000000000..166141c0a --- /dev/null +++ b/src/managers/base/commands/availableVersions.ts @@ -0,0 +1,31 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { explain as parsePep440Version } from '@renovatebot/pep440'; +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Arguments for available versions command execution (change per execution). + */ +export interface AvailableVersionsExecuteArgs extends BaseExecuteArgs { + packageName: string; + pythonVersion: string; + includePrerelease?: boolean; +} + +/** + * Template class for availableVersions commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class AvailableVersionsCommand extends PackageManagerCommand { + protected static readonly configSection = 'availableVersionsCommandArgs'; + protected abstract buildCommand(executeArgs: AvailableVersionsExecuteArgs): string[]; + protected parseVersions(versions: string[], includePrerelease?: boolean): Pep440Version[] { + let parsed = Array.from(new Set(versions)) + .map((version) => parsePep440Version(version.trim())) + .filter((version): version is Pep440Version => version !== null); + if (includePrerelease === false) { + parsed = parsed.filter((version) => !version.is_prerelease); + } + return parsed; + } + abstract execute(executeArgs: AvailableVersionsExecuteArgs): Promise; +} diff --git a/src/managers/base/commands/index.ts b/src/managers/base/commands/index.ts new file mode 100644 index 000000000..41a16fd4a --- /dev/null +++ b/src/managers/base/commands/index.ts @@ -0,0 +1,7 @@ +export { AvailableVersionsCommand, type AvailableVersionsExecuteArgs } from './availableVersions'; +export { InstallCommand, type InstallExecuteArgs } from './install'; +export { ListCommand } from './list'; +export { ListDirectNamesCommand } from './listDirectNames'; +export { BaseExecuteArgs, CommandConstructorOptions, PackageManagerCommand } from './packageManagerCommand'; +export { UninstallCommand, type UninstallExecuteArgs } from './uninstall'; +export { VersionCommand } from './version'; diff --git a/src/managers/base/commands/install.ts b/src/managers/base/commands/install.ts new file mode 100644 index 000000000..fc863723f --- /dev/null +++ b/src/managers/base/commands/install.ts @@ -0,0 +1,19 @@ +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Arguments for install command execution (change per execution). + */ +export interface InstallExecuteArgs extends BaseExecuteArgs { + packages: { packageName: string; version?: string }[]; + upgrade?: boolean; +} + +/** + * Template class for install commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class InstallCommand extends PackageManagerCommand { + protected static readonly configSection = 'installCommandArgs'; + protected abstract buildCommand(executeArgs: InstallExecuteArgs): string[]; + abstract execute(executeArgs: InstallExecuteArgs): Promise; +} diff --git a/src/managers/base/commands/list.ts b/src/managers/base/commands/list.ts new file mode 100644 index 000000000..9d3f69401 --- /dev/null +++ b/src/managers/base/commands/list.ts @@ -0,0 +1,12 @@ +import { PackageInfo } from '../../../api'; +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Template class for list commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class ListCommand extends PackageManagerCommand { + protected static readonly configSection = 'listCommandArgs'; + protected timeout = 30000; + abstract execute(executeArgs?: BaseExecuteArgs): Promise; +} diff --git a/src/managers/base/commands/listDirectNames.ts b/src/managers/base/commands/listDirectNames.ts new file mode 100644 index 000000000..5e9310311 --- /dev/null +++ b/src/managers/base/commands/listDirectNames.ts @@ -0,0 +1,11 @@ +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Template class for listDirectNames commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class ListDirectNamesCommand extends PackageManagerCommand { + protected static readonly configSection = 'listDirectNamesCommandArgs'; + protected timeout = 30000; + abstract execute(executeArgs?: BaseExecuteArgs): Promise>; +} diff --git a/src/managers/base/commands/packageManagerCommand.ts b/src/managers/base/commands/packageManagerCommand.ts new file mode 100644 index 000000000..0888ae011 --- /dev/null +++ b/src/managers/base/commands/packageManagerCommand.ts @@ -0,0 +1,46 @@ +import { CancellationToken, LogOutputChannel, WorkspaceConfiguration } from 'vscode'; +import { getConfiguration } from '../../../common/workspace.apis'; + +/** + * Base interface for all command execute arguments. + * Provides optional cancellation token that all commands can use. + */ +export interface BaseExecuteArgs { + cancellationToken?: CancellationToken; +} + +/** + * Constructor options shared by all package manager commands. + */ +export interface CommandConstructorOptions { + pythonExecutable: string; + cwd?: string; + log?: LogOutputChannel; +} + +/** + * Base class for all package manager commands. + * Provides common properties and minimal interface for subclasses. + */ +export abstract class PackageManagerCommand { + protected static readonly configSection?: string; + + protected pythonExecutable: string; + protected cwd?: string; + protected log?: LogOutputChannel; + protected timeout: number = 300000; + protected config?: WorkspaceConfiguration; + + constructor(options: CommandConstructorOptions) { + this.pythonExecutable = options.pythonExecutable; + this.cwd = options.cwd; + this.log = options.log; + const configSection = (this.constructor as typeof PackageManagerCommand).configSection; + this.config = configSection ? getConfiguration(`python-envs.packageManager.${configSection}`) : undefined; + } + + /** + * Subclasses implement to build the command arguments. + */ + protected abstract buildCommand(executeArgs: BaseExecuteArgs): string[]; +} diff --git a/src/managers/base/commands/uninstall.ts b/src/managers/base/commands/uninstall.ts new file mode 100644 index 000000000..5124c3b06 --- /dev/null +++ b/src/managers/base/commands/uninstall.ts @@ -0,0 +1,18 @@ +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Arguments for uninstall command execution (change per execution). + */ +export interface UninstallExecuteArgs extends BaseExecuteArgs { + packages: { packageName: string; version?: string }[]; +} + +/** + * Template class for uninstall commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class UninstallCommand extends PackageManagerCommand { + protected static readonly configSection = 'uninstallCommandArgs'; + protected abstract buildCommand(executeArgs: UninstallExecuteArgs): string[]; + abstract execute(executeArgs: UninstallExecuteArgs): Promise; +} diff --git a/src/managers/base/commands/version.ts b/src/managers/base/commands/version.ts new file mode 100644 index 000000000..9e917e0a1 --- /dev/null +++ b/src/managers/base/commands/version.ts @@ -0,0 +1,11 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { BaseExecuteArgs, PackageManagerCommand } from './packageManagerCommand'; + +/** + * Template class for version commands. + * Subclasses implement concrete package-manager-specific logic. + */ +export abstract class VersionCommand extends PackageManagerCommand { + protected static readonly configSection = 'versionCommandArgs'; + abstract execute(executeArgs?: BaseExecuteArgs): Promise; +} diff --git a/src/managers/builtin/commands/availableVersions.ts b/src/managers/builtin/commands/availableVersions.ts new file mode 100644 index 000000000..fb8128fed --- /dev/null +++ b/src/managers/builtin/commands/availableVersions.ts @@ -0,0 +1,93 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { AvailableVersionsCommand, type AvailableVersionsExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; + +/** + * Pip available versions command. + * Parsed command: `python -m pip index versions --json --python-version ` + * Official documentation: https://pip.pypa.io/en/stable/cli/pip_index/ + */ +export class PipAvailableVersionsCommand extends AvailableVersionsCommand { + protected buildCommand(executeArgs: AvailableVersionsExecuteArgs): string[] { + return [ + '-m', + 'pip', + 'index', + 'versions', + executeArgs.packageName, + '--json', + '--python-version', + executeArgs.pythonVersion, + ]; + } + + async execute(executeArgs: AvailableVersionsExecuteArgs): Promise { + const output = await runPython( + this.pythonExecutable, + this.buildCommand(executeArgs), + undefined, + this.log, + executeArgs.cancellationToken, + this.timeout, + ); + const match = output.match(/{[\s\S]*}/); + if (!match) { + return []; + } + + try { + const parsed = JSON.parse(match[0]) as { versions?: string[] }; + return this.parseVersions( + Array.isArray(parsed.versions) ? parsed.versions : [], + executeArgs.includePrerelease, + ); + } catch { + return []; + } + } +} + +/** + * UV available versions command. + * Parsed command: `uv tool run pip index versions --json --python-version ` + * Official documentation: https://docs.astral.sh/uv/pip/ + */ +export class UvAvailableVersionsCommand extends AvailableVersionsCommand { + protected buildCommand(executeArgs: AvailableVersionsExecuteArgs): string[] { + return [ + 'tool', + 'run', + 'pip', + 'index', + 'versions', + executeArgs.packageName, + '--json', + '--python-version', + executeArgs.pythonVersion, + ]; + } + + async execute(executeArgs: AvailableVersionsExecuteArgs): Promise { + const output = await runUV( + this.buildCommand(executeArgs), + undefined, + this.log, + executeArgs.cancellationToken, + this.timeout, + ); + const match = output.match(/{[\s\S]*}/); + if (!match) { + return []; + } + + try { + const parsed = JSON.parse(match[0]) as { versions?: string[] }; + return this.parseVersions( + Array.isArray(parsed.versions) ? parsed.versions : [], + executeArgs.includePrerelease, + ); + } catch { + return []; + } + } +} diff --git a/src/managers/builtin/commands/factory.ts b/src/managers/builtin/commands/factory.ts new file mode 100644 index 000000000..0bb76d53e --- /dev/null +++ b/src/managers/builtin/commands/factory.ts @@ -0,0 +1,13 @@ +import { CommandConstructorOptions } from '../../base/commands/index'; +import { shouldUseUv } from '../helpers'; + +type CommandConstructor = new (options: CommandConstructorOptions) => T; + +export async function createPipOrUvCommand( + options: CommandConstructorOptions, + environmentPath: string, + PipCommand: CommandConstructor

, + UvCommand: CommandConstructor, +): Promise { + return (await shouldUseUv(options.log, environmentPath)) ? new UvCommand(options) : new PipCommand(options); +} diff --git a/src/managers/builtin/commands/index.ts b/src/managers/builtin/commands/index.ts new file mode 100644 index 000000000..0f15cf97a --- /dev/null +++ b/src/managers/builtin/commands/index.ts @@ -0,0 +1,6 @@ +export { PipAvailableVersionsCommand, UvAvailableVersionsCommand } from './availableVersions'; +export { PipInstallCommand, UvInstallCommand } from './install'; +export { PipListCommand, UvListCommand } from './list'; +export { PipListDirectNamesCommand, UvListDirectNamesCommand } from './listDirectNames'; +export { PipUninstallCommand, UvUninstallCommand } from './uninstall'; +export { PipVersionCommand, UvVersionCommand } from './version'; diff --git a/src/managers/builtin/commands/install.ts b/src/managers/builtin/commands/install.ts new file mode 100644 index 000000000..6f484287f --- /dev/null +++ b/src/managers/builtin/commands/install.ts @@ -0,0 +1,52 @@ +import { InstallCommand, type InstallExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; +import { processEditableInstallArgs } from '../utils'; + +/** + * Pip install command. + * Parsed command: `python -m pip install [--upgrade] ` + * Official documentation: https://pip.pypa.io/en/stable/cli/pip_install/ + */ +export class PipInstallCommand extends InstallCommand { + protected buildCommand(executeArgs: InstallExecuteArgs): string[] { + let args = ['-m', 'pip', 'install']; + if (executeArgs.upgrade) { + args.push('--upgrade'); + } + const processedArgs = processEditableInstallArgs(executeArgs.packages.map((pkg) => pkg.packageName)); + args.push(...processedArgs); + return args; + } + + async execute(executeArgs: InstallExecuteArgs): Promise { + await runPython( + this.pythonExecutable, + this.buildCommand(executeArgs), + undefined, + this.log, + executeArgs.cancellationToken, + this.timeout, + ); + } +} + +/** + * UV install command. + * Parsed command: `uv pip install --python [--upgrade] ` + * Official documentation: https://docs.astral.sh/uv/pip/ + */ +export class UvInstallCommand extends InstallCommand { + protected buildCommand(executeArgs: InstallExecuteArgs): string[] { + let args = ['pip', 'install', '--python', this.pythonExecutable]; + if (executeArgs.upgrade) { + args.push('--upgrade'); + } + const processedArgs = processEditableInstallArgs(executeArgs.packages.map((pkg) => pkg.packageName)); + args.push(...processedArgs); + return args; + } + + async execute(executeArgs: InstallExecuteArgs): Promise { + await runUV(this.buildCommand(executeArgs), undefined, this.log, executeArgs.cancellationToken, this.timeout); + } +} diff --git a/src/managers/builtin/commands/list.ts b/src/managers/builtin/commands/list.ts new file mode 100644 index 000000000..1e129a639 --- /dev/null +++ b/src/managers/builtin/commands/list.ts @@ -0,0 +1,86 @@ +import { PackageInfo } from '../../../api'; +import { ListCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; + +/** + * Pip list command. + * Parsed command: `python -m pip list --format=json` --disable-pip-version-check + * Official documentation: https://pip.pypa.io/en/stable/cli/pip_list/ + */ +export class PipListCommand extends ListCommand { + protected buildCommand(): string[] { + return ['-m', 'pip', 'list', '--format=json', '--disable-pip-version-check']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runPython( + this.pythonExecutable, + this.buildCommand(), + undefined, + this.log, + executeArgs?.cancellationToken, + this.timeout, + ); + let json: unknown; + try { + json = JSON.parse(output); + } catch (e) { + this.log?.error(`Failed to parse pip list output: ${e}`); + return []; + } + if (!Array.isArray(json)) { + this.log?.error('Invalid output from pip list command'); + return []; + } + + return json + .filter(({ name, version }) => !!name && !!version) + .map(({ name, version }) => ({ + name, + version, + displayName: name, + description: version, + })); + } +} + +/** + * UV list command. + * Parsed command: `uv pip list --format=json --python ` + * Official documentation: https://docs.astral.sh/uv/pip/ + */ +export class UvListCommand extends ListCommand { + protected buildCommand(): string[] { + return ['pip', 'list', '--format=json', '--python', this.pythonExecutable]; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runUV( + this.buildCommand(), + undefined, + this.log, + executeArgs?.cancellationToken, + this.timeout, + ); + let json: unknown; + try { + json = JSON.parse(output); + } catch (e) { + this.log?.error(`Failed to parse uv pip list output: ${e}`); + return []; + } + if (!Array.isArray(json)) { + this.log?.error('Invalid output from uv pip list command'); + return []; + } + + return json + .filter(({ name, version }) => !!name && !!version) + .map(({ name, version }) => ({ + name, + version, + displayName: name, + description: version, + })); + } +} diff --git a/src/managers/builtin/commands/listDirectNames.ts b/src/managers/builtin/commands/listDirectNames.ts new file mode 100644 index 000000000..cdeb109ed --- /dev/null +++ b/src/managers/builtin/commands/listDirectNames.ts @@ -0,0 +1,78 @@ +import { ListDirectNamesCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; +import { normalizePackageName } from '../utils'; + +/** + * Pip list direct names command. + * Parsed command: `python -m pip list --format=json --not-required` + * Official documentation: https://pip.pypa.io/en/stable/cli/pip_list/ + */ +export class PipListDirectNamesCommand extends ListDirectNamesCommand { + protected buildCommand(): string[] { + return ['-m', 'pip', 'list', '--format=json', '--not-required']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise> { + const output = await runPython( + this.pythonExecutable, + this.buildCommand(), + undefined, + this.log, + executeArgs?.cancellationToken, + this.timeout, + ); + let packages: unknown; + try { + packages = JSON.parse(output); + } catch (e) { + this.log?.error(`Failed to parse pip list output: ${e}`); + return new Set(); + } + if (!Array.isArray(packages)) { + this.log?.error('Invalid output from pip list command'); + return new Set(); + } + + return new Set(packages.filter(({ name }) => !!name).map(({ name }) => normalizePackageName(name))); + } +} + +/** + * UV list direct names command. + * Parsed command: `uv pip tree --python --depth=0` + * Official documentation: https://docs.astral.sh/uv/pip/ + */ +export class UvListDirectNamesCommand extends ListDirectNamesCommand { + protected buildCommand(): string[] { + return ['pip', 'tree', '--python', this.pythonExecutable, '--depth=0']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise> { + const output = await runUV( + this.buildCommand(), + undefined, + this.log, + executeArgs?.cancellationToken, + this.timeout, + ); + const packageNames = new Set(); + const lines = output.split('\n'); + + for (const line of lines) { + // Tree output has top-level packages at the start of the line with no indentation + // Dependencies are indented with tree characters (├, └, │, etc.) + // We only want lines that start with a package name (not whitespace or tree chars) + if (line.length === 0 || /^[\s├└│]/.test(line)) { + continue; + } + + // Extract package name (first word, before space or end of line) + const match = line.match(/^(\S+)/); + if (match && match[1]) { + packageNames.add(normalizePackageName(match[1])); + } + } + + return packageNames; + } +} diff --git a/src/managers/builtin/commands/uninstall.ts b/src/managers/builtin/commands/uninstall.ts new file mode 100644 index 000000000..50ffe61e4 --- /dev/null +++ b/src/managers/builtin/commands/uninstall.ts @@ -0,0 +1,41 @@ +import { UninstallCommand, type UninstallExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; + +/** + * Pip uninstall command. + * Parsed command: `python -m pip uninstall -y ` + * Official documentation: https://pip.pypa.io/en/stable/cli/pip_uninstall/ + */ +export class PipUninstallCommand extends UninstallCommand { + protected buildCommand(executeArgs: UninstallExecuteArgs): string[] { + return ['-m', 'pip', 'uninstall', '-y', ...executeArgs.packages.map((pkg) => pkg.packageName)]; + } + + async execute(executeArgs: UninstallExecuteArgs): Promise { + await runPython( + this.pythonExecutable, + this.buildCommand(executeArgs), + undefined, + this.log, + executeArgs.cancellationToken, + this.timeout, + ); + } +} + +/** + * UV uninstall command. + * Parsed command: `uv pip uninstall -y --python ` + * Official documentation: https://docs.astral.sh/uv/pip/ + */ +export class UvUninstallCommand extends UninstallCommand { + protected buildCommand(executeArgs: UninstallExecuteArgs): string[] { + const args = ['pip', 'uninstall', '--python', this.pythonExecutable]; + args.push(...executeArgs.packages.map((pkg) => pkg.packageName)); + return args; + } + + async execute(executeArgs: UninstallExecuteArgs): Promise { + await runUV(this.buildCommand(executeArgs), undefined, this.log, executeArgs.cancellationToken, this.timeout); + } +} diff --git a/src/managers/builtin/commands/version.ts b/src/managers/builtin/commands/version.ts new file mode 100644 index 000000000..77faa3a09 --- /dev/null +++ b/src/managers/builtin/commands/version.ts @@ -0,0 +1,47 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { explain as parsePep440Version } from '@renovatebot/pep440'; +import { VersionCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runPython, runUV } from '../helpers'; + +/** + * Pip version command. + * Parsed command: `python -m pip --version` + * Official documentation: https://pip.pypa.io/en/stable/cli/pip/ + */ +export class PipVersionCommand extends VersionCommand { + protected buildCommand(): string[] { + return ['-m', 'pip', '--version']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runPython( + this.pythonExecutable, + this.buildCommand(), + undefined, + this.log, + executeArgs?.cancellationToken, + this.timeout, + ); + + const match = output.match(/^pip\s+(\d+\.\d+(?:\.\d+)*)/); + return match ? (parsePep440Version(match[1]) ?? undefined) : undefined; + } +} + +/** + * UV version command. + * Parsed command: `uv --version` + * Official documentation: https://docs.astral.sh/uv/ + */ +export class UvVersionCommand extends VersionCommand { + protected buildCommand(): string[] { + return ['--version']; + } + + async execute(): Promise { + const output = await runUV(this.buildCommand(), undefined, this.log, undefined, this.timeout); + + const match = output.match(/(\d+\.\d+(?:\.\d+)*)/); + return match ? (parsePep440Version(match[1]) ?? undefined) : undefined; + } +} diff --git a/src/managers/builtin/helpers.ts b/src/managers/builtin/helpers.ts index 7fb7062a2..666775163 100644 --- a/src/managers/builtin/helpers.ts +++ b/src/managers/builtin/helpers.ts @@ -153,7 +153,7 @@ export async function runPython( proc.stderr?.on('data', (data) => { const s = data.toString('utf-8'); builder += s; - log?.append(`python: ${s}`); + log?.append(s); }); proc.on('close', () => { resolve(builder); diff --git a/src/managers/builtin/pipListUtils.ts b/src/managers/builtin/pipListUtils.ts deleted file mode 100644 index 80519d89d..000000000 --- a/src/managers/builtin/pipListUtils.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { LogOutputChannel } from 'vscode'; - -export interface PipPackage { - name: string; - version: string; - displayName: string; - description: string; -} -export function parseUvTree(data: string): string[] { - return data - .split('\n') - .map((line) => line.trim()) - .map((line) => line.split(/\s+/, 1)[0]) - .filter((name) => !!name); -} - -export function parsePipListJson(data: string, log?: LogOutputChannel): PipPackage[] { - try { - const json = JSON.parse(data); - if (Array.isArray(json)) { - return json - .filter((item) => item.name && item.version) - .map(({ name, version }) => ({ - name, - version, - displayName: name, - description: version, - })); - } - } catch (ex) { - log?.error('Failed to parse pip list JSON output', ex); - } - return []; -} diff --git a/src/managers/builtin/pipPackageManager.ts b/src/managers/builtin/pipPackageManager.ts index f0e09a7d0..efdb82d73 100644 --- a/src/managers/builtin/pipPackageManager.ts +++ b/src/managers/builtin/pipPackageManager.ts @@ -1,5 +1,5 @@ import type { Pep440Version } from '@renovatebot/pep440'; -import { compare, explain as parse, rcompare } from '@renovatebot/pep440'; +import { compare, explain as parse } from '@renovatebot/pep440'; import { CancellationError, Disposable, @@ -21,10 +21,26 @@ import { PythonEnvironment, PythonEnvironmentApi, } from '../../api'; +import { withProgress } from '../../common/window.apis'; +import { CommandConstructorOptions } from '../base/commands/index'; import { updatePackagesAndNotify } from '../common/packageChanges'; -import { runPython, runUV, shouldUseUv } from './helpers'; +import { createPipOrUvCommand } from './commands/factory'; +import { + PipAvailableVersionsCommand, + PipInstallCommand, + PipListCommand, + PipListDirectNamesCommand, + PipUninstallCommand, + PipVersionCommand, + UvAvailableVersionsCommand, + UvInstallCommand, + UvListCommand, + UvListDirectNamesCommand, + UvUninstallCommand, + UvVersionCommand, +} from './commands/index'; import { getWorkspacePackagesToInstall } from './pipUtils'; -import { managePackages, normalizePackageName, refreshPipDirectPackageNames, refreshPipPackages } from './utils'; +import { parsePackageSpecs } from './utils'; import { VenvManager } from './venvManager'; export class PipPackageManager implements PackageManager, Disposable { @@ -65,43 +81,66 @@ export class PipPackageManager implements PackageManager, Disposable { } } - const manageOptions = { - ...options, - install: toInstall, - uninstall: toUninstall, - }; - await window.withProgress( - { - location: ProgressLocation.Notification, - title: 'Installing packages', - cancellable: true, - }, - async (_progress, token) => { - try { - await managePackages(environment, manageOptions, this, token); - await updatePackagesAndNotify( - this, - environment, - this.packages.get(environment.envId.id), - (changes) => { - 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'); - if (result === 'View Output') { - this.log.show(); - } - }); - throw e; + try { + const pythonExecutable = environment.execInfo?.run?.executable; + if (!pythonExecutable) { + throw new Error('Unable to determine Python executable path'); + } + + // Centralize command options for install/uninstall operations + const manageCommandOptions: CommandConstructorOptions = { + pythonExecutable, + log: this.log, + }; + + // Execute uninstall if needed + if (toUninstall.length > 0) { + const uninstallCmd: PipUninstallCommand | UvUninstallCommand = await createPipOrUvCommand( + manageCommandOptions, + environment.environmentPath.fsPath, + PipUninstallCommand, + UvUninstallCommand, + ); + const packages = parsePackageSpecs(toUninstall); + await withProgress( + { location: ProgressLocation.Notification, title: 'Installing packages', cancellable: true }, + (_progress, token) => uninstallCmd.execute({ packages, cancellationToken: token }), + ); + } + + // Execute install if needed + if (toInstall.length > 0) { + const installCmd: PipInstallCommand | UvInstallCommand = await createPipOrUvCommand( + manageCommandOptions, + environment.environmentPath.fsPath, + PipInstallCommand, + UvInstallCommand, + ); + const packages = parsePackageSpecs(toInstall); + await withProgress( + { location: ProgressLocation.Notification, title: 'Installing packages', cancellable: true }, + (_progress, token) => + installCmd.execute({ packages, upgrade: options.upgrade, cancellationToken: token }), + ); + } + + await updatePackagesAndNotify(this, environment, this.packages.get(environment.envId.id), (changes) => { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + }); + } catch (e) { + if (e instanceof CancellationError) { + // Cancellation is a normal control-flow exit; do not surface an error. + return; + } + this.log.error('Error managing packages', e); + setImmediate(async () => { + const result = await window.showErrorMessage('Error managing packages', 'View Output'); + if (result === 'View Output') { + this.log.show(); } - }, - ); + }); + throw e; + } } async refresh(environment: PythonEnvironment): Promise { @@ -125,7 +164,20 @@ export class PipPackageManager implements PackageManager, Disposable { async getPackages(environment: PythonEnvironment, options?: GetPackagesOptions): Promise { if (options?.skipCache || !this.packages.has(environment.envId.id)) { - const data = await refreshPipPackages(environment, this.log); + const pythonExecutable = environment.execInfo?.run?.executable; + if (!pythonExecutable) { + return undefined; + } + const listCmd: PipListCommand | UvListCommand = await createPipOrUvCommand( + { + pythonExecutable, + log: this.log, + }, + environment.environmentPath.fsPath, + PipListCommand, + UvListCommand, + ); + const data = await listCmd.execute(); const packages = (data ?? []).map((pkg) => this.api.createPackageItem(pkg, environment, this)); this.packages.set(environment.envId.id, packages); return packages; @@ -135,22 +187,17 @@ export class PipPackageManager implements PackageManager, Disposable { async getVersion(environment: PythonEnvironment): Promise { try { - const useUv = await shouldUseUv(this.log, environment.environmentPath.fsPath); - if (useUv) { - const result = await runUV(['--version'], undefined, this.log); - // "uv X.Y.Z" - const match = result.match(/^uv\s+(\d+\.\d+(?:\.\d+)*)/); - return match ? (parse(match[1]) ?? undefined) : undefined; + const pythonExecutable = environment.execInfo?.run?.executable; + if (!pythonExecutable) { + return undefined; } - const result = await runPython( - environment.execInfo?.run?.executable ?? 'python', - ['-m', 'pip', '--version'], - undefined, - this.log, + const versionCmd: PipVersionCommand | UvVersionCommand = await createPipOrUvCommand( + { pythonExecutable, log: this.log }, + environment.environmentPath.fsPath, + PipVersionCommand, + UvVersionCommand, ); - // "pip X.Y.Z from /path/to/pip (python X.Y)" - const match = result.match(/^pip\s+(\d+\.\d+(?:\.\d+)*)/); - return match ? (parse(match[1]) ?? undefined) : undefined; + return await versionCmd.execute(); } catch { return undefined; } @@ -161,39 +208,42 @@ export class PipPackageManager implements PackageManager, Disposable { packageName: string, ): Promise { try { - const python = environment.execInfo?.run?.executable; - if (!python) { + const pythonExecutable = environment.execInfo?.run?.executable; + if (!pythonExecutable) { return undefined; } - const baseVersion = parse(environment.version)?.base_version; + // Normalize versions like '3.13.1.final.0' (Python's sys.version_info format) to '3.13.1' + // before parsing, since pep440 only accepts valid PEP 440 version strings. + const versionMatch = (environment.version ?? '').match(/^(\d+(?:\.\d+)*)/); + const normalizedVersion = versionMatch?.[1] ?? ''; + const baseVersion = parse(normalizedVersion)?.base_version; if (!baseVersion) { return undefined; } - // uv - Run pip via `uv tool run pip` - const useUv = await shouldUseUv(this.log, environment.environmentPath.fsPath); - if (useUv) { - const output = await runUV( - ['tool', 'run', 'pip', 'index', 'versions', packageName, '--json', '--python-version', baseVersion], - undefined, - this.log, - ); - return parsePipIndexVersionsJson(output); - } - // pip >= 21.2.0 - use `pip index versions --json` to get available versions in a machine readable format. - const pipVersion = await this.getVersion(environment); - if (pipVersion && compare(pipVersion.public, '21.2.0') >= 0) { - const output = await runPython( - python, - ['-m', 'pip', 'index', 'versions', packageName, '--json', '--python-version', baseVersion], - undefined, - this.log, + const availableVersionsCmd: PipAvailableVersionsCommand | UvAvailableVersionsCommand = + await createPipOrUvCommand( + { pythonExecutable, log: this.log }, + environment.environmentPath.fsPath, + PipAvailableVersionsCommand, + UvAvailableVersionsCommand, ); - return parsePipIndexVersionsJson(output); + + // For pip < 21.2.0, check version first + if (availableVersionsCmd instanceof PipAvailableVersionsCommand) { + const pipVersion = await this.getVersion(environment); + if (!pipVersion || compare(pipVersion.public, '21.2.0') < 0) { + // pip <= 20.3.4 - version picking is undefined; no reliable machine-readable API exists. + return undefined; + } } - // pip <= 20.3.4 - version picking is undefined; no reliable machine-readable API exists. + const versions = await availableVersionsCmd.execute({ + packageName, + pythonVersion: baseVersion, + }); + return versions.sort((a, b) => compare(b.public, a.public)); } catch { return undefined; } @@ -205,38 +255,22 @@ export class PipPackageManager implements PackageManager, Disposable { } /** - * Returns direct (non-transitive) package names using `pip list --not-required` or `uv pip tree --depth=0`. + * Returns direct (non-transitive) package names using `pip list --not-required` or `uv pip list --not-required`. * * Note: These commands return packages with no installed dependents (leaf packages), not packages * the user explicitly installed. pip/uv do not track install intent. */ async getDirectPackageNames(environment: PythonEnvironment): Promise | undefined> { - const data = await refreshPipDirectPackageNames(environment, this.log); - return data ? new Set(data.map(normalizePackageName)) : undefined; - } -} - -/** - * Parses JSON output from `pip index versions --json`. - * Expected format: { "name": "...", "versions": ["1.2.3", "1.2.2", ...] } - */ -export function parsePipIndexVersionsJson(output: string): Pep440Version[] | undefined { - // Only capture output between braces - const match = output.match(/{[\s\S]*}/); - if (!match) { - return undefined; - } - try { - const parsed = JSON.parse(match[0]); - if (parsed && Array.isArray(parsed.versions) && parsed.versions.length > 0) { - return (parsed.versions as string[]) - .filter((v) => !!v.trim()) - .map((v) => parse(v.trim())) - .filter((v): v is Pep440Version => v !== null) - .sort((a, b) => rcompare(a.public, b.public)); + const pythonExecutable = environment.execInfo?.run?.executable; + if (!pythonExecutable) { + return undefined; } - return undefined; - } catch { - return undefined; + const listDirectNamesCmd: PipListDirectNamesCommand | UvListDirectNamesCommand = await createPipOrUvCommand( + { pythonExecutable, log: this.log }, + environment.environmentPath.fsPath, + PipListDirectNamesCommand, + UvListDirectNamesCommand, + ); + return listDirectNamesCmd.execute(); } } diff --git a/src/managers/builtin/pipUtils.ts b/src/managers/builtin/pipUtils.ts index 055ddb965..54795999d 100644 --- a/src/managers/builtin/pipUtils.ts +++ b/src/managers/builtin/pipUtils.ts @@ -13,7 +13,9 @@ import { findFiles } from '../../common/workspace.apis'; import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers'; import { Installable } from '../common/types'; import { mergePackages } from '../common/utils'; -import { normalizePackageName, refreshPipPackages } from './utils'; +import { createPipOrUvCommand } from './commands/factory'; +import { PipListCommand, UvListCommand } from './commands/index'; +import { normalizePackageName } from './utils'; export interface PyprojectToml { project?: { @@ -275,7 +277,17 @@ export async function getWorkspacePackagesToInstall( let common = await getCommonPackages(); let installed: string[] | undefined; if (environment) { - installed = (await refreshPipPackages(environment, log, { showProgress: true }))?.map((pkg) => pkg.name); + const pythonExecutable = environment.execInfo?.run?.executable; + if (pythonExecutable) { + const listCmd: PipListCommand | UvListCommand = await createPipOrUvCommand( + { pythonExecutable, log }, + environment.environmentPath.fsPath, + PipListCommand, + UvListCommand, + ); + const data = await listCmd.execute(); + installed = data?.map((pkg) => pkg.name); + } common = mergePackages(common, installed ?? []); } return selectWorkspaceOrCommon(installableResult, common, !!options.showSkipOption, installed ?? []); @@ -394,10 +406,7 @@ export async function getProjectInstallable( !path.isAbsolute(relative)) ); }) - .sort( - (a, b) => - path.dirname(b.fsPath).length - path.dirname(a.fsPath).length, - ) + .sort((a, b) => path.dirname(b.fsPath).length - path.dirname(a.fsPath).length) : []; if (preferredCandidates.length > 0) { @@ -502,17 +511,3 @@ export async function shouldProceedAfterPyprojectValidation( return false; } - -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); -} diff --git a/src/managers/builtin/utils.ts b/src/managers/builtin/utils.ts index dc44fe759..046348035 100644 --- a/src/managers/builtin/utils.ts +++ b/src/managers/builtin/utils.ts @@ -1,19 +1,10 @@ -import { CancellationToken, LogOutputChannel, ProgressLocation, QuickPickItem, Uri, window } from 'vscode'; -import { - EnvironmentManager, - Package, - PackageManagementOptions, - PackageManager, - PythonEnvironment, - PythonEnvironmentApi, - PythonEnvironmentInfo, -} from '../../api'; -import { showErrorMessageWithLogs } from '../../common/errors/utils'; +import { LogOutputChannel, QuickPickItem, Uri, window } from 'vscode'; +import { EnvironmentManager, Package, PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo } from '../../api'; import { getExtension } from '../../common/extension.apis'; import { Common, PixiStrings, SysManagerStrings } from '../../common/localize'; import { traceInfo, traceVerbose } from '../../common/logging'; import { getGlobalPersistentState } from '../../common/persistentState'; -import { showInformationMessage, withProgress } from '../../common/window.apis'; +import { showInformationMessage } from '../../common/window.apis'; import { openExtension } from '../../common/workbenchCommands'; import { isNativeEnvInfo, @@ -22,13 +13,22 @@ import { NativePythonFinder, } from '../common/nativePythonFinder'; import { shortenVersionString, sortEnvironments } from '../common/utils'; -import { runPython, runUV, shouldUseUv } from './helpers'; -import { parsePipListJson, parseUvTree, PipPackage } from './pipListUtils'; const PIXI_EXTENSION_ID = 'renan-r-santos.pixi-code'; const PIXI_RECOMMEND_DONT_ASK_KEY = 'pixi-extension-recommend-dont-ask'; let pixiRecommendationShown = false; +/** + * Parse package specifications (strings) into package objects. + * Each string becomes a package object with packageName and empty version. + */ +export function parsePackageSpecs(packageStrings: string[]): { packageName: string; version?: string }[] { + return packageStrings.map((pkg) => ({ + packageName: pkg, + version: undefined, + })); +} + function asPackageQuickPickItem(name: string, version?: string): QuickPickItem { return { label: name, @@ -183,153 +183,6 @@ export async function refreshPythons( return sortEnvironments(collection); } -const PIP_LIST_TIMEOUT_MS = 30_000; - -async function execPipList(environment: PythonEnvironment, log?: LogOutputChannel, args?: string[]): Promise { - // Use environmentPath directly for consistency with UV environment tracking - const useUv = await shouldUseUv(log, environment.environmentPath.fsPath); - if (useUv) { - return await runUV( - ['pip', 'list', '--python', environment.execInfo.run.executable, '--format=json', ...(args ?? [])], - undefined, - log, - undefined, - PIP_LIST_TIMEOUT_MS, - ); - } - try { - return await runPython( - environment.execInfo.run.executable, - ['-m', 'pip', 'list', '--format=json', ...(args ?? [])], - undefined, - log, - undefined, - PIP_LIST_TIMEOUT_MS, - ); - } catch (ex) { - log?.error('Error running pip list', ex); - log?.info( - 'Package list retrieval attempted using pip, action can be done with uv if installed and setting `alwaysUseUv` is enabled.', - ); - throw ex; - } -} - -export async function refreshPipPackages( - environment: PythonEnvironment, - log?: LogOutputChannel, - options?: { showProgress: boolean }, -): Promise { - let data: string; - try { - if (options?.showProgress) { - data = await withProgress( - { - location: ProgressLocation.Notification, - }, - async () => { - return await execPipList(environment, log); - }, - ); - } else { - data = await execPipList(environment, log); - } - - return parsePipListJson(data, log); - } catch (e) { - log?.error('Error refreshing packages', e); - showErrorMessageWithLogs(SysManagerStrings.packageRefreshError, log); - return undefined; - } -} - -/** - * Returns names of packages with no installed dependents (leaf packages). - * - * Uses `pip list --not-required` (pip) or `uv pip tree --depth=0` (uv). These report - * packages that nothing else depends on, which is a proxy for "directly installed" but - * not equivalent — e.g., `pip install flask werkzeug` will report werkzeug as having - * dependents (flask) even though the user installed it explicitly. - */ -export async function refreshPipDirectPackageNames( - environment: PythonEnvironment, - log?: LogOutputChannel, -): Promise { - const useUv = await shouldUseUv(log, environment.environmentPath.fsPath); - if (useUv) { - const treeOutput = await runUV( - ['pip', 'tree', '--python', environment.execInfo.run.executable, '--depth=0'], - undefined, - log, - undefined, - PIP_LIST_TIMEOUT_MS, - ); - return parseUvTree(treeOutput); - } - const data = await execPipList(environment, log, ['--not-required']); - const packages = parsePipListJson(data); - return packages.map((pkg) => pkg.name); -} - -export async function managePackages( - environment: PythonEnvironment, - options: PackageManagementOptions, - manager: PackageManager, - token?: CancellationToken, -): Promise { - if (environment.version.startsWith('2.')) { - throw new Error('Python 2.* is not supported (deprecated)'); - } - - // Use environmentPath directly for consistency with UV environment tracking - const useUv = await shouldUseUv(manager.log, environment.environmentPath.fsPath); - const uninstallArgs = ['pip', 'uninstall']; - if (options.uninstall && options.uninstall.length > 0) { - if (useUv) { - await runUV( - [...uninstallArgs, '--python', environment.execInfo.run.executable, ...options.uninstall], - undefined, - manager.log, - token, - ); - } else { - uninstallArgs.push('--yes'); - await runPython( - environment.execInfo.run.executable, - ['-m', ...uninstallArgs, ...options.uninstall], - undefined, - manager.log, - token, - ); - } - } - - const installArgs = ['pip', 'install']; - if (options.upgrade) { - 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, ...processedInstallArgs], - undefined, - manager.log, - token, - ); - } else { - await runPython( - environment.execInfo.run.executable, - ['-m', ...installArgs, ...processedInstallArgs], - undefined, - manager.log, - token, - ); - } - } -} - /** * 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 diff --git a/src/managers/conda/commands/availableVersions.ts b/src/managers/conda/commands/availableVersions.ts new file mode 100644 index 000000000..629d6b9df --- /dev/null +++ b/src/managers/conda/commands/availableVersions.ts @@ -0,0 +1,35 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { AvailableVersionsCommand, type AvailableVersionsExecuteArgs } from '../../base/commands/index'; +import { runCondaExecutable } from '../condaUtils'; + +/** + * Conda available versions command. + * Parsed command: `conda search --json` + * Official documentation: https://docs.conda.io/projects/conda/en/latest/commands/search.html + */ +export class CondaAvailableVersionsCommand extends AvailableVersionsCommand { + protected buildCommand(executeArgs: AvailableVersionsExecuteArgs): string[] { + return ['search', executeArgs.packageName, '--json']; + } + + async execute(executeArgs: AvailableVersionsExecuteArgs): Promise { + const output = await runCondaExecutable( + this.buildCommand(executeArgs), + this.log, + executeArgs.cancellationToken, + ); + + try { + const parsed = JSON.parse(output); + if (parsed && typeof parsed === 'object' && Array.isArray(parsed[executeArgs.packageName])) { + const versions = (parsed[executeArgs.packageName] as Array<{ version?: string }>) + .map((entry) => entry.version?.trim() ?? '') + .filter((version) => !!version); + return this.parseVersions(versions, executeArgs.includePrerelease); + } + return []; + } catch { + return []; + } + } +} diff --git a/src/managers/conda/commands/condaCommandOptions.ts b/src/managers/conda/commands/condaCommandOptions.ts new file mode 100644 index 000000000..a094aaa76 --- /dev/null +++ b/src/managers/conda/commands/condaCommandOptions.ts @@ -0,0 +1,5 @@ +import { CommandConstructorOptions } from '../../base/commands/index'; + +export interface CondaCommandConstructorOptions extends CommandConstructorOptions { + condaEnvironmentPath: string; +} diff --git a/src/managers/conda/commands/index.ts b/src/managers/conda/commands/index.ts new file mode 100644 index 000000000..7633b1ae6 --- /dev/null +++ b/src/managers/conda/commands/index.ts @@ -0,0 +1,6 @@ +export { CondaAvailableVersionsCommand } from './availableVersions'; +export { CondaCommandConstructorOptions } from './condaCommandOptions'; +export { CondaInstallCommand } from './install'; +export { CondaListCommand } from './list'; +export { CondaUninstallCommand } from './uninstall'; +export { CondaVersionCommand } from './version'; diff --git a/src/managers/conda/commands/install.ts b/src/managers/conda/commands/install.ts new file mode 100644 index 000000000..ad3e04690 --- /dev/null +++ b/src/managers/conda/commands/install.ts @@ -0,0 +1,38 @@ +import { InstallCommand, type InstallExecuteArgs } from '../../base/commands/index'; +import { runCondaExecutable } from '../condaUtils'; +import { CondaCommandConstructorOptions } from './condaCommandOptions'; + +/** + * Conda install command. + * Parsed command: `conda install --prefix --yes ` + * Parsed command (upgrade): `conda install --prefix --yes --update-all ` + * Official documentation: https://docs.conda.io/projects/conda/en/latest/commands/install.html + */ +export class CondaInstallCommand extends InstallCommand { + private readonly condaEnvironmentPath: string; + + constructor(options: CondaCommandConstructorOptions) { + super(options); + this.condaEnvironmentPath = options.condaEnvironmentPath; + } + + protected buildCommand(executeArgs: InstallExecuteArgs): string[] { + const args = ['install', '--prefix', this.condaEnvironmentPath, '--yes']; + if (executeArgs.upgrade) { + args.push('--update-all'); + } + args.push( + ...executeArgs.packages.map((pkg) => { + if (pkg.version) { + return `${pkg.packageName}=${pkg.version}`; + } + return pkg.packageName; + }), + ); + return args; + } + + async execute(executeArgs: InstallExecuteArgs): Promise { + await runCondaExecutable(this.buildCommand(executeArgs), this.log, executeArgs.cancellationToken); + } +} diff --git a/src/managers/conda/commands/list.ts b/src/managers/conda/commands/list.ts new file mode 100644 index 000000000..aeb989bcb --- /dev/null +++ b/src/managers/conda/commands/list.ts @@ -0,0 +1,46 @@ +import { PackageInfo } from '../../../api'; +import { ListCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runCondaExecutable } from '../condaUtils'; +import { CondaCommandConstructorOptions } from './condaCommandOptions'; + +/** + * Conda list command. + * Parsed command: `conda list -p --json` + * Official documentation: https://docs.conda.io/projects/conda/en/latest/commands/list.html + */ +export class CondaListCommand extends ListCommand { + private readonly condaEnvironmentPath: string; + + constructor(options: CondaCommandConstructorOptions) { + super(options); + this.condaEnvironmentPath = options.condaEnvironmentPath; + } + + protected buildCommand(): string[] { + return ['list', '-p', this.condaEnvironmentPath, '--json']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runCondaExecutable(this.buildCommand(), this.log, executeArgs?.cancellationToken); + let condaPackages: { name: string; version: string }[]; + try { + condaPackages = JSON.parse(output) as { name: string; version: string }[]; + } catch { + return []; + } + + const packages: PackageInfo[] = []; + for (const condaPkg of condaPackages) { + if (condaPkg.name && condaPkg.version) { + packages.push({ + name: condaPkg.name, + displayName: condaPkg.name, + version: condaPkg.version, + description: condaPkg.version, + }); + } + } + + return packages; + } +} diff --git a/src/managers/conda/commands/uninstall.ts b/src/managers/conda/commands/uninstall.ts new file mode 100644 index 000000000..53400acf3 --- /dev/null +++ b/src/managers/conda/commands/uninstall.ts @@ -0,0 +1,27 @@ +import { UninstallCommand, type UninstallExecuteArgs } from '../../base/commands/index'; +import { runCondaExecutable } from '../condaUtils'; +import { CondaCommandConstructorOptions } from './condaCommandOptions'; + +/** + * Conda uninstall command. + * Parsed command: `conda remove -y -p ` + * Official documentation: https://docs.conda.io/projects/conda/en/latest/commands/remove.html + */ +export class CondaUninstallCommand extends UninstallCommand { + private readonly condaEnvironmentPath: string; + + constructor(options: CondaCommandConstructorOptions) { + super(options); + this.condaEnvironmentPath = options.condaEnvironmentPath; + } + + protected buildCommand(executeArgs: UninstallExecuteArgs): string[] { + const args = ['remove', '-y', '-p', this.condaEnvironmentPath]; + args.push(...executeArgs.packages.map((pkg) => pkg.packageName)); + return args; + } + + async execute(executeArgs: UninstallExecuteArgs): Promise { + await runCondaExecutable(this.buildCommand(executeArgs), this.log, executeArgs.cancellationToken); + } +} diff --git a/src/managers/conda/commands/version.ts b/src/managers/conda/commands/version.ts new file mode 100644 index 000000000..e9921b2cc --- /dev/null +++ b/src/managers/conda/commands/version.ts @@ -0,0 +1,23 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { explain as parsePep440Version } from '@renovatebot/pep440'; +import { VersionCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runCondaExecutable } from '../condaUtils'; + +/** + * Conda version command. + * Parsed command: `conda --version` + * Official documentation: https://docs.conda.io/projects/conda/en/latest/commands.html + */ +export class CondaVersionCommand extends VersionCommand { + protected buildCommand(): string[] { + return ['--version']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runCondaExecutable(this.buildCommand(), this.log, executeArgs?.cancellationToken); + + // "conda X.Y.Z" + const match = output.match(/conda\s+(\d+\.\d+(?:\.\d+)*)/i); + return match ? (parsePep440Version(match[1]) ?? undefined) : undefined; + } +} diff --git a/src/managers/conda/condaPackageManager.ts b/src/managers/conda/condaPackageManager.ts index 4105800ba..df4c305d2 100644 --- a/src/managers/conda/condaPackageManager.ts +++ b/src/managers/conda/condaPackageManager.ts @@ -1,5 +1,5 @@ import type { Pep440Version } from '@renovatebot/pep440'; -import { explain as parse, rcompare } from '@renovatebot/pep440'; +import { compare } from '@renovatebot/pep440'; import * as path from 'path'; import { CancellationError, @@ -23,10 +23,18 @@ import { } from '../../api'; import { showErrorMessageWithLogs } from '../../common/errors/utils'; import { CondaStrings } from '../../common/localize'; -import { traceError } from '../../common/logging'; import { withProgress } from '../../common/window.apis'; + +import { parsePackageSpecs } from '../builtin/utils'; import { updatePackagesAndNotify } from '../common/packageChanges'; -import { getCommonCondaPackagesToInstall, managePackages, runCondaExecutable } from './condaUtils'; +import { + CondaAvailableVersionsCommand, + CondaInstallCommand, + CondaListCommand, + CondaUninstallCommand, + CondaVersionCommand, +} from './commands/index'; +import { getCommonCondaPackagesToInstall } from './condaUtils'; export class CondaPackageManager implements PackageManager, Disposable { private readonly _onDidChangePackages = new EventEmitter(); @@ -63,40 +71,59 @@ export class CondaPackageManager implements PackageManager, Disposable { } } - const manageOptions = { - ...options, - install: toInstall, - uninstall: toUninstall, - }; - await withProgress( - { - location: ProgressLocation.Notification, - title: CondaStrings.condaInstallingPackages, - cancellable: true, - }, - async (_progress, token) => { - try { - await managePackages(environment, manageOptions, token, this.log); - await updatePackagesAndNotify( - this, - environment, - this.packages.get(environment.envId.id), - (changes) => { - this._onDidChangePackages.fire({ environment, manager: this, changes }); - }, - ); - } catch (e) { - if (e instanceof CancellationError) { - throw e; - } - - this.log.error('Error installing packages', e); - setImmediate(async () => { - await showErrorMessageWithLogs(CondaStrings.condaInstallError, this.log); - }); - } - }, - ); + try { + // Centralize command options for install/uninstall operations + const environmentPath = environment.environmentPath.fsPath; + + // Execute uninstall if needed + if (toUninstall.length > 0) { + const uninstallCmd = new CondaUninstallCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: environmentPath, + log: this.log, + }); + const packages = parsePackageSpecs(toUninstall); + await withProgress( + { + location: ProgressLocation.Notification, + title: CondaStrings.condaInstallingPackages, + cancellable: true, + }, + (_progress, token) => uninstallCmd.execute({ packages, cancellationToken: token }), + ); + } + + // Execute install if needed + if (toInstall.length > 0) { + const installCmd = new CondaInstallCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: environmentPath, + log: this.log, + }); + const packages = parsePackageSpecs(toInstall); + await withProgress( + { + location: ProgressLocation.Notification, + title: CondaStrings.condaInstallingPackages, + cancellable: true, + }, + (_progress, token) => + installCmd.execute({ packages, upgrade: options.upgrade, cancellationToken: token }), + ); + } + + await updatePackagesAndNotify(this, environment, this.packages.get(environment.envId.id), (changes) => { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + }); + } catch (e) { + if (e instanceof CancellationError) { + throw e; + } + this.log.error('Error installing packages', e); + setImmediate(async () => { + await showErrorMessageWithLogs(CondaStrings.condaInstallError, this.log); + }); + } } async refresh(environment: PythonEnvironment): Promise { @@ -120,34 +147,13 @@ export class CondaPackageManager implements PackageManager, Disposable { async getPackages(environment: PythonEnvironment, options?: GetPackagesOptions): Promise { if (options?.skipCache || !this.packages.has(environment.envId.id)) { - const args = ['list', '-p', environment.environmentPath.fsPath, '--json']; - const data = await runCondaExecutable(args); - - let condaPackages: { name: string; version: string }[]; - try { - condaPackages = JSON.parse(data) as { name: string; version: string }[]; - } catch (e) { - traceError(`Failed to parse conda list JSON output: ${data}`, e); - return []; - } - - const packages: Package[] = []; - for (const condaPkg of condaPackages) { - if (condaPkg.name && condaPkg.version) { - packages.push( - this.api.createPackageItem( - { - name: condaPkg.name, - displayName: condaPkg.name, - version: condaPkg.version, - description: condaPkg.version, - }, - environment, - this, - ), - ); - } - } + const listCmd = new CondaListCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: environment.environmentPath.fsPath, + log: this.log, + }); + const data = await listCmd.execute(); + const packages = (data ?? []).map((pkg) => this.api.createPackageItem(pkg, environment, this)); this.packages.set(environment.envId.id, packages); return packages; } @@ -161,10 +167,11 @@ export class CondaPackageManager implements PackageManager, Disposable { async getVersion(_environment: PythonEnvironment): Promise { try { - const output = await runCondaExecutable(['--version'], this.log); - // "conda X.Y.Z" - const match = output.match(/conda\s+(\d+\.\d+(?:\.\d+)*)/i); - return match ? (parse(match[1]) ?? undefined) : undefined; + const versionCmd = new CondaVersionCommand({ + pythonExecutable: 'conda', + log: this.log, + }); + return await versionCmd.execute(); } catch { return undefined; } @@ -175,25 +182,12 @@ export class CondaPackageManager implements PackageManager, Disposable { packageName: string, ): Promise { try { - const output = await runCondaExecutable(['search', packageName, '--json'], this.log); - const parsed = JSON.parse(output); - if (parsed && typeof parsed === 'object' && Array.isArray(parsed[packageName])) { - const uniqueVersions = new Map(); - parsed[packageName] - .filter((entry: { version?: string }) => !!entry.version?.trim()) - .map((entry: { version?: string }) => parse(entry.version!)) - .filter((v: Pep440Version | null): v is Pep440Version => v !== null) - .forEach((version: Pep440Version) => { - if (!uniqueVersions.has(version.public)) { - uniqueVersions.set(version.public, version); - } - }); - - return Array.from(uniqueVersions.values()).sort((a: Pep440Version, b: Pep440Version) => - rcompare(a.public, b.public), - ); - } - return undefined; + const availableVersionsCmd = new CondaAvailableVersionsCommand({ + pythonExecutable: 'conda', + log: this.log, + }); + const versions = await availableVersionsCmd.execute({ packageName, pythonVersion: '' }); + return versions.sort((a, b) => compare(b.public, a.public)); } catch { return undefined; } diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts index 06d3ec54f..eee067ce3 100644 --- a/src/managers/conda/condaUtils.ts +++ b/src/managers/conda/condaUtils.ts @@ -1250,29 +1250,6 @@ export async function deleteCondaEnvironment(environment: PythonEnvironment, log ); } -export async function managePackages( - environment: PythonEnvironment, - options: PackageManagementOptions, - token: CancellationToken, - log: LogOutputChannel, -): Promise { - if (options.uninstall && options.uninstall.length > 0) { - await runCondaExecutable( - ['remove', '--prefix', environment.environmentPath.fsPath, '--yes', ...options.uninstall], - log, - token, - ); - } - 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 runCondaExecutable(args, log, token); - } -} - async function getCommonPackages(): Promise { try { const pipData = path.join(EXTENSION_ROOT_DIR, 'files', 'conda_packages.json'); diff --git a/src/managers/poetry/commands/add.ts b/src/managers/poetry/commands/add.ts new file mode 100644 index 000000000..972c711e8 --- /dev/null +++ b/src/managers/poetry/commands/add.ts @@ -0,0 +1,27 @@ +import { InstallCommand, type InstallExecuteArgs } from '../../base/commands/index'; +import { runPoetry } from './runPoetry'; + +/** + * Poetry add command. + * Parsed command: `poetry add [ ...]` + * Official documentation: https://python-poetry.org/docs/cli/#add + */ +export class PoetryAddCommand extends InstallCommand { + protected buildCommand(executeArgs: InstallExecuteArgs): string[] { + const args = ['add']; + args.push( + ...executeArgs.packages.map((pkg) => { + if (pkg.version) { + return `${pkg.packageName}@${pkg.version}`; + } + return pkg.packageName; + }), + ); + + return args; + } + + async execute(executeArgs: InstallExecuteArgs): Promise { + await runPoetry(this.buildCommand(executeArgs), this.cwd, this.log, executeArgs.cancellationToken); + } +} diff --git a/src/managers/poetry/commands/index.ts b/src/managers/poetry/commands/index.ts new file mode 100644 index 000000000..19a89134b --- /dev/null +++ b/src/managers/poetry/commands/index.ts @@ -0,0 +1,5 @@ +export { PoetryAddCommand } from './add'; +export { PoetryRemoveCommand } from './remove'; +export { PoetryShowCommand } from './show'; +export { PoetryShowTopLevelCommand } from './showTopLevel'; +export { PoetryVersionCommand } from './version'; diff --git a/src/managers/poetry/commands/remove.ts b/src/managers/poetry/commands/remove.ts new file mode 100644 index 000000000..6d27e79e0 --- /dev/null +++ b/src/managers/poetry/commands/remove.ts @@ -0,0 +1,17 @@ +import { UninstallCommand, type UninstallExecuteArgs } from '../../base/commands/index'; +import { runPoetry } from './runPoetry'; + +/** + * Poetry remove command. + * Parsed command: `poetry remove [ ...]` + * Official documentation: https://python-poetry.org/docs/cli/#remove + */ +export class PoetryRemoveCommand extends UninstallCommand { + protected buildCommand(executeArgs: UninstallExecuteArgs): string[] { + return ['remove', ...executeArgs.packages.map((pkg) => pkg.packageName)]; + } + + async execute(executeArgs: UninstallExecuteArgs): Promise { + await runPoetry(this.buildCommand(executeArgs), this.cwd, this.log, executeArgs.cancellationToken); + } +} diff --git a/src/managers/poetry/commands/runPoetry.ts b/src/managers/poetry/commands/runPoetry.ts new file mode 100644 index 000000000..092fe0a7c --- /dev/null +++ b/src/managers/poetry/commands/runPoetry.ts @@ -0,0 +1,47 @@ +import { CancellationError, CancellationToken, LogOutputChannel } from 'vscode'; +import { spawnProcess } from '../../../common/childProcess.apis'; +import { getPoetry } from '../poetryUtils'; + +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 = spawnProcess(poetry, args, { cwd }); + token?.onCancellationRequested(() => { + proc.kill(); + reject(new CancellationError()); + }); + let builder = ''; + proc.stdout?.on('data', (data) => { + const output = data.toString('utf-8'); + builder += output; + log?.append(`poetry: ${output}`); + }); + proc.stderr?.on('data', (data) => { + const output = data.toString('utf-8'); + builder += output; + log?.append(`poetry: ${output}`); + }); + proc.on('close', (code) => { + if (code !== 0) { + reject(new Error(`Failed to run poetry ${args.join(' ')}`)); + return; + } + resolve(builder); + }); + proc.on('error', (error) => { + log?.error(`Error executing poetry command: ${error}`); + reject(error); + }); + }); +} diff --git a/src/managers/poetry/commands/show.ts b/src/managers/poetry/commands/show.ts new file mode 100644 index 000000000..9370d9740 --- /dev/null +++ b/src/managers/poetry/commands/show.ts @@ -0,0 +1,42 @@ +import { PackageInfo } from '../../../api'; +import { ListCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { runPoetry } from './runPoetry'; + +/** + * Poetry show command. + * Parsed command: `poetry show --no-ansi` + * Official documentation: https://python-poetry.org/docs/cli/#show + */ +export class PoetryShowCommand extends ListCommand { + protected buildCommand(): string[] { + return ['show', '--no-ansi']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise { + const output = await runPoetry(this.buildCommand(), this.cwd, this.log, executeArgs?.cancellationToken); + const packages: PackageInfo[] = []; + try { + // Parse poetry show output + // Format: name version description + const lines = output.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; + packages.push({ + name, + displayName: name, + version, + description: `${version} - ${description?.trim() || ''}`, + }); + } + } + } catch { + return []; + } + + return packages; + } +} diff --git a/src/managers/poetry/commands/showTopLevel.ts b/src/managers/poetry/commands/showTopLevel.ts new file mode 100644 index 000000000..96de5859e --- /dev/null +++ b/src/managers/poetry/commands/showTopLevel.ts @@ -0,0 +1,30 @@ +import { ListDirectNamesCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { normalizePackageName } from '../../builtin/utils'; +import { runPoetry } from './runPoetry'; + +/** + * Poetry show --top-level command. + * Parsed command: `poetry show --no-ansi --top-level` + * Official documentation: https://python-poetry.org/docs/cli/#show + */ +export class PoetryShowTopLevelCommand extends ListDirectNamesCommand { + protected buildCommand(): string[] { + return ['show', '--no-ansi', '--top-level']; + } + + async execute(executeArgs?: BaseExecuteArgs): Promise> { + const output = await runPoetry(this.buildCommand(), this.cwd, this.log, executeArgs?.cancellationToken); + + try { + const names = output + .split('\n') + .map((line) => line.trim()) + .map((line) => line.match(/^([a-zA-Z0-9._-]+)/)?.[1] ?? '') + .filter((name) => !!name) + .map(normalizePackageName); + return new Set(names); + } catch { + return new Set(); + } + } +} diff --git a/src/managers/poetry/commands/version.ts b/src/managers/poetry/commands/version.ts new file mode 100644 index 000000000..d4f343df0 --- /dev/null +++ b/src/managers/poetry/commands/version.ts @@ -0,0 +1,26 @@ +import type { Pep440Version } from '@renovatebot/pep440'; +import { explain as parsePep440Version } from '@renovatebot/pep440'; +import { VersionCommand, type BaseExecuteArgs } from '../../base/commands/index'; +import { getPoetryVersion } from '../poetryUtils'; + +/** + * Poetry version command. + * Parsed command: `poetry --version` + * Official documentation: https://python-poetry.org/docs/cli/#options + */ +export class PoetryVersionCommand extends VersionCommand { + protected buildCommand(): string[] { + return ['--version']; + } + + async execute(_executeArgs?: BaseExecuteArgs): Promise { + try { + // Poetry version is obtained via getPoetryVersion utility which handles poetry --version + // We pass the pythonExecutable as the poetry path since it was set to the poetry executable + const versionString = await getPoetryVersion(this.pythonExecutable); + return versionString ? (parsePep440Version(versionString) ?? undefined) : undefined; + } catch { + return undefined; + } + } +} diff --git a/src/managers/poetry/poetryPackageManager.ts b/src/managers/poetry/poetryPackageManager.ts index 54845a20b..85a8a15a7 100644 --- a/src/managers/poetry/poetryPackageManager.ts +++ b/src/managers/poetry/poetryPackageManager.ts @@ -1,10 +1,8 @@ import type { Pep440Version } from '@renovatebot/pep440'; -import { explain as parse } from '@renovatebot/pep440'; import * as fsapi from 'fs-extra'; import * as path from 'path'; import { CancellationError, - CancellationToken, Event, EventEmitter, l10n, @@ -24,12 +22,18 @@ import { PythonEnvironment, PythonEnvironmentApi, } from '../../api'; -import { spawnProcess } from '../../common/childProcess.apis'; import { showErrorMessage, showInputBox, withProgress } from '../../common/window.apis'; -import { normalizePackageName } from '../builtin/utils'; +import { parsePackageSpecs } from '../builtin/utils'; import { updatePackagesAndNotify } from '../common/packageChanges'; +import { + PoetryAddCommand, + PoetryRemoveCommand, + PoetryShowCommand, + PoetryShowTopLevelCommand, + PoetryVersionCommand, +} from './commands/index'; import { PoetryManager } from './poetryManager'; -import { getPoetry, getPoetryVersion } from './poetryUtils'; +import { getPoetry } from './poetryUtils'; export class PoetryPackageManager implements PackageManager, Disposable { private readonly _onDidChangePackages = new EventEmitter(); @@ -77,38 +81,25 @@ export class PoetryPackageManager implements PackageManager, Disposable { } } - await withProgress( - { - location: ProgressLocation.Notification, - title: 'Managing packages with Poetry', - cancellable: true, - }, - async (_progress, token) => { - try { - await this.runPoetryManage({ install: toInstall, uninstall: toUninstall }, token); - await updatePackagesAndNotify( - this, - environment, - this.packages.get(environment.envId.id), - (changes) => { - 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; + try { + await this.runPoetryManage(environment, { install: toInstall, uninstall: toUninstall }); + await updatePackagesAndNotify(this, environment, this.packages.get(environment.envId.id), (changes) => { + this._onDidChangePackages.fire({ environment, manager: this, changes }); + }); + } catch (e) { + if (e instanceof CancellationError) { + // Cancellation is not an error; rethrow without surfacing an error message. + 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 { @@ -156,8 +147,11 @@ export class PoetryPackageManager implements PackageManager, Disposable { if (!poetry) { return undefined; } - const versionStr = await getPoetryVersion(poetry); - return versionStr ? (parse(versionStr) ?? undefined) : undefined; + const versionCmd = new PoetryVersionCommand({ + pythonExecutable: poetry, + log: this.log, + }); + return await versionCmd.execute(); } async getPackageAvailableVersions( @@ -181,8 +175,8 @@ export class PoetryPackageManager implements PackageManager, Disposable { } private async runPoetryManage( + environment: PythonEnvironment, options: { install?: string[]; uninstall?: string[] }, - token?: CancellationToken, ): Promise { const poetry = await getPoetry(); if (!poetry) { @@ -192,31 +186,34 @@ export class PoetryPackageManager implements PackageManager, Disposable { ), ); } + const cwd = await this.getPoetryCwd(environment); // 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; - } + const removeCmd = new PoetryRemoveCommand({ + pythonExecutable: poetry, + cwd, + log: this.log, + }); + const packages = parsePackageSpecs(options.uninstall); + await withProgress( + { location: ProgressLocation.Notification, title: 'Managing packages with Poetry', cancellable: true }, + (_progress, token) => removeCmd.execute({ packages, cancellationToken: token }), + ); } // 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; - } + const addCmd = new PoetryAddCommand({ + pythonExecutable: poetry, + cwd, + log: this.log, + }); + const packages = parsePackageSpecs(options.install); + await withProgress( + { location: ProgressLocation.Notification, title: 'Managing packages with Poetry', cancellable: true }, + (_progress, token) => addCmd.execute({ packages, cancellationToken: token }), + ); } } @@ -230,126 +227,64 @@ export class PoetryPackageManager implements PackageManager, Disposable { ); } - 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 }[] = []; + const cwd = await this.getPoetryCwd(environment); + const showCmd = new PoetryShowCommand({ + pythonExecutable: poetry, + cwd, + log: this.log, + }); + const data = await showCmd.execute(); + return (data ?? []).map((pkg) => this.api.createPackageItem(pkg, environment, this)); + } + async getDirectPackageNames(environment: PythonEnvironment): Promise | undefined> { 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() || ''}`, - }); - } + const poetry = await getPoetry(); + if (!poetry) { + return undefined; } + const cwd = await this.getPoetryCwd(environment); + const showTopLevelCmd = new PoetryShowTopLevelCommand({ + pythonExecutable: poetry, + cwd, + log: this.log, + }); + return await showTopLevelCmd.execute(); } catch (err) { - this.log.error(`Error refreshing packages with Poetry: ${err}`); - // Return empty array instead of throwing to avoid breaking the UI - return []; + this.log.error(`Error fetching direct package names with Poetry: ${err}`); + return undefined; } - - // Convert to Package objects using the API - return poetryPackages.map((pkg) => this.api.createPackageItem(pkg, environment, this)); } - async getDirectPackageNames(_environment: PythonEnvironment): Promise | undefined> { - try { - const topLevelResult = await runPoetry(['show', '--no-ansi', '--top-level'], undefined, this.log); - const names = topLevelResult - .split('\n') - .map((line) => line.trim()) - .map((line) => line.match(/^([a-zA-Z0-9._-]+)/)?.[1] ?? '') - .filter((name) => !!name) - .map(normalizePackageName); - return new Set(names); - } catch (err) { - this.log.error(`Error fetching direct package names with Poetry: ${err}`); + private async getPoetryCwd(environment: PythonEnvironment): Promise { + const projects = this.api.getPythonProjects(); + if (projects.length === 0) { return undefined; } - } -} -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'); - } + const toDirectory = async (fsPath: string): Promise => { + try { + const stat = await fsapi.stat(fsPath); + return stat.isDirectory() ? fsPath : path.dirname(fsPath); + } catch { + return path.dirname(fsPath); + } + }; - log?.info(`Running: ${poetry} ${args.join(' ')}`); + if (projects.length === 1) { + return toDirectory(projects[0].uri.fsPath); + } - return new Promise((resolve, reject) => { - const proc = spawnProcess(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(' ')}`)); - } - }); - }); + const matchingDirectories = new Set(); + await Promise.all( + projects.map(async (project) => { + const projectEnvironment = await this.api.getEnvironment(project.uri); + if (projectEnvironment?.envId.id === environment.envId.id) { + matchingDirectories.add(await toDirectory(project.uri.fsPath)); + } + }), + ); + + return Array.from(matchingDirectories).sort((a, b) => b.length - a.length)[0]; + } } diff --git a/src/test/managers/builtin/commands.unit.test.ts b/src/test/managers/builtin/commands.unit.test.ts new file mode 100644 index 000000000..808203731 --- /dev/null +++ b/src/test/managers/builtin/commands.unit.test.ts @@ -0,0 +1,111 @@ +import assert from 'assert'; +import * as sinon from 'sinon'; +import { LogOutputChannel } from 'vscode'; +import * as workspaceApis from '../../../common/workspace.apis'; +import { PipAvailableVersionsCommand, UvAvailableVersionsCommand } from '../../../managers/builtin/commands/availableVersions'; +import { PipInstallCommand, UvInstallCommand } from '../../../managers/builtin/commands/install'; +import { PipListCommand, UvListCommand } from '../../../managers/builtin/commands/list'; +import { PipListDirectNamesCommand, UvListDirectNamesCommand } from '../../../managers/builtin/commands/listDirectNames'; +import { PipUninstallCommand, UvUninstallCommand } from '../../../managers/builtin/commands/uninstall'; +import { PipVersionCommand, UvVersionCommand } from '../../../managers/builtin/commands/version'; +import * as helpers from '../../../managers/builtin/helpers'; +import { createMockLogOutputChannel } from '../../mocks/helper'; + +suite('Pip and UV commands', () => { + let mockLog: LogOutputChannel; + let runPythonStub: sinon.SinonStub; + let runUvStub: sinon.SinonStub; + + setup(() => { + mockLog = createMockLogOutputChannel(); + sinon.stub(workspaceApis, 'getConfiguration').returns({ + get: () => undefined, + } as unknown as ReturnType); + runPythonStub = sinon.stub(helpers, 'runPython').resolves(''); + runUvStub = sinon.stub(helpers, 'runUV').resolves(''); + }); + + teardown(() => { + sinon.restore(); + }); + + test('PipAvailableVersionsCommand executes without error', async () => { + runPythonStub.resolves(JSON.stringify({ versions: ['1.0.0'] })); + const command = new PipAvailableVersionsCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packageName: 'package', pythonVersion: '3.13.1' })); + }); + + test('UvAvailableVersionsCommand executes without error', async () => { + runUvStub.resolves(JSON.stringify({ versions: ['1.0.0'] })); + const command = new UvAvailableVersionsCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packageName: 'package', pythonVersion: '3.13.1' })); + }); + + test('PipInstallCommand executes without error', async () => { + const command = new PipInstallCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('UvInstallCommand executes without error', async () => { + const command = new UvInstallCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('PipUninstallCommand executes without error', async () => { + const command = new PipUninstallCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('UvUninstallCommand executes without error', async () => { + const command = new UvUninstallCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('PipListCommand executes without error', async () => { + runPythonStub.resolves(JSON.stringify([{ name: 'package', version: '1.0.0' }])); + const command = new PipListCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('UvListCommand executes without error', async () => { + runUvStub.resolves(JSON.stringify([{ name: 'package', version: '1.0.0' }])); + const command = new UvListCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('PipListDirectNamesCommand executes without error', async () => { + runPythonStub.resolves(JSON.stringify([{ name: 'package', version: '1.0.0' }])); + const command = new PipListDirectNamesCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('UvListDirectNamesCommand executes without error', async () => { + runUvStub.resolves('package 1.0.0'); + const command = new UvListDirectNamesCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('PipVersionCommand executes without error', async () => { + runPythonStub.resolves('pip 24.0 from site-packages'); + const command = new PipVersionCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('UvVersionCommand executes without error', async () => { + runUvStub.resolves('uv 0.4.20'); + const command = new UvVersionCommand({ pythonExecutable: 'python', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); +}); \ No newline at end of file diff --git a/src/test/managers/builtin/pipListUtils.unit.test.ts b/src/test/managers/builtin/pipListUtils.unit.test.ts deleted file mode 100644 index 0bc978e9f..000000000 --- a/src/test/managers/builtin/pipListUtils.unit.test.ts +++ /dev/null @@ -1,123 +0,0 @@ -import assert from 'assert'; -import * as fs from 'fs-extra'; -import * as path from 'path'; -import * as sinon from 'sinon'; -import { LogOutputChannel } from 'vscode'; -import { parsePipListJson, parseUvTree } from '../../../managers/builtin/pipListUtils'; -import { EXTENSION_TEST_ROOT } from '../../constants'; - -const TEST_DATA_ROOT = path.join(EXTENSION_TEST_ROOT, 'managers', 'builtin'); - -suite('Pip List JSON Parser tests', () => { - let log: LogOutputChannel; - - setup(() => { - log = { - error: sinon.stub(), - warn: sinon.stub(), - info: sinon.stub(), - } as unknown as LogOutputChannel; - }); - - teardown(() => { - sinon.restore(); - }); - - const testNames = ['piplist1', 'piplist2', 'piplist3']; - - testNames.forEach((testName) => { - test(`Test parsing pip list JSON output ${testName}`, async () => { - const expected = JSON.parse( - await fs.readFile(path.join(TEST_DATA_ROOT, `${testName}.expected.json`), 'utf8'), - ); - const pipListOutput = JSON.stringify(expected.packages); - - const actualPackages = parsePipListJson(pipListOutput, log); - - 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'); - }); - }); - }); - - test('Returns an empty array for invalid JSON input', () => { - assert.deepStrictEqual(parsePipListJson('not json', log), []); - }); - - test('Logs error when JSON parsing fails', () => { - parsePipListJson('not valid json', log); - assert.ok((log.error as sinon.SinonStub).calledOnce, 'Expected error to be logged'); - }); - - test('Returns empty array without logging when no log is provided', () => { - const result = parsePipListJson('not valid json'); - assert.deepStrictEqual(result, []); - }); - - test('Skips items without a name or version', () => { - const actualPackages = parsePipListJson( - JSON.stringify([{ name: 'pip', version: '24.0' }, { name: 'setuptools' }, { version: '1.0.0' }]), - log, - ); - - assert.deepStrictEqual(actualPackages, [ - { - name: 'pip', - version: '24.0', - displayName: 'pip', - description: '24.0', - }, - ]); - }); - - test('Returns empty array for non-array JSON', () => { - const result = parsePipListJson('{"name": "pip"}', log); - assert.deepStrictEqual(result, []); - }); - - test('Returns empty array for empty array JSON', () => { - const result = parsePipListJson('[]', log); - assert.deepStrictEqual(result, []); - }); -}); - -suite('parseUvTree tests', () => { - test('Parses uv pip tree output with depth 0', () => { - const input = 'requests v2.31.0\nflask v3.0.0\n'; - const result = parseUvTree(input); - assert.deepStrictEqual(result, ['requests', 'flask']); - }); - - test('Handles empty output', () => { - assert.deepStrictEqual(parseUvTree(''), []); - }); - - test('Filters blank lines', () => { - const input = 'requests v2.31.0\n\n\nflask v3.0.0\n'; - const result = parseUvTree(input); - assert.deepStrictEqual(result, ['requests', 'flask']); - }); - - test('Handles single package', () => { - const input = 'pip v24.0\n'; - const result = parseUvTree(input); - assert.deepStrictEqual(result, ['pip']); - }); - - test('Trims leading whitespace from indented lines', () => { - const input = ' requests v2.31.0\n flask v3.0.0\n'; - const result = parseUvTree(input); - assert.deepStrictEqual(result, ['requests', 'flask']); - }); -}); diff --git a/src/test/managers/builtin/pipVersions.unit.test.ts b/src/test/managers/builtin/pipVersions.unit.test.ts deleted file mode 100644 index 5c06c394b..000000000 --- a/src/test/managers/builtin/pipVersions.unit.test.ts +++ /dev/null @@ -1,37 +0,0 @@ -import assert from 'assert'; -import { explain } from '@renovatebot/pep440'; -import { parsePipIndexVersionsJson } from '../../../managers/builtin/pipPackageManager'; - -suite('Pip Version Parsing', () => { - suite('parsePipIndexVersionsJson', () => { - test('parses valid JSON with versions array', () => { - const output = JSON.stringify({ name: 'requests', versions: ['2.31.0', '2.30.0', '2.29.0'] }); - const versions = parsePipIndexVersionsJson(output); - assert.deepStrictEqual(versions, ['2.31.0', '2.30.0', '2.29.0'].map((v) => explain(v))); - }); - - test('parses output with a single version', () => { - const output = JSON.stringify({ name: 'my-package', versions: ['1.0.0'] }); - const versions = parsePipIndexVersionsJson(output); - assert.deepStrictEqual(versions, [explain('1.0.0')]); - }); - - test('returns undefined for empty versions array', () => { - const output = JSON.stringify({ name: 'pkg', versions: [] }); - const versions = parsePipIndexVersionsJson(output); - assert.strictEqual(versions, undefined); - }); - - test('returns undefined for invalid JSON', () => { - const versions = parsePipIndexVersionsJson('not json'); - assert.strictEqual(versions, undefined); - }); - - test('returns undefined when versions field is missing', () => { - const output = JSON.stringify({ name: 'pkg' }); - const versions = parsePipIndexVersionsJson(output); - assert.strictEqual(versions, undefined); - }); - }); -}); - diff --git a/src/test/managers/conda/commands.unit.test.ts b/src/test/managers/conda/commands.unit.test.ts new file mode 100644 index 000000000..8b1d11f48 --- /dev/null +++ b/src/test/managers/conda/commands.unit.test.ts @@ -0,0 +1,73 @@ +import assert from 'assert'; +import * as sinon from 'sinon'; +import { LogOutputChannel } from 'vscode'; +import * as workspaceApis from '../../../common/workspace.apis'; +import { CondaAvailableVersionsCommand } from '../../../managers/conda/commands/availableVersions'; +import { CondaInstallCommand } from '../../../managers/conda/commands/install'; +import { CondaListCommand } from '../../../managers/conda/commands/list'; +import { CondaUninstallCommand } from '../../../managers/conda/commands/uninstall'; +import { CondaVersionCommand } from '../../../managers/conda/commands/version'; +import * as condaUtils from '../../../managers/conda/condaUtils'; +import { createMockLogOutputChannel } from '../../mocks/helper'; + +suite('Conda commands', () => { + let mockLog: LogOutputChannel; + let runCondaStub: sinon.SinonStub; + + setup(() => { + mockLog = createMockLogOutputChannel(); + sinon.stub(workspaceApis, 'getConfiguration').returns({ + get: () => undefined, + } as unknown as ReturnType); + runCondaStub = sinon.stub(condaUtils, 'runCondaExecutable').resolves(''); + }); + + teardown(() => { + sinon.restore(); + }); + + test('CondaAvailableVersionsCommand executes without error', async () => { + runCondaStub.resolves(JSON.stringify({ package: [{ version: '1.0.0' }] })); + const command = new CondaAvailableVersionsCommand({ pythonExecutable: 'conda', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packageName: 'package', pythonVersion: '' })); + }); + + test('CondaInstallCommand executes without error', async () => { + const command = new CondaInstallCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: 'environment', + log: mockLog, + }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('CondaUninstallCommand executes without error', async () => { + const command = new CondaUninstallCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: 'environment', + log: mockLog, + }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('CondaListCommand executes without error', async () => { + runCondaStub.resolves(JSON.stringify([{ name: 'package', version: '1.0.0' }])); + const command = new CondaListCommand({ + pythonExecutable: 'conda', + condaEnvironmentPath: 'environment', + log: mockLog, + }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('CondaVersionCommand executes without error', async () => { + runCondaStub.resolves('conda 24.1.2'); + const command = new CondaVersionCommand({ pythonExecutable: 'conda', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); +}); \ No newline at end of file diff --git a/src/test/managers/poetry/commands.unit.test.ts b/src/test/managers/poetry/commands.unit.test.ts new file mode 100644 index 000000000..4deb7b058 --- /dev/null +++ b/src/test/managers/poetry/commands.unit.test.ts @@ -0,0 +1,62 @@ +import assert from 'assert'; +import * as sinon from 'sinon'; +import { LogOutputChannel } from 'vscode'; +import * as workspaceApis from '../../../common/workspace.apis'; +import { PoetryAddCommand } from '../../../managers/poetry/commands/add'; +import { PoetryRemoveCommand } from '../../../managers/poetry/commands/remove'; +import * as poetryRunner from '../../../managers/poetry/commands/runPoetry'; +import { PoetryShowCommand } from '../../../managers/poetry/commands/show'; +import { PoetryShowTopLevelCommand } from '../../../managers/poetry/commands/showTopLevel'; +import { PoetryVersionCommand } from '../../../managers/poetry/commands/version'; +import * as poetryUtils from '../../../managers/poetry/poetryUtils'; +import { createMockLogOutputChannel } from '../../mocks/helper'; + +suite('Poetry commands', () => { + let mockLog: LogOutputChannel; + let runPoetryStub: sinon.SinonStub; + + setup(() => { + mockLog = createMockLogOutputChannel(); + sinon.stub(workspaceApis, 'getConfiguration').returns({ + get: () => undefined, + } as unknown as ReturnType); + runPoetryStub = sinon.stub(poetryRunner, 'runPoetry').resolves(''); + sinon.stub(poetryUtils, 'getPoetryVersion').resolves('1.8.2'); + }); + + teardown(() => { + sinon.restore(); + }); + + test('PoetryAddCommand executes without error', async () => { + const command = new PoetryAddCommand({ pythonExecutable: 'poetry', cwd: 'project', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('PoetryRemoveCommand executes without error', async () => { + const command = new PoetryRemoveCommand({ pythonExecutable: 'poetry', cwd: 'project', log: mockLog }); + + await assert.doesNotReject(() => command.execute({ packages: [{ packageName: 'package' }] })); + }); + + test('PoetryShowCommand executes without error', async () => { + runPoetryStub.resolves('package 1.0.0 description'); + const command = new PoetryShowCommand({ pythonExecutable: 'poetry', cwd: 'project', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('PoetryShowTopLevelCommand executes without error', async () => { + runPoetryStub.resolves('package'); + const command = new PoetryShowTopLevelCommand({ pythonExecutable: 'poetry', cwd: 'project', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); + + test('PoetryVersionCommand executes without error', async () => { + const command = new PoetryVersionCommand({ pythonExecutable: 'poetry', log: mockLog }); + + await assert.doesNotReject(() => command.execute()); + }); +}); \ No newline at end of file