update

app/services/chat_processor.py

@@ -9,6 +9,7 @@ from app.services.environmental_condition import EnvironmentalData
 from app.services.prompts import *
 from app.services.vector_database_search import VectorDatabaseSearch
 import re
+
 vectordb = VectorDatabaseSearch()
 
 class ChatProcessor:
@@ -22,7 +23,6 @@ class ChatProcessor:
         city = self.user_city if self.user_city else ''
         self.environment_data = EnvironmentalData(city)
         self.web_searcher = WebSearch(num_results=num_results, max_images=num_images)
-        self.web_search_required = True
 
     def extract_keywords_yake(self, text: str, language: str, max_ngram_size: int = 2, num_keywords: int = 4) -> list:
         lang_code = "en"
@@ -58,210 +58,31 @@ class ChatProcessor:
             name = profile['name']
             age = profile['age']
             self.chat_session.load_chat_history()
-            self.chat_session.update_title(self.session_id,query)
+            self.chat_session.update_title(self.session_id, query)
             history = self.chat_session.format_history()
 
-            history_based_prompt = HISTORY_BASED_PROMPT.format(history=history,query= query)
-
+            history_based_prompt = HISTORY_BASED_PROMPT.format(history=history, query=query)
             enhanced_query = Model().send_message_openrouter(history_based_prompt)
 
             self.session_id = self.ensure_valid_session(title=enhanced_query)
             permission = self.chat_session.get_user_preferences()
-            websearch_enabled  = permission.get('websearch', False)
+            websearch_enabled = permission.get('websearch', False)
             env_recommendations = permission.get('environmental_recommendations', False)
             personalized_recommendations = permission.get('personalized_recommendations', False)
             keywords_permission = permission.get('keywords', False)
             reference_permission = permission.get('references', False)
             language = self.chat_session.get_language().lower()
 
-
-            language_prompt = LANGUAGE_RESPONSE_PROMPT.format(language = language)
-
-            if websearch_enabled :
-                with ThreadPoolExecutor(max_workers=2) as executor:
-                    future_web = executor.submit(self.web_searcher.search, enhanced_query)
-                    future_images = executor.submit(self.web_searcher.search_images, enhanced_query)
-                    web_results = future_web.result()
-                    image_results = future_images.result()
-
-                context_parts = []
-                references = []
-
-                for idx, result in enumerate(web_results, 1):
-                    if result['text']:
-                        context_parts.append(f"From Source {idx}: {result['text']}\n")
-                        references.append(result['link'])
-
-                context = "\n".join(context_parts)
-
-                if env_recommendations and personalized_recommendations:
-                    prompt = ENVIRONMENTAL_PERSONALIZED_PROMPT.format(
-                        user_name=name,
-                        user_age=age,
-                        history=history,
-                        user_details=self.chat_session.get_personalized_recommendation(),
-                        environmental_condition=self.environment_data.get_environmental_data(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                elif personalized_recommendations:
-                    prompt = PERSONALIZED_PROMPT.format(
-                        user_name=name,
-                        user_age=age,
-                        user_details=self.chat_session.get_personalized_recommendation(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                elif env_recommendations :
-                    prompt = ENVIRONMENTAL_PROMPT.format(
-                        user_name=name,
-                        user_age=age,
-                        environmental_condition=self.environment_data.get_environmental_data(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                else:
-                    prompt = DEFAULT_PROMPT.format(
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-
-                prompt = prompt + language_prompt
-
-                response = Model().llm(prompt,enhanced_query)
-
-                keywords = ""
-
-                if (keywords_permission):
-                    keywords = self.extract_keywords_yake(response, language=language)
-                if (not reference_permission):
-                    references = ""
-
-                chat_data = {
-                    "query": enhanced_query,
-                    "response": response,
-                    "references": references,
-                    "page_no": "",
-                    "keywords": keywords,
-                    "images": image_results,
-                    "context": context,
-                    "timestamp": datetime.now(timezone.utc).isoformat(),
-                    "session_id": self.chat_session.session_id
-                }
-
-                if not self.chat_session.save_chat(chat_data):
-                    raise ValueError("Failed to save chat message")
-                return chat_data
+            language_prompt = LANGUAGE_RESPONSE_PROMPT.format(language=language)
             
+            if websearch_enabled:
+                return self._process_with_websearch(enhanced_query, query, name, age, history, language, 
+                                                 env_recommendations, personalized_recommendations, 
+                                                 keywords_permission, reference_permission, language_prompt)
             else:
-                attach_image = False
-
-                with ThreadPoolExecutor(max_workers=2) as executor:
-                    future_images = executor.submit(self.web_searcher.search_images, enhanced_query)
-                    image_results = future_images.result()
-
-                start_time = datetime.now(timezone.utc)
-
-                results = vectordb.search( query=enhanced_query, top_k=3)
-
-                context_parts = []
-                references = []
-                seen_pages = set() 
-
-                for result in results:
-                    confidence = result['confidence']
-                    if confidence > 60:
-                        context_parts.append(f"Content: {result['content']}")
-                        page = result['page']
-                        if page not in seen_pages:  # Only append if page is not seen
-                            references.append(f"Source: {result['source']}, Page: {page}")
-                            seen_pages.add(page)
-                        attach_image = True 
-
-                context = "\n".join(context_parts)
-
-                if not context or len(context) < 10:
-                    context = "There is no context found unfortunately"
-
-                if env_recommendations  and personalized_recommendations:
-                    prompt = ENVIRONMENTAL_PERSONALIZED_PROMPT.format(
-                        user_name=name,
-                        user_age = age,
-                        history=history,
-                        user_details=self.chat_session.get_personalized_recommendation(),
-                        environmental_condition=self.environment_data.get_environmental_data(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                elif personalized_recommendations:
-                    prompt = PERSONALIZED_PROMPT.format(
-                        user_name=name,
-                        user_age=age,
-                        user_details=self.chat_session.get_personalized_recommendation(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                elif env_recommendations :
-                    prompt = ENVIRONMENTAL_PROMPT.format(
-                        user_name=name,
-                        user_age=age,
-                        environmental_condition=self.environment_data.get_environmental_data(),
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-                else:
-                    prompt = DEFAULT_PROMPT.format(
-                        previous_history=history,
-                        context=context,
-                        current_query=enhanced_query
-                    )
-
-                prompt = prompt + language_prompt
-
-                response = Model().response = Model().llm(prompt,query)
-
-                end_time = datetime.now(timezone.utc)
-
-                keywords = ""
-
-                if (keywords_permission):
-                    keywords = self.extract_keywords_yake(response, language=language)
-                    
-                if (not reference_permission):
-                    references = ""
-
-                if  not attach_image:
-                    image_results = ""
-                    keywords = ""
-
-                chat_data = {
-                    "query": enhanced_query,
-                    "response": response,
-                    "references": references,
-                    "page_no": "",
-                    "keywords": keywords,
-                    "images": image_results,
-                    "context": context,
-                    "timestamp": datetime.now(timezone.utc).isoformat(),
-                    "session_id": self.chat_session.session_id
-                }
-                match = re.search(r'(## Personal Recommendations|## Environmental Considerations)', response)
-                if match:
-                    truncated_response = response[:match.start()].strip()
-                else:
-                    truncated_response = response
-                if not self.chat_session.save_details(session_id=self.session_id , context= context , query= enhanced_query , response=truncated_response , rag_start_time=start_time  , rag_end_time=end_time ):
-                    raise ValueError("Failed to save the RAG details")
-                if not self.chat_session.save_chat(chat_data):
-                    raise ValueError("Failed to save chat message")
-                return chat_data
+                return self._process_with_vectordb(enhanced_query, query, name, age, history, language,
+                                                env_recommendations, personalized_recommendations,
+                                                keywords_permission, reference_permission, language_prompt)
 
         except Exception as e:
             return {
@@ -270,9 +91,189 @@ class ChatProcessor:
                 "response": "Sorry, there was an error processing your request.",
                 "timestamp": datetime.now(timezone.utc).isoformat()
             }
+            
+    def _process_with_websearch(self, enhanced_query, original_query, name, age, history, language,
+                             env_recommendations, personalized_recommendations, 
+                             keywords_permission, reference_permission, language_prompt):
+        with ThreadPoolExecutor(max_workers=2) as executor:
+            future_web = executor.submit(self.web_searcher.search, enhanced_query)
+            future_images = executor.submit(self.web_searcher.search_images, enhanced_query)
+            web_results = future_web.result()
+            image_results = future_images.result()
+
+        context_parts = []
+        references = []
+
+        for idx, result in enumerate(web_results, 1):
+            if result['text']:
+                context_parts.append(f"From Source {idx}: {result['text']}\n")
+                references.append(result['link'])
+
+        context = "\n".join(context_parts)
+
+        if env_recommendations and personalized_recommendations:
+            prompt = ENVIRONMENTAL_PERSONALIZED_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                history=history,
+                user_details=self.chat_session.get_personalized_recommendation(),
+                environmental_condition=self.environment_data.get_environmental_data(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        elif personalized_recommendations:
+            prompt = PERSONALIZED_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                user_details=self.chat_session.get_personalized_recommendation(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        elif env_recommendations:
+            prompt = ENVIRONMENTAL_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                environmental_condition=self.environment_data.get_environmental_data(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        else:
+            prompt = DEFAULT_PROMPT.format(
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+
+        prompt = prompt + language_prompt
+        response = Model().llm(prompt, enhanced_query)
+        keywords = self.extract_keywords_yake(response, language=language) if keywords_permission else ""
+        references = references if reference_permission else ""
+
+        chat_data = {
+            "query": enhanced_query,
+            "response": response,
+            "references": references,
+            "page_no": "",
+            "keywords": keywords,
+            "images": image_results,
+            "context": context,
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "session_id": self.chat_session.session_id
+        }
+
+        if not self.chat_session.save_chat(chat_data):
+            raise ValueError("Failed to save chat message")
+        return chat_data
+        
+    def _process_with_vectordb(self, enhanced_query, original_query, name, age, history, language,
+                            env_recommendations, personalized_recommendations, 
+                            keywords_permission, reference_permission, language_prompt):
+        attach_image = False
+        
+        with ThreadPoolExecutor(max_workers=1) as executor:
+            future_images = executor.submit(self.web_searcher.search_images, enhanced_query)
+            image_results = future_images.result()
+
+        start_time = datetime.now(timezone.utc)
+        results = vectordb.search(query=enhanced_query, top_k=3)
+
+        context_parts = []
+        references = []
+        seen_pages = set()
+
+        for result in results:
+            confidence = result['confidence']
+            if confidence > 60:
+                context_parts.append(f"Content: {result['content']}")
+                page = result['page']
+                if page not in seen_pages:
+                    references.append(f"Source: {result['source']}, Page: {page}")
+                    seen_pages.add(page)
+                attach_image = True
+
+        context = "\n".join(context_parts)
+        if not context or len(context) < 10:
+            context = "There is no context found unfortunately"
+
+        if env_recommendations and personalized_recommendations:
+            prompt = ENVIRONMENTAL_PERSONALIZED_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                history=history,
+                user_details=self.chat_session.get_personalized_recommendation(),
+                environmental_condition=self.environment_data.get_environmental_data(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        elif personalized_recommendations:
+            prompt = PERSONALIZED_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                user_details=self.chat_session.get_personalized_recommendation(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        elif env_recommendations:
+            prompt = ENVIRONMENTAL_PROMPT.format(
+                user_name=name,
+                user_age=age,
+                environmental_condition=self.environment_data.get_environmental_data(),
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+        else:
+            prompt = DEFAULT_PROMPT.format(
+                previous_history=history,
+                context=context,
+                current_query=enhanced_query
+            )
+
+        prompt = prompt + language_prompt
+        response = Model().llm(prompt, original_query)
+        end_time = datetime.now(timezone.utc)
+
+        keywords = self.extract_keywords_yake(response, language=language) if keywords_permission else ""
+        references = references if reference_permission else ""
+        
+        if not attach_image:
+            image_results = ""
+            keywords = ""
+
+        chat_data = {
+            "query": enhanced_query,
+            "response": response,
+            "references": references,
+            "page_no": "",
+            "keywords": keywords,
+            "images": image_results,
+            "context": context,
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "session_id": self.chat_session.session_id
+        }
+        
+        match = re.search(r'(## Personal Recommendations|## Environmental Considerations)', response)
+        truncated_response = response[:match.start()].strip() if match else response
+        
+        if not self.chat_session.save_details(
+            session_id=self.session_id, 
+            context=context, 
+            query=enhanced_query, 
+            response=truncated_response, 
+            rag_start_time=start_time, 
+            rag_end_time=end_time
+        ):
+            raise ValueError("Failed to save the RAG details")
+            
+        if not self.chat_session.save_chat(chat_data):
+            raise ValueError("Failed to save chat message")
+            
+        return chat_data
 
     def web_search(self, query: str) -> Dict[str, Any]:
-        if self.session_id and len(self.session_id) > 5:
-            return self.process_chat(query=query)
-        else:
-            return self.process_chat(query=query)
+        return self.process_chat(query=query)