Update app.py

app.py

@@ -15,7 +15,6 @@ from langchain_core.documents import Document
 from huggingface_hub import InferenceClient
 import inspect
 import logging
-from gradio.exceptions import CancelledError
 
 
 # Set up basic configuration for logging
@@ -159,7 +158,11 @@ def generate_chunked_response(prompt, model, max_tokens=1000, num_calls=1, tempe
                             continue
                 print(f"Cloudflare API call {i+1} completed")
             except Exception as e:
-                print(f"Error in generating response from Cloudflare: {str(e)}")
+                if "cancelled" in str(e).lower():
+                    print("Generation cancelled")
+                    return
+                else:
+                    print(f"Error in generating response from Cloudflare: {str(e)}")
     else:
         # Original Hugging Face API logic
         client = InferenceClient(model, token=huggingface_token)
@@ -185,7 +188,11 @@ def generate_chunked_response(prompt, model, max_tokens=1000, num_calls=1, tempe
                         yield full_response
                 print(f"Hugging Face API call {i+1} completed")
             except Exception as e:
-                print(f"Error in generating response from Hugging Face: {str(e)}")
+                if "cancelled" in str(e).lower():
+                    print("Generation cancelled")
+                    return
+                else:
+                    print(f"Error in generating response from Hugging Face: {str(e)}")
     
     # Clean up the response
     clean_response = re.sub(r'<s>\[INST\].*?\[/INST\]\s*', '', full_response, flags=re.DOTALL)
@@ -261,12 +268,14 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
             for partial_response in get_response_from_pdf(message, model, selected_docs, num_calls=num_calls, temperature=temperature):
                 history[-1] = (message, partial_response)
                 yield history
-    except CancelledError:
-        yield history
     except Exception as e:
-        logging.error(f"Unexpected error in respond: {str(e)}")
-        history[-1] = (message, f"An unexpected error occurred: {str(e)}")
-        yield history
+        if "cancelled" in str(e).lower():
+            # This is likely a cancellation, so we'll just return the current history
+            yield history
+        else:
+            logging.error(f"Unexpected error in respond: {str(e)}")
+            history[-1] = (message, f"An unexpected error occurred: {str(e)}")
+            yield history
 
 logging.basicConfig(level=logging.DEBUG)