cozy-search 2.3.3 → 2.5.0

package/dist/components/KnowledgeBase/provisioning.js

@@ -27,7 +27,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var AUTOPROVISION_FLAG = 'rag.assistants.autoprovision';
+var AUTOPROVISION_FLAG = 'cozy.assistant.autoprovision';
 exports.AUTOPROVISION_FLAG = AUTOPROVISION_FLAG;
 var ASSISTANTS_DOCTYPE = 'io.cozy.ai.chat.assistants';
 var APPS_DOCTYPE = 'io.cozy.apps';
@@ -248,48 +248,56 @@ var createOpenragAccount = /*#__PURE__*/function () {
 exports.createOpenragAccount = createOpenragAccount;
 
 var getAssistant = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, id) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, id, known) {
     var _buildAssistantByIdQu, definition, options, _yield$client$query, data;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
+            if (!known) {
+              _context3.next = 2;
+              break;
+            }
+
+            return _context3.abrupt("return", known.get(id) || null);
+
+          case 2:
+            _context3.prev = 2;
             _buildAssistantByIdQu = (0, _queries.buildAssistantByIdQuery)(id), definition = _buildAssistantByIdQu.definition, options = _buildAssistantByIdQu.options;
-            _context3.next = 4;
+            _context3.next = 6;
             return client.query(definition(), {
               as: options.as
             });
 
-          case 4:
+          case 6:
             _yield$client$query = _context3.sent;
             data = _yield$client$query.data;
             return _context3.abrupt("return", data || null);
 
-          case 9:
-            _context3.prev = 9;
-            _context3.t0 = _context3["catch"](0);
+          case 11:
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](2);
 
             if (!isNotFound(_context3.t0)) {
-              _context3.next = 13;
+              _context3.next = 15;
               break;
             }
 
             return _context3.abrupt("return", null);
 
-          case 13:
+          case 15:
             throw _context3.t0;
 
-          case 14:
+          case 16:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[0, 9]]);
+    }, _callee3, null, [[2, 11]]);
   }));
 
-  return function getAssistant(_x4, _x5) {
+  return function getAssistant(_x4, _x5, _x6) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -366,7 +374,7 @@ var createProvisionedAssistant = /*#__PURE__*/function () {
     }, _callee4, null, [[3, 8]]);
   }));
 
-  return function createProvisionedAssistant(_x6, _x7, _x8, _x9) {
+  return function createProvisionedAssistant(_x7, _x8, _x9, _x10) {
     return _ref5.apply(this, arguments);
   };
 }();
@@ -390,25 +398,45 @@ var validate = function validate(entry) {
   };
 };
 /**
- * Provisions the assistants described by the rag.assistants.autoprovision
+ * Provisions the assistants described by the cozy.assistant.autoprovision
  * flag. Idempotent: an existing assistant is left alone, or gets the flag's
  * folder back when it lost it or fell back to the root. Two entries whose
  * names derive to the same id would fight over one assistant: the second
  * one is skipped.
  * @param {import('cozy-client').CozyClient} client - The cozy client.
  * @param {Array<{name: string, dirName?: string, dirId?: string, prompt?: string, icon?: string|null, default?: boolean}>} configs - The flag entries.
+ * @param {object} [options] - Options.
+ * @param {Array<object>} [options.assistants] - Every assistant of the instance, when already fetched: spares one query per entry.
  * @returns {Promise<{created: string[], ensured: string[], skipped: {id: string, reason: string}[]}>} What was created, ensured and skipped.
  */
 
 
 var ensureProvisionedAssistants = /*#__PURE__*/function () {
   var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(client, configs) {
-    var result, seen, _iterator2, _step2, entry, _validate, id, reason, assistant, created, dirId, wanted, current, live;
+    var _ref7,
+        assistants,
+        result,
+        known,
+        seen,
+        _iterator2,
+        _step2,
+        entry,
+        _validate,
+        id,
+        reason,
+        assistant,
+        created,
+        dirId,
+        current,
+        wanted,
+        live,
+        _args5 = arguments;
 
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
           case 0:
+            _ref7 = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : {}, assistants = _ref7.assistants;
             result = {
               created: [],
               ensured: [],
@@ -416,22 +444,25 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
             };
 
             if (!(!Array.isArray(configs) || configs.length === 0)) {
-              _context5.next = 3;
+              _context5.next = 4;
               break;
             }
 
             return _context5.abrupt("return", result);
 
-          case 3:
+          case 4:
+            known = assistants ? new Map(assistants.map(function (assistant) {
+              return [assistant._id, assistant];
+            })) : null;
             seen = new Set();
             _iterator2 = _createForOfIteratorHelper(configs);
-            _context5.prev = 5;
+            _context5.prev = 7;
 
             _iterator2.s();
 
-          case 7:
+          case 9:
             if ((_step2 = _iterator2.n()).done) {
-              _context5.next = 70;
+              _context5.next = 75;
               break;
             }
 
@@ -439,7 +470,7 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
             _validate = validate(entry), id = _validate.id, reason = _validate.reason;
 
             if (!reason) {
-              _context5.next = 13;
+              _context5.next = 15;
               break;
             }
 
@@ -447,11 +478,11 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
               id: id,
               reason: reason
             });
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
 
-          case 13:
+          case 15:
             if (!seen.has(id)) {
-              _context5.next = 16;
+              _context5.next = 18;
               break;
             }
 
@@ -459,31 +490,31 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
               id: id,
               reason: 'duplicate assistant id'
             });
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
 
-          case 16:
+          case 18:
             seen.add(id);
-            _context5.prev = 17;
-            _context5.next = 20;
-            return getAssistant(client, id);
+            _context5.prev = 19;
+            _context5.next = 22;
+            return getAssistant(client, id, known);
 
-          case 20:
+          case 22:
             assistant = _context5.sent;
             created = false;
 
             if (assistant) {
-              _context5.next = 40;
+              _context5.next = 42;
               break;
             }
 
-            _context5.next = 25;
+            _context5.next = 27;
             return resolveProvisionedFolder(client, entry);
 
-          case 25:
+          case 27:
             dirId = _context5.sent;
 
             if (dirId) {
-              _context5.next = 29;
+              _context5.next = 31;
               break;
             }
 
@@ -491,17 +522,17 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
               id: id,
               reason: 'folder could not be resolved'
             });
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
 
-          case 29:
-            _context5.next = 31;
+          case 31:
+            _context5.next = 33;
             return createProvisionedAssistant(client, id, entry, dirId);
 
-          case 31:
+          case 33:
             created = _context5.sent;
 
             if (!created) {
-              _context5.next = 36;
+              _context5.next = 38;
               break;
             }
 
@@ -512,38 +543,50 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
                 dirId: dirId
               }]
             };
-            _context5.next = 39;
+            _context5.next = 41;
             break;
 
-          case 36:
-            _context5.next = 38;
+          case 38:
+            _context5.next = 40;
             return getAssistant(client, id);
 
-          case 38:
+          case 40:
             _context5.t0 = _context5.sent;
 
-          case 39:
+          case 41:
             assistant = _context5.t0;
 
-          case 40:
+          case 42:
             if (!created) {
-              _context5.next = 43;
+              _context5.next = 45;
               break;
             }
 
             // saveKnowledgeBase already saved the knowledge base.
             result.created.push(id);
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
+
+          case 45:
+            current = (0, _knowledgeBase.getKnowledgeBaseDirId)(assistant);
+
+            if (!(entry.dirId && current === entry.dirId)) {
+              _context5.next = 49;
+              break;
+            }
+
+            // The stack's rag-index worker skips a trashed folder by itself.
+            result.ensured.push(id);
+            return _context5.abrupt("continue", 73);
 
-          case 43:
-            _context5.next = 45;
+          case 49:
+            _context5.next = 51;
             return resolveProvisionedFolder(client, entry);
 
-          case 45:
+          case 51:
             wanted = _context5.sent;
 
             if (wanted) {
-              _context5.next = 49;
+              _context5.next = 55;
               break;
             }
 
@@ -551,37 +594,35 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
               id: id,
               reason: 'folder could not be resolved'
             });
-            return _context5.abrupt("continue", 68);
-
-          case 49:
-            current = (0, _knowledgeBase.getKnowledgeBaseDirId)(assistant);
+            return _context5.abrupt("continue", 73);
 
+          case 55:
             if (!(current === null || (0, _knowledgeBase.isRootDirId)(current) && !(0, _knowledgeBase.isRootDirId)(wanted))) {
-              _context5.next = 55;
+              _context5.next = 60;
               break;
             }
 
-            _context5.next = 53;
+            _context5.next = 58;
             return (0, _knowledgeBase.saveKnowledgeBase)(client, id, [{
               doctype: _queries.FILES_DOCTYPE,
               dirId: wanted
             }]);
 
-          case 53:
+          case 58:
             result.ensured.push(id);
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
 
-          case 55:
-            _context5.next = 57;
+          case 60:
+            _context5.next = 62;
             return resolveProvisionedFolder(client, {
               dirId: current
             });
 
-          case 57:
+          case 62:
             live = _context5.sent;
 
             if (live) {
-              _context5.next = 61;
+              _context5.next = 66;
               break;
             }
 
@@ -589,55 +630,55 @@ var ensureProvisionedAssistants = /*#__PURE__*/function () {
               id: id,
               reason: "folder ".concat(current, " is missing or trashed")
             });
-            return _context5.abrupt("continue", 68);
+            return _context5.abrupt("continue", 73);
 
-          case 61:
+          case 66:
             result.ensured.push(id);
-            _context5.next = 68;
+            _context5.next = 73;
             break;
 
-          case 64:
-            _context5.prev = 64;
-            _context5.t1 = _context5["catch"](17);
+          case 69:
+            _context5.prev = 69;
+            _context5.t1 = _context5["catch"](19);
             warn("entry ".concat(id, " failed"), _context5.t1);
             result.skipped.push({
               id: id,
               reason: (_context5.t1 === null || _context5.t1 === void 0 ? void 0 : _context5.t1.message) || String(_context5.t1)
             });
 
-          case 68:
-            _context5.next = 7;
+          case 73:
+            _context5.next = 9;
             break;
 
-          case 70:
-            _context5.next = 75;
+          case 75:
+            _context5.next = 80;
             break;
 
-          case 72:
-            _context5.prev = 72;
-            _context5.t2 = _context5["catch"](5);
+          case 77:
+            _context5.prev = 77;
+            _context5.t2 = _context5["catch"](7);
 
             _iterator2.e(_context5.t2);
 
-          case 75:
-            _context5.prev = 75;
+          case 80:
+            _context5.prev = 80;
 
             _iterator2.f();
 
-            return _context5.finish(75);
+            return _context5.finish(80);
 
-          case 78:
+          case 83:
             return _context5.abrupt("return", result);
 
-          case 79:
+          case 84:
           case "end":
             return _context5.stop();
         }
       }
-    }, _callee5, null, [[5, 72, 75, 78], [17, 64]]);
+    }, _callee5, null, [[7, 77, 80, 83], [19, 69]]);
   }));
 
-  return function ensureProvisionedAssistants(_x10, _x11) {
+  return function ensureProvisionedAssistants(_x11, _x12) {
     return _ref6.apply(this, arguments);
   };
 }();

package/dist/components/KnowledgeBase/provisioning.spec.js

@@ -364,6 +364,58 @@ describe('ensureProvisionedAssistants', () => {
     expect(client.save).not.toHaveBeenCalled()
   })
 
+  it('skips the folder lookup when the base already matches the flag dirId', async () => {
+    const { client, filesCollection } = makeClient({
+      assistants: {
+        docs: {
+          _id: 'docs',
+          _type: 'io.cozy.ai.chat.assistants',
+          knowledgeBase: [{ doctype: 'io.cozy.files', dirId: 'dir-1' }]
+        }
+      }
+    })
+
+    const result = await ensureProvisionedAssistants(client, [
+      { name: 'Docs', dirId: 'dir-1' }
+    ])
+
+    expect(result.ensured).toEqual(['docs'])
+    expect(filesCollection.statById).not.toHaveBeenCalled()
+    expect(client.save).not.toHaveBeenCalled()
+  })
+
+  it('uses the given assistants instead of querying them', async () => {
+    const docs = {
+      _id: 'docs',
+      _type: 'io.cozy.ai.chat.assistants',
+      knowledgeBase: [{ doctype: 'io.cozy.files', dirId: 'dir-1' }]
+    }
+    const { client } = makeClient()
+
+    const result = await ensureProvisionedAssistants(
+      client,
+      [{ name: 'Docs', dirId: 'dir-1' }],
+      { assistants: [docs] }
+    )
+
+    expect(result.ensured).toEqual(['docs'])
+    expect(client.query).not.toHaveBeenCalled()
+  })
+
+  it('creates the assistants missing from the given assistants', async () => {
+    const { client } = makeClient({
+      files: { 'dir-1': { _id: 'dir-1', type: 'directory', trashed: false } }
+    })
+
+    const result = await ensureProvisionedAssistants(
+      client,
+      [{ name: 'Docs', dirId: 'dir-1' }],
+      { assistants: [] }
+    )
+
+    expect(result.created).toEqual(['docs'])
+  })
+
   it('skips an existing assistant whose folder is trashed', async () => {
     const { client } = makeClient({
       assistants: {
@@ -485,6 +537,6 @@ describe('getDefaultProvisionedAssistantId', () => {
       { name: 'Autre', dirName: 'Autre', default: true }
     ])
     expect(getDefaultProvisionedAssistantId()).toBe('mes-documents')
-    expect(flag).toHaveBeenCalledWith('rag.assistants.autoprovision')
+    expect(flag).toHaveBeenCalledWith('cozy.assistant.autoprovision')
   })
 })

package/dist/components/KnowledgeBase/ragIndexing.d.ts

@@ -13,7 +13,9 @@ export function findRagIndexTriggers(client: any): Promise<{
     files: object | null;
     assistants: object | null;
 }>;
-export function migrateAssistantsWithoutFolder(client: any): Promise<string[]>;
+export function fetchAssistants(client: any): any;
+export function migrateAssistantsWithoutFolder(client: import("cozy-client").CozyClient, assistants?: object[] | undefined): Promise<string[]>;
+export function createRagIndexTriggers(client: import("cozy-client").CozyClient): Promise<string[]>;
 export function setupRagIndexing(client: import("cozy-client").CozyClient): Promise<{
     triggers: string[];
     migrated: string[];