Update app.py

app.py

@@ -346,19 +346,13 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
                 yield "No documents available. Please upload PDF documents to answer questions."
                 return
             
-            if model == "@cf/meta/llama-3.1-8b-instruct":
-                # Use Cloudflare API
-                for partial_response in get_response_from_cloudflare(prompt="", context=context_str, query=message, num_calls=num_calls, temperature=temperature, search_type="pdf"):
-                    first_line = partial_response.split('\n')[0] if partial_response else ''
-                    logging.info(f"Generated Response (first line): {first_line}")
-                    yield partial_response
-            elif model in ["gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b"]:
+            if model in ["gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b"]:
                 # Use DuckDuckGo Chat API
                 logging.info(f"Calling DuckDuckGo Chat API with model: {model}")
                 response = chat(message, model=model, timeout=30)
                 yield response
             else:
-                # Use Hugging Face API
+                # Use Hugging Face API or Cloudflare API
                 for partial_response in get_response_from_pdf(message, model, selected_docs, num_calls=num_calls, temperature=temperature):
                     first_line = partial_response.split('\n')[0] if partial_response else ''
                     logging.info(f"Generated Response (first line): {first_line}")
@@ -372,12 +366,14 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
         else:
             yield f"An error occurred with the {model} model: {str(e)}. Please try again or select a different model."
 
-def chat(self, keywords: str, model: str = "gpt-4o-mini", timeout: int = 30) -> str:
+from duckduckgo_search import DDGS
+
+def chat(keywords: str, model: str, timeout: int = 30) -> str:
     """Initiates a chat session with DuckDuckGo AI.
 
     Args:
         keywords (str): The initial message or question to send to the AI.
-        model (str): The model to use: "gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b". Defaults to "gpt-4o-mini".
+        model (str): The model to use: "gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b".
         timeout (int): Timeout value for the HTTP client. Defaults to 30.
 
     Returns:
@@ -385,36 +381,13 @@ def chat(self, keywords: str, model: str = "gpt-4o-mini", timeout: int = 30) ->
     """
     logging.info(f"Calling DuckDuckGo Chat API with model: {model}")
 
-    if model == "gpt-4o-mini":
-        url = "https://api.duckduckgo.com/api/d2a/v1/chat/gpt-4o-mini"
-    elif model == "claude-3-haiku":
-        url = "https://api.duckduckgo.com/api/d2a/v1/chat/claude-3-haiku"
-    elif model == "llama-3.1-70b":
-        url = "https://api.duckduckgo.com/api/d2a/v1/chat/llama-3.1-70b"
-    elif model == "mixtral-8x7b":
-        url = "https://api.duckduckgo.com/api/d2a/v1/chat/mixtral-8x7b"
-    else:
-        raise ValueError(f"Invalid model: {model}")
-
-    payload = {"keywords": keywords}
-    headers = {
-        "Content-Type": "application/json",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
-    }
-
     try:
-        logging.info(f"Sending request to DuckDuckGo Chat API: {url}")
-        response = requests.post(url, json=payload, headers=headers, timeout=timeout)
-        logging.info(f"DuckDuckGo Chat API response status code: {response.status_code}")
-        response.raise_for_status()
-        logging.info(f"DuckDuckGo Chat API response: {response.json()}")
-        return response.json()["response"]
-    except requests.exceptions.RequestException as e:
+        with DDGS() as ddgs:
+            return ddgs.chat(keywords, model=model, timeout=timeout)
+    except Exception as e:
         logging.error(f"Error in DuckDuckGo chat: {str(e)}")
         return "Error in DuckDuckGo chat. Please try again later."
 
-logging.basicConfig(level=logging.DEBUG)
-
 def get_response_from_cloudflare(prompt, context, query, num_calls=3, temperature=0.2, search_type="pdf"):
     headers = {
         "Authorization": f"Bearer {API_TOKEN}",