Fix activated conda env vars from PythonApi (#15526)

microsoft · Apr 9, 2024 · 3b57423 · 3b57423
1 parent cd2ec9c
commit 3b57423
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/src/platform/api/types.ts b/src/platform/api/types.ts
@@ -5,7 +5,7 @@ import { Event, Uri } from 'vscode';
 import { Resource } from '../common/types';
 import type { SemVer } from 'semver';
 import { PythonVersion } from '../pythonEnvironments/info/pythonVersion';
-import { PythonExtension } from '@vscode/python-extension';
+import { PythonExtension, type Environment } from '@vscode/python-extension';
 
 export const IPythonApiProvider = Symbol('IPythonApi');
 export interface IPythonApiProvider {
@@ -64,7 +64,7 @@ export interface PythonApi {
      */
     getActivatedEnvironmentVariables(
         resource: Resource,
-        interpreter: PythonEnvironment_PythonApi,
+        interpreter: Environment,
         allowExceptions?: boolean
     ): Promise<NodeJS.ProcessEnv | undefined>;
     /**

diff --git a/src/platform/interpreter/environmentActivationService.node.ts b/src/platform/interpreter/environmentActivationService.node.ts
@@ -18,7 +18,6 @@ import { KernelProgressReporter } from '../progress/kernelProgressReporter';
 import { Telemetry } from '../common/constants';
 import { ignoreLogging, logValue, traceDecoratorVerbose, traceError, traceVerbose, traceWarning } from '../logging';
 import { TraceOptions } from '../logging/types';
-import { pythonEnvToJupyterEnv, serializePythonEnvironment } from '../api/pythonApi';
 import { GlobalPythonExecutablePathService } from './globalPythonExePathService.node';
 import { noop } from '../common/utils/misc';
 import { CancellationToken, workspace } from 'vscode';
@@ -166,22 +165,16 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
         let failureEx: Error | undefined;
 
         let env = await this.apiProvider.getApi().then((api) =>
-            api
-                .getActivatedEnvironmentVariables(
-                    resource,
-                    serializePythonEnvironment(pythonEnvToJupyterEnv(environment))!,
-                    false
-                )
-                .catch((ex) => {
-                    traceError(
-                        `Failed to get activated env variables from Python Extension for ${getDisplayPath(
-                            environment.path
-                        )}`,
-                        ex
-                    );
-                    reasonForFailure = 'failedToGetActivatedEnvVariablesFromPython';
-                    return undefined;
-                })
+            api.getActivatedEnvironmentVariables(resource, environment, false).catch((ex) => {
+                traceError(
+                    `Failed to get activated env variables from Python Extension for ${getDisplayPath(
+                        environment.path
+                    )}`,
+                    ex
+                );
+                reasonForFailure = 'failedToGetActivatedEnvVariablesFromPython';
+                return undefined;
+            })
         );
         if (token?.isCancellationRequested) {
             return;