ninegrid2 6.503.0 → 6.505.0

package/dist/ai/aiContainer.js

@@ -4,6 +4,7 @@ class aiContainer extends HTMLElement
 {
 	#target;
 	#ing = false;
+	#model;
 	//#elChat;
 
 	constructor() {
@@ -57,10 +58,27 @@ class aiContainer extends HTMLElement
 		this.#target = v;
 	}
 
+	#createModel = () => {
+		const el = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!el) return;
+
+		switch (el.server) {
+			case "gemini":
+				this.#model = new ChatGoogleGenerativeAI({ model: settingsRef.current.model, apiKey: googleApiKey, temperature: 0,});
+				break;
+			case "openai":
+				this.#model = new ChatOpenAI({ model: settingsRef.current.model, apiKey });
+				break;
+			case "ollama":
+				this.#model = new Ollama({ model: settingsRef.current.model });
+				break;
+		}
+	};
+
 	#getColumnInfo = () => {
 		let colInfo = "";
 
-		console.log(this.#target, this.#target.tagName);
+		//console.log(this.#target, this.#target.tagName);
 
 		if (this.#target.tagName === "NINE-GRID") {
 			this.#target.columns.info().forEach(info => {
@@ -73,6 +91,7 @@ class aiContainer extends HTMLElement
 
 	#generateQdrantFilter = async (userInput) => {
 
+		const systemMessage = "You are a helpful assistant.";
 		// Qdrant 필터로 변환하기 위한 프롬프트 엔지니어링
 		// 중요: 실제 컬렉션의 payload 필드와 그 데이터 타입을 정확히 알려줘야 Gemini가 올바른 필터를 생성합니다.
 		const prompt = `
@@ -104,9 +123,9 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		try {
-			const response = await chatModel.invoke([
-				new SystemMessage("You are a helpful assistant."),
+		//try {
+			const response = await this.#model.invoke([
+				new SystemMessage(systemMessage),
 				new HumanMessage(prompt),
 			]);
 
@@ -133,10 +152,11 @@ filterString = "a" + filterString;
 			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
 			//}
 
-		} catch (error) {
-			console.error("Error generating Qdrant filter with Gemini:", error);
-			return null;
-		}
+		//} catch (error) {
+
+		//	console.error("Error generating Qdrant filter with Gemini:", error);
+		//	return null;
+		//}
 	}
 
 	#q1 = () => {
@@ -188,15 +208,23 @@ this.#generateQdrantFilter();
 		this.shadowRoot.querySelector("nx-ai-chat").add("me", question);
 		this.shadowRoot.querySelector("nx-ai-chat").add("ing", question);
 
-		if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
-			this.#q1();
-		}
-		else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
-			this.#q2();
-		}
-		else {
-			this.#q3();
+		try {
+			this.#createModel();
+
+			if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
+				this.#q1();
+			}
+			else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
+				this.#q2();
+			}
+			else {
+				this.#q3();
+			}
+		} catch (error) {
+			console.error("Error generating Qdrant filter with Gemini:", error);
+			return null;
 		}
+		
 
 		this.#ing = false;
 	}

package/dist/bundle.cjs.js

@@ -27858,6 +27858,7 @@ class aiContainer extends HTMLElement
 {
 	#target;
 	#ing = false;
+	#model;
 	//#elChat;
 
 	constructor() {
@@ -27911,10 +27912,27 @@ class aiContainer extends HTMLElement
 		this.#target = v;
 	}
 
+	#createModel = () => {
+		const el = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!el) return;
+
+		switch (el.server) {
+			case "gemini":
+				this.#model = new ChatGoogleGenerativeAI({ model: settingsRef.current.model, apiKey: googleApiKey, temperature: 0,});
+				break;
+			case "openai":
+				this.#model = new ChatOpenAI({ model: settingsRef.current.model, apiKey });
+				break;
+			case "ollama":
+				this.#model = new Ollama({ model: settingsRef.current.model });
+				break;
+		}
+	};
+
 	#getColumnInfo = () => {
 		let colInfo = "";
 
-		console.log(this.#target, this.#target.tagName);
+		//console.log(this.#target, this.#target.tagName);
 
 		if (this.#target.tagName === "NINE-GRID") {
 			this.#target.columns.info().forEach(info => {
@@ -27927,6 +27945,7 @@ class aiContainer extends HTMLElement
 
 	#generateQdrantFilter = async (userInput) => {
 
+		const systemMessage = "You are a helpful assistant.";
 		// Qdrant 필터로 변환하기 위한 프롬프트 엔지니어링
 		// 중요: 실제 컬렉션의 payload 필드와 그 데이터 타입을 정확히 알려줘야 Gemini가 올바른 필터를 생성합니다.
 		const prompt = `
@@ -27958,9 +27977,9 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		try {
-			const response = await chatModel.invoke([
-				new SystemMessage("You are a helpful assistant."),
+		//try {
+			const response = await this.#model.invoke([
+				new SystemMessage(systemMessage),
 				new HumanMessage(prompt),
 			]);
 
@@ -27987,10 +28006,11 @@ filterString = "a" + filterString;
 			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
 			//}
 
-		} catch (error) {
-			console.error("Error generating Qdrant filter with Gemini:", error);
-			return null;
-		}
+		//} catch (error) {
+
+		//	console.error("Error generating Qdrant filter with Gemini:", error);
+		//	return null;
+		//}
 	}
 
 	#q1 = () => {
@@ -28041,15 +28061,23 @@ this.#generateQdrantFilter();
 		this.shadowRoot.querySelector("nx-ai-chat").add("me", question);
 		this.shadowRoot.querySelector("nx-ai-chat").add("ing", question);
 
-		if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
-			this.#q1();
-		}
-		else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
-			this.#q2();
-		}
-		else {
-			this.#q3();
+		try {
+			this.#createModel();
+
+			if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
+				this.#q1();
+			}
+			else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
+				this.#q2();
+			}
+			else {
+				this.#q3();
+			}
+		} catch (error) {
+			console.error("Error generating Qdrant filter with Gemini:", error);
+			return null;
 		}
+		
 
 		this.#ing = false;
 	}

package/dist/bundle.esm.js

@@ -27856,6 +27856,7 @@ class aiContainer extends HTMLElement
 {
 	#target;
 	#ing = false;
+	#model;
 	//#elChat;
 
 	constructor() {
@@ -27909,10 +27910,27 @@ class aiContainer extends HTMLElement
 		this.#target = v;
 	}
 
+	#createModel = () => {
+		const el = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!el) return;
+
+		switch (el.server) {
+			case "gemini":
+				this.#model = new ChatGoogleGenerativeAI({ model: settingsRef.current.model, apiKey: googleApiKey, temperature: 0,});
+				break;
+			case "openai":
+				this.#model = new ChatOpenAI({ model: settingsRef.current.model, apiKey });
+				break;
+			case "ollama":
+				this.#model = new Ollama({ model: settingsRef.current.model });
+				break;
+		}
+	};
+
 	#getColumnInfo = () => {
 		let colInfo = "";
 
-		console.log(this.#target, this.#target.tagName);
+		//console.log(this.#target, this.#target.tagName);
 
 		if (this.#target.tagName === "NINE-GRID") {
 			this.#target.columns.info().forEach(info => {
@@ -27925,6 +27943,7 @@ class aiContainer extends HTMLElement
 
 	#generateQdrantFilter = async (userInput) => {
 
+		const systemMessage = "You are a helpful assistant.";
 		// Qdrant 필터로 변환하기 위한 프롬프트 엔지니어링
 		// 중요: 실제 컬렉션의 payload 필드와 그 데이터 타입을 정확히 알려줘야 Gemini가 올바른 필터를 생성합니다.
 		const prompt = `
@@ -27956,9 +27975,9 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		try {
-			const response = await chatModel.invoke([
-				new SystemMessage("You are a helpful assistant."),
+		//try {
+			const response = await this.#model.invoke([
+				new SystemMessage(systemMessage),
 				new HumanMessage(prompt),
 			]);
 
@@ -27985,10 +28004,11 @@ filterString = "a" + filterString;
 			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
 			//}
 
-		} catch (error) {
-			console.error("Error generating Qdrant filter with Gemini:", error);
-			return null;
-		}
+		//} catch (error) {
+
+		//	console.error("Error generating Qdrant filter with Gemini:", error);
+		//	return null;
+		//}
 	}
 
 	#q1 = () => {
@@ -28039,15 +28059,23 @@ this.#generateQdrantFilter();
 		this.shadowRoot.querySelector("nx-ai-chat").add("me", question);
 		this.shadowRoot.querySelector("nx-ai-chat").add("ing", question);
 
-		if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
-			this.#q1();
-		}
-		else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
-			this.#q2();
-		}
-		else {
-			this.#q3();
+		try {
+			this.#createModel();
+
+			if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
+				this.#q1();
+			}
+			else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
+				this.#q2();
+			}
+			else {
+				this.#q3();
+			}
+		} catch (error) {
+			console.error("Error generating Qdrant filter with Gemini:", error);
+			return null;
 		}
+		
 
 		this.#ing = false;
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ninegrid2",
   "type": "module",
-  "version": "6.503.0",
+  "version": "6.505.0",
   "main": "dist/index.js",
   "exports": {
     "import": "./dist/index.js",

package/src/ai/aiContainer.js

@@ -4,6 +4,7 @@ class aiContainer extends HTMLElement
 {
 	#target;
 	#ing = false;
+	#model;
 	//#elChat;
 
 	constructor() {
@@ -57,10 +58,27 @@ class aiContainer extends HTMLElement
 		this.#target = v;
 	}
 
+	#createModel = () => {
+		const el = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!el) return;
+
+		switch (el.server) {
+			case "gemini":
+				this.#model = new ChatGoogleGenerativeAI({ model: settingsRef.current.model, apiKey: googleApiKey, temperature: 0,});
+				break;
+			case "openai":
+				this.#model = new ChatOpenAI({ model: settingsRef.current.model, apiKey });
+				break;
+			case "ollama":
+				this.#model = new Ollama({ model: settingsRef.current.model });
+				break;
+		}
+	};
+
 	#getColumnInfo = () => {
 		let colInfo = "";
 
-		console.log(this.#target, this.#target.tagName);
+		//console.log(this.#target, this.#target.tagName);
 
 		if (this.#target.tagName === "NINE-GRID") {
 			this.#target.columns.info().forEach(info => {
@@ -73,6 +91,7 @@ class aiContainer extends HTMLElement
 
 	#generateQdrantFilter = async (userInput) => {
 
+		const systemMessage = "You are a helpful assistant.";
 		// Qdrant 필터로 변환하기 위한 프롬프트 엔지니어링
 		// 중요: 실제 컬렉션의 payload 필드와 그 데이터 타입을 정확히 알려줘야 Gemini가 올바른 필터를 생성합니다.
 		const prompt = `
@@ -104,9 +123,9 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		try {
-			const response = await chatModel.invoke([
-				new SystemMessage("You are a helpful assistant."),
+		//try {
+			const response = await this.#model.invoke([
+				new SystemMessage(systemMessage),
 				new HumanMessage(prompt),
 			]);
 
@@ -133,10 +152,11 @@ filterString = "a" + filterString;
 			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
 			//}
 
-		} catch (error) {
-			console.error("Error generating Qdrant filter with Gemini:", error);
-			return null;
-		}
+		//} catch (error) {
+
+		//	console.error("Error generating Qdrant filter with Gemini:", error);
+		//	return null;
+		//}
 	}
 
 	#q1 = () => {
@@ -188,15 +208,23 @@ this.#generateQdrantFilter();
 		this.shadowRoot.querySelector("nx-ai-chat").add("me", question);
 		this.shadowRoot.querySelector("nx-ai-chat").add("ing", question);
 
-		if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
-			this.#q1();
-		}
-		else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
-			this.#q2();
-		}
-		else {
-			this.#q3();
+		try {
+			this.#createModel();
+
+			if (this.shadowRoot.querySelector(".menu-filter").classList.contains("active")) {
+				this.#q1();
+			}
+			else if (this.shadowRoot.querySelector(".menu-general").classList.contains("active")) {
+				this.#q2();
+			}
+			else {
+				this.#q3();
+			}
+		} catch (error) {
+			console.error("Error generating Qdrant filter with Gemini:", error);
+			return null;
 		}
+		
 
 		this.#ing = false;
 	}