ninegrid2 6.547.0 → 6.550.0

package/dist/ai/aiContainer.js

@@ -124,6 +124,11 @@ class aiContainer extends HTMLElement
 		}
 	};
 
+	#extractJsonSnippet = (text) => {
+		const match = text.match(/```json([\s\S]*?)```/);
+		return match ? match[1].trim() : text;
+	};
+
 	
 	#generateQdrantFilter = async () => {
 
@@ -161,43 +166,35 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		
-		//try {
-			const response = await this.#model.invoke([
-				new SystemMessage(systemMessage),
-				new HumanMessage(prompt),
-			]);
-
-			console.log(response);
-
-			let filterString = response.content.trim();
-			if (filterString.startsWith("```json")) {
-				filterString = filterString.replace("```json", "");
-				const idx = filterString.indexOf("```");
-				if (idx > 0) {
-					filterString = filterString.substring(0, idx);
-					//console.log(filterString.substring(idx+3));
-				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
-
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
-			//} catch (parseError) {
-			//	console.error("Failed to parse filter string as JSON:", parseError);
-			//	console.error("String that failed to parse:", filterString);
-			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
-			//}
+	
+		const response = await this.#model.invoke([
+			new SystemMessage(systemMessage),
+			new HumanMessage(prompt),
+		]);
 
-		//} catch (error) {
+		const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
 
-		//	console.error("Error generating Qdrant filter with Gemini:", error);
-		//	return null;
-		//}
+		console.log(response);
+
+		let filterString;
+		switch (elSettings.server) {
+			case "openai":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				filterString = this.#extractJsonSnippet(response);
+				break;
+			default:
+				break;
+		}
+
+		//console.log(filterString);
+
+		return JSON.parse(filterString);
 	}
 
 	#searchWithQdrantFilter = async (filter) => {
@@ -244,6 +241,7 @@ class aiContainer extends HTMLElement
 
 	#q1 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = ninegrid.filter(this.#getData(), filter);
 
 		await this.#answer(searchResults);
@@ -251,6 +249,7 @@ class aiContainer extends HTMLElement
 
 	#q2 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = await this.#searchWithQdrantFilter(filter);
 
 		await this.#answer(searchResults);
@@ -360,7 +359,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);
 

package/dist/ai/aiSettings.js

@@ -102,10 +102,10 @@ class aiSettings extends HTMLElement
 				<label><input name="server" type="radio" value="openai">Open AI</label>
 				<label><input name="server" type="radio" value="ollama">Ollama</label>
 			</div>
-			<div class="line gemini">
+			<div class="line gemini" style="display:none;">
 				<label>API Key: <input id="geminiApiKey" value="${this.geminiApiKey}"/></label>
 			</div>
-			<div class="line openai">
+			<div class="line openai" style="display:none;">
 				<label>API Key: <input id="openaiApiKey" value="${this.openaiApiKey}"/></label>
 			</div>
 			<div class="line ollama">

package/dist/bundle.cjs.js

@@ -27620,10 +27620,10 @@ class aiSettings extends HTMLElement
 				<label><input name="server" type="radio" value="openai">Open AI</label>
 				<label><input name="server" type="radio" value="ollama">Ollama</label>
 			</div>
-			<div class="line gemini">
+			<div class="line gemini" style="display:none;">
 				<label>API Key: <input id="geminiApiKey" value="${this.geminiApiKey}"/></label>
 			</div>
-			<div class="line openai">
+			<div class="line openai" style="display:none;">
 				<label>API Key: <input id="openaiApiKey" value="${this.openaiApiKey}"/></label>
 			</div>
 			<div class="line ollama">
@@ -54325,6 +54325,11 @@ class aiContainer extends HTMLElement
 		}
 	};
 
+	#extractJsonSnippet = (text) => {
+		const match = text.match(/```json([\s\S]*?)```/);
+		return match ? match[1].trim() : text;
+	};
+
 	
 	#generateQdrantFilter = async () => {
 
@@ -54362,43 +54367,33 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		
-		//try {
-			const response = await this.#model.invoke([
-				new messages.SystemMessage(systemMessage),
-				new messages.HumanMessage(prompt),
-			]);
-
-			console.log(response);
-
-			let filterString = response.content.trim();
-			if (filterString.startsWith("```json")) {
-				filterString = filterString.replace("```json", "");
-				const idx = filterString.indexOf("```");
-				if (idx > 0) {
-					filterString = filterString.substring(0, idx);
-					//console.log(filterString.substring(idx+3));
-				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
-
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
-			//} catch (parseError) {
-			//	console.error("Failed to parse filter string as JSON:", parseError);
-			//	console.error("String that failed to parse:", filterString);
-			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
-			//}
-
-		//} catch (error) {
-
-		//	console.error("Error generating Qdrant filter with Gemini:", error);
-		//	return null;
-		//}
+	
+		const response = await this.#model.invoke([
+			new messages.SystemMessage(systemMessage),
+			new messages.HumanMessage(prompt),
+		]);
+
+		const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
+
+		console.log(response);
+
+		let filterString;
+		switch (elSettings.server) {
+			case "openai":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				filterString = this.#extractJsonSnippet(response);
+				break;
+		}
+
+		//console.log(filterString);
+
+		return JSON.parse(filterString);
 	}
 
 	#searchWithQdrantFilter = async (filter) => {
@@ -54441,6 +54436,7 @@ class aiContainer extends HTMLElement
 
 	#q1 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = ninegrid.filter(this.#getData(), filter);
 
 		await this.#answer(searchResults);
@@ -54448,6 +54444,7 @@ class aiContainer extends HTMLElement
 
 	#q2 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = await this.#searchWithQdrantFilter(filter);
 
 		await this.#answer(searchResults);
@@ -54536,7 +54533,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);
 

package/dist/bundle.esm.js

@@ -27618,10 +27618,10 @@ class aiSettings extends HTMLElement
 				<label><input name="server" type="radio" value="openai">Open AI</label>
 				<label><input name="server" type="radio" value="ollama">Ollama</label>
 			</div>
-			<div class="line gemini">
+			<div class="line gemini" style="display:none;">
 				<label>API Key: <input id="geminiApiKey" value="${this.geminiApiKey}"/></label>
 			</div>
-			<div class="line openai">
+			<div class="line openai" style="display:none;">
 				<label>API Key: <input id="openaiApiKey" value="${this.openaiApiKey}"/></label>
 			</div>
 			<div class="line ollama">
@@ -54323,6 +54323,11 @@ class aiContainer extends HTMLElement
 		}
 	};
 
+	#extractJsonSnippet = (text) => {
+		const match = text.match(/```json([\s\S]*?)```/);
+		return match ? match[1].trim() : text;
+	};
+
 	
 	#generateQdrantFilter = async () => {
 
@@ -54360,43 +54365,33 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		
-		//try {
-			const response = await this.#model.invoke([
-				new SystemMessage(systemMessage),
-				new HumanMessage(prompt),
-			]);
-
-			console.log(response);
-
-			let filterString = response.content.trim();
-			if (filterString.startsWith("```json")) {
-				filterString = filterString.replace("```json", "");
-				const idx = filterString.indexOf("```");
-				if (idx > 0) {
-					filterString = filterString.substring(0, idx);
-					//console.log(filterString.substring(idx+3));
-				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
-
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
-			//} catch (parseError) {
-			//	console.error("Failed to parse filter string as JSON:", parseError);
-			//	console.error("String that failed to parse:", filterString);
-			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
-			//}
-
-		//} catch (error) {
-
-		//	console.error("Error generating Qdrant filter with Gemini:", error);
-		//	return null;
-		//}
+	
+		const response = await this.#model.invoke([
+			new SystemMessage(systemMessage),
+			new HumanMessage(prompt),
+		]);
+
+		const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
+
+		console.log(response);
+
+		let filterString;
+		switch (elSettings.server) {
+			case "openai":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				filterString = this.#extractJsonSnippet(response);
+				break;
+		}
+
+		//console.log(filterString);
+
+		return JSON.parse(filterString);
 	}
 
 	#searchWithQdrantFilter = async (filter) => {
@@ -54439,6 +54434,7 @@ class aiContainer extends HTMLElement
 
 	#q1 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = ninegrid.filter(this.#getData(), filter);
 
 		await this.#answer(searchResults);
@@ -54446,6 +54442,7 @@ class aiContainer extends HTMLElement
 
 	#q2 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = await this.#searchWithQdrantFilter(filter);
 
 		await this.#answer(searchResults);
@@ -54534,7 +54531,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);
 

package/package.json

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

package/src/ai/aiContainer.js

@@ -124,6 +124,11 @@ class aiContainer extends HTMLElement
 		}
 	};
 
+	#extractJsonSnippet = (text) => {
+		const match = text.match(/```json([\s\S]*?)```/);
+		return match ? match[1].trim() : text;
+	};
+
 	
 	#generateQdrantFilter = async () => {
 
@@ -161,43 +166,35 @@ class aiContainer extends HTMLElement
 			Qdrant 필터 JSON:
 		`;
 
-		
-		//try {
-			const response = await this.#model.invoke([
-				new SystemMessage(systemMessage),
-				new HumanMessage(prompt),
-			]);
-
-			console.log(response);
-
-			let filterString = response.content.trim();
-			if (filterString.startsWith("```json")) {
-				filterString = filterString.replace("```json", "");
-				const idx = filterString.indexOf("```");
-				if (idx > 0) {
-					filterString = filterString.substring(0, idx);
-					//console.log(filterString.substring(idx+3));
-				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
-
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
-			//} catch (parseError) {
-			//	console.error("Failed to parse filter string as JSON:", parseError);
-			//	console.error("String that failed to parse:", filterString);
-			//	return null; // 파싱 실패 시 null 반환 또는 적절한 에러 처리
-			//}
+	
+		const response = await this.#model.invoke([
+			new SystemMessage(systemMessage),
+			new HumanMessage(prompt),
+		]);
 
-		//} catch (error) {
+		const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
 
-		//	console.error("Error generating Qdrant filter with Gemini:", error);
-		//	return null;
-		//}
+		console.log(response);
+
+		let filterString;
+		switch (elSettings.server) {
+			case "openai":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "gemini":
+				filterString = this.#extractJsonSnippet(response.content.trim());
+				break;
+			case "ollama":
+				filterString = this.#extractJsonSnippet(response);
+				break;
+			default:
+				break;
+		}
+
+		//console.log(filterString);
+
+		return JSON.parse(filterString);
 	}
 
 	#searchWithQdrantFilter = async (filter) => {
@@ -244,6 +241,7 @@ class aiContainer extends HTMLElement
 
 	#q1 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = ninegrid.filter(this.#getData(), filter);
 
 		await this.#answer(searchResults);
@@ -251,6 +249,7 @@ class aiContainer extends HTMLElement
 
 	#q2 = async () => {
 		const filter = await this.#generateQdrantFilter();
+		console.log(filter);
 		const searchResults = await this.#searchWithQdrantFilter(filter);
 
 		await this.#answer(searchResults);
@@ -360,7 +359,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);
 

package/src/ai/aiSettings.js

@@ -102,10 +102,10 @@ class aiSettings extends HTMLElement
 				<label><input name="server" type="radio" value="openai">Open AI</label>
 				<label><input name="server" type="radio" value="ollama">Ollama</label>
 			</div>
-			<div class="line gemini">
+			<div class="line gemini" style="display:none;">
 				<label>API Key: <input id="geminiApiKey" value="${this.geminiApiKey}"/></label>
 			</div>
-			<div class="line openai">
+			<div class="line openai" style="display:none;">
 				<label>API Key: <input id="openaiApiKey" value="${this.openaiApiKey}"/></label>
 			</div>
 			<div class="line ollama">