fix: rebase with main

Author: karthiknadig

src/managers/builtin/pipUtils.ts

@@ -9,7 +9,8 @@ import { findFiles } from '../../common/workspace.apis';
 import { EXTENSION_ROOT_DIR } from '../../common/constants';
 import { selectFromCommonPackagesToInstall, selectFromInstallableToInstall } from '../common/pickers';
 import { traceInfo } from '../../common/logging';
-import { Installable, mergePackages } from '../common/utils';
+import { mergePackages } from '../common/utils';
+import { Installable } from '../common/types';
 
 async function tomlParse(fsPath: string, log?: LogOutputChannel): Promise<tomljs.JsonMap> {
     try {

src/managers/common/pickers.ts

@@ -2,7 +2,7 @@ import { QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickIt
 import { Common, PackageManagement } from '../../common/localize';
 import { launchBrowser } from '../../common/env.apis';
 import { showInputBoxWithButtons, showQuickPickWithButtons, showTextDocument } from '../../common/window.apis';
-import { Installable } from './utils';
+import { Installable } from './types';
 
 const OPEN_BROWSER_BUTTON = {
     iconPath: new ThemeIcon('globe'),

src/managers/common/types.ts

@@ -0,0 +1,45 @@
+import { Uri } from 'vscode';
+
+export interface Installable {
+    /**
+     * The name of the package, requirements, lock files, or step name.
+     */
+    readonly name: string;
+
+    /**
+     * The name of the package, requirements, pyproject.toml or any other project file, etc.
+     */
+    readonly displayName: string;
+
+    /**
+     * Arguments passed to the package manager to install the package.
+     *
+     * @example
+     *  ['debugpy==1.8.7'] for `pip install debugpy==1.8.7`.
+     *  ['--pre', 'debugpy'] for `pip install --pre debugpy`.
+     *  ['-r', 'requirements.txt'] for `pip install -r requirements.txt`.
+     */
+    readonly args?: string[];
+
+    /**
+     * Installable group name, this will be used to group installable items in the UI.
+     *
+     * @example
+     *  `Requirements` for any requirements file.
+     *  `Packages` for any package.
+     */
+    readonly group?: string;
+
+    /**
+     * Description about the installable item. This can also be path to the requirements,
+     * version of the package, or any other project file path.
+     */
+    readonly description?: string;
+
+    /**
+     * External Uri to the package on pypi or docs.
+     * @example
+     *  https://pypi.org/project/debugpy/ for `debugpy`.
+     */
+    readonly uri?: Uri;
+}

src/managers/common/utils.ts

@@ -1,4 +1,5 @@
 import { PythonEnvironment } from '../../api';
+import { Installable } from './types';
 
 export function noop() {
     // do nothing

src/managers/conda/condaUtils.ts

@@ -39,11 +39,12 @@ import { pickProject } from '../../common/pickers/projects';
 import { CondaStrings, PackageManagement, Pickers } from '../../common/localize';
 import { showInputBox, showQuickPick, showQuickPickWithButtons, withProgress } from '../../common/window.apis';
 import { showErrorMessageWithLogs } from '../../common/errors/utils';
-import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers';
+import { selectFromCommonPackagesToInstall } from '../common/pickers';
 import { quoteArgs } from '../../features/execution/execUtils';
 import { traceInfo } from '../../common/logging';
 import { untildify } from '../../common/utils/pathUtils';
 import { isWindows } from '../../common/utils/platformUtils';
+import { Installable } from '../common/types';
 
 export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`;
 export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`;