set interrupted announcement and show the last used query in the message bar

Author: karthikjeeyar

workspaces/lightspeed/plugins/lightspeed-backend/src/service/router.ts

@@ -228,6 +228,7 @@ export async function createRouter(
         const errormsg = `Error from lightspeed-core server: ${errorBody.error?.message || errorBody?.detail?.cause || 'Unknown error'}`;
         logger.error(errormsg);
         response.status(500).json({ error: errormsg });
+        return;
       }
       response.status(fetchResponse.status).json(await fetchResponse.json());
     } catch (error) {

workspaces/lightspeed/plugins/lightspeed/report-alpha.api.md

@@ -84,6 +84,7 @@ readonly "conversation.rename": string;
 readonly "conversation.addToPinnedChats": string;
 readonly "conversation.removeFromPinnedChats": string;
 readonly "conversation.announcement.userMessage": string;
+readonly "conversation.announcement.responseStopped": string;
 readonly "user.guest": string;
 readonly "user.loading": string;
 readonly "tooltip.attach": string;

workspaces/lightspeed/plugins/lightspeed/src/components/LightSpeedChat.tsx

@@ -21,6 +21,7 @@ import {
   useCallback,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from 'react';
 import {
@@ -167,6 +168,8 @@ export const LightspeedChat = ({
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState<boolean>(false);
   const [isRenameModalOpen, setIsRenameModalOpen] = useState<boolean>(false);
   const [isSortSelectOpen, setIsSortSelectOpen] = useState<boolean>(false);
+  const [messageBarKey, setMessageBarKey] = useState(0);
+  const wasStoppedByUserRef = useRef(false);
   const { isReady, lastOpenedId, setLastOpenedId, clearLastOpenedId } =
     useLastOpenedConversation(user);
   const {
@@ -296,7 +299,10 @@ export const LightspeedChat = ({
 
   const onComplete = (message: string) => {
     setIsSendButtonDisabled(false);
-    setAnnouncement(`Message from Bot: ${message}`);
+    if (!wasStoppedByUserRef.current) {
+      setAnnouncement(`Message from Bot: ${message}`);
+    }
+    wasStoppedByUserRef.current = false;
     queryClient.invalidateQueries({
       queryKey: ['conversations'],
     });
@@ -324,6 +330,7 @@ export const LightspeedChat = ({
   const sendMessage = (message: string | number) => {
     if (!message.toString().trim()) return;
 
+    wasStoppedByUserRef.current = false;
     if (conversationId !== TEMP_CONVERSATION_ID) {
       setNewChatCreated(false);
     }
@@ -682,13 +689,19 @@ export const LightspeedChat = ({
   const { mutate: stopConversation } = useStopConversation();
 
   const handleStopButton = () => {
+    wasStoppedByUserRef.current = true;
     if (requestId) {
       stopConversation(requestId);
       setRequestId('');
     }
     setIsSendButtonDisabled(false);
-    setAnnouncement('');
-    setDraftMessage('');
+    setAnnouncement(t('conversation.announcement.responseStopped'));
+    const lastUserMessage = [...conversationMessages]
+      .reverse()
+      .find((m: { role?: string }) => m.role === 'user');
+    const restoredPrompt = (lastUserMessage?.content as string) ?? '';
+    setDraftMessage(restoredPrompt.trim());
+    if (restoredPrompt) setMessageBarKey(k => k + 1);
     setFileContents([]);
     setUploadError({ message: null });
   };
@@ -851,6 +864,7 @@ export const LightspeedChat = ({
               <ChatbotFooter className={classes.footer}>
                 <FilePreview />
                 <MessageBar
+                  key={messageBarKey}
                   onSendMessage={sendMessage}
                   isSendButtonDisabled={isSendButtonDisabled}
                   hasStopButton={isSendButtonDisabled}

workspaces/lightspeed/plugins/lightspeed/src/components/RenameConversationModal.tsx

@@ -58,8 +58,8 @@ export const RenameConversationModal = ({
         c => c.conversation_id === conversationId,
       );
       if (conversation) {
-        setChatName(conversation.topic_summary);
-        setOriginalChatName(conversation.topic_summary);
+        setChatName(conversation.topic_summary ?? '');
+        setOriginalChatName(conversation.topic_summary ?? '');
       } else {
         setChatName('');
         setOriginalChatName('');

workspaces/lightspeed/plugins/lightspeed/src/translations/de.ts

@@ -110,6 +110,7 @@ const lightspeedTranslationDe = createTranslationMessages({
     'conversation.removeFromPinnedChats': 'Lösen',
     'conversation.announcement.userMessage':
       'Nachricht vom Benutzer: {{prompt}}. Nachricht vom Bot wird geladen.',
+    'conversation.announcement.responseStopped': 'Antwort angehalten.',
     'user.loading': '...',
     'tooltip.attach': 'Anhängen',
     'tooltip.send': 'Senden',

workspaces/lightspeed/plugins/lightspeed/src/translations/es.ts

@@ -110,6 +110,7 @@ const lightspeedTranslationEs = createTranslationMessages({
     'conversation.removeFromPinnedChats': 'Quitar fijación',
     'conversation.announcement.userMessage':
       'Mensaje del usuario: {{prompt}}. El mensaje del bot se está cargando.',
+    'conversation.announcement.responseStopped': 'Respuesta detenida.',
     'user.loading': '...',
     'tooltip.attach': 'Adjuntar',
     'tooltip.send': 'Enviar',

workspaces/lightspeed/plugins/lightspeed/src/translations/fr.ts

@@ -122,6 +122,7 @@ const lightspeedTranslationFr = createTranslationMessages({
     'conversation.removeFromPinnedChats': 'Détacher',
     'conversation.announcement.userMessage':
       'Message en provenance de l’utilisateur: {{prompt}}. Message en provenance du Bot en cours de chargement.',
+    'conversation.announcement.responseStopped': 'Réponse arrêtée.',
     'user.guest': 'Invité',
     'user.loading': '...',
     'tooltip.attach': 'Attacher',

workspaces/lightspeed/plugins/lightspeed/src/translations/it.ts

@@ -122,6 +122,7 @@ const lightspeedTranslationIt = createTranslationMessages({
     'conversation.removeFromPinnedChats': 'Sblocca',
     'conversation.announcement.userMessage':
       "Messaggio dall'utente: {{prompt}}. Caricamento in corso del messaggio del bot.",
+    'conversation.announcement.responseStopped': 'Risposta interrotta.',
     'user.guest': 'Ospite',
     'user.loading': '...',
     'tooltip.attach': 'Allega',

workspaces/lightspeed/plugins/lightspeed/src/translations/ja.ts

@@ -120,6 +120,7 @@ const lightspeedTranslationJa = createTranslationMessages({
     'conversation.removeFromPinnedChats': '固定解除',
     'conversation.announcement.userMessage':
       'ユーザーからのメッセージ: {{prompt}}。ボットからのメッセージを読み込んでいます。',
+    'conversation.announcement.responseStopped': '応答を停止しました。',
     'user.guest': 'ゲスト',
     'user.loading': '...',
     'tooltip.attach': '割り当て',

workspaces/lightspeed/plugins/lightspeed/src/translations/ref.ts

@@ -141,6 +141,7 @@ export const lightspeedMessages = {
   'conversation.removeFromPinnedChats': 'Unpin',
   'conversation.announcement.userMessage':
     'Message from User: {{prompt}}. Message from Bot is loading.',
+  'conversation.announcement.responseStopped': 'Response stopped.',
 
   // User states
   'user.guest': 'Guest',