npm - @digipair/skill-vespa - Versions diffs - 0.20.2 → 0.21.1 - Mend

@digipair/skill-vespa 0.20.2 → 0.21.1

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 (4) hide show

package/index.cjs.js CHANGED Viewed

@@ -68122,14 +68122,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -68148,7 +68148,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -68167,9 +68167,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
-        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+        return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -72182,11 +72182,11 @@ let VespaService = class VespaService {
         ];
         return result;
     }
-    async pushDocuments(modelEmbeddings, baseUrl, collection, documents) {
+    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
         const results = [];
         for (const document of documents){
             const content_embedding = await modelEmbeddings.embedQuery(document.content);
-            const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${collection}/docid/${document.uuid}`, {
+            const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
                 method: 'POST',
                 body: JSON.stringify({
                     fields: _extends({}, document, {
@@ -72204,29 +72204,25 @@ let VespaService = class VespaService {
     async find(params, _pinsSettingsList, context) {
         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 } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
         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, `${prefix}${collection}`, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
+        const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
             query
         });
         return results;
     }
     async search(params, _pinsSettingsList, context) {
         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, language = 'fr', filter = 'true', query } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
+        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)) {
             throw new Error('vespa:find - Invalid orderby parameter');
         }
         const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
         const modelEmbeddings = await executePinsList(embeddings, context);
         const queryEmbedding = await modelEmbeddings.embedQuery(query);
-        const results = await this.searchParentDocuments(baseUrl, `${prefix}${collection}`, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
+        const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
             'ranking.profile': 'fusion',
             'input.query(q)': queryEmbedding,
             query,
@@ -72248,20 +72244,16 @@ let VespaService = class VespaService {
             }));
     }
     async push(params, _pinsSettingsList, context) {
-        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', documents } = params;
+        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);
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
-        return await this.pushDocuments(modelEmbeddings, baseUrl, `${prefix}${collection}`, results);
+        return await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
     }
     async remove(params, _pinsSettingsList, context) {
-        var _context_privates_VESPA_SERVER;
-        const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', selection } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
-        const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${prefix}${collection}/docid?selection=${encodeURI(selection)}&cluster=Digipair_default`, {
+        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}`, {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json'

package/index.esm.js CHANGED Viewed

@@ -68100,14 +68100,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -68126,7 +68126,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -68145,9 +68145,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
         }
-        return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
             v: nextMatch1
         };
     };
@@ -72160,11 +72160,11 @@ let VespaService = class VespaService {
         ];
         return result;
     }
-    async pushDocuments(modelEmbeddings, baseUrl, collection, documents) {
+    async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
         const results = [];
         for (const document of documents){
             const content_embedding = await modelEmbeddings.embedQuery(document.content);
-            const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${collection}/docid/${document.uuid}`, {
+            const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
                 method: 'POST',
                 body: JSON.stringify({
                     fields: _extends({}, document, {
@@ -72182,29 +72182,25 @@ let VespaService = class VespaService {
     async find(params, _pinsSettingsList, context) {
         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 } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
         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, `${prefix}${collection}`, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
+        const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
             query
         });
         return results;
     }
     async search(params, _pinsSettingsList, context) {
         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, language = 'fr', filter = 'true', query } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
+        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)) {
             throw new Error('vespa:find - Invalid orderby parameter');
         }
         const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
         const modelEmbeddings = await executePinsList(embeddings, context);
         const queryEmbedding = await modelEmbeddings.embedQuery(query);
-        const results = await this.searchParentDocuments(baseUrl, `${prefix}${collection}`, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
+        const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
             'ranking.profile': 'fusion',
             'input.query(q)': queryEmbedding,
             query,
@@ -72226,20 +72222,16 @@ let VespaService = class VespaService {
             }));
     }
     async push(params, _pinsSettingsList, context) {
-        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', documents } = params;
+        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);
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
-        return await this.pushDocuments(modelEmbeddings, baseUrl, `${prefix}${collection}`, results);
+        return await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
     }
     async remove(params, _pinsSettingsList, context) {
-        var _context_privates_VESPA_SERVER;
-        const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', selection } = params;
-        var _context_privates_VESPA_PREFIX, _ref;
-        const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
-        const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${prefix}${collection}/docid?selection=${encodeURI(selection)}&cluster=Digipair_default`, {
+        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}`, {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json'

package/package.json CHANGED Viewed

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

package/schema.json CHANGED Viewed

@@ -138,7 +138,7 @@
           {
             "name": "language",
             "summary": "Langue",
-            "required": false,
+            "required": true,
             "description": "Langue de recherche",
             "schema": {
               "type": "string"