npm - @digipair/skill-vespa - Versions diffs - 0.48.1 → 0.49.0 - Mend

@digipair/skill-vespa 0.48.1 → 0.49.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/index.cjs.js CHANGED Viewed

@@ -48059,8 +48059,9 @@ var RecursiveCharacterTextSplitter = /*#__PURE__*/ function(TextSplitter) {
 var _process_env_VESPA_SERVER;
 const VESPA_SERVER = (_process_env_VESPA_SERVER = process.env['VESPA_SERVER']) != null ? _process_env_VESPA_SERVER : 'http://localhost:8080';
 let VespaService = class VespaService {
-    async searchDocuments(baseUrl, collection, query, options = {}) {
+    async searchDocuments(baseUrl, collection, query, options = {}, signal) {
         const response = await fetch(`${baseUrl}/search/`, {
+            signal,
             method: 'POST',
             body: JSON.stringify(_extends({
                 yql: `select * from ${collection} where ${query}`
@@ -48079,11 +48080,11 @@ let VespaService = class VespaService {
         const messages = ((await response.json()).root.children || []).map((child)=>child.id === 'group:root:0' ? child.children[0].children : child.fields);
         return messages;
     }
-    async searchParentDocuments(baseUrl, collection, query, options = {}) {
+    async searchParentDocuments(baseUrl, collection, query, options = {}, signal) {
         const documents = [];
         const uuids = [];
         const queryUuids = [];
-        const chunks = await this.searchDocuments(baseUrl, collection, query, options);
+        const chunks = await this.searchDocuments(baseUrl, collection, query, options, signal);
         documents.push(...chunks.filter(({ is_parent })=>is_parent));
         uuids.push(...chunks.filter(({ is_parent })=>is_parent).map(({ uuid })=>uuid));
         for (const chunk of chunks){
@@ -48092,7 +48093,7 @@ let VespaService = class VespaService {
             }
         }
         if (queryUuids.length > 0) {
-            documents.push(...await this.searchDocuments(baseUrl, collection, `uuid in (${queryUuids.map((uuid)=>`"${uuid}"`).join(',')})`, options));
+            documents.push(...await this.searchDocuments(baseUrl, collection, `uuid in (${queryUuids.map((uuid)=>`"${uuid}"`).join(',')})`, options, signal));
         }
         const results = [];
         for (const chunk of chunks){
@@ -48152,11 +48153,12 @@ let VespaService = class VespaService {
         ];
         return result;
     }
-    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
+    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents, signal) {
         const results = [];
         for (const document of documents){
             const content_embedding = await modelEmbeddings.embedQuery(document.content);
             const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
+                signal,
                 method: 'POST',
                 body: JSON.stringify({
                     fields: _extends({}, document, {
@@ -48172,6 +48174,7 @@ let VespaService = class VespaService {
         return results;
     }
     async find(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER;
         const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', query, grouping } = params;
         if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
@@ -48180,10 +48183,11 @@ let VespaService = class VespaService {
         const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
         const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}` + (grouping ? ` | ${grouping}` : ''), {
             query
-        });
+        }, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results;
     }
     async search(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER;
         const { embeddings = context.privates.MODEL_EMBEDDINGS, baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', targetHits = 50, filter = 'true', language, query } = params;
         if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
@@ -48197,7 +48201,7 @@ let VespaService = class VespaService {
             'input.query(q)': queryEmbedding,
             query,
             language
-        });
+        }, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results;
     }
     async textSplitter(params, _pinsSettingsList, _context) {
@@ -48214,17 +48218,20 @@ let VespaService = class VespaService {
             }));
     }
     async push(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
         const { embeddings = context.privates.MODEL_EMBEDDINGS, baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, namespace = (_ref = (_context_privates_VESPA_NAMESPACE = context.privates.VESPA_NAMESPACE) != null ? _context_privates_VESPA_NAMESPACE : process.env['VESPA_NAMESPACE']) != null ? _ref : 'Digipair_default', collection = 'knowledge', documents } = params;
         const modelEmbeddings = await engine.executePinsList(embeddings, context);
         const results = await this.prepareDocuments(documents);
-        await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
+        await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results.filter(({ is_parent })=>is_parent).map(({ uuid })=>uuid);
     }
     async remove(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
         const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, namespace = (_ref = (_context_privates_VESPA_NAMESPACE = context.privates.VESPA_NAMESPACE) != null ? _context_privates_VESPA_NAMESPACE : process.env['VESPA_NAMESPACE']) != null ? _ref : 'Digipair_default', collection = 'knowledge', selection } = params;
         const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid?selection=${encodeURI(selection)}&cluster=${namespace}`, {
+            signal: (_context_protected = context.protected) == null ? void 0 : _context_protected.signal,
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json'

package/index.esm.js CHANGED Viewed

@@ -75997,8 +75997,9 @@ const preparePinsSettings = async (settings, context)=>{
 var _process_env_VESPA_SERVER;
 const VESPA_SERVER = (_process_env_VESPA_SERVER = process.env['VESPA_SERVER']) != null ? _process_env_VESPA_SERVER : 'http://localhost:8080';
 let VespaService = class VespaService {
-    async searchDocuments(baseUrl, collection, query, options = {}) {
+    async searchDocuments(baseUrl, collection, query, options = {}, signal) {
         const response = await fetch(`${baseUrl}/search/`, {
+            signal,
             method: 'POST',
             body: JSON.stringify(_extends({
                 yql: `select * from ${collection} where ${query}`
@@ -76017,11 +76018,11 @@ let VespaService = class VespaService {
         const messages = ((await response.json()).root.children || []).map((child)=>child.id === 'group:root:0' ? child.children[0].children : child.fields);
         return messages;
     }
-    async searchParentDocuments(baseUrl, collection, query, options = {}) {
+    async searchParentDocuments(baseUrl, collection, query, options = {}, signal) {
         const documents = [];
         const uuids = [];
         const queryUuids = [];
-        const chunks = await this.searchDocuments(baseUrl, collection, query, options);
+        const chunks = await this.searchDocuments(baseUrl, collection, query, options, signal);
         documents.push(...chunks.filter(({ is_parent })=>is_parent));
         uuids.push(...chunks.filter(({ is_parent })=>is_parent).map(({ uuid })=>uuid));
         for (const chunk of chunks){
@@ -76030,7 +76031,7 @@ let VespaService = class VespaService {
             }
         }
         if (queryUuids.length > 0) {
-            documents.push(...await this.searchDocuments(baseUrl, collection, `uuid in (${queryUuids.map((uuid)=>`"${uuid}"`).join(',')})`, options));
+            documents.push(...await this.searchDocuments(baseUrl, collection, `uuid in (${queryUuids.map((uuid)=>`"${uuid}"`).join(',')})`, options, signal));
         }
         const results = [];
         for (const chunk of chunks){
@@ -76090,11 +76091,12 @@ let VespaService = class VespaService {
         ];
         return result;
     }
-    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
+    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents, signal) {
         const results = [];
         for (const document of documents){
             const content_embedding = await modelEmbeddings.embedQuery(document.content);
             const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
+                signal,
                 method: 'POST',
                 body: JSON.stringify({
                     fields: _extends({}, document, {
@@ -76110,6 +76112,7 @@ let VespaService = class VespaService {
         return results;
     }
     async find(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER;
         const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', query, grouping } = params;
         if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
@@ -76118,10 +76121,11 @@ let VespaService = class VespaService {
         const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
         const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}` + (grouping ? ` | ${grouping}` : ''), {
             query
-        });
+        }, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results;
     }
     async search(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER;
         const { embeddings = context.privates.MODEL_EMBEDDINGS, baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', targetHits = 50, filter = 'true', language, query } = params;
         if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
@@ -76135,7 +76139,7 @@ let VespaService = class VespaService {
             'input.query(q)': queryEmbedding,
             query,
             language
-        });
+        }, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results;
     }
     async textSplitter(params, _pinsSettingsList, _context) {
@@ -76152,17 +76156,20 @@ let VespaService = class VespaService {
             }));
     }
     async push(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
         const { embeddings = context.privates.MODEL_EMBEDDINGS, baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, namespace = (_ref = (_context_privates_VESPA_NAMESPACE = context.privates.VESPA_NAMESPACE) != null ? _context_privates_VESPA_NAMESPACE : process.env['VESPA_NAMESPACE']) != null ? _ref : 'Digipair_default', collection = 'knowledge', documents } = params;
         const modelEmbeddings = await executePinsList(embeddings, context);
         const results = await this.prepareDocuments(documents);
-        await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
+        await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results, (_context_protected = context.protected) == null ? void 0 : _context_protected.signal);
         return results.filter(({ is_parent })=>is_parent).map(({ uuid })=>uuid);
     }
     async remove(params, _pinsSettingsList, context) {
+        var _context_protected;
         var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
         const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, namespace = (_ref = (_context_privates_VESPA_NAMESPACE = context.privates.VESPA_NAMESPACE) != null ? _context_privates_VESPA_NAMESPACE : process.env['VESPA_NAMESPACE']) != null ? _ref : 'Digipair_default', collection = 'knowledge', selection } = params;
         const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid?selection=${encodeURI(selection)}&cluster=${namespace}`, {
+            signal: (_context_protected = context.protected) == null ? void 0 : _context_protected.signal,
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json'

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-vespa",
-  "version": "0.48.1",
+  "version": "0.49.0",
   "dependencies": {},
   "main": "./index.cjs.js",
   "module": "./index.esm.js"