3.9.3 pyspark 环境管理

Author: msxfscyx

.vscode/settings.json

@@ -25,7 +25,7 @@
     "[python]": {
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         }
     },
     "[typescript]": {
@@ -53,7 +53,7 @@
     "prettier.printWidth": 120,
     "prettier.singleQuote": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "python.languageServer": "Default",
     "python.linting.pylintEnabled": false,

package-lock.json

@@ -22,7 +22,6 @@
         "quickPickSortByLabel",
         "testObserver",
         "quickPickItemTooltip",
-        "saveEditor",
         "terminalDataWriteEvent"
     ],
     "author": {
@@ -324,6 +323,10 @@
             }
         ],
         "commands": [
+            {
+                "command": "pyspark.paramRegister.copy",
+                "title": "Pyspark ParamRegister Copy"
+            },
             {
                 "title": "%python.command.python.createNewFile.title%",
                 "shortTitle": "%python.menu.createNewFile.title%",
@@ -1555,6 +1558,7 @@
         "@vscode/extension-telemetry": "^0.8.4",
         "@vscode/jupyter-lsp-middleware": "^0.2.50",
         "arch": "^2.1.0",
+        "axios": "^1.7.4",
         "fs-extra": "^10.0.1",
         "glob": "^7.2.0",
         "hash.js": "^1.1.7",

package.json

@@ -157,6 +157,9 @@ export type Environment = EnvironmentPath & {
                * Any specific workspace folder this environment is created for.
                */
               readonly workspaceFolder: WorkspaceFolder | undefined;
+              status: number;
+              readonly detail: string;
+              level: number;
           }
         | undefined;
     /**

src/client/api/types.ts

@@ -58,6 +58,10 @@ export async function deactivate(): Promise<void> {
     }
 }
 
+export type PySparkParam = {
+    [key: string]: string
+}
+
 async function runPylance(
     context: vscode.ExtensionContext,
     pylanceExtension: vscode.Extension<PylanceApi>,

src/client/browser/extension.ts

@@ -272,6 +272,7 @@ async function resolveEnvironment(path: string, discoveryApi: IDiscoveryAPI): Pr
 }
 
 export function convertCompleteEnvInfo(env: PythonEnvInfo): ResolvedEnvironment {
+    // console.log(`convertCompleteEnvInfo1: ${JSON.stringify(env)}`)
     const version = { ...env.version, sysVersion: env.version.sysVersion };
     let tool = convertKind(env.kind);
     if (env.type && !tool) {
@@ -292,11 +293,15 @@ export function convertCompleteEnvInfo(env: PythonEnvInfo): ResolvedEnvironment
                   name: env.name === '' ? undefined : env.name,
                   folderUri: Uri.file(env.location),
                   workspaceFolder: getWorkspaceFolder(env.searchLocation),
+                  status: env.status ?? 0, // 如果status不存在， 则默认为0
+                  detail: env.detail ?? "",
+                  level: env.level ?? 1
               }
             : undefined,
         version: env.executable.filename === 'python' ? undefined : (version as ResolvedEnvironment['version']),
         tools: tool ? [tool] : [],
     };
+    // console.log(`convertCompleteEnvInfo2: ${JSON.stringify(resolvedEnv)}`)
     return resolvedEnv;
 }
 

src/client/environmentApi.ts

@@ -28,7 +28,7 @@ initializeFileLogging(logDispose);
 //===============================================
 // loading starts here
 
-import { ProgressLocation, ProgressOptions, window } from 'vscode';
+import { commands, ProgressLocation, ProgressOptions, window } from 'vscode';
 import { buildApi } from './api';
 import { IApplicationShell, IWorkspaceService } from './common/application/types';
 import { IDisposableRegistry, IExperimentService, IExtensionContext } from './common/types';
@@ -46,6 +46,8 @@ import { WorkspaceService } from './common/application/workspace';
 import { disposeAll } from './common/utils/resourceLifecycle';
 import { ProposedExtensionAPI } from './proposedApiTypes';
 import { buildProposedApi } from './proposedApi';
+import ContextManager from './pythonEnvironments/base/locators/composite/envsCollectionService';
+import { PySparkParam } from './browser/extension';
 
 durations.codeLoadingTime = stopWatch.elapsedTime;
 
@@ -63,13 +65,34 @@ export async function activate(context: IExtensionContext): Promise<PythonExtens
     let ready: Promise<void>;
     let serviceContainer: IServiceContainer;
     try {
+        // 设置 context
+        ContextManager.getInstance().setContext(context);
         const workspaceService = new WorkspaceService();
         context.subscriptions.push(
             workspaceService.onDidGrantWorkspaceTrust(async () => {
                 await deactivate();
                 await activate(context);
             }),
         );
+
+        let gatewayUri = "http://10.245.23.158:8080";
+        const runEnv = process.env.RUN_ENV;
+
+        if (runEnv === 'online') {
+            console.log('当前运行环境: online');
+            gatewayUri = "http://easdsp-gateway.msxf.lo";
+        } else {
+            console.log('当前运行环境: 非 online');
+        }
+        context.globalState.update('gateway.addr', gatewayUri);
+
+        context.subscriptions.push(
+            commands.registerCommand('pyspark.paramRegister.copy', (pySparkParam: PySparkParam) => {
+                console.log(`PySparkParam-python: ${JSON.stringify(pySparkParam)}`);
+                context.globalState.update('pyspark.paramRegister.copy', pySparkParam);
+            }),
+        );
+
         [api, ready, serviceContainer] = await activateUnsafe(context, stopWatch, durations);
     } catch (ex) {
         // We want to completely handle the error

src/client/extension.ts

@@ -42,6 +42,8 @@ export function buildEnvInfo(init?: {
     sysPrefix?: string;
     searchLocation?: Uri;
     type?: PythonEnvType;
+    status?: number;
+    level?: number;
 }): PythonEnvInfo {
     const env: PythonEnvInfo = {
         name: init?.name ?? '',
@@ -92,7 +94,8 @@ export function areEnvsDeepEqual(env1: PythonEnvInfo, env2: PythonEnvInfo): bool
     return (
         isEqual(env1Clone, env2Clone) &&
         arePathsSame(searchLocation1, searchLocation2) &&
-        searchLocation1Scheme === searchLocation2Scheme
+        searchLocation1Scheme === searchLocation2Scheme &&
+        env1.status === env2.status
     );
 }
 

src/client/pythonEnvironments/base/info/env.ts

@@ -201,6 +201,9 @@ export type PythonEnvInfo = _PythonEnvInfo & {
     display?: string;
     detailedDisplayName?: string;
     searchLocation?: Uri;
+    status?: number; // 0: 项目空间同步过来，但未下载  1：本地创建/修改了，但未提交至项目空间 2：本地存在，且项目空间也在
+    detail?: string; // python env yml
+    level?: number; // 项目级别  0：公共， 1：项目
 };
 
 /**

src/client/pythonEnvironments/base/info/index.ts

@@ -144,6 +144,9 @@ export type BasicEnvInfo = {
     executablePath: string;
     source?: PythonEnvSource[];
     envPath?: string;
+    status?: number; // 如果status不存在， 则默认为0
+    detail?: string;
+    level?: number;
 };
 
 /**