ishangsf/DeepCodeGeniusWeb-vscode
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update devchat check logic

Browse Source
This commit is contained in:
bobo.yang 2023-07-06 07:42:44 +08:00
parent 5de9d0f7ee
commit e6f184cfe6
3 changed files with 109 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/contributes/commandsBase.ts
View File

@ -4,6 +4,20 @@ import { UiUtilWrapper } from "../util/uiUtil";
import { runCommand } from "../util/commonUtil";
import { logger } from "../util/logger";
let pipxPathStatus = '';
let devchatStatus = '';
function locateCommand(command): string | undefined {
try {
return runCommand(`where ${command}`).toString().trim();
} catch (error) {
try {
return runCommand(`which ${command}`).toString().trim();
} catch (error) {
return undefined;
}
}
}
export function checkDevChatDependency(pythonCommand: string): boolean {
try {
@ -11,21 +25,55 @@ export function checkDevChatDependency(pythonCommand: string): boolean {
if (binPath) {
updateEnvironmentPath(binPath);
const error_status = `Updated pipx environment path.`;
if (pipxPathStatus !== error_status) {
logger.channel()?.info(error_status);
pipxPathStatus = error_status;
}
} else {
logger.channel()?.info(`Failed to obtain the pipx environment path.`);
const error_status = `Failed to obtain the pipx environment path.`;
if (pipxPathStatus !== error_status) {
logger.channel()?.error(error_status);
logger.channel()?.show();
pipxPathStatus = error_status;
}
}
} catch (error) {
// DevChat dependency check failed
// log out detail error message
logger.channel()?.info(`Failed to check DevChat dependency due to error: ${error}`);
const error_status = `Failed to check DevChat dependency due to error: ${error}`;
if (pipxPathStatus !== error_status) {
logger.channel()?.error(error_status);
logger.channel()?.show();
pipxPathStatus = error_status;
}
}
try {
// Check if DevChat is installed
runCommand('devchat --help');
const devchatCommand = locateCommand('devchat');
if (devchatCommand) {
UiUtilWrapper.updateConfiguration('DevChat', 'DevChatPath', devchatCommand);
}
const error_status = `DevChat has installed.`;
if (devchatStatus !== error_status) {
logger.channel()?.info(error_status);
devchatStatus = error_status;
}
return true;
} catch(error) {
logger.channel()?.error(`Failed to check DevChat dependency due to error: ${error}`);
const error_status = `Failed to check DevChat dependency due to error: ${error}`;
if (devchatStatus !== error_status) {
logger.channel()?.error(error_status);
logger.channel()?.show();
devchatStatus = error_status;
}
return false;
}
}
@ -33,20 +81,12 @@ export function checkDevChatDependency(pythonCommand: string): boolean {
function getDefaultPythonCommand(): string | undefined {
try {
runCommand('python3 -V');
try {
return runCommand('where python3').toString().trim();
} catch (error) {
return runCommand('which python3').toString().trim();
}
return locateCommand('python3');
} catch (error) {
try {
const version = runCommand('python -V');
if (version.includes('Python 3')) {
try {
return runCommand('where python').toString().trim();
} catch (error) {
return runCommand('which python').toString().trim();
}
return locateCommand('python');
}
return undefined;
} catch (error) {
@ -73,17 +113,21 @@ export function getValidPythonCommand(): string | undefined {
}
}
export function getPipxEnvironmentPath(pythonCommand: string): string | null {
export function getPipxEnvironmentPath(pythonCommand: string): string | undefined {
// Get pipx environment
const pipxEnvOutput = runCommand(`"${pythonCommand}" -m pipx environment`).toString();
const binPathRegex = /PIPX_BIN_DIR=\s*(.*)/;
try {
const pipxEnvOutput = runCommand(`"${pythonCommand}" -m pipx environment`).toString();
const binPathRegex = /PIPX_BIN_DIR=\s*(.*)/;
// Get BIN path from pipx environment
const match = pipxEnvOutput.match(binPathRegex);
if (match && match[1]) {
return match[1];
} else {
return null;
// Get BIN path from pipx environment
const match = pipxEnvOutput.match(binPathRegex);
if (match && match[1]) {
return match[1];
} else {
return undefined;
}
} catch (error) {
return undefined;
}
}

60
src/panel/statusBarView.ts
View File

@ -1,6 +1,7 @@
import * as vscode from 'vscode';
import { dependencyCheck } from './statusBarViewBase';
import { logger } from '@/util/logger';
export function createStatusBarItem(context: vscode.ExtensionContext): vscode.StatusBarItem {
@ -13,32 +14,51 @@ export function createStatusBarItem(context: vscode.ExtensionContext): vscode.St
statusBarItem.command = undefined;
// add a timer to update the status bar item
let runStatus = 0;
let continueTimes = 0
setInterval(async () => {
const [devchatStatus, apiKeyStatus] = await dependencyCheck();
if (devchatStatus !== 'ready') {
statusBarItem.text = `$(warning)DevChat`;
statusBarItem.tooltip = `${devchatStatus}`;
if (runStatus > 0 && continueTimes < 20) {
continueTimes += 1;
return ;
}
if (devchatStatus === 'Missing required dependency: Python3') {
statusBarItem.command = "devchat.PythonPath";
} else {
statusBarItem.command = undefined;
runStatus = 1;
continueTimes = 0;
try {
const [devchatStatus, apiKeyStatus] = await dependencyCheck();
if (devchatStatus !== 'ready') {
statusBarItem.text = `$(warning)DevChat`;
statusBarItem.tooltip = `${devchatStatus}`;
if (devchatStatus === 'Missing required dependency: Python3') {
statusBarItem.command = "devchat.PythonPath";
} else {
statusBarItem.command = undefined;
}
// set statusBarItem warning color
return;
}
// set statusBarItem warning color
return;
}
if (apiKeyStatus !== 'ready') {
if (apiKeyStatus !== 'ready') {
statusBarItem.text = `$(warning)DevChat`;
statusBarItem.tooltip = `${apiKeyStatus}`;
statusBarItem.command = 'DevChat.OPENAI_API_KEY';
return;
}
statusBarItem.text = `$(pass)DevChat`;
statusBarItem.tooltip = `ready to chat`;
statusBarItem.command = 'devcaht.onStatusBarClick';
} catch (error) {
statusBarItem.text = `$(warning)DevChat`;
statusBarItem.tooltip = `${apiKeyStatus}`;
statusBarItem.command = 'DevChat.OPENAI_API_KEY';
return;
statusBarItem.tooltip = `Error: ${error}`;
statusBarItem.command = undefined;
} finally {
runStatus = 0;
}
statusBarItem.text = `$(pass)DevChat`;
statusBarItem.tooltip = `ready to chat`;
statusBarItem.command = 'devcaht.onStatusBarClick';
}, 3000);
// Add the status bar item to the status bar

5
src/panel/statusBarViewBase.ts
View File

@ -4,7 +4,7 @@ import { logger } from "../util/logger";
import { UiUtilWrapper } from "../util/uiUtil";
import { TopicManager } from "../topic/topicManager";
import { checkDevChatDependency, getValidPythonCommand } from "../contributes/commandsBase";
import { checkDevChatDependency, getPipxEnvironmentPath, getValidPythonCommand } from "../contributes/commandsBase";
import { ApiKeyManager } from '../util/apiKey';
@ -56,7 +56,8 @@ export async function dependencyCheck(): Promise<[string, string]> {
if (devchatStatus === '' || devchatStatus === 'Waiting for devchat installation to complete') {
let bOk = true;
let devChat: string | undefined = UiUtilWrapper.getConfiguration('DevChat', 'DevChatPath');
if (!devChat) {
const pipxPath = getPipxEnvironmentPath(pythonCommand!);
if (!devChat || !pipxPath || devChat.indexOf(pipxPath) > -1) {
bOk = false;
}