Merge pull request #13 from RonasIT/veliseev/is-generating-flag-fixes

Fix is response generating flag

Author: veliseev93

libs/mobile/chat/features/chat/src/lib/components/messages-list/component.tsx

@@ -11,9 +11,11 @@ import { useSetSelectedModel } from '@open-webui-react-native/mobile/shared/feat
 import { View, AppFlashList } from '@open-webui-react-native/mobile/shared/ui/ui-kit';
 import { ChatScreenParams } from '@open-webui-react-native/mobile/shared/utils/navigation';
 import {
+  Chat,
   chatApi,
   History as ChatHistory,
   Message,
+  patchChatQueryData,
   prepareCompleteChatPayload,
 } from '@open-webui-react-native/shared/data-access/api';
 import { Role } from '@open-webui-react-native/shared/data-access/common';
@@ -131,6 +133,18 @@ export default function ChatMessagesList({
   const handleContinueResponsePress = (messageId: string): void => {
     if (!modelId) return;
 
+    patchChatQueryData(chatId, {
+      chat: {
+        history: {
+          messages: {
+            [messageId]: {
+              done: false,
+            },
+          },
+        },
+      } as Chat,
+    });
+
     const completePayload = prepareCompleteChatPayload({
       chatId,
       messages,
@@ -146,7 +160,11 @@ export default function ChatMessagesList({
       const message = history?.messages[item.id];
       if (!message) return null;
 
-      const isLast = item.id === history?.lastAssistantMessage?.id;
+      const lastAssistantMessageInUIList = [...messages]
+        .reverse()
+        .find((m) => history?.messages[m.id]?.role === Role.ASSISTANT);
+
+      const isLast = item.id === lastAssistantMessageInUIList?.id;
 
       return item.role === Role.ASSISTANT ? (
         <AiMessageActions

libs/shared/data-access/api/src/lib/chats/api.ts

@@ -111,6 +111,7 @@ function useGet(
 
       return result;
     },
+    staleTime: 5000, //NOTE Needs to avoid simultaneous requests for the same chat
     ...options,
   });
 

libs/shared/data-access/api/src/lib/chats/utils/patch-chat-message-with-completion.ts

@@ -17,7 +17,7 @@ export function patchChatMessagesWithCompletion(
   const { chat } = oldData;
   const { messages, history } = chat;
 
-  const lastMessage = messages[messages.length - 1];
+  const lastMessage = history.messages[history.currentId];
   if (lastMessage.role !== Role.ASSISTANT) return oldData;
 
   const updatedLastMessage: Message = {

libs/shared/data-access/api/src/lib/chats/utils/patch-get-chat-query.ts

@@ -9,6 +9,6 @@ export const patchChatQueryData = (chatId: string, partialData: Partial<ChatResp
       return undefined;
     }
 
-    return merge({}, draft, partialData);
+    return new ChatResponse(merge(draft, partialData));
   });
 };