Improve error handling in gui

g4f/gui/client/js/chat.v1.js

@@ -65,7 +65,7 @@ const remove_cancel_button = async () => {
 const ask_gpt = async () => {
     regenerate.classList.add(`regenerate-hidden`);
     messages = await get_messages(window.conversation_id);
-    try {
+
     window.scrollTo(0, 0);
     window.controller = new AbortController();
 
@@ -95,9 +95,7 @@ const ask_gpt = async () => {
 
     message_box.scrollTop = message_box.scrollHeight;
     window.scrollTo(0, 0);
-        await new Promise((r) => setTimeout(r, 1000));
+    try {
-        window.scrollTo(0, 0);
-
         const response = await fetch(`/backend-api/v2/conversation`, {
             method: `POST`,
             signal: window.controller.signal,
@@ -122,8 +120,10 @@ const ask_gpt = async () => {
             }),
         });
 
-        const reader = response.body.getReader();
+        await new Promise((r) => setTimeout(r, 1000));
+        window.scrollTo(0, 0);
 
+        const reader = response.body.getReader();
         while (true) {
             const { value, done } = await reader.read();
             if (done) break;
@@ -142,43 +142,29 @@ const ask_gpt = async () => {
         }
 
         if (text.includes(`G4F_ERROR`)) {
+            console.log("response", text);
             document.getElementById(`gpt_${window.token}`).innerHTML = "An error occured, please try again, if the problem persists, please use a other model or provider";
         }
-
-        add_message(window.conversation_id, "assistant", text);
-
-        message_box.scrollTop = message_box.scrollHeight;
-        await remove_cancel_button();
-        prompt_lock = false;
-
-        await load_conversations(20, 0);
-        window.scrollTo(0, 0);
-    
     } catch (e) {
-
-        message_box.scrollTop = message_box.scrollHeight;
-        await remove_cancel_button();
-        prompt_lock = false;
-
-        await load_conversations(20, 0);
-
         console.log(e);
 
         let cursorDiv = document.getElementById(`cursor`);
         if (cursorDiv) cursorDiv.parentNode.removeChild(cursorDiv);
 
         if (e.name != `AbortError`) {
-            let error_message = `oops ! something went wrong, please try again / reload. [stacktrace in console]`;
+            text = `oops ! something went wrong, please try again / reload. [stacktrace in console]`;
-
+            document.getElementById(`gpt_${window.token}`).innerHTML = text;
-            document.getElementById(`gpt_${window.token}`).innerHTML = error_message;
-            add_message(window.conversation_id, "assistant", error_message);
         } else {
             document.getElementById(`gpt_${window.token}`).innerHTML += ` [aborted]`;
-            add_message(window.conversation_id, "assistant", text + ` [aborted]`);
+            text += ` [aborted]`
         }
-
-        window.scrollTo(0, 0);
     }
+    add_message(window.conversation_id, "assistant", text);
+    message_box.scrollTop = message_box.scrollHeight;
+    await remove_cancel_button();
+    prompt_lock = false;
+    window.scrollTo(0, 0);
+    await load_conversations(20, 0);
     regenerate.classList.remove(`regenerate-hidden`);
 };
 

g4f/gui/server/backend.py

@@ -74,6 +74,7 @@ class Backend_Api:
             provider = g4f.Provider.ProviderUtils.convert.get(provider)
             
         def try_response():
+            try:
                 response = g4f.ChatCompletion.create(
                     model=model,
                     provider=provider,
@@ -81,7 +82,6 @@ class Backend_Api:
                     stream=True,
                     ignore_stream_and_auth=True
                 )
-            try:
                 yield from response
             except Exception as e:
                 print(e)