Update app.py

app.py

@@ -104,98 +104,51 @@ def detect_tools(message):
     return tools
 
 # --- Internet Search Feature ---
-def ddg_search(query, max_results=5): 
-    try: 
-        from duckduckgo_search import DDGS 
-        time.sleep(random.uniform(1, 3)) 
-        with DDGS(headers={"User-Agent": "Mozilla/5.0 (X11; Linux x86_64)"}) as ddgs: 
-            return list(ddgs.text(query, max_results=max_results))
-    except: 
-        return [] 
-
-def bing_search(query, max_results=5): 
-    headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.0"} 
-    try: 
-        url = f"https://www.bing.com/search?q={requests.utils.quote(query)}" 
-        r = requests.get(url, headers=headers, timeout=10) 
-        links = re.findall(r'<a[^>]*href="(https?://[^"]+)"[^>]*h="[^"]*"', r.text) 
-        titles = re.findall(r'<a[^>]*href="https?://[^"]+"[^>]*h="[^"]*"[^>]*>(.*?)</a>', r.text) 
-        results = [] 
-        for i in range(min(max_results, len(links))): 
-            results.append({ 
-                "title": re.sub(r'<[^>]+>', '', titles[i]) if i < len(titles) else "No title", 
-                "href": links[i], 
-                "body": "" 
-            }) 
-        return results 
-    except: 
-        return [] 
-
-def wiki_search(query, max_results=3): 
-    try: 
-        url = "https://en.wikipedia.org/w/api.php" 
-        params = {"action": "query", "list": "search", "srsearch": query, "format": "json", "srlimit": max_results} 
-        r = requests.get(url, params=params, timeout=10) 
-        data = r.json() 
-        return [{"title": i["title"], "href": f"https://en.wikipedia.org/wiki/{i['title'].replace(' ', '_')}", 
-                 "body": i["snippet"].replace('<span class="searchmatch">', '').replace('</span>', '')} 
-                for i in data["query"]["search"]] 
-    except: 
-        return [] 
-
-def web_search(query, max_results=5): 
-    # Try DDG 
-    logger.info(f"🔍 Searching DDG: {query}")
-    ddg = ddg_search(query, max_results) 
-    if ddg: 
-        return {"engine": "DuckDuckGo", "results": ddg} 
-    
-    logger.warning("⚠️ DDG failed, trying Bing in 2s...")
-    time.sleep(2) 
-    # Try Bing 
-    bing = bing_search(query, max_results) 
-    if bing: 
-        return {"engine": "Bing", "results": bing} 
-    
-    logger.warning("⚠️ Bing failed, trying Wikipedia in 2s...")
-    time.sleep(2) 
-    # Try Wikipedia 
-    wiki = wiki_search(query, max_results) 
-    if wiki: 
-        return {"engine": "Wikipedia", "results": wiki} 
-    
-    return {"engine": "Failed", "results": [{"error": "All engines failed"}]} 
-
-def format_results(data): 
-    if not data or not data.get("results") or (isinstance(data["results"][0], dict) and "error" in data["results"][0]): 
-        return "No results found." 
+def web_search(query: str, max_results: int = 5) -> list:
+    """Search the web using DuckDuckGo v7.5.0 syntax. No API key required."""
+    try:
+        from duckduckgo_search import DDGS
+        with DDGS() as ddgs:
+            results = list(ddgs.text(query, max_results=max_results))
+            return results
+    except Exception as e:
+        logger.error(f"Search failed: {str(e)}")
+        return [{"error": f"Search failed: {str(e)}"}]
+
+def format_results(results: list) -> str:
+    """Format search results with markdown citations."""
+    if not results:
+        return "No results found."
+    if isinstance(results[0], dict) and "error" in results[0]:
+        return results[0]["error"]
     
-    out = [f"Source: {data['engine']}\n"] 
-    for i, r in enumerate(data["results"], 1): 
-        title = r.get("title", "No title") 
-        url = r.get("href", r.get("url", "#")) 
-        body = r.get("body", r.get("snippet", ""))[:200] 
-        out.append(f"{i}. [{title}]({url})\n   {body}") 
-    return "\n\n".join(out)
+    formatted = []
+    for i, r in enumerate(results, 1):
+        title = r.get("title", "No title")
+        url = r.get("href", "#")
+        body = r.get("body", "No description")[:300]
+        formatted.append(f"{i}. [{title}]({url})\n   {body}")
+    return "\n\n".join(formatted)
 
 def perform_search(query):
     try:
         # Clean query for better search results
         search_query = query.lower().replace('search for', '').replace('find out about', '').replace('/search', '').strip()
+        logger.info(f"🔍 Searching for: {search_query}")
         
-        search_data = web_search(search_query)
+        results = web_search(search_query)
         
-        if search_data["engine"] != "Failed":
-            logger.info(f"✅ Found {len(search_data['results'])} results via {search_data['engine']}")
-            return search_data, None
+        if results and not (isinstance(results[0], dict) and "error" in results[0]):
+            logger.info(f"✅ Found {len(results)} results")
+            return results, None
         else:
-            error_msg = search_data["results"][0].get("error", "All search engines failed.")
+            error_msg = results[0]["error"] if results and "error" in results[0] else "No results found."
             logger.warning(f"❌ Search failed: {error_msg}")
-            return None, error_msg
+            return [], error_msg
             
     except Exception as e:
         logger.error(f"⚠️ Global Search Error: {str(e)}")
-        return None, str(e)
+        return [], str(e)
 
 # --- Image Generation Feature ---
 @app.route('/api/image', methods=['POST'])