Update app.py

app.py

@@ -6,6 +6,9 @@ import os
 import logging
 from typing import Dict, List
 from datetime import datetime
+from bs4 import BeautifulSoup
+from serpapi import GoogleSearch
+from newsapi import NewsApiClient
 
 # Set up logging
 logging.basicConfig(
@@ -18,11 +21,51 @@ class RaindropSearchBot:
     def __init__(self):
         self.openai_api_key = os.getenv('openaikey')
         self.raindrop_api_token = os.getenv('raindroptoken')
-        if not self.openai_api_key or not self.raindrop_api_token:
+        self.serpapi_key = os.getenv('serpapikey')
+        self.newsapi_key = os.getenv('newsapikey')
+        
+        if not all([self.openai_api_key, self.raindrop_api_token, self.serpapi_key, self.newsapi_key]):
             raise EnvironmentError(
-                "Missing required environment variables. Please ensure 'openaikey' and 'raindroptoken' are set."
+                "Missing required environment variables. Please ensure all API keys are set."
             )
+        
         self.client = OpenAI(api_key=self.openai_api_key)
+        self.newsapi = NewsApiClient(api_key=self.newsapi_key)
+
+    def get_google_results(self, query: str, num_results: int = 5) -> List[Dict]:
+        """Get Google search results using SerpAPI."""
+        try:
+            params = {
+                "q": query,
+                "num": num_results,
+                "api_key": self.serpapi_key
+            }
+            search = GoogleSearch(params)
+            results = search.get_dict()
+            
+            if 'organic_results' in results:
+                return results['organic_results']
+            return []
+            
+        except Exception as e:
+            logger.error(f"Google search error: {e}")
+            return []
+
+    def get_news_results(self, query: str, num_results: int = 5) -> List[Dict]:
+        """Get news articles using NewsAPI."""
+        try:
+            news_results = self.newsapi.get_everything(
+                q=query,
+                language='en',
+                sort_by='relevancy',
+                page_size=num_results
+            )
+            
+            return news_results.get('articles', [])
+            
+        except Exception as e:
+            logger.error(f"News API error: {e}")
+            return []
 
     def generate_search_query(self, user_request: str) -> str:
         """Convert user request to optimized search terms."""
@@ -105,31 +148,53 @@ class RaindropSearchBot:
             logger.error(f"Search error: {e}")
             return []
 
-    def analyze_results(self, results: List[Dict], user_query: str) -> str:
-        """Generate an analysis of the search results."""
-        if not results:
+    def analyze_results(self, results: List[Dict], google_results: List[Dict], 
+                       news_results: List[Dict], user_query: str) -> str:
+        """Generate an analysis of all search results."""
+        if not any([results, google_results, news_results]):
             return "No relevant results found. Try modifying your search terms."
 
         # Create context for analysis
         context = f"Based on the search query: '{user_query}'\n\n"
-        context += "Analyze these relevant sources:\n\n"
+        context += "Analyze these sources:\n\n"
         
-        for item in results:
-            context += f"Title: {item.get('title', 'No title')}\n"
-            if item.get('excerpt'):
-                context += f"Content: {item['excerpt'][:500]}...\n"
-            context += f"Created: {item.get('created', 'No date')}\n\n"
+        # Add Raindrop results
+        if results:
+            context += "Bookmarked Sources:\n"
+            for item in results:
+                context += f"Title: {item.get('title', 'No title')}\n"
+                if item.get('excerpt'):
+                    context += f"Content: {item['excerpt'][:500]}...\n"
+                context += f"Created: {item.get('created', 'No date')}\n\n"
+
+        # Add Google results
+        if google_results:
+            context += "Web Sources:\n"
+            for item in google_results:
+                context += f"Title: {item.get('title', 'No title')}\n"
+                if item.get('snippet'):
+                    context += f"Content: {item['snippet']}\n\n"
+
+        # Add News results
+        if news_results:
+            context += "News Sources:\n"
+            for item in news_results:
+                context += f"Title: {item.get('title', 'No title')}\n"
+                if item.get('description'):
+                    context += f"Content: {item['description']}\n"
+                context += f"Published: {item.get('publishedAt', 'No date')}\n\n"
 
         try:
             prompt = f"""
-            Based on these search results, provide a comprehensive analysis of {user_query}.
+            Based on all available sources, provide a comprehensive analysis of {user_query}.
             
             Requirements:
-            1. Focus only on information directly related to the query
-            2. Organize the response by key themes or chronologically
+            1. Focus on the most relevant and recent information
+            2. Organize the response by key themes
             3. Include only factual information from the sources
             4. Highlight any significant developments or changes
-            5. Note any gaps in information
+            5. Note any conflicts or differences between sources
+            6. Prioritize official sources and recent developments
             
             Context:
             {context}
@@ -148,28 +213,53 @@ class RaindropSearchBot:
             logger.error(f"Analysis generation error: {e}")
             return "Error generating analysis."
 
-    def format_results(self, results: List[Dict], analysis: str) -> str:
-        """Format the search results with analysis."""
-        if not results:
-            return "No results found. Try modifying your search terms."
-
+    def format_results(self, results: List[Dict], google_results: List[Dict], 
+                      news_results: List[Dict], analysis: str) -> str:
+        """Format all search results with analysis."""
         output = f"{analysis}\n\n"
         output += "-------\n\n"
-        output += "🔍 Source Links:\n\n"
+        
+        # Format Raindrop results
+        if results:
+            output += "🔍 Bookmarked Sources:\n\n"
+            for idx, item in enumerate(results, 1):
+                if item.get('title') or item.get('link'):
+                    output += f"{idx}. {item.get('title', 'No Title')}\n"
+                    if item.get('link'):
+                        output += f"   Link: {item['link']}\n"
+                    if item.get('tags'):
+                        output += f"   Tags: {', '.join(item['tags'])}\n"
+                    if item.get('excerpt'):
+                        output += f"   Description: {item['excerpt'][:200]}...\n"
+                    if item.get('created'):
+                        created_date = item['created'][:10]
+                        output += f"   Created: {created_date}\n"
+                    output += "\n"
 
-        for idx, item in enumerate(results, 1):
-            # Only include if there's at least a title or link
-            if item.get('title') or item.get('link'):
+        # Format Google results
+        if google_results:
+            output += "🌐 Web Sources:\n\n"
+            for idx, item in enumerate(google_results, 1):
                 output += f"{idx}. {item.get('title', 'No Title')}\n"
                 if item.get('link'):
                     output += f"   Link: {item['link']}\n"
-                if item.get('tags'):
-                    output += f"   Tags: {', '.join(item['tags'])}\n"
-                if item.get('excerpt'):
-                    output += f"   Description: {item['excerpt'][:200]}...\n"
-                if item.get('created'):
-                    created_date = item['created'][:10]  # Get just the date part
-                    output += f"   Created: {created_date}\n"
+                if item.get('snippet'):
+                    output += f"   Description: {item['snippet']}\n"
+                output += "\n"
+
+        # Format News results
+        if news_results:
+            output += "📰 Recent News:\n\n"
+            for idx, item in enumerate(news_results, 1):
+                output += f"{idx}. {item.get('title', 'No Title')}\n"
+                if item.get('url'):
+                    output += f"   Link: {item['url']}\n"
+                if item.get('description'):
+                    output += f"   Description: {item['description']}\n"
+                if item.get('publishedAt'):
+                    output += f"   Published: {item['publishedAt'][:10]}\n"
+                if item.get('source', {}).get('name'):
+                    output += f"   Source: {item['source']['name']}\n"
                 output += "\n"
 
         return output
@@ -183,15 +273,20 @@ class RaindropSearchBot:
             search_query = self.generate_search_query(user_request)
             logger.info(f"Using search query: {search_query}")
             
-            # Search Raindrop.io
-            results = self.search_raindrop(search_query)
-            logger.info(f"Found {len(results)} results")
+            # Get results from all sources
+            raindrop_results = self.search_raindrop(search_query)
+            google_results = self.get_google_results(search_query)
+            news_results = self.get_news_results(search_query)
+            
+            logger.info(f"Found {len(raindrop_results)} Raindrop results")
+            logger.info(f"Found {len(google_results)} Google results")
+            logger.info(f"Found {len(news_results)} News results")
             
             # Generate analysis
-            analysis = self.analyze_results(results, user_request)
+            analysis = self.analyze_results(raindrop_results, google_results, news_results, user_request)
             
             # Format and return results
-            return self.format_results(results, analysis)
+            return self.format_results(raindrop_results, google_results, news_results, analysis)
             
         except Exception as e:
             logger.error(f"Error processing request: {e}", exc_info=True)
@@ -205,10 +300,13 @@ def chatbot_interface(user_input: str) -> str:
     return bot.process_request(user_input)
 
 # Define and launch the interface
-with gr.Blocks(title="Raindrop.io Search Assistant", theme=gr.themes.Soft()) as demo:
+with gr.Blocks(title="Enhanced Search Assistant", theme=gr.themes.Soft()) as demo:
     gr.Markdown("""
-    # 🔍 Raindrop.io Search Assistant
-    Enter your search request in natural language, and I'll find and analyze relevant bookmarked information.
+    # 🔍 Enhanced Search Assistant
+    Enter your search request in natural language, and I'll find and analyze information from multiple sources:
+    - Your bookmarked content
+    - Web search results
+    - Recent news articles
     """)
     
     with gr.Row():
@@ -224,7 +322,7 @@ with gr.Blocks(title="Raindrop.io Search Assistant", theme=gr.themes.Soft()) as
     with gr.Row():
         output_text = gr.Textbox(
             label="Analysis and Results",
-            lines=15,
+            lines=20,
             interactive=False
         )