ide-assi 0.86.0 → 0.90.0

package/dist/bundle.cjs.js

@@ -193257,7 +193257,7 @@ window.jQuery = window.$ = $$1;
 
 //export default new ninegrid();
 
-class IdeAiPrompt
+class IdeUtils
 {
 	constructor() {
 	}
@@ -193272,16 +193272,31 @@ class IdeAiPrompt
 		}).format(params);
 	};
 
-	static getDevelopActionClassification = async (userPrompt) => {
+	static extractResponse = (response, gptServer) => {
 
-		const template = await fetch('/prompts/meta/개발액션분류.txt').then(res => res.text());
+		const extractJsonSnippet = (text) => {
+			const match = text.match(/```json([\s\S]*?)```/);
+			return match ? match[1].trim() : text;
+		};
 
-		return await new PromptTemplate({
-			template,
-			inputVariables: ['userPrompt'],
-		}).format({
-			userPrompt: userPrompt,
-		});
+		let r;
+		switch (gptServer) {
+			case "openai":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				r = extractJsonSnippet(response);
+				break;
+		}
+
+		try {
+			return JSON.parse(r);
+		} catch (error) {
+			return r;
+		}
 	};
 }
 
@@ -193458,14 +193473,24 @@ class IdeAi
 		this.#createModel();
 
 		const systemMessage = "You are a helpful assistant.";
-		const prompt = await IdeAiPrompt.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
+		const prompt = await IdeUtils.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
 
 		const response = await this.#model.invoke([
 			new SystemMessage(systemMessage),
 			new HumanMessage(prompt),
 		]);
 
-		console.log(response);
+		const o = IdeUtils.extractResponse(response, this.#parent.settings.server);
+		if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
+			if (o.result == "0") {
+				return o.reason;
+			}
+		}
+		else {
+			return o;
+		}
+
+		return "OK";
 	}
 }
 

package/dist/bundle.esm.js

@@ -193253,7 +193253,7 @@ window.jQuery = window.$ = $$1;
 
 //export default new ninegrid();
 
-class IdeAiPrompt
+class IdeUtils
 {
 	constructor() {
 	}
@@ -193268,16 +193268,31 @@ class IdeAiPrompt
 		}).format(params);
 	};
 
-	static getDevelopActionClassification = async (userPrompt) => {
+	static extractResponse = (response, gptServer) => {
 
-		const template = await fetch('/prompts/meta/개발액션분류.txt').then(res => res.text());
+		const extractJsonSnippet = (text) => {
+			const match = text.match(/```json([\s\S]*?)```/);
+			return match ? match[1].trim() : text;
+		};
 
-		return await new PromptTemplate({
-			template,
-			inputVariables: ['userPrompt'],
-		}).format({
-			userPrompt: userPrompt,
-		});
+		let r;
+		switch (gptServer) {
+			case "openai":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				r = extractJsonSnippet(response);
+				break;
+		}
+
+		try {
+			return JSON.parse(r);
+		} catch (error) {
+			return r;
+		}
 	};
 }
 
@@ -193454,14 +193469,24 @@ class IdeAi
 		this.#createModel();
 
 		const systemMessage = "You are a helpful assistant.";
-		const prompt = await IdeAiPrompt.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
+		const prompt = await IdeUtils.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
 
 		const response = await this.#model.invoke([
 			new SystemMessage(systemMessage),
 			new HumanMessage(prompt),
 		]);
 
-		console.log(response);
+		const o = IdeUtils.extractResponse(response, this.#parent.settings.server);
+		if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
+			if (o.result == "0") {
+				return o.reason;
+			}
+		}
+		else {
+			return o;
+		}
+
+		return "OK";
 	}
 }
 

package/dist/components/ideAi.js

@@ -1,5 +1,5 @@
 import ninegrid from "ninegrid2";
-import {IdeAiPrompt} from "./ideAiPrompt.js";
+import {IdeUtils} from "./ideUtils.js";
 import { HumanMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { Ollama } from "@langchain/ollama";
@@ -178,14 +178,24 @@ export class IdeAi
 		this.#createModel();
 
 		const systemMessage = "You are a helpful assistant.";
-		const prompt = await IdeAiPrompt.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
+		const prompt = await IdeUtils.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
 
 		const response = await this.#model.invoke([
 			new SystemMessage(systemMessage),
 			new HumanMessage(prompt),
 		]);
 
-		console.log(response);
+		const o = IdeUtils.extractResponse(response, this.#parent.settings.server);
+		if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
+			if (o.result == "0") {
+				return o.reason;
+			}
+		}
+		else {
+			return o;
+		}
+
+		return "OK";
 	}
 }
 

package/dist/components/ideUtils.js

@@ -0,0 +1,47 @@
+import { PromptTemplate } from '@langchain/core/prompts';
+
+export class IdeUtils
+{
+	constructor() {
+	}
+
+	static generatePrompt = async (path, params) => {
+
+		const template = await fetch(path).then(res => res.text());
+
+		return await new PromptTemplate({
+			template,
+			inputVariables:  Object.keys(params),
+		}).format(params);
+	};
+
+	static extractResponse = (response, gptServer) => {
+
+		const extractJsonSnippet = (text) => {
+			const match = text.match(/```json([\s\S]*?)```/);
+			return match ? match[1].trim() : text;
+		};
+
+		let r;
+		switch (gptServer) {
+			case "openai":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				r = extractJsonSnippet(response);
+				break;
+			default:
+				break;
+		}
+
+		try {
+			return JSON.parse(r);
+		} catch (error) {
+			return r;
+		}
+	};
+}
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ide-assi",
   "type": "module",
-  "version": "0.86.0",
+  "version": "0.90.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

package/src/components/ideAi.js

@@ -1,5 +1,5 @@
 import ninegrid from "ninegrid2";
-import {IdeAiPrompt} from "./ideAiPrompt.js";
+import {IdeUtils} from "./ideUtils.js";
 import { HumanMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { Ollama } from "@langchain/ollama";
@@ -178,14 +178,24 @@ export class IdeAi
 		this.#createModel();
 
 		const systemMessage = "You are a helpful assistant.";
-		const prompt = await IdeAiPrompt.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
+		const prompt = await IdeUtils.generatePrompt('/prompts/meta/개발액션분류.txt', { "userPrompt": userPrompt });
 
 		const response = await this.#model.invoke([
 			new SystemMessage(systemMessage),
 			new HumanMessage(prompt),
 		]);
 
-		console.log(response);
+		const o = IdeUtils.extractResponse(response, this.#parent.settings.server);
+		if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
+			if (o.result == "0") {
+				return o.reason;
+			}
+		}
+		else {
+			return o;
+		}
+
+		return "OK";
 	}
 }
 

package/src/components/ideUtils.js

@@ -0,0 +1,47 @@
+import { PromptTemplate } from '@langchain/core/prompts';
+
+export class IdeUtils
+{
+	constructor() {
+	}
+
+	static generatePrompt = async (path, params) => {
+
+		const template = await fetch(path).then(res => res.text());
+
+		return await new PromptTemplate({
+			template,
+			inputVariables:  Object.keys(params),
+		}).format(params);
+	};
+
+	static extractResponse = (response, gptServer) => {
+
+		const extractJsonSnippet = (text) => {
+			const match = text.match(/```json([\s\S]*?)```/);
+			return match ? match[1].trim() : text;
+		};
+
+		let r;
+		switch (gptServer) {
+			case "openai":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				r = extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				r = extractJsonSnippet(response);
+				break;
+			default:
+				break;
+		}
+
+		try {
+			return JSON.parse(r);
+		} catch (error) {
+			return r;
+		}
+	};
+}
+

package/src/components/ideAiPrompt.js

@@ -1,30 +0,0 @@
-import { PromptTemplate } from '@langchain/core/prompts';
-
-export class IdeAiPrompt
-{
-	constructor() {
-	}
-
-	static generatePrompt = async (path, params) => {
-
-		const template = await fetch(path).then(res => res.text());
-
-		return await new PromptTemplate({
-			template,
-			inputVariables:  Object.keys(params),
-		}).format(params);
-	};
-
-	static getDevelopActionClassification = async (userPrompt) => {
-
-		const template = await fetch('/prompts/meta/개발액션분류.txt').then(res => res.text());
-
-		return await new PromptTemplate({
-			template,
-			inputVariables: ['userPrompt'],
-		}).format({
-			userPrompt: userPrompt,
-		});
-	};
-}
-