cozy-search 2.2.18 → 2.2.19

package/dist/components/Conversations/ConversationListItem.js

@@ -102,7 +102,7 @@ var ConversationListItem = function ConversationListItem(_ref) {
     }, (0, _helpers.getNameOfConversation)(conversation)),
     secondary: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)('u-db u-ellipsis', styles['conversation-list-item-subtitle'])
-    }, (0, _helpers.getDescriptionOfConversation)(conversation)), /*#__PURE__*/_react.default.createElement("span", {
+    }, (0, _helpers.getDescriptionOfConversation)(conversation, t)), /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)('u-flex u-flex-items-center', styles['conversation-list-item-subtitle'], styles['conversation-list-item-meta'])
     }, /*#__PURE__*/_react.default.createElement(_AssistantAvatar.default, {
       assistant: conversation.assistant,

package/dist/components/Conversations/ConversationListItemWider.js

@@ -106,7 +106,7 @@ var ConversationListItemWider = function ConversationListItemWider(_ref) {
     secondary: /*#__PURE__*/_react.default.createElement(_Typography.default, {
       variant: "h6",
       className: "u-coolGrey"
-    }, (0, _helpers.getDescriptionOfConversation)(conversation))
+    }, (0, _helpers.getDescriptionOfConversation)(conversation, t))
   }), /*#__PURE__*/_react.default.createElement(_Typography.default, {
     className: "u-miw-4 u-fz-xsmall u-ta-right u-dn-s"
   }, (0, _helpers.formatConversationDate)((_conversation$cozyMet = conversation.cozyMetadata) === null || _conversation$cozyMet === void 0 ? void 0 : _conversation$cozyMet.updatedAt, t, lang)));

package/dist/components/CozyAssistantRuntimeProvider.js

@@ -63,13 +63,13 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 var log = (0, _cozyMinilog.default)('🔍 [CozyAssistantRuntimeProvider]');
 
-var convertMessagesToThreadMessages = function convertMessagesToThreadMessages(messages) {
+var convertMessagesToThreadMessages = function convertMessagesToThreadMessages(messages, t) {
   if (!messages) return [];
   return messages.map(function (msg, idx) {
     return {
       id: msg.id || "msg-".concat(idx),
       role: msg.role,
-      content: (0, _helpers.sanitizeChatContent)(msg.content),
+      content: (0, _helpers.formatAnswer)(msg, t),
       metadata: msg.role === 'assistant' && msg.sources ? {
         custom: {
           sources: msg.sources
@@ -85,6 +85,9 @@ var ConversationLoader = function ConversationLoader(_ref) {
   var children = _ref.children,
       conversationId = _ref.conversationId;
 
+  var _useI18n = (0, _twakeI18n.useI18n)(),
+      t = _useI18n.t;
+
   var _useAssistant = (0, _AssistantProvider.useAssistant)(),
       setSelectedAssistantId = _useAssistant.setSelectedAssistantId;
 
@@ -93,8 +96,8 @@ var ConversationLoader = function ConversationLoader(_ref) {
   var conversation = queryResult.data;
   var isLoading = (0, _cozyClient.isQueryLoading)(queryResult);
   var initialMessages = (0, _react2.useMemo)(function () {
-    return convertMessagesToThreadMessages(conversation === null || conversation === void 0 ? void 0 : conversation.messages);
-  }, [conversation === null || conversation === void 0 ? void 0 : conversation.messages]);
+    return convertMessagesToThreadMessages(conversation === null || conversation === void 0 ? void 0 : conversation.messages, t);
+  }, [conversation === null || conversation === void 0 ? void 0 : conversation.messages, t]);
   (0, _react2.useEffect)(function () {
     var _conversation$relatio, _conversation$relatio2, _conversation$relatio3;
 
@@ -121,8 +124,8 @@ var CozyAssistantRuntimeProviderInner = function CozyAssistantRuntimeProviderInn
       conversationId = _ref2.conversationId,
       initialMessages = _ref2.initialMessages;
 
-  var _useI18n = (0, _twakeI18n.useI18n)(),
-      t = _useI18n.t;
+  var _useI18n2 = (0, _twakeI18n.useI18n)(),
+      t = _useI18n2.t;
 
   var client = (0, _cozyClient.useClient)();
   var streamBridgeRef = (0, _react2.useRef)(new _StreamBridge.StreamBridge());
@@ -332,8 +335,8 @@ var CozyAssistantErrorBoundary = /*#__PURE__*/function (_React$Component) {
 }(_react2.default.Component);
 
 var CozyAssistantRuntimeProviderWithErrorBoundary = function CozyAssistantRuntimeProviderWithErrorBoundary(props) {
-  var _useI18n2 = (0, _twakeI18n.useI18n)(),
-      t = _useI18n2.t;
+  var _useI18n3 = (0, _twakeI18n.useI18n)(),
+      t = _useI18n3.t;
 
   return /*#__PURE__*/_react2.default.createElement(CozyAssistantErrorBoundary, {
     t: t

package/dist/components/adapters/CozyRealtimeChatAdapter.js

@@ -66,7 +66,7 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
       var messages = _ref.messages,
           abortSignal = _ref.abortSignal;
       return (0, _wrapAsyncGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var client, conversationId, assistantId, websearchEnabled, streamBridge, userQuery, stream, fullText, wasAborted, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, sanitizedText, finalText, sources;
+        var client, conversationId, assistantId, websearchEnabled, streamBridge, userQuery, stream, fullText, wasAborted, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, sanitizedText, sources;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
@@ -133,25 +133,24 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
 
               case 23:
                 if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
-                  _context.next = 36;
+                  _context.next = 35;
                   break;
                 }
 
                 chunk = _step.value;
 
                 if (!(abortSignal !== null && abortSignal !== void 0 && abortSignal.aborted)) {
-                  _context.next = 29;
+                  _context.next = 28;
                   break;
                 }
 
                 wasAborted = true;
-                streamBridge.cleanup(conversationId);
-                return _context.abrupt("break", 36);
+                return _context.abrupt("break", 35);
 
-              case 29:
+              case 28:
                 fullText += chunk;
                 sanitizedText = (0, _helpers.sanitizeChatContent)(fullText);
-                _context.next = 33;
+                _context.next = 32;
                 return {
                   content: [{
                     type: 'text',
@@ -162,62 +161,64 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
                   }
                 };
 
-              case 33:
+              case 32:
                 _iteratorAbruptCompletion = false;
                 _context.next = 21;
                 break;
 
-              case 36:
-                _context.next = 42;
+              case 35:
+                _context.next = 41;
                 break;
 
-              case 38:
-                _context.prev = 38;
+              case 37:
+                _context.prev = 37;
                 _context.t0 = _context["catch"](19);
                 _didIteratorError = true;
                 _iteratorError = _context.t0;
 
-              case 42:
+              case 41:
+                _context.prev = 41;
                 _context.prev = 42;
-                _context.prev = 43;
 
                 if (!(_iteratorAbruptCompletion && _iterator.return != null)) {
-                  _context.next = 47;
+                  _context.next = 46;
                   break;
                 }
 
-                _context.next = 47;
+                _context.next = 46;
                 return (0, _awaitAsyncGenerator2.default)(_iterator.return());
 
-              case 47:
-                _context.prev = 47;
+              case 46:
+                _context.prev = 46;
 
                 if (!_didIteratorError) {
-                  _context.next = 50;
+                  _context.next = 49;
                   break;
                 }
 
                 throw _iteratorError;
 
+              case 49:
+                return _context.finish(46);
+
               case 50:
-                return _context.finish(47);
+                return _context.finish(41);
 
               case 51:
-                return _context.finish(42);
-
-              case 52:
-                if (wasAborted) {
-                  _context.next = 58;
+                if (!(!wasAborted && !(abortSignal !== null && abortSignal !== void 0 && abortSignal.aborted))) {
+                  _context.next = 55;
                   break;
                 }
 
-                finalText = (0, _helpers.sanitizeChatContent)(fullText);
                 sources = streamBridge.getSources(conversationId);
-                _context.next = 57;
+                _context.next = 55;
                 return _objectSpread({
                   content: [{
                     type: 'text',
-                    text: finalText
+                    text: (0, _helpers.formatAnswer)({
+                      role: 'assistant',
+                      content: fullText
+                    }, t)
                   }],
                   status: {
                     type: 'complete',
@@ -231,19 +232,17 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
                   }
                 } : {});
 
-              case 57:
+              case 55:
                 streamBridge.cleanup(conversationId);
-
-              case 58:
-                _context.next = 66;
+                _context.next = 64;
                 break;
 
-              case 60:
-                _context.prev = 60;
+              case 58:
+                _context.prev = 58;
                 _context.t1 = _context["catch"](10);
                 log.error('Error:', _context.t1);
                 streamBridge.cleanup(conversationId);
-                _context.next = 66;
+                _context.next = 64;
                 return {
                   content: [{
                     type: 'text',
@@ -260,12 +259,12 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
                   }
                 };
 
-              case 66:
+              case 64:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[10, 60], [19, 38, 42, 52], [43,, 47, 51]]);
+        }, _callee, null, [[10, 58], [19, 37, 41, 51], [42,, 46, 50]]);
       }))();
     }
   };

package/dist/components/adapters/CozyRealtimeChatAdapter.spec.ts

@@ -1,4 +1,7 @@
-import type { ChatModelRunOptions } from '@assistant-ui/react'
+import type {
+  ChatModelRunOptions,
+  ChatModelRunResult
+} from '@assistant-ui/react'
 
 import { createCozyRealtimeChatAdapter } from './CozyRealtimeChatAdapter'
 import type { StreamBridge } from './StreamBridge'
@@ -38,6 +41,27 @@ const runAdapter = async (assistantId?: string): Promise<jest.Mock> => {
   return fetchJSON
 }
 
+const runAdapterAndCollectResults = async (
+  streamBridge: StreamBridge
+): Promise<ChatModelRunResult[]> => {
+  const adapter = createCozyRealtimeChatAdapter(
+    {
+      client: { stackClient: { fetchJSON: jest.fn().mockResolvedValue({}) } },
+      conversationId: 'conv-1'
+    },
+    key => key,
+    { current: streamBridge }
+  )
+  const generator = adapter.run(
+    makeRunOptions()
+  ) as AsyncGenerator<ChatModelRunResult>
+  const results: ChatModelRunResult[] = []
+  for await (const result of generator) {
+    results.push(result)
+  }
+  return results
+}
+
 describe('CozyRealtimeChatAdapter', () => {
   it('sends the assistantID for a real assistant', async () => {
     const fetchJSON = await runAdapter('real-assistant-id')
@@ -67,4 +91,28 @@ describe('CozyRealtimeChatAdapter', () => {
     ]
     expect(body).not.toHaveProperty('assistantID')
   })
+
+  it('yields the fallback message when the stream completes with no content', async () => {
+    const results = await runAdapterAndCollectResults(makeStreamBridge())
+    const finalResult = results[results.length - 1]
+    expect(finalResult.content).toEqual([
+      { type: 'text', text: 'assistant.default_empty_response' }
+    ])
+  })
+
+  it('yields the sanitized content when the stream returns text', async () => {
+    const streamBridge = {
+      // eslint-disable-next-line @typescript-eslint/require-await
+      createStream: jest.fn(async function* () {
+        yield 'Hello '
+        yield 'world'
+      }),
+      getSources: jest.fn(() => null),
+      cleanup: jest.fn()
+    } as unknown as StreamBridge
+
+    const results = await runAdapterAndCollectResults(streamBridge)
+    const finalResult = results[results.length - 1]
+    expect(finalResult.content).toEqual([{ type: 'text', text: 'Hello world' }])
+  })
 })

package/dist/components/helpers.d.ts

@@ -1,6 +1,10 @@
 export function makeConversationId(): string;
 export function isAssistantEnabled(): any;
 export function sanitizeChatContent(content: string): string;
+export function formatAnswer(message: {
+    role: string;
+    content: string;
+}, t: (key: string) => string): string;
 export function formatConversationDate(dateString: any, t: any, lang: any): string;
 export function getNameOfConversation(conversation: any): any;
-export function getDescriptionOfConversation(conversation: any): any;
+export function getDescriptionOfConversation(conversation: any, t: any): string | undefined;

package/dist/components/helpers.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sanitizeChatContent = exports.makeConversationId = exports.isAssistantEnabled = exports.getNameOfConversation = exports.getDescriptionOfConversation = exports.formatConversationDate = void 0;
+exports.sanitizeChatContent = exports.makeConversationId = exports.isAssistantEnabled = exports.getNameOfConversation = exports.getDescriptionOfConversation = exports.formatConversationDate = exports.formatAnswer = void 0;
 
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 
@@ -41,9 +41,26 @@ var sanitizeChatContent = function sanitizeChatContent(content) {
   .replace(/\s?\[Source\s+\d+(?:\s*,\s*(?:Source\s+)?\d+)*\]/g, '') // remove « [Sources: 1, 3, 6] » citations, with optional empty link parens
   .replace(/\s?\[Sources?:\s*\d+(?:\s*,\s*\d+)*\s*\](?:\([^)]*\))?/g, '');
 };
+/**
+ * Formats a chat message's answer: sanitizes citation markup, and
+ * substitutes a translated fallback when an assistant answer is empty.
+ * Used wherever an assistant response may come back empty from the RAG backend.
+ *
+ * @param {{ role: string, content: string }} message
+ * @param {(key: string) => string} t - translation function from twake-i18n
+ * @returns {string}
+ */
+
 
 exports.sanitizeChatContent = sanitizeChatContent;
 
+var formatAnswer = function formatAnswer(message, t) {
+  var sanitized = sanitizeChatContent(message.content);
+  return message.role === 'assistant' && !sanitized.trim() ? t('assistant.default_empty_response') : sanitized;
+};
+
+exports.formatAnswer = formatAnswer;
+
 var formatConversationDate = function formatConversationDate(dateString, t, lang) {
   if (!dateString) return '';
   var date = new Date(dateString);
@@ -91,11 +108,12 @@ var getNameOfConversation = function getNameOfConversation(conversation) {
 
 exports.getNameOfConversation = getNameOfConversation;
 
-var getDescriptionOfConversation = function getDescriptionOfConversation(conversation) {
-  var _conversation$message4, _conversation$message5;
+var getDescriptionOfConversation = function getDescriptionOfConversation(conversation, t) {
+  var _conversation$message4;
 
-  var content = (_conversation$message4 = conversation.messages) === null || _conversation$message4 === void 0 ? void 0 : (_conversation$message5 = _conversation$message4[conversation.messages.length - 1]) === null || _conversation$message5 === void 0 ? void 0 : _conversation$message5.content;
-  return content && sanitizeChatContent(content);
+  var lastMessage = conversation === null || conversation === void 0 ? void 0 : (_conversation$message4 = conversation.messages) === null || _conversation$message4 === void 0 ? void 0 : _conversation$message4[conversation.messages.length - 1];
+  if (!lastMessage) return undefined;
+  return formatAnswer(lastMessage, t);
 };
 
 exports.getDescriptionOfConversation = getDescriptionOfConversation;

package/dist/components/helpers.spec.js

@@ -179,4 +179,25 @@ describe('getDescriptionOfConversation', () => {
     }
     expect(getDescriptionOfConversation(convo)).toBe('It is 4')
   })
+
+  it('returns the translated fallback when the last assistant message has no content', () => {
+    const t = key => key
+    const convo = {
+      messages: [
+        { role: 'user', content: 'sum?' },
+        { role: 'assistant', content: '' }
+      ]
+    }
+    expect(getDescriptionOfConversation(convo, t)).toBe(
+      'assistant.default_empty_response'
+    )
+  })
+
+  it('does not apply the fallback when the last message is from the user', () => {
+    const t = key => key
+    const convo = {
+      messages: [{ role: 'user', content: '[Source 1]' }]
+    }
+    expect(getDescriptionOfConversation(convo, t)).toBe('')
+  })
 })

package/dist/locales/en.json

@@ -47,6 +47,7 @@
       "yesterday": "Yesterday"
     },
     "default_error": "An error occurred during response generation. Please try again",
+    "default_empty_response": "I could not find an answer to your request. Please try rephrasing it",
     "hide": "Hide",
     "show": "Show",
     "search_conversation": {

package/dist/locales/fr.json

@@ -47,6 +47,7 @@
       "yesterday": "Hier"
     },
     "default_error": "Une erreur est survenue lors de la génération de la réponse. Veuillez réessayer",
+    "default_empty_response": "Je n'ai pas trouvé de réponse à votre demande. Essayez de reformuler votre question",
     "hide": "Masquer",
     "show": "Afficher",
     "search_conversation": {

package/dist/locales/index.js

@@ -53,6 +53,7 @@ var en = {
       yesterday: "Yesterday"
     },
     default_error: "An error occurred during response generation. Please try again",
+    default_empty_response: "I could not find an answer to your request. Please try rephrasing it",
     hide: "Hide",
     show: "Show",
     search_conversation: {
@@ -236,6 +237,7 @@ var fr = {
       yesterday: "Hier"
     },
     default_error: "Une erreur est survenue lors de la g\xE9n\xE9ration de la r\xE9ponse. Veuillez r\xE9essayer",
+    default_empty_response: "Je n'ai pas trouv\xE9 de r\xE9ponse \xE0 votre demande. Essayez de reformuler votre question",
     hide: "Masquer",
     show: "Afficher",
     search_conversation: {
@@ -409,6 +411,7 @@ var ru = {
       yesterday: "\u0412\u0447\u0435\u0440\u0430"
     },
     default_error: "\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0441\u043D\u043E\u0432\u0430",
+    default_empty_response: "\u042F \u043D\u0435 \u0441\u043C\u043E\u0433 \u043D\u0430\u0439\u0442\u0438 \u043E\u0442\u0432\u0435\u0442 \u043D\u0430 \u0432\u0430\u0448 \u0437\u0430\u043F\u0440\u043E\u0441. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u0435\u0440\u0435\u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u043E\u043F\u0440\u043E\u0441",
     hide: "\u0421\u043A\u0440\u044B\u0442\u044C",
     show: "\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C",
     search_conversation: {
@@ -616,6 +619,7 @@ var vi = {
       yesterday: "H\xF4m qua"
     },
     default_error: "\u0110\xE3 x\u1EA3y ra l\u1ED7i, vui l\xF2ng th\u1EED l\u1EA1i",
+    default_empty_response: "T\xF4i kh\xF4ng t\xECm th\u1EA5y c\xE2u tr\u1EA3 l\u1EDDi cho y\xEAu c\u1EA7u c\u1EE7a b\u1EA1n. Vui l\xF2ng th\u1EED di\u1EC5n \u0111\u1EA1t l\u1EA1i",
     hide: "\u1EA8n",
     show: "Hi\u1EC7n",
     message: {

package/dist/locales/ru.json

@@ -37,6 +37,7 @@
       "yesterday": "Вчера"
     },
     "default_error": "Произошла ошибка, попробуйте снова",
+    "default_empty_response": "Я не смог найти ответ на ваш запрос. Попробуйте переформулировать вопрос",
     "hide": "Скрыть",
     "show": "Показать",
     "search_conversation": {

package/dist/locales/vi.json

@@ -44,6 +44,7 @@
       "yesterday": "Hôm qua"
     },
     "default_error": "Đã xảy ra lỗi, vui lòng thử lại",
+    "default_empty_response": "Tôi không tìm thấy câu trả lời cho yêu cầu của bạn. Vui lòng thử diễn đạt lại",
     "hide": "Ẩn",
     "show": "Hiện",
     "message": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cozy-search",
   "description": "UI components about search bar and IA assistant",
-  "version": "2.2.18",
+  "version": "2.2.19",
   "author": {
     "name": "Cozy Cloud",
     "url": "https://github.com/cozy"
@@ -96,5 +96,5 @@
     "lint": "cd .. && yarn eslint --ext js,jsx,ts packages/cozy-search"
   },
   "types": "dist/index.d.ts",
-  "gitHead": "c442a0903e06f8877c303548a9d22be5ee60bf01"
+  "gitHead": "9945afd53a9a030aa0a80b15380191db260d30c0"
 }