ngpt 3.3.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

ngpt/utils/web_search.py

@@ -11,6 +11,7 @@ from duckduckgo_search import DDGS
 from urllib.parse import urlparse
 import requests
 import sys
+import datetime
 
 # Get actual logger from global context instead of using standard logging
 from . import log
@@ -36,7 +37,7 @@ def get_logger():
             def debug(self, msg): pass
         return DefaultLogger()
 
-def perform_web_search(query: str, max_results: int = 3) -> List[Dict[str, Any]]:
+def perform_web_search(query: str, max_results: int = 5) -> List[Dict[str, Any]]:
     """
     Search the web using DuckDuckGo and return relevant results.
     
@@ -211,10 +212,13 @@ def get_web_search_results(query: str, max_results: int = 3, max_chars_per_resul
             logger.info(f"Successfully retrieved content from all {success_count} sources")
     else:
         logger.error("No search results were found")
+    
+    # Add current timestamp
+    current_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             
     return {
         'query': query,
-        'timestamp': 'current_time',  # Could replace with actual timestamp
+        'timestamp': current_time,
         'results': enhanced_results
     }
 
@@ -230,8 +234,9 @@ def format_web_search_results_for_prompt(search_results: Dict[str, Any]) -> str:
     """
     query = search_results['query']
     results = search_results['results']
+    timestamp = search_results['timestamp']
     
-    formatted_text = f"[Web Search Results for: {query}]\n\n"
+    formatted_text = f"[Web Search Results for: {query} (searched at {timestamp})]\n\n"
     
     for i, result in enumerate(results, 1):
         formatted_text += f"RESULT {i}: {result['title']}\n"
@@ -239,11 +244,27 @@ def format_web_search_results_for_prompt(search_results: Dict[str, Any]) -> str:
         formatted_text += f"CONTENT:\n{result['content']}\n\n"
     
     formatted_text += f"[End of Web Search Results]\n\n"
-    formatted_text += "Consider the above information when answering the following question:\n\n"
+    formatted_text += "Use the above web search information to help answer the user's question. When using this information:\n"
+    formatted_text += "1. Use numbered citations in square brackets [1], [2], etc. when presenting information from search results\n"
+    formatted_text += "2. Include a numbered reference list at the end of your response with the source URLs\n"
+    formatted_text += "3. Format citations like 'According to [1]...' or 'Research indicates [2]...' or add citations at the end of sentences or paragraphs\n"
+    formatted_text += "4. If search results contain conflicting information, acknowledge the differences and explain them with citations\n"
+    formatted_text += "5. If the search results don't provide sufficient information, acknowledge the limitations\n"
+    formatted_text += "6. Balance information from multiple sources when appropriate\n"
+    formatted_text += "7. YOU MUST include an empty blockquote line ('>') between each reference in the reference list\n"
+    formatted_text += "8. YOU MUST include ALL available references (between 2-7 sources) in your reference list\n\n"
+    formatted_text += "Example citation format in text:\n"
+    formatted_text += "Today is Thursday [1] and it's expected to rain tomorrow [2].\n\n"
+    formatted_text += "Example reference format (YOU MUST FOLLOW THIS EXACT FORMAT WITH EMPTY LINES BETWEEN REFERENCES):\n"
+    formatted_text += "> [0] https://example.com/date\n"
+    formatted_text += ">\n"
+    formatted_text += "> [1] https://weather.com/forecast\n"
+    formatted_text += ">\n"
+    formatted_text += "> [2] https://www.timeanddate.com\n\n"
     
     return formatted_text
 
-def enhance_prompt_with_web_search(prompt: str, max_results: int = 3, logger=None) -> str:
+def enhance_prompt_with_web_search(prompt: str, max_results: int = 5, logger=None) -> str:
     """
     Enhance a prompt with web search results.
     

{ngpt-3.3.0.dist-info → ngpt-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.3.0
+Version: 3.4.0
 Summary: Swiss army knife for LLMs: powerful CLI, interactive chatbot, and flexible Python library. Works with OpenAI, Ollama, Groq, Claude, Gemini, and any OpenAI-compatible API.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-3.3.0.dist-info → ngpt-3.4.0.dist-info}/RECORD

@@ -20,9 +20,9 @@ ngpt/utils/__init__.py,sha256=qu_66I1Vtav2f1LDiPn5J3DUsbK7o1CSScMcTkYqxoM,1179
 ngpt/utils/cli_config.py,sha256=IlHnOEEGpLoGZInynM778wgpxLVcJ_STKWxg2Ypvir4,11196
 ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
-ngpt/utils/web_search.py,sha256=DXjf5zJW4jXbmpir6Oqv7abfrFxjqJqvnuAA9gJIFJk,9919
-ngpt-3.3.0.dist-info/METADATA,sha256=1gGlQ6gzQwnnB8wfdmzcwlf3DRV9JNup7HgfXsSRo2Y,29100
-ngpt-3.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.3.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.3.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.3.0.dist-info/RECORD,,
+ngpt/utils/web_search.py,sha256=xHfAymkVkx5b7rOITee2smxpH7waRUpaX8aqTf5WBeA,11599
+ngpt-3.4.0.dist-info/METADATA,sha256=1xkrTK7mKFEVilhnLdkNqsRmuczpphjRCgSD8t89Gp8,29100
+ngpt-3.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.4.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.4.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.4.0.dist-info/RECORD,,