3.9.3 环境管理

Author: msxfscyx

src/client/environmentApi.ts

@@ -235,8 +235,18 @@ export function buildEnvironmentApi(
         },
         get known(): Environment[] {
             sendApiTelemetry('known');
-            return discoveryApi
-                .getEnvs()
+            const envs = discoveryApi.getEnvs()
+            envs.sort((a, b) => {
+                // Move items with level 0 to the front
+                if (a.level === 0 && b.level !== 0) {
+                    return -1; // a should come before b
+                }
+                if (a.level !== 0 && b.level === 0) {
+                    return 1; // b should come before a
+                }
+                return 0; // keep original order if both are 0 or neither is 0
+            });
+            return envs
                 .filter((e) => filterUsingVSCodeContext(e))
                 .map((e) => convertEnvInfoAndGetReference(e));
         },

src/client/extension.ts

@@ -48,6 +48,8 @@ import { ProposedExtensionAPI } from './proposedApiTypes';
 import { buildProposedApi } from './proposedApi';
 import ContextManager from './pythonEnvironments/base/locators/composite/envsCollectionService';
 import { PySparkParam } from './browser/extension';
+import * as fs from 'fs';
+import * as path from 'path';
 
 durations.codeLoadingTime = stopWatch.elapsedTime;
 
@@ -60,6 +62,17 @@ let activatedServiceContainer: IServiceContainer | undefined;
 /////////////////////////////
 // public functions
 
+// Function to write PySparkParam to a file
+function writePySparkParamToFile(params: PySparkParam, filePath: string): void {
+    // Convert the object to a string in the required format
+    const content = Object.entries(params)
+        .map(([key, value]) => `${key} = ${value}`)
+        .join(',\n');
+
+    // Write the content to the specified file
+    fs.writeFileSync(filePath, content);
+}
+
 export async function activate(context: IExtensionContext): Promise<PythonExtension> {
     let api: PythonExtension;
     let ready: Promise<void>;
@@ -75,12 +88,12 @@ export async function activate(context: IExtensionContext): Promise<PythonExtens
             }),
         );
 
-        let gatewayUri = "http://10.245.23.158:8080";
+        let gatewayUri = 'http://easdsp-gateway-bdpenv3-test.msxf.msxfyun.test';
         const runEnv = process.env.RUN_ENV;
 
         if (runEnv === 'online') {
             console.log('当前运行环境: online');
-            gatewayUri = "http://easdsp-gateway.msxf.lo";
+            gatewayUri = 'http://easdsp-gateway.msxf.lo';
         } else {
             console.log('当前运行环境: 非 online');
         }
@@ -90,6 +103,11 @@ export async function activate(context: IExtensionContext): Promise<PythonExtens
             commands.registerCommand('pyspark.paramRegister.copy', (pySparkParam: PySparkParam) => {
                 console.log(`PySparkParam-python: ${JSON.stringify(pySparkParam)}`);
                 context.globalState.update('pyspark.paramRegister.copy', pySparkParam);
+                // 将项目信息写到本地
+                const filePath = path.join('/tmp', 'pySparkParam.txt');
+                // Write the pySparkParam to the file
+                writePySparkParamToFile(pySparkParam, filePath);
+                console.log(`pySparkParam has been written to ${filePath}`);
             }),
         );
 

src/client/pythonEnvironments/base/locators/lowLevel/condaLocator.ts

@@ -106,7 +106,7 @@ async function fetchEnvironments(): Promise<PySparkEnvironmentMeta[]> {
             console.log('No PySparkParam found in global state.');
         }
 
-        const response = await fetch(`${ContextManager.getInstance().getContext().globalState.get<string>('gateway.addr')}/env/pyspark/list?proId=${proId}`, {
+        const response = await fetch(`${ContextManager.getInstance().getContext().globalState.get<string>('gateway.addr')}/api/v1/env/pyspark/list?proId=${proId}`, {
             method: 'GET',
             headers: {
                 Cookie: 'token=2345fc15-fe44-4e3b-afbc-24688c2f5f70;userId=idegw',

src/test/pythonEnvironments/base/common.ts

@@ -230,7 +230,8 @@ export function sortedEnvs(envs: PythonEnvInfo[]): PythonEnvInfo[] {
     return envs.sort((env1, env2) => {
         const env1str = `${env1.kind}-${env1.executable.filename}-${getVersionString(env1.version)}`;
         const env2str = `${env2.kind}-${env2.executable.filename}-${getVersionString(env2.version)}`;
-        return env1str.localeCompare(env2str);
+        // return env1str.localeCompare(env2str);
+        return env2str.localeCompare(env1str);
     });
 }