Update app.py

app.py

@@ -117,7 +117,7 @@ class RaindropSearchBot:
             logger.error(f"Error extracting content from {url}: {e}")
             return None
 
-    def get_content_and_summary(self, item: Dict, source_type: str) -> Dict:
+    def get_content_and_summary(self, request: str, item: Dict, source_type: str) -> Dict:
         """Get content and generate summary for a single item."""
         try:
             # Get URL based on source type
@@ -140,16 +140,18 @@ class RaindropSearchBot:
             # Generate summary focused on the query topic
             try:
                 prompt = f"""
-                Analyze this content and provide a detailed summary focusing on key points.
+                Analyze this content and provide a detailed summary focusing on key points related to the user request:
+                {request}
                 
                 Content: {content[:4000]}  # Limit content length for token constraints
                 
                 Requirements:
-                1. Focus on the most important facts and findings
+                1. Focus on the most important facts and findings related to the topic
                 2. Include specific data points and quotes if relevant
                 3. Organize the information logically
                 4. Keep the summary to 2-3 paragraphs
                 5. Highlight any unique insights from this source
+                6. No need to add a conclusion
                 """
 
                 response = self.client.chat.completions.create(
@@ -220,26 +222,26 @@ class RaindropSearchBot:
             logger.error(f"Search error: {e}")
             return []
 
-    def process_all_results(self, raindrop_results: List[Dict], 
+    def process_all_results(self, userquest: Str, raindrop_results: List[Dict], 
                           google_results: List[Dict], 
                           news_results: List[Dict]) -> Tuple[List[Dict], List[Dict], List[Dict]]:
         """Process and enrich all results with content and summaries."""
         
         processed_raindrop = []
         for item in raindrop_results:
-            processed_item = self.get_content_and_summary(item, 'raindrop')
+            processed_item = self.get_content_and_summary(userquest, item, 'raindrop')
             if processed_item.get('detailed_summary'):
                 processed_raindrop.append(processed_item)
 
         processed_google = []
         for item in google_results:
-            processed_item = self.get_content_and_summary(item, 'google')
+            processed_item = self.get_content_and_summary(userquest, item, 'google')
             if processed_item.get('detailed_summary'):
                 processed_google.append(processed_item)
 
         processed_news = []
         for item in news_results:
-            processed_item = self.get_content_and_summary(item, 'news')
+            processed_item = self.get_content_and_summary(userquest, item, 'news')
             if processed_item.get('detailed_summary'):
                 processed_news.append(processed_item)
 
@@ -291,7 +293,7 @@ class RaindropSearchBot:
             prompt = f"""
             Create a comprehensive essay-style analysis about: {user_query}
             
-            Use this content as your source material:
+            Use this content as your reference source material:
             {all_content}
     
             Requirements:
@@ -303,7 +305,7 @@ class RaindropSearchBot:
             6. Address any contradictions or gaps
             7. Use markdown formatting for better readability
             
-            Format the response as a proper academic essay with sections.
+            Format the response as a proper academic essay with sections and sources.
             """
     
             response = self.client.chat.completions.create(
@@ -384,15 +386,16 @@ class RaindropSearchBot:
             
             # Generate search query
             search_query = self.generate_search_query(user_request)
+            search_query_adjusted = search_query.replace("match:OR", "OK").replace("match:AND", "AND")
             logger.info(f"Using search query: {search_query}")
             
             # 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)
+            google_results = self.get_google_results(search_query_adjusted)
+            news_results = self.get_news_results(search_query_adjusted)
             
             # Process all results to get content and summaries
-            processed_results = self.process_all_results(
+            processed_results = self.process_all_results(user_request,
                 raindrop_results, google_results, news_results
             )
             
@@ -411,7 +414,7 @@ class RaindropSearchBot:
         logger.info(f"Generating search query for: {user_request}")
         
         prompt = f"""
-        You are a search expert. Create a search query to find relevant documents in raindrop about:
+        You are a search expert. Create a search query to find relevant documents about:
         {user_request}
         
         Guidelines:
@@ -423,10 +426,11 @@ class RaindropSearchBot:
         - use the formatting authorised in raindrop search:
             o use " for exact search (ex: "artificial intelligence")
             o use - to exclude some terms (ex: -math) // Do not exclude terms that are potentially relevant
-            o use match:OR for alternatives (ex: apple banana match:OR)
-            o use parenthesis for combinations ( ex: sugar (banana apple match:OR) match:AND )
-            o use match:AND for inclusion of both cases systematically (ex: apple banana match:AND)
-        Example elaborate request: ("artificial intelligence" AI match:OR) -"machine learning"
+            o use match:OR for alternatives (ex: apple match:OR banana )
+            o use match:AND for inclusion of both cases systematically (ex: apple match:AND banana )
+            o use parenthesis for combinations ( ex: sugar match:AND (banana match:OR apple) )
+
+        Example elaborate request: ("artificial intelligence" match:OR AI) -"machine learning"
         Use your judgement, think step by steps.
         Return only the search query terms.
         """