ninegrid2 6.546.0 → 6.549.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 () => {
 
@@ -168,9 +173,49 @@ class aiContainer extends HTMLElement
 				new HumanMessage(prompt),
 			]);
 
-			console.log(response);
+			//console.log(response);
+
+			/**
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+			if (elSettings) {
+				switch (elSettings.server) {
+					case "ollama":
+						this.#model = new Ollama({
+							model: elSettings.model,
+							host: elSettings.ollamaUrl,
+						});
+						break;
+				}
+			} */
+
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
+
+		console.log(response);
 
-			let filterString = response.content.trim();
+		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);
+			
+
+			
+
+			//let filterString = response.content.trim();
 			if (filterString.startsWith("```json")) {
 				filterString = filterString.replace("```json", "");
 				const idx = filterString.indexOf("```");
@@ -360,7 +405,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);
 

package/dist/bundle.cjs.js

@@ -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 () => {
 
@@ -54369,25 +54374,42 @@ class aiContainer extends HTMLElement
 				new messages.HumanMessage(prompt),
 			]);
 
-			console.log(response);
+			//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));
+			/**
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+			if (elSettings) {
+				switch (elSettings.server) {
+					case "ollama":
+						this.#model = new Ollama({
+							model: elSettings.model,
+							host: elSettings.ollamaUrl,
+						});
+						break;
 				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
+			} */
+
+			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;
+		}
 
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
+		console.log(filterString);
+
+		return JSON.parse(filterString);
 			//} catch (parseError) {
 			//	console.error("Failed to parse filter string as JSON:", parseError);
 			//	console.error("String that failed to parse:", filterString);
@@ -54536,7 +54558,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

@@ -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 () => {
 
@@ -54367,25 +54372,42 @@ class aiContainer extends HTMLElement
 				new HumanMessage(prompt),
 			]);
 
-			console.log(response);
+			//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));
+			/**
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+			if (elSettings) {
+				switch (elSettings.server) {
+					case "ollama":
+						this.#model = new Ollama({
+							model: elSettings.model,
+							host: elSettings.ollamaUrl,
+						});
+						break;
 				}
-			}
-			//filterString = filterString.replaceAll('"value"', '"text"')
-			console.log("Generated Filter String:", filterString);
+			} */
+
+			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;
+		}
 
-			// Gemini가 JSON 모드나 Structured Output을 지원하지 않는 경우, 직접 파싱 시도
-			// 안정적인 JSON 파싱을 위해 'JSON Mode' 또는 Function Calling 사용을 강력히 권장
-			// LangChain의 SelfQueryRetriever를 사용하면 이 부분을 자동화할 수 있습니다.
-			//try {
-				return JSON.parse(filterString);
+		console.log(filterString);
+
+		return JSON.parse(filterString);
 			//} catch (parseError) {
 			//	console.error("Failed to parse filter string as JSON:", parseError);
 			//	console.error("String that failed to parse:", filterString);
@@ -54534,7 +54556,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.546.0",
+  "version": "6.549.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 () => {
 
@@ -168,9 +173,49 @@ class aiContainer extends HTMLElement
 				new HumanMessage(prompt),
 			]);
 
-			console.log(response);
+			//console.log(response);
+
+			/**
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+			if (elSettings) {
+				switch (elSettings.server) {
+					case "ollama":
+						this.#model = new Ollama({
+							model: elSettings.model,
+							host: elSettings.ollamaUrl,
+						});
+						break;
+				}
+			} */
+
+			const elSettings = this.shadowRoot.querySelector("nx-ai-settings");
+		if (!elSettings) throw new Error("nx-ai-settings missing !!!");
+
+		console.log(response);
 
-			let filterString = response.content.trim();
+		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);
+			
+
+			
+
+			//let filterString = response.content.trim();
 			if (filterString.startsWith("```json")) {
 				filterString = filterString.replace("```json", "");
 				const idx = filterString.indexOf("```");
@@ -360,7 +405,6 @@ class aiContainer extends HTMLElement
 
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
-
 		elAiChat.add("me", question);
 		elAiChat.add("ing", question);