@digipair/skill-vespa 0.21.0 → 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.
package/index.cjs.js CHANGED
@@ -68122,14 +68122,14 @@ function indent(str, spaces) {
68122
68122
  var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
68123
68123
  // match is required
68124
68124
  if (!match) {
68125
- return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
68125
+ return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
68126
68126
  v: nextMatch1
68127
68127
  };
68128
68128
  }
68129
68129
  var token = match.token, offset = match.offset;
68130
68130
  i1 += offset;
68131
68131
  if (token === " ") {
68132
- return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68132
+ return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
68133
68133
  }
68134
68134
  tokens1 = _to_consumable_array$1(tokens1).concat([
68135
68135
  token
@@ -68148,7 +68148,7 @@ function indent(str, spaces) {
68148
68148
  if (contextKeys.some(function(el) {
68149
68149
  return el.startsWith(name);
68150
68150
  })) {
68151
- return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68151
+ return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
68152
68152
  }
68153
68153
  if (dateTimeIdentifiers.some(function(el) {
68154
68154
  return el === name;
@@ -68167,9 +68167,9 @@ function indent(str, spaces) {
68167
68167
  if (dateTimeIdentifiers.some(function(el) {
68168
68168
  return el.startsWith(name);
68169
68169
  })) {
68170
- return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68170
+ return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
68171
68171
  }
68172
- return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
68172
+ return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
68173
68173
  v: nextMatch1
68174
68174
  };
68175
68175
  };
@@ -72182,11 +72182,11 @@ let VespaService = class VespaService {
72182
72182
  ];
72183
72183
  return result;
72184
72184
  }
72185
- async pushDocuments(modelEmbeddings, baseUrl, collection, documents) {
72185
+ async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
72186
72186
  const results = [];
72187
72187
  for (const document of documents){
72188
72188
  const content_embedding = await modelEmbeddings.embedQuery(document.content);
72189
- const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${collection}/docid/${document.uuid}`, {
72189
+ const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
72190
72190
  method: 'POST',
72191
72191
  body: JSON.stringify({
72192
72192
  fields: _extends({}, document, {
@@ -72204,29 +72204,25 @@ let VespaService = class VespaService {
72204
72204
  async find(params, _pinsSettingsList, context) {
72205
72205
  var _context_privates_VESPA_SERVER;
72206
72206
  const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', query } = params;
72207
- var _context_privates_VESPA_PREFIX, _ref;
72208
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72209
72207
  if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
72210
72208
  throw new Error('vespa:find - Invalid orderby parameter');
72211
72209
  }
72212
72210
  const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
72213
- const results = await this.searchDocuments(baseUrl, `${prefix}${collection}`, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
72211
+ const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
72214
72212
  query
72215
72213
  });
72216
72214
  return results;
72217
72215
  }
72218
72216
  async search(params, _pinsSettingsList, context) {
72219
72217
  var _context_privates_VESPA_SERVER;
72220
- 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;
72221
- var _context_privates_VESPA_PREFIX, _ref;
72222
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72218
+ 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;
72223
72219
  if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
72224
72220
  throw new Error('vespa:find - Invalid orderby parameter');
72225
72221
  }
72226
72222
  const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
72227
72223
  const modelEmbeddings = await executePinsList(embeddings, context);
72228
72224
  const queryEmbedding = await modelEmbeddings.embedQuery(query);
72229
- const results = await this.searchParentDocuments(baseUrl, `${prefix}${collection}`, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
72225
+ const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
72230
72226
  'ranking.profile': 'fusion',
72231
72227
  'input.query(q)': queryEmbedding,
72232
72228
  query,
@@ -72248,20 +72244,16 @@ let VespaService = class VespaService {
72248
72244
  }));
72249
72245
  }
72250
72246
  async push(params, _pinsSettingsList, context) {
72251
- var _context_privates_VESPA_SERVER;
72252
- 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;
72247
+ var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
72248
+ 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;
72253
72249
  const modelEmbeddings = await executePinsList(embeddings, context);
72254
72250
  const results = await this.prepareDocuments(documents);
72255
- var _context_privates_VESPA_PREFIX, _ref;
72256
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72257
- return await this.pushDocuments(modelEmbeddings, baseUrl, `${prefix}${collection}`, results);
72251
+ return await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
72258
72252
  }
72259
72253
  async remove(params, _pinsSettingsList, context) {
72260
- var _context_privates_VESPA_SERVER;
72261
- const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', selection } = params;
72262
- var _context_privates_VESPA_PREFIX, _ref;
72263
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72264
- const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${prefix}${collection}/docid?selection=${encodeURI(selection)}&cluster=Digipair_default`, {
72254
+ var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
72255
+ 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;
72256
+ const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid?selection=${encodeURI(selection)}&cluster=${namespace}`, {
72265
72257
  method: 'DELETE',
72266
72258
  headers: {
72267
72259
  'Content-Type': 'application/json'
package/index.esm.js CHANGED
@@ -68100,14 +68100,14 @@ function indent(str, spaces) {
68100
68100
  var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
68101
68101
  // match is required
68102
68102
  if (!match) {
68103
- return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
68103
+ return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
68104
68104
  v: nextMatch1
68105
68105
  };
68106
68106
  }
68107
68107
  var token = match.token, offset = match.offset;
68108
68108
  i1 += offset;
68109
68109
  if (token === " ") {
68110
- return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
68110
+ return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68111
68111
  }
68112
68112
  tokens1 = _to_consumable_array$1(tokens1).concat([
68113
68113
  token
@@ -68126,7 +68126,7 @@ function indent(str, spaces) {
68126
68126
  if (contextKeys.some(function(el) {
68127
68127
  return el.startsWith(name);
68128
68128
  })) {
68129
- return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
68129
+ return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68130
68130
  }
68131
68131
  if (dateTimeIdentifiers.some(function(el) {
68132
68132
  return el === name;
@@ -68145,9 +68145,9 @@ function indent(str, spaces) {
68145
68145
  if (dateTimeIdentifiers.some(function(el) {
68146
68146
  return el.startsWith(name);
68147
68147
  })) {
68148
- return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
68148
+ return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
68149
68149
  }
68150
- return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
68150
+ return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
68151
68151
  v: nextMatch1
68152
68152
  };
68153
68153
  };
@@ -72160,11 +72160,11 @@ let VespaService = class VespaService {
72160
72160
  ];
72161
72161
  return result;
72162
72162
  }
72163
- async pushDocuments(modelEmbeddings, baseUrl, collection, documents) {
72163
+ async pushDocuments(modelEmbeddings, baseUrl, namespace, collection, documents) {
72164
72164
  const results = [];
72165
72165
  for (const document of documents){
72166
72166
  const content_embedding = await modelEmbeddings.embedQuery(document.content);
72167
- const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${collection}/docid/${document.uuid}`, {
72167
+ const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid/${document.uuid}`, {
72168
72168
  method: 'POST',
72169
72169
  body: JSON.stringify({
72170
72170
  fields: _extends({}, document, {
@@ -72182,29 +72182,25 @@ let VespaService = class VespaService {
72182
72182
  async find(params, _pinsSettingsList, context) {
72183
72183
  var _context_privates_VESPA_SERVER;
72184
72184
  const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', limit = 100, orderby = '', query } = params;
72185
- var _context_privates_VESPA_PREFIX, _ref;
72186
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72187
72185
  if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
72188
72186
  throw new Error('vespa:find - Invalid orderby parameter');
72189
72187
  }
72190
72188
  const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
72191
- const results = await this.searchDocuments(baseUrl, `${prefix}${collection}`, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
72189
+ const results = await this.searchDocuments(baseUrl, collection, `is_parent = true and userQuery() ${orderbySecured} limit ${parseInt(limit)}`, {
72192
72190
  query
72193
72191
  });
72194
72192
  return results;
72195
72193
  }
72196
72194
  async search(params, _pinsSettingsList, context) {
72197
72195
  var _context_privates_VESPA_SERVER;
72198
- 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;
72199
- var _context_privates_VESPA_PREFIX, _ref;
72200
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72196
+ 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;
72201
72197
  if (orderby !== '' && !/^([a-zA-Z0-9_-]+)(,\s*[a-zA-Z0-9_-]+)*(\s+(asc|desc))?$/.test(orderby)) {
72202
72198
  throw new Error('vespa:find - Invalid orderby parameter');
72203
72199
  }
72204
72200
  const orderbySecured = orderby === '' ? '' : `order by ${orderby}`;
72205
72201
  const modelEmbeddings = await executePinsList(embeddings, context);
72206
72202
  const queryEmbedding = await modelEmbeddings.embedQuery(query);
72207
- const results = await this.searchParentDocuments(baseUrl, `${prefix}${collection}`, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
72203
+ const results = await this.searchParentDocuments(baseUrl, collection, `((userQuery()) or ({targetHits:${targetHits}}nearestNeighbor(content_embedding,q))) and (${filter}) ${orderbySecured} limit ${parseInt(limit)}`, {
72208
72204
  'ranking.profile': 'fusion',
72209
72205
  'input.query(q)': queryEmbedding,
72210
72206
  query,
@@ -72226,20 +72222,16 @@ let VespaService = class VespaService {
72226
72222
  }));
72227
72223
  }
72228
72224
  async push(params, _pinsSettingsList, context) {
72229
- var _context_privates_VESPA_SERVER;
72230
- 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;
72225
+ var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
72226
+ 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;
72231
72227
  const modelEmbeddings = await executePinsList(embeddings, context);
72232
72228
  const results = await this.prepareDocuments(documents);
72233
- var _context_privates_VESPA_PREFIX, _ref;
72234
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72235
- return await this.pushDocuments(modelEmbeddings, baseUrl, `${prefix}${collection}`, results);
72229
+ return await this.pushDocuments(modelEmbeddings, baseUrl, namespace, collection, results);
72236
72230
  }
72237
72231
  async remove(params, _pinsSettingsList, context) {
72238
- var _context_privates_VESPA_SERVER;
72239
- const { baseUrl = (_context_privates_VESPA_SERVER = context.privates.VESPA_SERVER) != null ? _context_privates_VESPA_SERVER : VESPA_SERVER, collection = 'knowledge', selection } = params;
72240
- var _context_privates_VESPA_PREFIX, _ref;
72241
- const prefix = (_ref = (_context_privates_VESPA_PREFIX = context.privates.VESPA_PREFIX) != null ? _context_privates_VESPA_PREFIX : process.env['VESPA_PREFIX']) != null ? _ref : '';
72242
- const response = await fetch(`${baseUrl}/document/v1/Digipair_default/${prefix}${collection}/docid?selection=${encodeURI(selection)}&cluster=Digipair_default`, {
72232
+ var _context_privates_VESPA_SERVER, _context_privates_VESPA_NAMESPACE, _ref;
72233
+ 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;
72234
+ const response = await fetch(`${baseUrl}/document/v1/${namespace}/${collection}/docid?selection=${encodeURI(selection)}&cluster=${namespace}`, {
72243
72235
  method: 'DELETE',
72244
72236
  headers: {
72245
72237
  'Content-Type': 'application/json'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@digipair/skill-vespa",
3
- "version": "0.21.0",
3
+ "version": "0.21.1",
4
4
  "dependencies": {},
5
5
  "main": "./index.cjs.js",
6
6
  "module": "./index.esm.js"
package/schema.json CHANGED
@@ -138,7 +138,7 @@
138
138
  {
139
139
  "name": "language",
140
140
  "summary": "Langue",
141
- "required": false,
141
+ "required": true,
142
142
  "description": "Langue de recherche",
143
143
  "schema": {
144
144
  "type": "string"