ngpt 3.5.0__py3-none-any.whl → 3.5.2__py3-none-any.whl

ngpt/cli/modes/chat.py

@@ -59,8 +59,31 @@ def chat_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
-            print("Enhanced input with web search results.")
+            
+            # Start spinner for web search
+            stop_spinner = threading.Event()
+            spinner_thread = threading.Thread(
+                target=spinner, 
+                args=("Searching the web for information...",), 
+                kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+            )
+            spinner_thread.daemon = True
+            spinner_thread.start()
+            
+            try:
+                prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+                # Stop the spinner
+                stop_spinner.set()
+                spinner_thread.join()
+                # Clear the spinner line completely
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+                print("Enhanced input with web search results.")
+            except Exception as e:
+                # Stop the spinner before re-raising
+                stop_spinner.set()
+                spinner_thread.join()
+                raise e
             
             # Log the enhanced prompt if logging is enabled
             if logger:

ngpt/cli/modes/code.py

@@ -105,8 +105,31 @@ def code_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
-            print("Enhanced input with web search results.")
+            
+            # Start spinner for web search
+            stop_spinner = threading.Event()
+            spinner_thread = threading.Thread(
+                target=spinner, 
+                args=("Searching the web for information...",), 
+                kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+            )
+            spinner_thread.daemon = True
+            spinner_thread.start()
+            
+            try:
+                prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
+                # Stop the spinner
+                stop_spinner.set()
+                spinner_thread.join()
+                # Clear the spinner line completely
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+                print("Enhanced input with web search results.")
+            except Exception as e:
+                # Stop the spinner before re-raising
+                stop_spinner.set()
+                spinner_thread.join()
+                raise e
             
             # Log the enhanced prompt if logging is enabled
             if logger:

ngpt/cli/modes/interactive.py

@@ -6,6 +6,7 @@ import sys
 import time
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
+from ..ui import spinner
 from ...utils import enhance_prompt_with_web_search
 
 # Optional imports for enhanced UI
@@ -198,9 +199,30 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             enhanced_prompt = user_input
             if web_search:
                 try:
-                    print(f"{COLORS['cyan']}Searching the web...{COLORS['reset']}")
-                    enhanced_prompt = enhance_prompt_with_web_search(user_input, logger=logger)
-                    print(f"{COLORS['green']}Enhanced input with web search results.{COLORS['reset']}")
+                    # Start spinner for web search
+                    stop_spinner = threading.Event()
+                    spinner_thread = threading.Thread(
+                        target=spinner, 
+                        args=("Searching the web for information...",), 
+                        kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+                    )
+                    spinner_thread.daemon = True
+                    spinner_thread.start()
+                    
+                    try:
+                        enhanced_prompt = enhance_prompt_with_web_search(user_input, logger=logger)
+                        # Stop the spinner
+                        stop_spinner.set()
+                        spinner_thread.join()
+                        # Clear the spinner line completely
+                        sys.stdout.write("\r" + " " * shutil.get_terminal_size().columns + "\r")
+                        sys.stdout.flush()
+                        print(f"{COLORS['green']}Enhanced input with web search results.{COLORS['reset']}")
+                    except Exception as e:
+                        # Stop the spinner before re-raising
+                        stop_spinner.set()
+                        spinner_thread.join()
+                        raise e
                     
                     # Update the user message in conversation with enhanced prompt
                     for i in range(len(conversation) - 1, -1, -1):

ngpt/cli/modes/rewrite.py

@@ -130,8 +130,31 @@ def rewrite_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_text = input_text
-            input_text = enhance_prompt_with_web_search(input_text, logger=logger)
-            print("Enhanced input with web search results.")
+            
+            # Start spinner for web search
+            stop_spinner = threading.Event()
+            spinner_thread = threading.Thread(
+                target=spinner, 
+                args=("Searching the web for information...",), 
+                kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+            )
+            spinner_thread.daemon = True
+            spinner_thread.start()
+            
+            try:
+                input_text = enhance_prompt_with_web_search(input_text, logger=logger)
+                # Stop the spinner
+                stop_spinner.set()
+                spinner_thread.join()
+                # Clear the spinner line completely
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+                print("Enhanced input with web search results.")
+            except Exception as e:
+                # Stop the spinner before re-raising
+                stop_spinner.set()
+                spinner_thread.join()
+                raise e
             
             # Log the enhanced input if logging is enabled
             if logger:

ngpt/cli/modes/shell.py

@@ -60,8 +60,31 @@ def shell_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
-            print("Enhanced input with web search results.")
+            
+            # Start spinner for web search
+            stop_spinner = threading.Event()
+            spinner_thread = threading.Thread(
+                target=spinner, 
+                args=("Searching the web for information...",), 
+                kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+            )
+            spinner_thread.daemon = True
+            spinner_thread.start()
+            
+            try:
+                prompt = enhance_prompt_with_web_search(prompt, logger=logger, disable_citations=True)
+                # Stop the spinner
+                stop_spinner.set()
+                spinner_thread.join()
+                # Clear the spinner line completely
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+                print("Enhanced input with web search results.")
+            except Exception as e:
+                # Stop the spinner before re-raising
+                stop_spinner.set()
+                spinner_thread.join()
+                raise e
             
             # Log the enhanced prompt if logging is enabled
             if logger:

ngpt/cli/modes/text.py

@@ -30,8 +30,31 @@ def text_mode(client, args, logger=None):
     if args.web_search:
         try:
             original_prompt = prompt
-            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
-            print("Enhanced input with web search results.")
+            
+            # Start spinner for web search
+            stop_spinner = threading.Event()
+            spinner_thread = threading.Thread(
+                target=spinner, 
+                args=("Searching the web for information...",), 
+                kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+            )
+            spinner_thread.daemon = True
+            spinner_thread.start()
+            
+            try:
+                prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+                # Stop the spinner
+                stop_spinner.set()
+                spinner_thread.join()
+                # Clear the spinner line completely
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+                print("Enhanced input with web search results.")
+            except Exception as e:
+                # Stop the spinner before re-raising
+                stop_spinner.set()
+                spinner_thread.join()
+                raise e
             
             # Log the enhanced prompt if logging is enabled
             if logger:

ngpt/utils/web_search.py

@@ -1,5 +1,5 @@
 """
-Web search utilities for nGPT using duckduckgo-search and BeautifulSoup4.
+Web search utilities for nGPT using BeautifulSoup4.
 
 This module provides functionality to search the web and extract
 information from search results to enhance AI prompts.
@@ -7,8 +7,7 @@ information from search results to enhance AI prompts.
 
 import re
 from typing import List, Dict, Any, Optional
-from duckduckgo_search import DDGS
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 import requests
 import sys
 import datetime
@@ -32,17 +31,17 @@ def get_logger():
     if _logger is not None:
         return _logger
     else:
-        # Default logging to stderr if no logger provided, but only for errors
+        # Default logging behavior - suppress all messages to console
         class DefaultLogger:
             def info(self, msg): pass  # Suppress INFO messages
-            def error(self, msg): print(f"ERROR: {msg}", file=sys.stderr)
+            def error(self, msg): pass  # Suppress ERROR messages instead of printing to stderr
             def warning(self, msg): pass  # Suppress WARNING messages
             def debug(self, msg): pass
         return DefaultLogger()
 
 def perform_web_search(query: str, max_results: int = 5) -> List[Dict[str, Any]]:
     """
-    Search the web using DuckDuckGo and return relevant results.
+    Search DuckDuckGo directly and return relevant results.
     
     Args:
         query: The search query
@@ -53,8 +52,48 @@ def perform_web_search(query: str, max_results: int = 5) -> List[Dict[str, Any]]
     """
     logger = get_logger()
     try:
-        ddgs = DDGS()
-        results = list(ddgs.text(query, max_results=max_results))
+        # Headers to mimic a browser request
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+        }
+        
+        # DuckDuckGo search URL
+        encoded_query = requests.utils.quote(query)
+        url = f"https://html.duckduckgo.com/html/?q={encoded_query}"
+        
+        # Fetch search results
+        response = requests.get(url, headers=headers, timeout=10)
+        response.raise_for_status()
+        
+        # Parse HTML response with html.parser (no lxml dependency)
+        soup = BeautifulSoup(response.text, 'html.parser')
+        results = []
+        
+        # Extract search results
+        for result in soup.select('.result')[:max_results]:
+            title_elem = result.select_one('.result__title')
+            snippet_elem = result.select_one('.result__snippet')
+            url_elem = result.select_one('.result__url')
+            
+            # Extract actual URL from DDG's redirect URL if needed
+            href = title_elem.find('a')['href'] if title_elem and title_elem.find('a') else None
+            if href and href.startswith('/'):
+                # Parse DDG redirect URL to get actual URL
+                parsed_url = urlparse(href)
+                query_params = parse_qs(parsed_url.query)
+                actual_url = query_params.get('uddg', [None])[0]
+            else:
+                actual_url = href
+            
+            # Add result to list
+            if title_elem and actual_url:
+                results.append({
+                    'title': title_elem.get_text(strip=True),
+                    'href': actual_url,
+                    'body': snippet_elem.get_text(strip=True) if snippet_elem else ''
+                })
+        
         return results
     except Exception as e:
         logger.error(f"Error performing web search: {str(e)}")
@@ -112,18 +151,15 @@ def extract_article_content(url: str, max_chars: int = 5000) -> Optional[str]:
                         # Default to UTF-8 if we can't detect
                         response.encoding = 'utf-8'
                 
-                # Parse with BeautifulSoup using lxml parser for better results if available
-                try:
-                    soup = BeautifulSoup(response.text, 'lxml')
-                except ImportError:
-                    soup = BeautifulSoup(response.text, 'html.parser')
+                # Parse with BeautifulSoup using html.parser
+                soup = BeautifulSoup(response.text, 'html.parser')
                 
                 # Extract main content using multiple strategies
                 extracted_content = None
                 
                 # ---------- PREPROCESSING ----------
                 # Clone the soup before preprocessing
-                processed_soup = BeautifulSoup(str(soup), 'lxml' if 'lxml' in str(type(soup.parser)) else 'html.parser')
+                processed_soup = BeautifulSoup(str(soup), 'html.parser')
                 
                 # Remove all script, style tags and comments
                 for element in processed_soup.find_all(['script', 'style', 'noscript']):

{ngpt-3.5.0.dist-info → ngpt-3.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.5.0
+Version: 3.5.2
 Summary: Swiss army knife for LLMs: powerful CLI and interactive chatbot in one package. Seamlessly work with OpenAI, Ollama, Groq, Claude, Gemini, or any OpenAI-compatible API to generate code, craft git commits, rewrite text, and execute shell commands.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt
@@ -29,7 +29,6 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4>=4.12.0
-Requires-Dist: duckduckgo-search>=3.0.0
 Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: pyperclip>=1.8.0
 Requires-Dist: requests>=2.31.0
@@ -46,10 +45,10 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-  <a href="https://nazdridoy.github.io/ngpt/installation/"><img src="https://img.shields.io/badge/Linux-support-blue?logo=linux" alt="Linux"></a>
-  <a href="https://nazdridoy.github.io/ngpt/installation/"><img src="https://img.shields.io/badge/Windows-support-blue?logo=windows" alt="Windows"></a>
-  <a href="https://nazdridoy.github.io/ngpt/installation/"><img src="https://img.shields.io/badge/macOS-support-blue?logo=apple" alt="macOS"></a>
-  <a href="https://nazdridoy.github.io/ngpt/installation/"><img src="https://img.shields.io/badge/Android-Termux-blue?logo=android" alt="Android"></a>
+  <a href="https://nazdridoy.github.io/ngpt/installation/#linuxmacos"><img src="https://img.shields.io/badge/Linux-support-blue?logo=linux" alt="Linux"></a>
+  <a href="https://nazdridoy.github.io/ngpt/installation/#windows"><img src="https://img.shields.io/badge/Windows-support-blue?logo=windows" alt="Windows"></a>
+  <a href="https://nazdridoy.github.io/ngpt/installation/#linuxmacos"><img src="https://img.shields.io/badge/macOS-support-blue?logo=apple" alt="macOS"></a>
+  <a href="https://nazdridoy.github.io/ngpt/installation/#android-termux"><img src="https://img.shields.io/badge/Android-Termux-blue?logo=android" alt="Android"></a>
 </p> 
 
 🤖 nGPT: A Swiss army knife for LLMs: powerful CLI and interactive chatbot in one package. Seamlessly work with OpenAI, Ollama, Groq, Claude, Gemini, or any OpenAI-compatible API to generate code, craft git commits, rewrite text, and execute shell commands. Fast, lightweight, and designed for both casual users and developers.

{ngpt-3.5.0.dist-info → ngpt-3.5.2.dist-info}/RECORD

@@ -9,20 +9,20 @@ ngpt/cli/main.py,sha256=oKX7ryTIrsvQRJHVnH2a763pGyNZthq81wkrRILwHLw,28932
 ngpt/cli/renderers.py,sha256=m71BeUXKynpKKGXFzwRSW1XngvyKiZ_xEsdujUbU0MA,16597
 ngpt/cli/ui.py,sha256=HoHDFpLiwMBP5wtMb8YYo244FMiqiPFRoBNcNGp6N0A,7310
 ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,363
-ngpt/cli/modes/chat.py,sha256=pv8Ec1l3XsHnW1o3iukxmKg3pK4UJeODl8mC73MH0qg,6927
-ngpt/cli/modes/code.py,sha256=ounayP8exu8Bb8QFL4TcyF2d3QI_QlsG5tf6v1FktxE,11470
+ngpt/cli/modes/chat.py,sha256=jfKkrtSkx1gKPsKXDMxZ7BiJiMsCtFHyZCGIdmNQ0fk,7816
+ngpt/cli/modes/code.py,sha256=VYpAHXNLDmrOznTIy4XgQPM7gunSnw3VorvrjPG_1Wg,12359
 ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
-ngpt/cli/modes/interactive.py,sha256=COJABbSgfyVC98lvFD1K2yqKPqyH20vbVrYYh8oiPUk,16395
-ngpt/cli/modes/rewrite.py,sha256=ftD-6M9iQ7g4rLdlKyyLTRiJWYtbz64LIG4PIByxmOk,11472
-ngpt/cli/modes/shell.py,sha256=9oaOvzKc0VZ0Hjervbzo_kryMlYVZH0IXhc0MaBTYVk,8008
-ngpt/cli/modes/text.py,sha256=gdn4opioZ6G3nvfrTkp-dpoD-Of_ZvjVVRggVd6edkg,5528
+ngpt/cli/modes/interactive.py,sha256=TtBrZUX45CVfKOPvkb1ya7dIQhXLILtn7ajmfM9ohso,17419
+ngpt/cli/modes/rewrite.py,sha256=9o37-o5Q8SGfJ91-8pD4h7d5RsJeu85OEdv3nXKzQiA,12361
+ngpt/cli/modes/shell.py,sha256=FaFOzxTxPJCpYsiQJIttS69fZg-asV4LVA5TLaGVN0Y,8897
+ngpt/cli/modes/text.py,sha256=7t5WWXMFxGkBM5HMP4irbN9aQwxE2YgywjiVPep710k,6417
 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=_e78fk-6WDVqHDIaAMP9CDoX4FyOWM9XhdSZcr5KasI,29163
-ngpt-3.5.0.dist-info/METADATA,sha256=BEcmK1bv4EZ_Q6W7MDnDPo304e-_L0zk1bDgH4mmp8Q,23926
-ngpt-3.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.5.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.5.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.5.0.dist-info/RECORD,,
+ngpt/utils/web_search.py,sha256=w5ke4KJMRxq7r5jtbUXvspja6XhjoPZloVkZ0IvBXIE,30731
+ngpt-3.5.2.dist-info/METADATA,sha256=sC8YBnPKWY39E1CMiaYzcxW5JWMWkPOoZ05K8KgspuQ,23931
+ngpt-3.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.5.2.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.5.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.5.2.dist-info/RECORD,,