fix(vscode): make work better with venvs

Author: benfdking

vscode/extension/src/utilities/common/python.ts

@@ -5,7 +5,6 @@ import { commands, Disposable, Event, EventEmitter, Uri } from 'vscode'
 import { traceError, traceLog } from './log'
 import { PythonExtension, ResolvedEnvironment } from '@vscode/python-extension'
 import path from 'path'
-import { IS_WINDOWS } from '../isWindows'
 
 export interface IInterpreterDetails {
   path?: string[]
@@ -39,15 +38,16 @@ export async function initializePython(
         api.environments.onDidChangeActiveEnvironmentPath(async e => {
           const environment = await api.environments.resolveEnvironment(e.path)
           const isVirtualEnv = environment?.environment !== undefined
-          const binPath = isVirtualEnv
-            ? environment?.environment?.folderUri.fsPath
+          // Get the directory of the Python executable for virtual environments
+          const pythonDir = environment?.executable.uri
+            ? path.dirname(environment.executable.uri.fsPath)
             : undefined
 
           onDidChangePythonInterpreterEvent.fire({
             path: [e.path],
             resource: e.resource?.uri,
             isVirtualEnvironment: isVirtualEnv,
-            binPath,
+            binPath: isVirtualEnv ? pythonDir : undefined,
           })
         }),
       )
@@ -76,17 +76,16 @@ export async function getInterpreterDetails(
   )
   if (environment?.executable.uri && checkVersion(environment)) {
     const isVirtualEnv = environment.environment !== undefined
-    const binPath = isVirtualEnv
-      ? environment.environment?.folderUri.fsPath
-      : undefined
+    // Get the directory of the Python executable
+    const pythonDir = path.dirname(environment?.executable.uri.fsPath)
 
     return {
       path: [environment?.executable.uri.fsPath],
       resource,
       isVirtualEnvironment: isVirtualEnv,
-      binPath: binPath
-        ? path.join(binPath, IS_WINDOWS ? 'Scripts' : 'bin')
-        : undefined,
+      // For virtual environments, we need to point directly to the bin directory
+      // rather than constructing it from the environment folder
+      binPath: isVirtualEnv ? pythonDir : undefined,
     }
   }
   return { path: undefined, resource }

vscode/extension/src/utilities/sqlmesh/sqlmesh.ts

@@ -230,7 +230,7 @@ export const sqlmeshExec = async (): Promise<
       workspacePath,
       env: {
         PYTHONPATH: interpreterDetails.path?.[0],
-        VIRTUAL_ENV: path.dirname(interpreterDetails.binPath!),
+        VIRTUAL_ENV: path.dirname(path.dirname(interpreterDetails.binPath!)), // binPath now points to bin dir
         PATH: interpreterDetails.binPath!,
       },
       args: [],
@@ -347,8 +347,8 @@ export const sqlmeshLspExec = async (): Promise<
       workspacePath,
       env: {
         PYTHONPATH: interpreterDetails.path?.[0],
-        VIRTUAL_ENV: path.dirname(interpreterDetails.binPath!),
-        PATH: path.join(path.dirname(interpreterDetails.binPath!), 'bin'),
+        VIRTUAL_ENV: path.dirname(path.dirname(interpreterDetails.binPath!)), // binPath now points to bin dir
+        PATH: interpreterDetails.binPath!, // binPath already points to the bin directory
       },
       args: [],
     })