Update app.py

app.py

@@ -89,20 +89,26 @@ Write a detailed and complete research document that fulfills the following user
         {"role": "user", "content": user_message}
     ]
 
-    # Include chat history if provided
     if history:
         messages = history + messages
 
     try:
         for call in range(num_calls):
             try:
-                for response in client.chat_completion(
+                response_stream = client.chat_completion(
                     messages=messages,
                     max_tokens=6000,
                     temperature=temperature,
                     stream=True,
                     top_p=0.8,
-                ):
+                )
+                
+                if response_stream is None:
+                    logging.error(f"API call {call + 1} returned None")
+                    yield "The API returned an empty response. Please try again.", ""
+                    continue
+
+                for response in response_stream:
                     if isinstance(response, dict) and "choices" in response:
                         for choice in response["choices"]:
                             if "delta" in choice and "content" in choice["delta"]:
@@ -110,8 +116,11 @@ Write a detailed and complete research document that fulfills the following user
                                 full_response += chunk
                                 yield full_response, ""
                     else:
-                        logging.error("Unexpected response format or missing attributes in the response object.")
-                        break
+                        logging.error(f"Unexpected response format in API call {call + 1}: {response}")
+                
+                if full_response:
+                    break  # If we got a valid response, exit the loop
+                
             except Exception as e:
                 logging.error(f"Error in API call {call + 1}: {str(e)}")
                 if "422 Client Error" in str(e):
@@ -119,18 +128,20 @@ Write a detailed and complete research document that fulfills the following user
                     # You might want to adjust parameters here, e.g., reduce max_tokens
                 yield f"An error occurred during API call {call + 1}. Retrying...", ""
             
-            # Add a small delay between API calls
-            await asyncio.sleep(1)  # 1 second delay
+            await asyncio.sleep(1)  # 1 second delay between calls
 
     except asyncio.CancelledError:
         logging.warning("The operation was cancelled.")
         yield "The operation was cancelled. Please try again.", ""
+    except Exception as e:
+        logging.error(f"Unexpected error in get_response_with_search: {str(e)}")
+        yield f"An unexpected error occurred: {str(e)}", ""
 
     if not full_response:
         logging.warning("No response generated from the model")
-        yield "No response generated from the model.", ""
-
-    yield f"{full_response}\n\nSources:\n{source_list_str}", ""
+        yield "No response generated from the model. Please try again.", ""
+    else:
+        yield f"{full_response}\n\nSources:\n{source_list_str}", ""
 
 async def respond(message, system_prompt, history, model, temperature, num_calls, use_embeddings):
     logging.info(f"User Query: {message}")
@@ -166,10 +177,14 @@ async def respond(message, system_prompt, history, model, temperature, num_calls
             num_calls=num_calls, 
             temperature=temperature
         ):
-            # Yield only the new content
-            new_content = main_content[len(full_response):]
-            full_response = main_content
-            yield new_content
+            if "error" in main_content.lower() or "no response" in main_content.lower():
+                # If it's an error message, yield it as is
+                yield main_content
+            else:
+                # Otherwise, yield only the new content
+                new_content = main_content[len(full_response):]
+                full_response = main_content
+                yield new_content
 
         # Yield the sources as a separate message
         if sources: