fix(chat): Revert: fix chat server error handling (Issue #2914)" (#3163)

epam · Feb 13, 2025 · ee9247b · ee9247b
1 parent e630eb3
commit ee9247b
Showing 1 changed file with 9 additions and 40 deletions.
diff --git a/apps/chat/src/components/Chat/Chat.tsx b/apps/chat/src/components/Chat/Chat.tsx
@@ -40,10 +40,7 @@ import {
   ConversationsSelectors,
 } from '@/src/store/conversations/conversations.reducers';
 import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
-import {
-  ModelsActions,
-  ModelsSelectors,
-} from '@/src/store/models/models.reducers';
+import { ModelsSelectors } from '@/src/store/models/models.reducers';
 import { PublicationSelectors } from '@/src/store/publication/publication.reducers';
 import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 import { UISelectors } from '@/src/store/ui/ui.reducers';
@@ -169,8 +166,8 @@ export const ChatView = memo(() => {
     isReplayRequiresVariables ||
     selectedConversations.some((conv) => conv.messages.length > 0);
 
-  const isNotAllowedModel = useMemo(
-    () =>
+  useLayoutEffect(() => {
+    const isNotAllowedModel =
       isModelsLoaded &&
       (models.length === 0 ||
         selectedConversations.some((conv) => {
@@ -196,11 +193,8 @@ export const ChatView = memo(() => {
               conv.assistantModelId &&
               !modelsMap[conv.assistantModelId])
           );
-        })),
-    [isModelsLoaded, models.length, modelsMap, selectedConversations],
-  );
+        }));
 
-  useLayoutEffect(() => {
     if (isNotAllowedModel) {
       setNotAllowedType(EntityType.Model);
     } else if (
@@ -212,14 +206,7 @@ export const ChatView = memo(() => {
     } else {
       setNotAllowedType(null);
     }
-  }, [
-    selectedConversations,
-    models,
-    isModelsLoaded,
-    addonsMap,
-    modelsMap,
-    isNotAllowedModel,
-  ]);
+  }, [selectedConversations, models, isModelsLoaded, addonsMap, modelsMap]);
 
   const onLikeHandler = useCallback(
     (index: number, conversation: Conversation) => (rate: LikeState) => {
@@ -291,34 +278,16 @@ export const ChatView = memo(() => {
   }, []);
 
   useEffect(() => {
-    if (!mergedMessages.length) {
-      setIsLastMessageError(false);
-      return;
-    }
+    const lastMergedMessages = mergedMessages.length
+      ? mergedMessages[mergedMessages.length - 1]
+      : [];
 
-    const lastMergedMessages = mergedMessages[mergedMessages.length - 1];
     const isErrorInSomeLastMessage = lastMergedMessages.some(
       (mergedStr: [Conversation, Message, number, Message[]]) =>
         !!mergedStr[1].errorMessage,
     );
-
     setIsLastMessageError(isErrorInSomeLastMessage);
-
-    const lastMessage = lastMergedMessages[0]?.[1];
-    if (
-      lastMessage?.errorMessage &&
-      lastMessage.errorMessage.includes('server error') &&
-      !isNotAllowedModel
-    ) {
-      dispatch(ModelsActions.getModels());
-    }
-  }, [
-    dispatch,
-    isModelsLoaded,
-    isNotAllowedModel,
-    mergedMessages,
-    notAllowedType,
-  ]);
+  }, [mergedMessages]);
 
   useEffect(() => {
     const handleResize = () => {