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

fix: Improve config checks to prevent launch failures

Browse Source 
- Added null checks to configuration retrieval to prevent failures
- Ensured default configurations are provided for missing settings
- Modified activation sequence to prevent errors with uninitiated UI utils
This commit is contained in:
bobo.yang 2024-02-18 16:33:07 +08:00
parent d25b16b6ef
commit a6cc1b8221
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/extension.ts
View File

@ -34,13 +34,13 @@ async function isProviderHasSetted() {
try { try {
const providerProperty = "Provider.devchat"; const providerProperty = "Provider.devchat";
const providerConfig: any = UiUtilWrapper.getConfiguration("devchat", providerProperty); const providerConfig: any = UiUtilWrapper.getConfiguration("devchat", providerProperty);
if (Object.keys(providerConfig).length > 0) { if (providerConfig && Object.keys(providerConfig).length > 0) {
return true; return true;
} }
const providerPropertyOpenAI = "Provider.openai"; const providerPropertyOpenAI = "Provider.openai";
const providerConfigOpenAI: any = UiUtilWrapper.getConfiguration("devchat", providerPropertyOpenAI); const providerConfigOpenAI: any = UiUtilWrapper.getConfiguration("devchat", providerPropertyOpenAI);
if (Object.keys(providerConfigOpenAI).length > 0) { if (providerConfigOpenAI && Object.keys(providerConfigOpenAI).length > 0) {
return true; return true;
} }
@ -68,7 +68,7 @@ async function configUpdateTo1115() {
for (const model of supportModels) { for (const model of supportModels) {
const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model); const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model);
if (Object.keys(modelConfig1).length === 0) { if (modelConfig1 && Object.keys(modelConfig1).length === 0) {
let modelConfigNew = {}; let modelConfigNew = {};
modelConfigNew = {"provider": "devchat"}; modelConfigNew = {"provider": "devchat"};
if (model.startsWith("Model.gpt-")) { if (model.startsWith("Model.gpt-")) {
@ -138,7 +138,7 @@ async function configUpdateTo0924() {
for (const model of supportModels) { for (const model of supportModels) {
const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model); const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model);
if (Object.keys(modelConfig1).length === 0) { if (modelConfig1 && Object.keys(modelConfig1).length === 0) {
modelConfigNew = {"provider": "devchat"}; modelConfigNew = {"provider": "devchat"};
if (model.startsWith("Model.gpt-")) { if (model.startsWith("Model.gpt-")) {
modelConfigNew = {"provider": "openai"}; modelConfigNew = {"provider": "openai"};
@ -168,7 +168,7 @@ async function configUpdate0912To0924() {
for (const model of oldModels) { for (const model of oldModels) {
const modelConfig: any = UiUtilWrapper.getConfiguration("devchat", model); const modelConfig: any = UiUtilWrapper.getConfiguration("devchat", model);
if (Object.keys(modelConfig).length !== 0) { if (modelConfig && Object.keys(modelConfig).length !== 0) {
let modelProperties: any = {}; let modelProperties: any = {};
for (const key of Object.keys(modelConfig || {})) { for (const key of Object.keys(modelConfig || {})) {
const property = modelConfig![key]; const property = modelConfig![key];
@ -217,7 +217,7 @@ async function configUpdateto240205() {
for (const model of supportModels) { for (const model of supportModels) {
const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model); const modelConfig1: any = UiUtilWrapper.getConfiguration("devchat", model);
if (Object.keys(modelConfig1).length === 0) { if (modelConfig1 && Object.keys(modelConfig1).length === 0) {
let modelConfigNew = {}; let modelConfigNew = {};
modelConfigNew = {"provider": "devchat"}; modelConfigNew = {"provider": "devchat"};
await vscode.workspace.getConfiguration("devchat").update(model, modelConfigNew, vscode.ConfigurationTarget.Global); await vscode.workspace.getConfiguration("devchat").update(model, modelConfigNew, vscode.ConfigurationTarget.Global);
@ -247,7 +247,7 @@ async function updateInvalidSettings() {
for (const model of oldModels) { for (const model of oldModels) {
const modelConfig: any = UiUtilWrapper.getConfiguration("devchat", model); const modelConfig: any = UiUtilWrapper.getConfiguration("devchat", model);
if (Object.keys(modelConfig).length !== 0) { if (modelConfig && Object.keys(modelConfig).length !== 0) {
let modelProperties: any = {}; let modelProperties: any = {};
for (const key of Object.keys(modelConfig || {})) { for (const key of Object.keys(modelConfig || {})) {
const property = modelConfig![key]; const property = modelConfig![key];
@ -326,7 +326,7 @@ async function activate(context: vscode.ExtensionContext) {
ExtensionContextHolder.context = context; ExtensionContextHolder.context = context;
logger.init(LoggerChannelVscode.getInstance()); logger.init(LoggerChannelVscode.getInstance());
UiUtilWrapper.init(new UiUtilVscode()); UiUtilWrapper.init(new UiUtilVscode());
await configUpdateTo0924(); await configUpdateTo0924();
await configUpdate0912To0924(); await configUpdate0912To0924();