cozy-client 60.21.3 → 60.22.1

package/dist/CozyClient.js

@@ -3126,7 +3126,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "60.21.3";
+CozyClient.version = "60.22.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/assistant.js

@@ -23,21 +23,28 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
+var ASSISTANT_DOCTYPE = 'io.cozy.ai.chat.assistants';
+var ACCOUNT_DOCTYPE = 'io.cozy.accounts';
+/**
+ * @typedef {object} Assistant
+ * @property {string} name - Name of the assistant
+ * @property {string} prompt - Prompt for the assistant
+ * @property {string} [icon] - Optional icon for the assistant
+ * @property {string} model - Model identifier
+ * @property {string} baseUrl - Provider's base URL
+ * @property {string} [apiKey] - API key for authentication
+ * @property {string} providerId - ID of the provider
+ */
+
 /**
  * Creates a new assistant with the provided data.
  *
  * @param {CozyClient} client - An instance of CozyClient
- * @param {object} assistantData - Data for the new assistant
- * @param {string} assistantData.name - Name of the assistant
- * @param {string} assistantData.prompt - Prompt for the assistant
- * @param {string} [assistantData.icon] - Optional icon for the assistant
- * @param {boolean} assistantData.isCustomModel - Indicates if it's a custom model
- * @param {string} assistantData.model - Model identifier
- * @param {string} assistantData.baseUrl - Provider's base URL
- * @param {string} assistantData.apiKey - API key for authentication
+ * @param {Assistant} assistantData - Data for the new assistant
  * @returns {Promise<void>} - A promise that resolves when the assistant is created
  * @throws {Error} - Throws an error if the creation fails
  */
+
 var createAssistant = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, assistantData) {
     var createdAccountId, account, response, assistant;
@@ -48,86 +55,96 @@ var createAssistant = /*#__PURE__*/function () {
             createdAccountId = null;
             _context.prev = 1;
             account = {
-              _type: 'io.cozy.accounts',
+              _type: ACCOUNT_DOCTYPE,
               auth: {
-                login: assistantData.model,
-                password: assistantData.apiKey
+                login: assistantData.model
               },
-              data: {
-                baseUrl: assistantData.baseUrl
-              }
+              account_type: assistantData.providerId
             };
-            _context.next = 5;
+
+            if (assistantData.baseUrl) {
+              account.data = {
+                baseUrl: assistantData.baseUrl
+              };
+            }
+
+            if (assistantData.apiKey) {
+              account.auth.password = assistantData.apiKey;
+            }
+
+            _context.next = 7;
             return client.save(account);
 
-          case 5:
+          case 7:
             response = _context.sent;
 
             if (!(!response.data || !response.data._id)) {
-              _context.next = 8;
+              _context.next = 10;
               break;
             }
 
             throw new Error('Failed to create account for assistant');
 
-          case 8:
+          case 10:
             createdAccountId = response.data._id;
             assistant = {
-              _type: 'io.cozy.ai.chat.assistants',
+              _type: ASSISTANT_DOCTYPE,
               name: assistantData.name,
               prompt: assistantData.prompt,
               icon: assistantData.icon || null,
-              isCustomModel: assistantData.isCustomModel,
               relationships: {
                 provider: {
                   data: {
-                    _type: 'io.cozy.accounts',
-                    _id: createdAccountId
+                    _type: ACCOUNT_DOCTYPE,
+                    _id: createdAccountId,
+                    metadata: {
+                      providerId: assistantData.providerId
+                    }
                   }
                 }
               }
             };
-            _context.next = 12;
+            _context.next = 14;
             return client.save(assistant);
 
-          case 12:
-            _context.next = 26;
+          case 14:
+            _context.next = 28;
             break;
 
-          case 14:
-            _context.prev = 14;
+          case 16:
+            _context.prev = 16;
             _context.t0 = _context["catch"](1);
 
             if (!createdAccountId) {
-              _context.next = 25;
+              _context.next = 27;
               break;
             }
 
-            _context.prev = 17;
-            _context.next = 20;
+            _context.prev = 19;
+            _context.next = 22;
             return client.stackClient.collection('io.cozy.accounts').destroy({
               _id: createdAccountId
             });
 
-          case 20:
-            _context.next = 25;
+          case 22:
+            _context.next = 27;
             break;
 
-          case 22:
-            _context.prev = 22;
-            _context.t1 = _context["catch"](17);
+          case 24:
+            _context.prev = 24;
+            _context.t1 = _context["catch"](19);
 
             _logger.default.warn('Failed to cleanup orphaned account:', _context.t1);
 
-          case 25:
+          case 27:
             throw new Error("Failed to create assistant: ".concat(_context.t0.message));
 
-          case 26:
+          case 28:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 14], [17, 22]]);
+    }, _callee, null, [[1, 16], [19, 24]]);
   }));
 
   return function createAssistant(_x, _x2) {
@@ -156,14 +173,14 @@ var deleteAssistant = /*#__PURE__*/function () {
           case 0:
             _context2.prev = 0;
             _context2.next = 3;
-            return client.query((0, _dsl.Q)('io.cozy.ai.chat.assistants').getById(assistantId).include(['provider']));
+            return client.query((0, _dsl.Q)(ASSISTANT_DOCTYPE).getById(assistantId).include(['provider']));
 
           case 3:
             existedAssistant = _context2.sent;
             assistantInstance = existedAssistant.data;
             provider = (_existedAssistant$inc = existedAssistant.included) === null || _existedAssistant$inc === void 0 ? void 0 : _existedAssistant$inc[0];
             _context2.next = 8;
-            return client.stackClient.collection('io.cozy.ai.chat.assistants').destroy({
+            return client.stackClient.collection(ASSISTANT_DOCTYPE).destroy({
               _id: assistantId,
               _rev: assistantInstance._rev
             });
@@ -175,7 +192,7 @@ var deleteAssistant = /*#__PURE__*/function () {
             }
 
             _context2.next = 11;
-            return client.stackClient.collection('io.cozy.accounts').destroy({
+            return client.stackClient.collection(ACCOUNT_DOCTYPE).destroy({
               _id: provider._id,
               _rev: provider._rev
             });
@@ -206,14 +223,7 @@ var deleteAssistant = /*#__PURE__*/function () {
  *
  * @param {CozyClient} client - An instance of CozyClient
  * @param {string} assistantId - ID of existed assistant
- * @param {object} assistantData - Data for the new assistant
- * @param {string} assistantData.name - Name of the assistant
- * @param {string} assistantData.prompt - Prompt for the assistant
- * @param {string} [assistantData.icon] - Optional icon for the assistant
- * @param {boolean} assistantData.isCustomModel - Indicates if it's a custom model
- * @param {string} assistantData.model - Model identifier
- * @param {string} assistantData.baseUrl - Provider's base URL
- * @param {string} [assistantData.apiKey] - API key for authentication
+ * @param {Assistant} assistantData - Data for the editted assistant
  * @returns {Promise<void>} - A promise that resolves when the assistant is edited
  * @throws {Error} - Throws an error if the edition fails
  */
@@ -223,7 +233,7 @@ exports.deleteAssistant = deleteAssistant;
 
 var editAssistant = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, assistantId, assistantData) {
-    var _existedAssistant$inc2, existedAssistant, existedAssistantData, provider, account, response, assistant;
+    var _existedAssistant$inc2, _existedAssistantData, _existedAssistantData2, _existedAssistantData3, _existedAssistantData4, _existedAssistantData5, existedAssistant, existedAssistantData, provider, account, _account$data, _account$auth, response, assistant;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -231,7 +241,7 @@ var editAssistant = /*#__PURE__*/function () {
           case 0:
             _context3.prev = 0;
             _context3.next = 3;
-            return client.query((0, _dsl.Q)('io.cozy.ai.chat.assistants').getById(assistantId).include(['provider']));
+            return client.query((0, _dsl.Q)(ASSISTANT_DOCTYPE).getById(assistantId).include(['provider']));
 
           case 3:
             existedAssistant = _context3.sent;
@@ -259,53 +269,69 @@ var editAssistant = /*#__PURE__*/function () {
               auth: _objectSpread(_objectSpread({}, provider.auth || {}), {}, {
                 login: assistantData.model
               }),
-              data: _objectSpread(_objectSpread({}, provider.data || {}), {}, {
-                baseUrl: assistantData.baseUrl
-              })
+              account_type: assistantData.providerId,
+              data: _objectSpread({}, provider.data || {})
             });
 
+            if (assistantData.baseUrl) {
+              account.data.baseUrl = assistantData.baseUrl;
+            } else {
+              (_account$data = account.data) === null || _account$data === void 0 ? true : delete _account$data.baseUrl;
+            } // Only update the password if a new API key is explicitly provided
+
+
             if (assistantData.apiKey) {
               account.auth.password = assistantData.apiKey;
+            } else if (!assistantData.baseUrl) {
+              (_account$auth = account.auth) === null || _account$auth === void 0 ? true : delete _account$auth.password;
             }
 
-            _context3.next = 14;
+            _context3.next = 15;
             return client.save(account);
 
-          case 14:
+          case 15:
             response = _context3.sent;
 
             if (!(!response.data || !response.data._id)) {
-              _context3.next = 17;
+              _context3.next = 18;
               break;
             }
 
             throw new Error('Failed to edit account for assistant');
 
-          case 17:
+          case 18:
             assistant = _objectSpread(_objectSpread({}, existedAssistantData), {}, {
               name: assistantData.name,
               prompt: assistantData.prompt,
               icon: assistantData.icon || null,
-              isCustomModel: assistantData.isCustomModel
+              relationships: {
+                provider: {
+                  data: _objectSpread(_objectSpread({}, (existedAssistantData === null || existedAssistantData === void 0 ? void 0 : (_existedAssistantData = existedAssistantData.relationships) === null || _existedAssistantData === void 0 ? void 0 : (_existedAssistantData2 = _existedAssistantData.provider) === null || _existedAssistantData2 === void 0 ? void 0 : _existedAssistantData2.data) || {}), {}, {
+                    metadata: _objectSpread(_objectSpread({}, (existedAssistantData === null || existedAssistantData === void 0 ? void 0 : (_existedAssistantData3 = existedAssistantData.relationships) === null || _existedAssistantData3 === void 0 ? void 0 : (_existedAssistantData4 = _existedAssistantData3.provider) === null || _existedAssistantData4 === void 0 ? void 0 : (_existedAssistantData5 = _existedAssistantData4.data) === null || _existedAssistantData5 === void 0 ? void 0 : _existedAssistantData5.metadata) || {}), {}, {
+                      providerId: assistantData.providerId
+                    })
+                  })
+                }
+              }
             });
-            _context3.next = 20;
+            _context3.next = 21;
             return client.save(assistant);
 
-          case 20:
-            _context3.next = 25;
+          case 21:
+            _context3.next = 26;
             break;
 
-          case 22:
-            _context3.prev = 22;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](0);
             throw new Error("Failed to edit assistant: ".concat(_context3.t0.message));
 
-          case 25:
+          case 26:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[0, 22]]);
+    }, _callee3, null, [[0, 23]]);
   }));
 
   return function editAssistant(_x5, _x6, _x7) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.21.3",
+  "version": "60.22.1",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -19,7 +19,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^60.21.1",
+    "cozy-stack-client": "^60.22.0",
     "date-fns": "^2.30.0",
     "fast-deep-equal": "^3.1.3",
     "json-stable-stringify": "^1.0.1",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "89ecca51a6d65c50280a60d25f327c7237af91ef"
+  "gitHead": "b1d8d07e1152cda660cadab7531d71fc637e8e81"
 }

package/types/models/assistant.d.ts

@@ -1,20 +1,34 @@
-export function createAssistant(client: CozyClient, assistantData: {
-    name: string;
-    prompt: string;
-    icon: string;
-    isCustomModel: boolean;
-    model: string;
-    baseUrl: string;
-    apiKey: string;
-}): Promise<void>;
+export function createAssistant(client: CozyClient, assistantData: Assistant): Promise<void>;
 export function deleteAssistant(client: CozyClient, assistantId: string): Promise<void>;
-export function editAssistant(client: CozyClient, assistantId: string, assistantData: {
+export function editAssistant(client: CozyClient, assistantId: string, assistantData: Assistant): Promise<void>;
+export type Assistant = {
+    /**
+     * - Name of the assistant
+     */
     name: string;
+    /**
+     * - Prompt for the assistant
+     */
     prompt: string;
-    icon: string;
-    isCustomModel: boolean;
+    /**
+     * - Optional icon for the assistant
+     */
+    icon?: string;
+    /**
+     * - Model identifier
+     */
     model: string;
+    /**
+     * - Provider's base URL
+     */
     baseUrl: string;
-    apiKey: string;
-}): Promise<void>;
+    /**
+     * - API key for authentication
+     */
+    apiKey?: string;
+    /**
+     * - ID of the provider
+     */
+    providerId: string;
+};
 import CozyClient from "../CozyClient";