Merge pull request #4 from sprodribaba/CTX-3998

Add initial Job run mechanism

Author: igorperic17

media/projectViewScripts.js

@@ -0,0 +1,39 @@
+// Copyright (C) 2023 Coretex LLC
+
+// This file is part of Coretex.ai 
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// This script will be run within the webview itself
+// It cannot access the main VS Code APIs directly.
+(function () {
+ const vscode = acquireVsCodeApi();
+
+ document.querySelector('.start-action').addEventListener('click', () => {
+ onStartClicked();
+ });
+
+ document.querySelector('.update-action-new').addEventListener('click', () => {
+ onListNodesClicked();
+ });
+
+ function onStartClicked() {
+ vscode.postMessage({ type: 'start'});
+ }
+
+ function onListNodesClicked() {
+ vscode.postMessage({ type: 'nodes'});
+ }
+}());
+

package.json

@@ -41,6 +41,16 @@
 "type": "string",
 "default": "",
 "description": "Your Node Storage Path"
+},
+"Space": {
+"type": "integer",
+"default": 0,
+"description": "Your Current Coretex Space"
+},
+"NodeID": {
+"type": "integer",
+"default": 0,
+"description": "Your Current Coretex Node"
 }
 }
 }
@@ -101,6 +111,10 @@
 {
 "command": "coretex.configureUser",
 "title": "Coretex: Log in"
+},
+{
+"command": "coretex.listNodes",
+"title": "Coretex: List Nodes"
 }
 ],
 "views": {

src/commands/listNodes.ts

@@ -0,0 +1,47 @@
+// Copyright (C) 2023 Coretex LLC
+
+// This file is part of Coretex.ai 
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import { ExecException, exec } from 'child_process';
+import * as vscode from 'vscode';
+
+const listNodesCommand = vscode.commands.registerCommand(
+'coretex.listNodes',
+async () => {
+// Execute the config user command in the integrated terminal
+ const command = getNodeListCommand();
+
+ vscode.window.terminals.forEach((terminal) => {
+ terminal.dispose();
+ });
+ const terminal = vscode.window.createTerminal();
+ terminal.show();
+ terminal.sendText(command);
+}
+);
+
+function getNodeListCommand(): string {
+const platform = process.platform;
+if (platform === 'darwin' || platform === 'linux') {
+return 'coretex node list';
+} else if (platform === 'win32') {
+return 'coretex.exe node list';
+}
+
+throw new Error('Platform not supported.');
+}
+
+export default listNodesCommand;

src/extension.ts

@@ -14,10 +14,11 @@ import openDocumentationPythonLibCommand from './commands/openDocumentationPytho
 import addParameterCommand from './commands/addParameter';
 import showNodeLogsCommand from './commands/showLogs';
 import configureUserCommand from './commands/configureUser';
+import listNodesCommand from './commands/listNodes';
 
 import {CLIView} from './views/cliView';
 import {NodeView} from './views/nodeView';
-import {ProjectView} from './views/projectView.ts';
+import {ProjectView} from './views/projectView';
 import { HelpView } from './views/helpView';
 import { UserView } from './views/userView';
 
@@ -38,6 +39,7 @@ export function activate(context: vscode.ExtensionContext) {
 context.subscriptions.push(addParameterCommand);
 context.subscriptions.push(showNodeLogsCommand);
 context.subscriptions.push(configureUserCommand);
+context.subscriptions.push(listNodesCommand);
 
 // VIEWS
 

src/views/projectView.ts

@@ -0,0 +1,196 @@
+// Copyright (C) 2023 Coretex LLC
+
+// This file is part of Coretex.ai 
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import * as vscode from 'vscode';
+import * as child_process from 'child_process';
+import { getNonce } from '../utilities/getNonce';
+
+export class ProjectView implements vscode.WebviewViewProvider {
+viewId = 'coretex.project';
+private _view?: vscode.WebviewView;
+
+constructor(private readonly _extensionUri: vscode.Uri) {}
+
+public resolveWebviewView(webviewView: vscode.WebviewView): void {
+this._view = webviewView;
+
+webviewView.webview.options = {
+// Allow scripts in the webview
+enableScripts: true,
+
+localResourceRoots: [
+this._extensionUri
+]
+};
+
+this.updateView();
+
+this._view.onDidChangeVisibility(async event => {
+this.updateView();
+});
+
+this._view.webview.onDidReceiveMessage(data => {
+this.runCommand(data);
+});
+}
+
+private updateView(): void {
+if (!this._view) {
+return;
+}
+
+const storagePath = this.checkStoragePath();
+const text = storagePath == '' ? 'Storage path not set. Check your configuration.' : storagePath.substring(storagePath.indexOf(':') + 1, storagePath.length);
+
+this._view.webview.html = this.getWebviewContent(this._view.webview, text);
+}
+
+private getRunCommand(space: number, node: number, path: string): string {
+const platform = process.platform;
+if (platform === 'darwin' || platform === 'linux') {
+return `coretex run create ${node} -s ${space} -f ${path}`;
+} else if (platform === 'win32') {
+return `coretex.exe run create ${node} -s ${space} -f ${path}`;
+}
+
+return '';
+}
+
+private async runCommand(data: any) {
+switch (data.type) {
+case 'start':
+{
+const spaceConf = 'Space';
+const nodeConf = 'NodeID';
+
+const conf = vscode.workspace.getConfiguration();
+const spaceID = conf.get<{}>(spaceConf);
+const spaceDefaultValue = spaceID ? spaceID.toString() : '';
+
+const space = await vscode.window.showInputBox({
+prompt: 'Enter Space ID in which you wish to run the Job',
+placeHolder: 'Space',
+validateInput: (value) => (value ? null : 'Space is required'),
+value: spaceDefaultValue, // Default value
+});
+
+if (!space) {
+vscode.window.showErrorMessage(
+'Space is required to run a Job.'
+);
+return;
+}
+
+const nodeID = conf.get<{}>(nodeConf);
+const nodeDefaultValue = nodeID ? nodeID.toString() : '';
+
+const node = await vscode.window.showInputBox({
+prompt: 'Enter Node ID on which you wish to run the Job',
+placeHolder: 'Node',
+validateInput: (value) => (value ? null : 'Node is required'),
+value: nodeDefaultValue, // Default value
+});
+
+if (!node) {
+vscode.window.showErrorMessage(
+'Node is required to run a Job.'
+);
+return;
+}
+
+let currentWorkspacePath = '';
+
+if (vscode.workspace.workspaceFolders) {
+currentWorkspacePath = vscode.workspace.workspaceFolders[0].uri.path;
+}
+
+const command = this.getRunCommand(Number(space), Number(node), currentWorkspacePath);
+
+vscode.window.terminals.forEach((terminal) => {
+terminal.dispose();
+});
+const terminal = vscode.window.createTerminal();
+terminal.show();
+terminal.sendText(command);
+break;
+}
+case 'nodes':
+{
+vscode.commands.executeCommand('coretex.listNodes');
+}
+}
+}
+
+private checkStoragePath(): string {
+const platform = process.platform;
+if (platform === 'darwin' || platform === 'linux') {
+try {
+const version = child_process.execSync('coretex storage');
+return version.toString();
+} catch (error) {
+return '';
+}
+} else if (platform === 'win32') {
+try {
+const version = child_process.execSync('coretex storage');
+return version.toString();
+} catch (error) {
+try {
+const version = child_process.execSync('coretex.exe storage');
+return version.toString();
+} catch (error) {
+return '';
+}
+}
+}
+
+return '';
+}
+
+private getWebviewContent(webview: vscode.Webview, text: string): string {
+const viewStyle = webview.asWebviewUri(vscode.Uri.joinPath(this._extensionUri, 'media', 'views.css'));
+const runStyle = 'start-action button'
+const nodesStyle = 'update-action-new button'
+
+const scriptUri = webview.asWebviewUri(vscode.Uri.joinPath(this._extensionUri, 'media', 'projectViewScripts.js'));
+
+// Use a nonce to only allow a specific script to be run.
+const nonce = getNonce();
+
+return `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src ${webview.cspSource}; script-src 'nonce-${nonce}';">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link href="${viewStyle}" rel="stylesheet">
+<title>Project</title>
+</head>
+<body>
+<p>Run a Job with the current workspace contents:</p>
+<button class="${runStyle}">Run Job</button>
+<p>List nodes available for Job execution (set default in global extension settings):</p>
+<button class="${nodesStyle}">List Nodes</button>
+<p class="title">Storage path:</p>
+<p class="subtitle">${text}</p>
+<script nonce="${nonce}" src="${scriptUri}"></script>
+</body>
+</html>
+`;
+}
+}