ide-assi 0.668.0 → 0.670.0

package/dist/bundle.cjs.js

@@ -203805,40 +203805,33 @@ console.log(el, href, title);
 		}
 	}
 
-	generateWhereCause2 = async (xmlPath, queryId, userPrompt, apiKey) => {
+	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
 
-		this.#createModel();
+		const invoke = async (path, params) => {
+			const prompt = await IdeUtils.generatePrompt(path, params);
+			//console.log(prompt);
 
-		const res = await api.post("/api/source/query", {
-			xmlPath: xmlPath,
-			queryId: queryId
-		});
+			try {
+				const model = new ChatGoogleGenerativeAI({ model: "gemini-2.5-flash", apiKey: apiKey, temperature: 0,});
 
-		console.log(res.query);
+				const response = await model.invoke([
+					//new SystemMessage(systemMessage),
+					new HumanMessage(prompt),
+				]);
 
-		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
-				"query": res.query,
-				"userPrompt": userPrompt
-			});
+				console.log(response);
 
-			console.log(o);
+				let r = IdeUtils.extractResponse(response, "gemini");
+				if ((r.startsWith("'") && r.endsWith("'")) || (r.startsWith('"') && r.endsWith('"')) || (r.startsWith('`') && r.endsWith('`'))) {
+					r = r.slice(1, -1); // 맨 앞, 맨 뒤 한 글자씩 제거
+				}
 
-			if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
-				if (o.result !== true) throw new Error(o.condition);
+				return r;
 			}
-			else {
-				throw new Error(o);
+			catch (error) {
+				throw error;
 			}
-
-			return o.condition;
-		}
-
-
-	};
-
-
-	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
+		};
 
 		const res = await api.post("/api/source/query", {
 			xmlPath: xmlPath,
@@ -203848,7 +203841,7 @@ console.log(el, href, title);
 		console.log(res.query);
 
 		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
+			const o = await invoke('/prompts/user/generateWhereCause.txt', {
 				"query": res.query,
 				"userPrompt": userPrompt
 			});
@@ -237585,12 +237578,9 @@ class aiNatualInput extends HTMLElement
 	#queryId;
 	#selectFunc;
 	#target;
-	#ai;
 
 	constructor() {
 		super();
-
-		this.#ai = new IdeAi(this);
 	}
 	
 	connectedCallback() {
@@ -237614,7 +237604,7 @@ class aiNatualInput extends HTMLElement
 
 			let params = {};
 			if (this.#target.value) {
-				params = { "_whereClause": await this.#ai.generateWhereCause2(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
+				params = { "_whereClause": await IdeAi.generateWhereCause(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
 			}
 
 			this.#selectFunc.call(this, params);

package/dist/bundle.esm.js

@@ -203801,40 +203801,33 @@ console.log(el, href, title);
 		}
 	}
 
-	generateWhereCause2 = async (xmlPath, queryId, userPrompt, apiKey) => {
+	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
 
-		this.#createModel();
+		const invoke = async (path, params) => {
+			const prompt = await IdeUtils.generatePrompt(path, params);
+			//console.log(prompt);
 
-		const res = await api.post("/api/source/query", {
-			xmlPath: xmlPath,
-			queryId: queryId
-		});
+			try {
+				const model = new ChatGoogleGenerativeAI({ model: "gemini-2.5-flash", apiKey: apiKey, temperature: 0,});
 
-		console.log(res.query);
+				const response = await model.invoke([
+					//new SystemMessage(systemMessage),
+					new HumanMessage(prompt),
+				]);
 
-		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
-				"query": res.query,
-				"userPrompt": userPrompt
-			});
+				console.log(response);
 
-			console.log(o);
+				let r = IdeUtils.extractResponse(response, "gemini");
+				if ((r.startsWith("'") && r.endsWith("'")) || (r.startsWith('"') && r.endsWith('"')) || (r.startsWith('`') && r.endsWith('`'))) {
+					r = r.slice(1, -1); // 맨 앞, 맨 뒤 한 글자씩 제거
+				}
 
-			if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
-				if (o.result !== true) throw new Error(o.condition);
+				return r;
 			}
-			else {
-				throw new Error(o);
+			catch (error) {
+				throw error;
 			}
-
-			return o.condition;
-		}
-
-
-	};
-
-
-	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
+		};
 
 		const res = await api.post("/api/source/query", {
 			xmlPath: xmlPath,
@@ -203844,7 +203837,7 @@ console.log(el, href, title);
 		console.log(res.query);
 
 		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
+			const o = await invoke('/prompts/user/generateWhereCause.txt', {
 				"query": res.query,
 				"userPrompt": userPrompt
 			});
@@ -237581,12 +237574,9 @@ class aiNatualInput extends HTMLElement
 	#queryId;
 	#selectFunc;
 	#target;
-	#ai;
 
 	constructor() {
 		super();
-
-		this.#ai = new IdeAi(this);
 	}
 	
 	connectedCallback() {
@@ -237610,7 +237600,7 @@ class aiNatualInput extends HTMLElement
 
 			let params = {};
 			if (this.#target.value) {
-				params = { "_whereClause": await this.#ai.generateWhereCause2(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
+				params = { "_whereClause": await IdeAi.generateWhereCause(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
 			}
 
 			this.#selectFunc.call(this, params);

package/dist/components/aiNatualInput.js

@@ -8,12 +8,9 @@ class aiNatualInput extends HTMLElement
 	#queryId;
 	#selectFunc;
 	#target;
-	#ai;
 
 	constructor() {
 		super();
-
-		this.#ai = new IdeAi(this);
 	}
 	
 	connectedCallback() {
@@ -37,7 +34,7 @@ class aiNatualInput extends HTMLElement
 
 			let params = {};
 			if (this.#target.value) {
-				params = { "_whereClause": await this.#ai.generateWhereCause2(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
+				params = { "_whereClause": await IdeAi.generateWhereCause(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
 			}
 
 			this.#selectFunc.call(this, params);

package/dist/components/ideAi.js

@@ -1260,44 +1260,10 @@ console.log(el, href, title);
 		}
 	}
 
-	generateWhereCause2 = async (xmlPath, queryId, userPrompt, apiKey) => {
-
-		this.#createModel();
-
-		const res = await api.post("/api/source/query", {
-			xmlPath: xmlPath,
-			queryId: queryId
-		});
-
-		console.log(res.query);
-
-		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
-				"query": res.query,
-				"userPrompt": userPrompt
-			});
-
-			console.log(o);
-
-			if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
-				if (o.result !== true) throw new Error(o.condition);
-			}
-			else {
-				throw new Error(o);
-			}
-
-			return o.condition;
-		}
-
-
-	};
-
-
 	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
 
 		const invoke = async (path, params) => {
 			const prompt = await IdeUtils.generatePrompt(path, params);
-
 			//console.log(prompt);
 
 			try {
@@ -1330,7 +1296,7 @@ console.log(el, href, title);
 		console.log(res.query);
 
 		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
+			const o = await invoke('/prompts/user/generateWhereCause.txt', {
 				"query": res.query,
 				"userPrompt": userPrompt
 			});

package/package.json

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

package/src/components/aiNatualInput.js

@@ -8,12 +8,9 @@ class aiNatualInput extends HTMLElement
 	#queryId;
 	#selectFunc;
 	#target;
-	#ai;
 
 	constructor() {
 		super();
-
-		this.#ai = new IdeAi(this);
 	}
 	
 	connectedCallback() {
@@ -37,7 +34,7 @@ class aiNatualInput extends HTMLElement
 
 			let params = {};
 			if (this.#target.value) {
-				params = { "_whereClause": await this.#ai.generateWhereCause2(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
+				params = { "_whereClause": await IdeAi.generateWhereCause(this.#xmlPath, this.#queryId, this.#target.value, this.#apiKey) };
 			}
 
 			this.#selectFunc.call(this, params);

package/src/components/ideAi.js

@@ -1260,44 +1260,10 @@ console.log(el, href, title);
 		}
 	}
 
-	generateWhereCause2 = async (xmlPath, queryId, userPrompt, apiKey) => {
-
-		this.#createModel();
-
-		const res = await api.post("/api/source/query", {
-			xmlPath: xmlPath,
-			queryId: queryId
-		});
-
-		console.log(res.query);
-
-		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
-				"query": res.query,
-				"userPrompt": userPrompt
-			});
-
-			console.log(o);
-
-			if (Object.prototype.toString.call(o) === "[object Object]" && o.hasOwnProperty("result")) {
-				if (o.result !== true) throw new Error(o.condition);
-			}
-			else {
-				throw new Error(o);
-			}
-
-			return o.condition;
-		}
-
-
-	};
-
-
 	static generateWhereCause = async (xmlPath, queryId, userPrompt, apiKey) => {
 
 		const invoke = async (path, params) => {
 			const prompt = await IdeUtils.generatePrompt(path, params);
-
 			//console.log(prompt);
 
 			try {
@@ -1330,7 +1296,7 @@ console.log(el, href, title);
 		console.log(res.query);
 
 		if (res.query) {
-			const o = await this.#invoke('/prompts/user/generateWhereCause.txt', {
+			const o = await invoke('/prompts/user/generateWhereCause.txt', {
 				"query": res.query,
 				"userPrompt": userPrompt
 			});