Merge pull request #1002 from ManishMadan2882/main

Better Error handling on /stream endpoint

application/api/answer/routes.py

@@ -9,13 +9,11 @@ import traceback
 from pymongo import MongoClient
 from bson.objectid import ObjectId
 
-
 from application.core.settings import settings
 from application.llm.llm_creator import LLMCreator
 from application.retriever.retriever_creator import RetrieverCreator
 from application.error import bad_request
 
-
 logger = logging.getLogger(__name__)
 
 mongo = MongoClient(settings.MONGO_URI)
@@ -75,8 +73,10 @@ def run_async_chain(chain, question, chat_history):
 
 def get_data_from_api_key(api_key):
     data = api_key_collection.find_one({"key": api_key})
+    
+    # # Raise custom exception if the API key is not found
     if data is None:
-        return bad_request(401, "Invalid API key")
+        raise Exception("Invalid API Key, please generate new key", 401)
     return data
 
 
@@ -173,6 +173,7 @@ def get_prompt(prompt_id):
 
 def complete_stream(question, retriever, conversation_id, user_api_key):
 
+    try:
         response_full = ""
         source_log_docs = []
         answer = retriever.gen()
@@ -196,10 +197,15 @@ def complete_stream(question, retriever, conversation_id, user_api_key):
         yield f"data: {data}\n\n"
         data = json.dumps({"type": "end"})
         yield f"data: {data}\n\n"
-
+    except Exception as e:
+        data = json.dumps({"type": "error","error":"Please try again later. We apologize for any inconvenience.",
+          "error_exception": str(e)})
+        yield f"data: {data}\n\n"
+        return 
 
 @answer.route("/stream", methods=["POST"])
 def stream():
+   try:
     data = request.get_json()
     # get parameter from url question
     question = data["question"]
@@ -274,6 +280,28 @@ def stream():
         mimetype="text/event-stream",
     )
     
+   except ValueError:
+       message = "Malformed request body"
+       return Response(
+        error_stream_generate(message),
+        status=400,
+        mimetype="text/event-stream",
+    )
+   except Exception as e:
+        print("err",str(e))
+        message = e.args[0]
+        status_code = 400
+        # # Custom exceptions with two arguments, index 1 as status code
+        if(len(e.args) >= 2):
+            status_code = e.args[1]
+        return Response(
+        error_stream_generate(message),
+        status=status_code,
+        mimetype="text/event-stream",
+    )
+def error_stream_generate(err_response):
+            data = json.dumps({"type": "error", "error":err_response})
+            yield f"data: {data}\n\n"
 
 @answer.route("/api/answer", methods=["POST"])
 def api_answer():

application/api/user/routes.py

@@ -257,8 +257,8 @@ def combined_json():
         }
     ]
     # structure: name, language, version, description, fullName, date, docLink
-    # append data from vectors_collection
-    for index in vectors_collection.find({"user": user}):
+    # append data from vectors_collection in sorted order in descending order of date
+    for index in vectors_collection.find({"user": user}).sort("date", -1):
         data.append(
             {
                 "name": index["name"],

frontend/src/conversation/conversationSlice.ts

@@ -68,6 +68,15 @@ export const fetchAnswer = createAsyncThunk<Answer, { question: string }>(
                   query: { conversationId: data.id },
                 }),
               );
+            } else if (data.type === 'error') {
+              // set status to 'failed'
+              dispatch(conversationSlice.actions.setStatus('failed'));
+              dispatch(
+                conversationSlice.actions.raiseError({
+                  index: state.conversation.queries.length - 1,
+                  message: data.error,
+                }),
+              );
             } else {
               const result = data.answer;
               dispatch(
@@ -191,6 +200,13 @@ export const conversationSlice = createSlice({
     setStatus(state, action: PayloadAction<Status>) {
       state.status = action.payload;
     },
+    raiseError(
+      state,
+      action: PayloadAction<{ index: number; message: string }>,
+    ) {
+      const { index, message } = action.payload;
+      state.queries[index].error = message;
+    },
   },
   extraReducers(builder) {
     builder
@@ -204,7 +220,7 @@ export const conversationSlice = createSlice({
         }
         state.status = 'failed';
         state.queries[state.queries.length - 1].error =
-          'Something went wrong. Please try again later.';
+          'Something went wrong. Please check your internet connection.';
       });
   },
 });