@digipair/skill-vespa 0.0.1 → 0.0.2

package/index.esm.js

@@ -34561,14 +34561,17 @@ let VespaService = class VespaService {
         const response = await fetch(`${baseUrl}/search/`, {
             method: 'POST',
             body: JSON.stringify(_extends({
-                yql: `select * from ${collection} Digipair_default where ${query}`
+                yql: `select * from ${collection} where ${query}`
             }, options)),
             headers: {
                 'Content-Type': 'application/json'
             }
         });
         if (!response.ok) {
-            console.error('Error - VespaService:getDocuments - fetching', await response.json());
+            var _error_root;
+            const error = await response.json();
+            var _error_root_errors;
+            console.error('Error - VespaService:getDocuments - fetching', (_error_root_errors = (_error_root = error.root) == null ? void 0 : _error_root.errors) != null ? _error_root_errors : error);
             throw new Error(`Error - VespaService:getDocuments - fetching ${collection}`);
         }
         const messages = ((await response.json()).root.children || []).map((child)=>child.fields);
@@ -34591,13 +34594,6 @@ let VespaService = class VespaService {
         }
         return documents;
     }
-    async embedding(text) {
-        const { HuggingFaceTransformersEmbeddings } = await eval(`import('@langchain/community/embeddings/hf_transformers')`);
-        const model = new HuggingFaceTransformersEmbeddings({
-            modelName: 'Xenova/multilingual-e5-large'
-        });
-        return await model.embedQuery(text);
-    }
     async prepareDocuments(documents) {
         const parents = documents.map((document)=>{
             const uuid = v4();
@@ -34648,12 +34644,15 @@ let VespaService = class VespaService {
                 content_embedding: embeddings[index]
             }));
     }
-    async embeddings(texts) {
+    async embedding(text) {
         const { HuggingFaceTransformersEmbeddings } = await eval(`import('@langchain/community/embeddings/hf_transformers')`);
         const model = new HuggingFaceTransformersEmbeddings({
             modelName: 'Xenova/multilingual-e5-large'
         });
-        return Promise.all(texts.map((text)=>model.embedQuery(text)));
+        return await model.embedQuery(text);
+    }
+    async embeddings(texts) {
+        return Promise.all(texts.map((text)=>this.embedding(text)));
     }
     async pushDocuments(baseUrl, collection, documents) {
         const results = [];
@@ -34661,7 +34660,7 @@ let VespaService = class VespaService {
             const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${collection}/docid/${document.uuid}`, {
                 method: 'POST',
                 body: JSON.stringify({
-                    fields: document
+                    fields: _extends({}, document)
                 }),
                 headers: {
                     'Content-Type': 'application/json'
@@ -34674,8 +34673,12 @@ let VespaService = class VespaService {
     async find(params, _pinsSettingsList, context) {
         var _context_private;
         var _context_private_VESPA_SERVER;
-        const { baseUrl = (_context_private_VESPA_SERVER = (_context_private = context.private) == null ? void 0 : _context_private.VESPA_SERVER) != null ? _context_private_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, query } = params;
-        const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() limit ${limit}`, {
+        const { baseUrl = (_context_private_VESPA_SERVER = (_context_private = context.private) == null ? void 0 : _context_private.VESPA_SERVER) != null ? _context_private_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', query } = params;
+        if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
+            throw new Error('vespa:find - Invalid orderby parameter');
+        }
+        const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
+        const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
             query
         });
         return results;
@@ -34683,12 +34686,17 @@ let VespaService = class VespaService {
     async search(params, _pinsSettingsList, context) {
         var _context_private;
         var _context_private_VESPA_SERVER;
-        const { baseUrl = (_context_private_VESPA_SERVER = (_context_private = context.private) == null ? void 0 : _context_private.VESPA_SERVER) != null ? _context_private_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, targetHits = 50, query } = params;
+        const { baseUrl = (_context_private_VESPA_SERVER = (_context_private = context.private) == null ? void 0 : _context_private.VESPA_SERVER) != null ? _context_private_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', targetHits = 50, language = 'fr', query } = params;
+        if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
+            throw new Error('vespa:find - Invalid orderby parameter');
+        }
+        const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
         const queryEmbedding = await this.embedding(query);
-        const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) limit ${limit}`, {
+        const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) ${orderbySecured} limit ${parseInt(limit)}`, {
             'ranking.profile': 'fusion',
             'input.query(q)': queryEmbedding,
-            'query': query
+            query: query,
+            language
         });
         return results;
     }
@@ -34715,7 +34723,7 @@ let VespaService = class VespaService {
 };
 const find = (params, pinsSettingsList, context)=>new VespaService().find(params, pinsSettingsList, context);
 const search = (params, pinsSettingsList, context)=>new VespaService().search(params, pinsSettingsList, context);
-const push = (params, pinsSettingsList, context)=>new VespaService().push(params, pinsSettingsList, context);
 const textSplitter = (params, pinsSettingsList, context)=>new VespaService().textSplitter(params, pinsSettingsList, context);
+const push = (params, pinsSettingsList, context)=>new VespaService().push(params, pinsSettingsList, context);
 
 export { find, push, search, textSplitter };

package/libs/skill-vespa/src/lib/skill-vespa.d.ts

@@ -1,6 +1,6 @@
 type PinsSettings = any;
 export declare const find: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const search: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
-export declare const push: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const textSplitter: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const push: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export {};

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@digipair/skill-vespa",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "dependencies": {},
-  "type": "module",
   "main": "./index.cjs.js",
   "module": "./index.esm.js"
 }