updates

Author: eleanorjboyd

package.json

@@ -132,7 +132,7 @@
                     "type": "boolean",
                     "description": "%python-envs.alwaysUseUv.description%",
                     "default": true,
-                    "scope": "machine"
+                    "scope": "resource"
                 }
             }
         },

src/managers/builtin/helpers.ts

@@ -1,10 +1,10 @@
 import * as ch from 'child_process';
 import { CancellationError, CancellationToken, LogOutputChannel } from 'vscode';
-import { createDeferred } from '../../common/utils/deferred';
-import { sendTelemetryEvent } from '../../common/telemetry/sender';
+import { EnvironmentGroupInfo } from '../../api';
 import { EventNames } from '../../common/telemetry/constants';
+import { sendTelemetryEvent } from '../../common/telemetry/sender';
+import { createDeferred } from '../../common/utils/deferred';
 import { getConfiguration } from '../../common/workspace.apis';
-import { NativePythonEnvironmentKind } from '../common/nativePythonFinder';
 
 const available = createDeferred<boolean>();
 export async function isUvInstalled(log?: LogOutputChannel): Promise<boolean> {
@@ -28,33 +28,26 @@ export async function isUvInstalled(log?: LogOutputChannel): Promise<boolean> {
 
 /**
  * Determines if uv should be used for managing a virtual environment.
- * @param envKind - The kind of environment (Venv, VenvUv, etc.)
- * @param log - Optional log output channel
- * @returns True if uv should be used, false otherwise
+ * @param group - Optional environment group name (string) or EnvironmentGroupInfo object. If 'uv' or group.name is 'uv', uv will be used if available.
+ * @param log - Optional log output channel for logging operations
+ * @returns True if uv should be used, false otherwise. For 'uv' environments, returns true if uv is installed. For other environments, checks the 'python-envs.alwaysUseUv' setting and uv availability.
  */
-export async function shouldUseUv(
-    envKind?: NativePythonEnvironmentKind,
-    log?: LogOutputChannel,
-): Promise<boolean> {
-    // If the environment is explicitly a VenvUv type, always use uv
-    if (envKind === NativePythonEnvironmentKind.venvUv) {
+export async function shouldUseUv(group?: string | EnvironmentGroupInfo, log?: LogOutputChannel): Promise<boolean> {
+    if (group === 'uv' || (typeof group === 'object' && group.name === 'uv')) {
+        // Always use uv for VenvUv environments
         return await isUvInstalled(log);
     }
 
-    // Check the alwaysUseUv setting
+    // For other environments, check the user setting
     const config = getConfiguration('python-envs');
     const alwaysUseUv = config.get<boolean>('alwaysUseUv', true);
 
-    // If alwaysUseUv is true and uv is installed, use it
     if (alwaysUseUv) {
         return await isUvInstalled(log);
     }
-
-    // Otherwise, only use uv for VenvUv environments (already handled above)
     return false;
 }
 
-
 export async function runUV(
     args: string[],
     cwd?: string,

src/managers/builtin/pipManager.ts

@@ -8,6 +8,7 @@ import {
     ThemeIcon,
     window,
 } from 'vscode';
+import { Disposable } from 'vscode-jsonrpc';
 import {
     DidChangePackagesEventArgs,
     IconPath,
@@ -18,10 +19,9 @@ import {
     PythonEnvironment,
     PythonEnvironmentApi,
 } from '../../api';
+import { getWorkspacePackagesToInstall } from './pipUtils';
 import { managePackages, refreshPackages } from './utils';
-import { Disposable } from 'vscode-jsonrpc';
 import { VenvManager } from './venvManager';
-import { getWorkspacePackagesToInstall } from './pipUtils';
 
 function getChanges(before: Package[], after: Package[]): { kind: PackageChangeKind; pkg: Package }[] {
     const changes: { kind: PackageChangeKind; pkg: Package }[] = [];

src/managers/builtin/utils.ts

@@ -18,7 +18,7 @@ import {
     NativePythonFinder,
 } from '../common/nativePythonFinder';
 import { shortVersion, sortEnvironments } from '../common/utils';
-import { shouldUseUv, runPython, runUV } from './helpers';
+import { runPython, runUV, shouldUseUv } from './helpers';
 import { parsePipList, PipPackage } from './pipListUtils';
 
 function asPackageQuickPickItem(name: string, version?: string): QuickPickItem {
@@ -139,11 +139,19 @@ export async function refreshPythons(
 }
 
 async function refreshPipPackagesRaw(environment: PythonEnvironment, log?: LogOutputChannel): Promise<string> {
-    const useUv = await shouldUseUv(undefined, log);
+    const useUv = await shouldUseUv(environment.group, log);
     if (useUv) {
         return await runUV(['pip', 'list', '--python', environment.execInfo.run.executable], undefined, log);
     }
-    return await runPython(environment.execInfo.run.executable, ['-m', 'pip', 'list'], undefined, log);
+    try {
+        return await runPython(environment.execInfo.run.executable, ['-m', 'pip', 'list'], undefined, log);
+    } catch (ex) {
+        log?.error('Error running pip list', ex);
+        log?.info(
+            'Installation attempted using pip, action can be done with uv if installed and setting `alwaysUseUv` is enabled.',
+        );
+        throw ex;
+    }
 }
 
 export async function refreshPipPackages(
@@ -194,7 +202,7 @@ export async function managePackages(
         throw new Error('Python 2.* is not supported (deprecated)');
     }
 
-    const useUv = await shouldUseUv(undefined, manager.log);
+    const useUv = await shouldUseUv(environment.group, manager.log);
     const uninstallArgs = ['pip', 'uninstall'];
     if (options.uninstall && options.uninstall.length > 0) {
         if (useUv) {

src/managers/builtin/venvUtils.ts

@@ -25,7 +25,7 @@ import {
     NativePythonFinder,
 } from '../common/nativePythonFinder';
 import { getShellActivationCommands, shortVersion, sortEnvironments } from '../common/utils';
-import { shouldUseUv, runPython, runUV } from './helpers';
+import { runPython, runUV, shouldUseUv } from './helpers';
 import { getProjectInstallable, PipPackages } from './pipUtils';
 import { resolveSystemPythonEnvironmentPath } from './utils';
 import { createStepBasedVenvFlow } from './venvStepBasedFlow';
@@ -157,6 +157,7 @@ async function getPythonInfo(env: NativeEnvInfo): Promise<PythonEnvironmentInfo>
                 shellActivation,
                 shellDeactivation,
             },
+            group: env.kind === NativePythonEnvironmentKind.venvUv ? 'uv' : 'venv',
         };
     } else {
         throw new Error(`Invalid python info: ${JSON.stringify(env)}`);
@@ -290,7 +291,7 @@ export async function createWithProgress(
         async () => {
             const result: CreateEnvironmentResult = {};
             try {
-                const useUv = await shouldUseUv(undefined, log);
+                const useUv = await shouldUseUv(basePython.group, log);
                 // env creation
                 if (basePython.execInfo?.run.executable) {
                     if (useUv) {