Skip to content

Commit 76f57b6

Browse files
olasunkanmi-SEolasunkanmi-SE
authored
Merge pull request #112 from olasunkanmi-SE/house-cleaning
fix issues with the webview events
2 parents 4ad46f1 + d35fa91 commit 76f57b6

14 files changed

+428
-601
lines changed

‎package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,111 +41,111 @@
4141
"editor/context": [
4242
{
4343
"when": "editorHasSelection",
44-
"command": "ola.commentCode",
44+
"command": "CodeBuddy.commentCode",
4545
"group": "CodeBuddy"
4646
},
4747
{
4848
"when": "editorHasSelection",
49-
"command": "ola.reviewCode",
49+
"command": "CodeBuddy.reviewCode",
5050
"group": "CodeBuddy"
5151
},
5252
{
5353
"when": "editorHasSelection",
54-
"command": "ola.codeRefactor",
54+
"command": "CodeBuddy.codeRefactor",
5555
"group": "CodeBuddy"
5656
},
5757
{
5858
"when": "editorHasSelection",
59-
"command": "ola.codeOptimize",
59+
"command": "CodeBuddy.codeOptimize",
6060
"group": "CodeBuddy"
6161
},
6262
{
6363
"when": "editorHasSelection",
64-
"command": "ola.explain",
64+
"command": "CodeBuddy.explain",
6565
"group": "CodeBuddy"
6666
},
6767
{
6868
"when": "editorHasSelection",
69-
"command": "ola.sendChatMessage",
69+
"command": "CodeBuddy.sendChatMessage",
7070
"group": "CodeBuddy"
7171
},
7272
{
73-
"command": "ola.savePattern",
73+
"command": "CodeBuddy.savePattern",
7474
"group": "CodeBuddy"
7575
},
7676
{
7777
"when": "editorHasSelection",
78-
"command": "ola.readFromKnowledgeBase",
78+
"command": "CodeBuddy.readFromKnowledgeBase",
7979
"group": "CodeBuddy"
8080
},
8181
{
82-
"command": "ola.generateCommitMessage",
82+
"command": "CodeBuddy.generateCommitMessage",
8383
"group": "CodeBuddy"
8484
},
8585
{
8686
"when": "editorHasSelection",
87-
"command": "ola.interviewMe",
87+
"command": "CodeBuddy.interviewMe",
8888
"group": "CodeBuddy"
8989
},
9090
{
9191
"when": "editorHasSelection",
92-
"command": "ola.generateUnitTest",
92+
"command": "CodeBuddy.generateUnitTest",
9393
"group": "CodeBuddy"
9494
},
9595
{
9696
"when": "editorHasSelection",
97-
"command": "ola.generateCodeChart",
97+
"command": "CodeBuddy.generateCodeChart",
9898
"group": "CodeBuddy"
9999
}
100100
]
101101
},
102102
"commands": [
103103
{
104-
"command": "ola.commentCode",
104+
"command": "CodeBuddy.commentCode",
105105
"title": "CodeBuddy. Add comment to selected code."
106106
},
107107
{
108-
"command": "ola.reviewCode",
108+
"command": "CodeBuddy.reviewCode",
109109
"title": "CodeBuddy. Review these selected code."
110110
},
111111
{
112-
"command": "ola.codeRefactor",
112+
"command": "CodeBuddy.codeRefactor",
113113
"title": "CodeBuddy. Refactor these selected code."
114114
},
115115
{
116-
"command": "ola.codeOptimize",
116+
"command": "CodeBuddy.codeOptimize",
117117
"title": "CodeBuddy. Optimize these selected code."
118118
},
119119
{
120-
"command": "ola.sendChatMessage",
120+
"command": "CodeBuddy.sendChatMessage",
121121
"title": "Send to CodeBuddy"
122122
},
123123
{
124-
"command": "ola.explain",
124+
"command": "CodeBuddy.explain",
125125
"title": "CodeBuddy. Explain this code"
126126
},
127127
{
128-
"command": "ola.savePattern",
128+
"command": "CodeBuddy.savePattern",
129129
"title": "CodeBuddy. Save this code pattern"
130130
},
131131
{
132-
"command": "ola.readFromKnowledgeBase",
132+
"command": "CodeBuddy.readFromKnowledgeBase",
133133
"title": "CodeBuddy. Generate based on knowledgeBase"
134134
},
135135
{
136-
"command": "ola.generateCommitMessage",
136+
"command": "CodeBuddy.generateCommitMessage",
137137
"title": "CodeBuddy. Generate commit message"
138138
},
139139
{
140-
"command": "ola.interviewMe",
140+
"command": "CodeBuddy.interviewMe",
141141
"title": "CodeBuddy. Interview Me."
142142
},
143143
{
144-
"command": "ola.generateUnitTest",
144+
"command": "CodeBuddy.generateUnitTest",
145145
"title": "CodeBuddy. Generate Unit Test."
146146
},
147147
{
148-
"command": "ola.generateCodeChart",
148+
"command": "CodeBuddy.generateCodeChart",
149149
"title": "CodeBuddy. Generate Code Chart."
150150
}
151151
],

‎src/constant.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
export const USER_MESSAGE = " ☕️ Hold on while CodeBuddy ";
22
export enum OLA_ACTIONS {
3-
comment = "ola.commentCode",
4-
review = "ola.reviewCode",
5-
refactor = "ola.codeRefactor",
6-
optimize = "ola.codeOptimize",
7-
fix = "ola.codeFix",
8-
explain = "ola.explain",
9-
pattern = "ola.savePattern",
10-
knowledge = "ola.readFromKnowledgeBase",
11-
commitMessage = "ola.generateCommitMessage",
12-
interviewMe = "ola.interviewMe",
13-
generateUnitTest = "ola.generateUnitTest",
14-
generateCodeChart = "ola.generateCodeChart",
3+
comment = "CodeBuddy.commentCode",
4+
review = "CodeBuddy.reviewCode",
5+
refactor = "CodeBuddy.codeRefactor",
6+
optimize = "CodeBuddy.codeOptimize",
7+
fix = "CodeBuddy.codeFix",
8+
explain = "CodeBuddy.explain",
9+
pattern = "CodeBuddy.savePattern",
10+
knowledge = "CodeBuddy.readFromKnowledgeBase",
11+
commitMessage = "CodeBuddy.generateCommitMessage",
12+
interviewMe = "CodeBuddy.interviewMe",
13+
generateUnitTest = "CodeBuddy.generateUnitTest",
14+
generateCodeChart = "CodeBuddy.generateCodeChart",
1515
}
1616

1717
export enum COMMON {

‎src/events/event-generator.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { APP_CONFIG, COMMON, generativeAiModels } from "../constant";
77
import { AnthropicWebViewProvider } from "../providers/anthropic-web-view-provider";
88
import { GeminiWebViewProvider } from "../providers/gemini-web-view-provider";
99
import { GroqWebViewProvider } from "../providers/groq-web-view-provider";
10-
import { MemoryCache } from "../services/memory";
10+
import { Brain } from "../services/memory";
1111
import {
1212
createAnthropicClient,
1313
getConfigValue,
@@ -38,7 +38,7 @@ export abstract class EventGenerator implements IEventGenerator {
3838
constructor(
3939
private readonly action: string,
4040
_context: vscode.ExtensionContext,
41-
errorMessage?: string
41+
errorMessage?: string,
4242
) {
4343
this.context = _context;
4444
this.error = errorMessage;
@@ -76,15 +76,15 @@ export abstract class EventGenerator implements IEventGenerator {
7676
let modelName = "";
7777
if (!this.generativeAi) {
7878
vscodeErrorMessage(
79-
"Configuration not found. Go to settings, search for Your coding buddy. Fill up the model and model name"
79+
"Configuration not found. Go to settings, search for Your coding buddy. Fill up the model and model name",
8080
);
8181
}
8282
if (this.generativeAi === generativeAiModels.GROQ) {
8383
const apiKey = this.groqApiKey;
8484
modelName = this.groqModel;
8585
if (!apiKey || !modelName) {
8686
vscodeErrorMessage(
87-
"Configuration not found. Go to settings, search for Your coding buddy. Fill up the model and model name"
87+
"Configuration not found. Go to settings, search for Your coding buddy. Fill up the model and model name",
8888
);
8989
}
9090
model = this.createGroqModel(apiKey);
@@ -111,7 +111,7 @@ export abstract class EventGenerator implements IEventGenerator {
111111
} catch (error) {
112112
console.error("Error creating model:", error);
113113
vscode.window.showErrorMessage(
114-
"An error occurred while creating the model. Please try again."
114+
"An error occurred while creating the model. Please try again.",
115115
);
116116
}
117117
}
@@ -150,7 +150,7 @@ export abstract class EventGenerator implements IEventGenerator {
150150
}
151151

152152
protected async generateModelResponse(
153-
text: string
153+
text: string,
154154
): Promise<string | Anthropic.Messages.Message | undefined> {
155155
try {
156156
const activeModel = this.createModel();
@@ -189,7 +189,7 @@ export abstract class EventGenerator implements IEventGenerator {
189189

190190
if (!response) {
191191
throw new Error(
192-
"Could not generate response. Check your settings, ensure the API keys and Model Name is added properly."
192+
"Could not generate response. Check your settings, ensure the API keys and Model Name is added properly.",
193193
);
194194
}
195195
if (this.action.includes("chart")) {
@@ -199,7 +199,7 @@ export abstract class EventGenerator implements IEventGenerator {
199199
} catch (error) {
200200
console.error("Error generating response:", error);
201201
vscode.window.showErrorMessage(
202-
"An error occurred while generating the response. Please try again."
202+
"An error occurred while generating the response. Please try again.",
203203
);
204204
}
205205
}
@@ -213,7 +213,7 @@ export abstract class EventGenerator implements IEventGenerator {
213213

214214
async generateGeminiResponse(
215215
model: any,
216-
text: string
216+
text: string,
217217
): Promise<string | undefined> {
218218
const result = await model.generateContent(text);
219219
return result ? await result.response.text() : undefined;
@@ -222,7 +222,7 @@ export abstract class EventGenerator implements IEventGenerator {
222222
private async anthropicResponse(
223223
model: Anthropic,
224224
generativeAiModel: string,
225-
userPrompt: string
225+
userPrompt: string,
226226
) {
227227
try {
228228
const response = await model.messages.create({
@@ -235,7 +235,7 @@ export abstract class EventGenerator implements IEventGenerator {
235235
} catch (error) {
236236
console.error("Error generating response:", error);
237237
vscode.window.showErrorMessage(
238-
"An error occurred while generating the response. Please try again."
238+
"An error occurred while generating the response. Please try again.",
239239
);
240240
return;
241241
}
@@ -244,11 +244,11 @@ export abstract class EventGenerator implements IEventGenerator {
244244
private async groqResponse(
245245
model: Groq,
246246
prompt: string,
247-
generativeAiModel: string
247+
generativeAiModel: string,
248248
): Promise<string | undefined> {
249249
try {
250-
const chatHistory = MemoryCache.has(COMMON.ANTHROPIC_CHAT_HISTORY)
251-
? MemoryCache.get(COMMON.GROQ_CHAT_HISTORY)
250+
const chatHistory = Brain.has(COMMON.ANTHROPIC_CHAT_HISTORY)
251+
? Brain.get(COMMON.GROQ_CHAT_HISTORY)
252252
: [];
253253
const params = {
254254
messages: [
@@ -267,7 +267,7 @@ export abstract class EventGenerator implements IEventGenerator {
267267
} catch (error) {
268268
console.error("Error generating response:", error);
269269
vscode.window.showErrorMessage(
270-
"An error occurred while generating the response. Please try again."
270+
"An error occurred while generating the response. Please try again.",
271271
);
272272
return;
273273
}
@@ -278,7 +278,7 @@ export abstract class EventGenerator implements IEventGenerator {
278278
abstract createPrompt(text?: string): any;
279279

280280
async generateResponse(
281-
errorMessage?: string
281+
errorMessage?: string,
282282
): Promise<string | Anthropic.Messages.Message | undefined> {
283283
this.showInformationMessage();
284284
let prompt;
@@ -305,7 +305,7 @@ export abstract class EventGenerator implements IEventGenerator {
305305
switch (model) {
306306
case generativeAiModels.GEMINI:
307307
chatHistory = getLatestChatHistory(COMMON.GEMINI_CHAT_HISTORY);
308-
MemoryCache.set(COMMON.GEMINI_CHAT_HISTORY, [
308+
Brain.set(COMMON.GEMINI_CHAT_HISTORY, [
309309
...chatHistory,
310310
{
311311
role: "user",
@@ -319,7 +319,7 @@ export abstract class EventGenerator implements IEventGenerator {
319319
break;
320320
case generativeAiModels.GROQ:
321321
chatHistory = getLatestChatHistory(COMMON.GROQ_CHAT_HISTORY);
322-
MemoryCache.set(COMMON.GROQ_CHAT_HISTORY, [
322+
Brain.set(COMMON.GROQ_CHAT_HISTORY, [
323323
...chatHistory,
324324
{
325325
role: "user",
@@ -333,7 +333,7 @@ export abstract class EventGenerator implements IEventGenerator {
333333
break;
334334
case generativeAiModels.ANTHROPIC:
335335
chatHistory = getLatestChatHistory(COMMON.ANTHROPIC_CHAT_HISTORY);
336-
MemoryCache.set(COMMON.ANTHROPIC_CHAT_HISTORY, [
336+
Brain.set(COMMON.ANTHROPIC_CHAT_HISTORY, [
337337
...chatHistory,
338338
{
339339
role: "user",
@@ -347,7 +347,7 @@ export abstract class EventGenerator implements IEventGenerator {
347347
break;
348348
case generativeAiModels.GROK:
349349
chatHistory = getLatestChatHistory(COMMON.ANTHROPIC_CHAT_HISTORY);
350-
MemoryCache.set(COMMON.ANTHROPIC_CHAT_HISTORY, [
350+
Brain.set(COMMON.ANTHROPIC_CHAT_HISTORY, [
351351
...chatHistory,
352352
{
353353
role: "user",

0 commit comments

Comments
 (0)