ngpt 3.4.1__py3-none-any.whl → 3.4.2__py3-none-any.whl

ngpt/cli/modes/code.py

@@ -31,7 +31,7 @@ def code_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
             print("Enhanced input with web search results.")
             
             # Log the enhanced prompt if logging is enabled

ngpt/cli/modes/shell.py

@@ -31,7 +31,7 @@ def shell_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
             print("Enhanced input with web search results.")
             
             # Log the enhanced prompt if logging is enabled

ngpt/utils/web_search.py

@@ -29,11 +29,11 @@ def get_logger():
     if _logger is not None:
         return _logger
     else:
-        # Default logging to stderr if no logger provided
+        # Default logging to stderr if no logger provided, but only for errors
         class DefaultLogger:
-            def info(self, msg): print(f"INFO: {msg}", file=sys.stderr)
+            def info(self, msg): pass  # Suppress INFO messages
             def error(self, msg): print(f"ERROR: {msg}", file=sys.stderr)
-            def warning(self, msg): print(f"WARNING: {msg}", file=sys.stderr)
+            def warning(self, msg): pass  # Suppress WARNING messages
             def debug(self, msg): pass
         return DefaultLogger()
 
@@ -256,15 +256,15 @@ def format_web_search_results_for_prompt(search_results: Dict[str, Any]) -> str:
     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 += "> [1] https://example.com/date\n"
     formatted_text += ">\n"
-    formatted_text += "> [1] https://weather.com/forecast\n"
+    formatted_text += "> [2] https://weather.com/forecast\n"
     formatted_text += ">\n"
-    formatted_text += "> [2] https://www.timeanddate.com\n\n"
+    formatted_text += "> [3] https://www.timeanddate.com\n\n"
     
     return formatted_text
 
-def enhance_prompt_with_web_search(prompt: str, max_results: int = 5, logger=None) -> str:
+def enhance_prompt_with_web_search(prompt: str, max_results: int = 5, logger=None, disable_citations: bool = False) -> str:
     """
     Enhance a prompt with web search results.
     
@@ -272,6 +272,7 @@ def enhance_prompt_with_web_search(prompt: str, max_results: int = 5, logger=Non
         prompt: The original user prompt
         max_results: Maximum number of search results to include
         logger: Optional logger to use
+        disable_citations: If True, disables citation instructions (used for code and shell modes)
         
     Returns:
         Enhanced prompt with web search results prepended
@@ -282,10 +283,28 @@ def enhance_prompt_with_web_search(prompt: str, max_results: int = 5, logger=Non
         
     logger = get_logger()
     search_results = get_web_search_results(prompt, max_results)
-    formatted_results = format_web_search_results_for_prompt(search_results)
+    
+    if disable_citations:
+        # Modified version without citation instructions for code/shell modes
+        query = search_results['query']
+        results = search_results['results']
+        timestamp = search_results['timestamp']
+        
+        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"
+            formatted_text += f"URL: {result['url']}\n"
+            formatted_text += f"CONTENT:\n{result['content']}\n\n"
+        
+        formatted_text += f"[End of Web Search Results]\n\n"
+        formatted_text += "Use the above web search information to help you, but do not include citations or references in your response.\n\n"
+    else:
+        # Standard version with citation instructions
+        formatted_text = format_web_search_results_for_prompt(search_results)
     
     # Combine results with original prompt
-    enhanced_prompt = formatted_results + prompt
+    enhanced_prompt = formatted_text + prompt
     
     logger.info("Enhanced input with web search results")
     return enhanced_prompt 

{ngpt-3.4.1.dist-info → ngpt-3.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.4.1
+Version: 3.4.2
 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.4.1.dist-info → ngpt-3.4.2.dist-info}/RECORD

@@ -11,18 +11,18 @@ ngpt/cli/renderers.py,sha256=m71BeUXKynpKKGXFzwRSW1XngvyKiZ_xEsdujUbU0MA,16597
 ngpt/cli/ui.py,sha256=HoHDFpLiwMBP5wtMb8YYo244FMiqiPFRoBNcNGp6N0A,7310
 ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
 ngpt/cli/modes/chat.py,sha256=UlnZWqvxL_CSyVIDZKGVXNlG-KufDfo05E8-8xTcM_Y,6713
-ngpt/cli/modes/code.py,sha256=4TpIV-EkyXb8d3XJKrsLs9Wxq5P9jC82z94PI2Zck_g,6730
+ngpt/cli/modes/code.py,sha256=Pdyfde_elIyZKp-pcArkRfWMJcucpBCwY2bVAMk5nzc,6754
 ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
 ngpt/cli/modes/rewrite.py,sha256=ftD-6M9iQ7g4rLdlKyyLTRiJWYtbz64LIG4PIByxmOk,11472
-ngpt/cli/modes/shell.py,sha256=fxE9LEEo4arSn5-q_6zxdnUH7RlqifWmk-_kcA76OhM,4070
+ngpt/cli/modes/shell.py,sha256=KPhIfB-fCtyJLa4PJC9ztoKLaRtkNolAAo5-fuGh-eM,4094
 ngpt/cli/modes/text.py,sha256=gdn4opioZ6G3nvfrTkp-dpoD-Of_ZvjVVRggVd6edkg,5528
 ngpt/utils/__init__.py,sha256=qu_66I1Vtav2f1LDiPn5J3DUsbK7o1CSScMcTkYqxoM,1179
 ngpt/utils/cli_config.py,sha256=Ug8cECBTIuzOwkBWidLTfs-OAdOsCMJ2bNa70pOADfw,11195
 ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
-ngpt/utils/web_search.py,sha256=xHfAymkVkx5b7rOITee2smxpH7waRUpaX8aqTf5WBeA,11599
-ngpt-3.4.1.dist-info/METADATA,sha256=z2jPQJa1kWQZmTsYgoEbln4TREkW3YPbwdrU0gqTx40,29100
-ngpt-3.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.4.1.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.4.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.4.1.dist-info/RECORD,,
+ngpt/utils/web_search.py,sha256=yvCUDNhwcIcKZ_hWESFQQ-vB-LKsDDCDT17YFzFcGR4,12598
+ngpt-3.4.2.dist-info/METADATA,sha256=2ulru5egoGUkDG3bHm-gUYD7-wpj-ogt12J9fcBfoCM,29100
+ngpt-3.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.4.2.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.4.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.4.2.dist-info/RECORD,,