ngpt 3.2.0__tar.gz → 3.4.0__tar.gz

{ngpt-3.2.0 → ngpt-3.4.0}/.github/workflows/aur-publish.yml

@@ -10,6 +10,10 @@ on:
         description: 'Package version (leave empty to use current pyproject.toml version)'
         required: false
         default: ''
+      pkgrel:
+        description: 'Package release number (leave empty to keep current pkgrel)'
+        required: false
+        default: ''
 
 jobs:
   publish-aur:
@@ -40,6 +44,13 @@ jobs:
           
           # Update version in PKGBUILD
           sed -i "s/^pkgver=.*/pkgver=$VERSION/" PKGBUILD
+          
+          # Update pkgrel if provided
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ github.event.inputs.pkgrel }}" ]]; then
+            PKGREL="${{ github.event.inputs.pkgrel }}"
+            echo "Updating package release to: $PKGREL"
+            sed -i "s/^pkgrel=.*/pkgrel=$PKGREL/" PKGBUILD
+          fi
 
       - name: Publish AUR package
         uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
@@ -52,7 +63,7 @@ jobs:
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "${{ github.event_name == 'workflow_dispatch' && 'Manual update to version' || 'Update to version' }} ${{ steps.extract_version.outputs.version }}"
+          commit_message: "${{ github.event_name == 'workflow_dispatch' && 'Manual update to version' || 'Update to version' }} ${{ steps.extract_version.outputs.version }}${{ github.event.inputs.pkgrel && format(' with pkgrel={0}', github.event.inputs.pkgrel) || '' }}"
           ssh_keyscan_types: rsa,ecdsa,ed25519
           updpkgsums: true  # Let the action update checksums automatically
           test: false  # Disable testing since the environment doesn't have necessary tools

{ngpt-3.2.0 → ngpt-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.2.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
@@ -28,10 +28,12 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
+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
 Requires-Dist: rich>=10.0.0
+Requires-Dist: trafilatura>=1.6.0
 Description-Content-Type: text/markdown
 
 # nGPT
@@ -63,7 +65,7 @@ Description-Content-Type: text/markdown
 - 🔄 **API Flexibility**: Works with OpenAI, Ollama, Groq, Claude, Gemini, and any compatible endpoint
 - 💬 **Interactive Chat**: Continuous conversation with memory in modern UI
 - 📊 **Streaming Responses**: Real-time output for better user experience
-- 🔍 **Web Search**: Integrated with compatible API endpoints
+- 🔍 **Web Search**: Enhance any model with contextual information from the web
 - 📥 **Stdin Processing**: Process piped content by using `{}` placeholder in prompts
 - 🎨 **Markdown Rendering**: Beautiful formatting of markdown and code with syntax highlighting
 - ⚡ **Real-time Markdown**: Stream responses with live updating syntax highlighting and formatting
@@ -271,7 +273,7 @@ ngpt --list-models --provider Gemini
 # With custom options
 ngpt --api-key your-key --base-url http://your-endpoint --model your-model "Hello"
 
-# Enable web search (if your API endpoint supports it)
+# Enable web search capability to enhance prompts with web information
 ngpt --web-search "What's the latest news about AI?"
 
 # Generate and execute shell commands (using -s or --shell flag)

ngpt-3.4.0/PKGBUILD

@@ -0,0 +1,66 @@
+# Maintainer: nazdridoy <nazdridoy399@gmail.com>
+pkgname=ngpt
+pkgver=0.0.0  # Automatically updated by CI on release
+pkgrel=1
+pkgdesc="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."
+arch=('any')
+url="https://github.com/nazdridoy/ngpt"
+license=('MIT')
+depends=('python' 'python-requests>=2.31.0' 'python-rich>=10.0.0' 'python-prompt_toolkit>=3.0.0' 'python-pyperclip>=1.8.0')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-hatchling' 'python-pip')
+options=(!debug)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nazdridoy/${pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('SKIP')  # Automatically updated by CI on release
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  # Install dependencies using pip since they're not in main Arch repos
+  mkdir -p vendor
+  pip install --target=vendor duckduckgo-search>=3.0.0 trafilatura>=1.6.0
+  
+  # Add an __init__.py file to modify sys.path to include our bundled dependencies
+  cat > ngpt/bundled_deps.py << 'EOF'
+import os
+import sys
+
+def setup_bundled_deps():
+    # Add the bundled dependencies to the path
+    bundled_path = os.path.join(os.path.dirname(__file__), 'vendor')
+    if os.path.exists(bundled_path) and bundled_path not in sys.path:
+        sys.path.insert(0, bundled_path)
+EOF
+
+  # Modify __init__.py to include the bundled deps setup
+  # First check if it already imports bundled_deps
+  if ! grep -q "bundled_deps" ngpt/__init__.py; then
+    # Make a backup of the original file
+    cp ngpt/__init__.py ngpt/__init__.py.bak
+    
+    # Add the import at the top of the file
+    echo 'from .bundled_deps import setup_bundled_deps' > ngpt/__init__.py.new
+    echo 'setup_bundled_deps()' >> ngpt/__init__.py.new
+    cat ngpt/__init__.py.bak >> ngpt/__init__.py.new
+    mv ngpt/__init__.py.new ngpt/__init__.py
+  fi
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  python -m build --wheel --no-isolation
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  
+  # Install the bundled dependencies in the ngpt package directory
+  if [ -d "vendor" ]; then
+    # Get the ngpt package directory
+    ngpt_pkg_dir=$(python -c "import site; print(site.getsitepackages()[0])")/ngpt
+    mkdir -p "$pkgdir$ngpt_pkg_dir/vendor"
+    cp -r vendor/* "$pkgdir$ngpt_pkg_dir/vendor/"
+  fi
+  
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+}

{ngpt-3.2.0 → ngpt-3.4.0}/README.md

@@ -27,7 +27,7 @@
 - 🔄 **API Flexibility**: Works with OpenAI, Ollama, Groq, Claude, Gemini, and any compatible endpoint
 - 💬 **Interactive Chat**: Continuous conversation with memory in modern UI
 - 📊 **Streaming Responses**: Real-time output for better user experience
-- 🔍 **Web Search**: Integrated with compatible API endpoints
+- 🔍 **Web Search**: Enhance any model with contextual information from the web
 - 📥 **Stdin Processing**: Process piped content by using `{}` placeholder in prompts
 - 🎨 **Markdown Rendering**: Beautiful formatting of markdown and code with syntax highlighting
 - ⚡ **Real-time Markdown**: Stream responses with live updating syntax highlighting and formatting
@@ -235,7 +235,7 @@ ngpt --list-models --provider Gemini
 # With custom options
 ngpt --api-key your-key --base-url http://your-endpoint --model your-model "Hello"
 
-# Enable web search (if your API endpoint supports it)
+# Enable web search capability to enhance prompts with web information
 ngpt --web-search "What's the latest news about AI?"
 
 # Generate and execute shell commands (using -s or --shell flag)

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/args.py

@@ -68,7 +68,7 @@ def setup_argument_parser():
     global_group.add_argument('--model', 
                               help='Model to use')
     global_group.add_argument('--web-search', action='store_true', 
-                      help='Enable web search capability (Note: Your API endpoint must support this feature)')
+                      help='Enable web search capability using DuckDuckGo to enhance prompts with relevant information')
     global_group.add_argument('--temperature', type=float, default=0.7,
                       help='Set temperature (controls randomness, default: 0.7)')
     global_group.add_argument('--top_p', type=float, default=1.0,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/interactive.py

@@ -6,6 +6,7 @@ import sys
 import time
 from .formatters import COLORS
 from .renderers import prettify_markdown, prettify_streaming_markdown
+from ..utils import enhance_prompt_with_web_search
 
 # Optional imports for enhanced UI
 try:
@@ -64,6 +65,10 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
     if logger:
         print(f"{COLORS['green']}Logging conversation to: {logger.get_log_path()}{COLORS['reset']}")
     
+    # Display a note about web search if enabled
+    if web_search:
+        print(f"{COLORS['green']}Web search capability is enabled.{COLORS['reset']}")
+    
     # Display a note about markdown rendering only once at the beginning
     if prettify and not no_stream and not stream_prettify:
         print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
@@ -188,6 +193,28 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             # Log user message if logging is enabled
             if logger:
                 logger.log("user", user_input)
+                
+            # Enhance prompt with web search if enabled
+            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']}")
+                    
+                    # Update the user message in conversation with enhanced prompt
+                    for i in range(len(conversation) - 1, -1, -1):
+                        if conversation[i]["role"] == "user" and conversation[i]["content"] == user_input:
+                            conversation[i]["content"] = enhanced_prompt
+                            break
+                    
+                    # Log the enhanced prompt if logging is enabled
+                    if logger:
+                        # Use "web_search" role instead of "system" for clearer logs
+                        logger.log("web_search", enhanced_prompt.replace(user_input, "").strip())
+                except Exception as e:
+                    print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
+                    # Continue with the original prompt if web search fails
             
             # Print assistant indicator with formatting - but only if we're not going to show a rich formatted box
             # With Rich prettify, no header should be printed as the Rich panel already includes it
@@ -271,10 +298,9 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             
             # Get AI response with conversation history
             response = client.chat(
-                prompt=user_input,
+                prompt=enhanced_prompt,
                 messages=conversation,
                 stream=should_stream,
-                web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
                 max_tokens=max_tokens,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/modes/chat.py

@@ -1,6 +1,7 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
 from ..ui import spinner
+from ...utils import enhance_prompt_with_web_search
 import sys
 import threading
 
@@ -53,6 +54,21 @@ def chat_mode(client, args, logger=None):
     # Log the user message if logging is enabled
     if logger:
         logger.log("user", prompt)
+    
+    # Enhance prompt with web search if enabled
+    if args.web_search:
+        try:
+            original_prompt = prompt
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            print("Enhanced input with web search results.")
+            
+            # Log the enhanced prompt if logging is enabled
+            if logger:
+                # Use "web_search" role instead of "system" for clearer logs
+                logger.log("web_search", prompt.replace(original_prompt, "").strip())
+        except Exception as e:
+            print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
+            # Continue with the original prompt if web search fails
         
     # Create messages array with preprompt if available
     messages = None
@@ -123,7 +139,7 @@ def chat_mode(client, args, logger=None):
     if args.stream_prettify and live_display:
         stream_callback = spinner_handling_callback
     
-    response = client.chat(prompt, stream=should_stream, web_search=args.web_search,
+    response = client.chat(prompt, stream=should_stream,
                        temperature=args.temperature, top_p=args.top_p,
                        max_tokens=args.max_tokens, messages=messages,
                        markdown_format=args.prettify or args.stream_prettify,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/modes/code.py

@@ -1,6 +1,7 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown, has_markdown_renderer, show_available_renderers
 from ..ui import spinner
+from ...utils import enhance_prompt_with_web_search
 import sys
 import threading
 
@@ -25,6 +26,21 @@ def code_mode(client, args, logger=None):
     # Log the user prompt if logging is enabled
     if logger:
         logger.log("user", prompt)
+    
+    # Enhance prompt with web search if enabled
+    if args.web_search:
+        try:
+            original_prompt = prompt
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            print("Enhanced input with web search results.")
+            
+            # Log the enhanced prompt if logging is enabled
+            if logger:
+                # Use "web_search" role instead of "system" for clearer logs
+                logger.log("web_search", prompt.replace(original_prompt, "").strip())
+        except Exception as e:
+            print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
+            # Continue with the original prompt if web search fails
 
     # Setup for streaming and prettify logic
     stream_callback = None
@@ -110,8 +126,7 @@ def code_mode(client, args, logger=None):
         
     generated_code = client.generate_code(
         prompt=prompt, 
-        language=args.language, 
-        web_search=args.web_search,
+        language=args.language,
         temperature=args.temperature, 
         top_p=args.top_p,
         max_tokens=args.max_tokens,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/modes/rewrite.py

@@ -5,6 +5,7 @@ import time
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
 from ..ui import get_multiline_input, spinner
+from ...utils import enhance_prompt_with_web_search
 
 # System prompt for rewriting text
 REWRITE_SYSTEM_PROMPT = """You are an expert text editor and rewriter. Your task is to rewrite the user's text to improve readability and flow while carefully preserving the original meaning, tone, and style.
@@ -125,6 +126,21 @@ def rewrite_mode(client, args, logger=None):
         print(f"{COLORS['yellow']}Error: Empty input. Please provide text to rewrite.{COLORS['reset']}")
         return
     
+    # Enhance input with web search if enabled
+    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.")
+            
+            # Log the enhanced input if logging is enabled
+            if logger:
+                # Use "web_search" role instead of "system" for clearer logs
+                logger.log("web_search", input_text.replace(original_text, "").strip())
+        except Exception as e:
+            print(f"{COLORS['yellow']}Warning: Failed to enhance input with web search: {str(e)}{COLORS['reset']}")
+            # Continue with the original input if web search fails
+    
     # Set up messages array with system prompt and user content
     messages = [
         {"role": "system", "content": REWRITE_SYSTEM_PROMPT},
@@ -195,7 +211,6 @@ def rewrite_mode(client, args, logger=None):
     response = client.chat(
         prompt=None,  # Not used when messages are provided
         stream=should_stream, 
-        web_search=args.web_search,
         temperature=args.temperature, 
         top_p=args.top_p,
         max_tokens=args.max_tokens, 

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/modes/shell.py

@@ -1,5 +1,6 @@
 from ..formatters import COLORS
 from ..ui import spinner
+from ...utils import enhance_prompt_with_web_search
 import subprocess
 import sys
 import threading
@@ -26,6 +27,21 @@ def shell_mode(client, args, logger=None):
     if logger:
         logger.log("user", prompt)
     
+    # Enhance prompt with web search if enabled
+    if args.web_search:
+        try:
+            original_prompt = prompt
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            print("Enhanced input with web search results.")
+            
+            # Log the enhanced prompt if logging is enabled
+            if logger:
+                # Use "web_search" role instead of "system" for clearer logs
+                logger.log("web_search", prompt.replace(original_prompt, "").strip())
+        except Exception as e:
+            print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
+            # Continue with the original prompt if web search fails
+    
     # Start spinner while waiting for command generation
     stop_spinner = threading.Event()
     spinner_thread = threading.Thread(
@@ -37,9 +53,9 @@ def shell_mode(client, args, logger=None):
     spinner_thread.start()
     
     try:
-        command = client.generate_shell_command(prompt, web_search=args.web_search, 
-                                            temperature=args.temperature, top_p=args.top_p,
-                                            max_tokens=args.max_tokens)
+        command = client.generate_shell_command(prompt,
+                                           temperature=args.temperature, top_p=args.top_p,
+                                           max_tokens=args.max_tokens)
     finally:
         # Stop the spinner
         stop_spinner.set()

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/cli/modes/text.py

@@ -1,6 +1,7 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
 from ..ui import get_multiline_input, spinner
+from ...utils import enhance_prompt_with_web_search
 import threading
 import sys
 
@@ -25,6 +26,21 @@ def text_mode(client, args, logger=None):
     if logger:
         logger.log("user", prompt)
     
+    # Enhance prompt with web search if enabled
+    if args.web_search:
+        try:
+            original_prompt = prompt
+            prompt = enhance_prompt_with_web_search(prompt, logger=logger)
+            print("Enhanced input with web search results.")
+            
+            # Log the enhanced prompt if logging is enabled
+            if logger:
+                # Use "web_search" role instead of "system" for clearer logs
+                logger.log("web_search", prompt.replace(original_prompt, "").strip())
+        except Exception as e:
+            print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
+            # Continue with the original prompt if web search fails
+    
     # Create messages array with preprompt if available
     messages = None
     if args.preprompt:
@@ -94,7 +110,7 @@ def text_mode(client, args, logger=None):
     if args.stream_prettify and live_display:
         stream_callback = spinner_handling_callback
     
-    response = client.chat(prompt, stream=should_stream, web_search=args.web_search,
+    response = client.chat(prompt, stream=should_stream,
                        temperature=args.temperature, top_p=args.top_p,
                        max_tokens=args.max_tokens, messages=messages,
                        markdown_format=args.prettify or args.stream_prettify,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/client.py

@@ -32,7 +32,6 @@ class NGPTClient:
         max_tokens: Optional[int] = None,
         top_p: float = 1.0,
         messages: Optional[List[Dict[str, str]]] = None,
-        web_search: bool = False,
         markdown_format: bool = False,
         stream_callback: Optional[callable] = None,
         **kwargs
@@ -47,7 +46,6 @@ class NGPTClient:
             max_tokens: Maximum number of tokens to generate
             top_p: Controls diversity via nucleus sampling
             messages: Optional list of message objects to override default behavior
-            web_search: Whether to enable web search capability
             markdown_format: If True, allow markdown-formatted responses, otherwise plain text
             stream_callback: Optional callback function for streaming mode updates
             **kwargs: Additional arguments to pass to the API
@@ -75,10 +73,6 @@ class NGPTClient:
             "top_p": top_p,
         }
         
-        # Conditionally add web_search
-        if web_search:
-            payload["web_search"] = True
-        
         # Add max_tokens if provided
         if max_tokens is not None:
             payload["max_tokens"] = max_tokens
@@ -180,7 +174,6 @@ class NGPTClient:
     def generate_shell_command(
         self, 
         prompt: str, 
-        web_search: bool = False,
         temperature: float = 0.4,
         top_p: float = 0.95,
         max_tokens: Optional[int] = None
@@ -190,7 +183,6 @@ class NGPTClient:
         
         Args:
             prompt: Description of the command to generate
-            web_search: Whether to enable web search capability
             temperature: Controls randomness in the response
             top_p: Controls diversity via nucleus sampling
             max_tokens: Maximum number of tokens to generate
@@ -241,7 +233,6 @@ Command:"""
                 prompt=prompt,
                 stream=False,
                 messages=messages,
-                web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
                 max_tokens=max_tokens
@@ -254,7 +245,6 @@ Command:"""
         self, 
         prompt: str, 
         language: str = "python", 
-        web_search: bool = False,
         temperature: float = 0.4,
         top_p: float = 0.95,
         max_tokens: Optional[int] = None,
@@ -268,7 +258,6 @@ Command:"""
         Args:
             prompt: Description of the code to generate
             language: Programming language to generate code in
-            web_search: Whether to enable web search capability
             temperature: Controls randomness in the response
             top_p: Controls diversity via nucleus sampling
             max_tokens: Maximum number of tokens to generate
@@ -315,7 +304,6 @@ Code:"""
                 prompt=prompt,
                 stream=stream,
                 messages=messages,
-                web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
                 max_tokens=max_tokens,

{ngpt-3.2.0 → ngpt-3.4.0}/ngpt/utils/__init__.py

@@ -22,6 +22,11 @@ from .cli_config import (
     get_cli_config_dir,
     get_cli_config_path
 )
+from .web_search import (
+    enhance_prompt_with_web_search,
+    get_web_search_results,
+    format_web_search_results_for_prompt
+)
 
 __all__ = [
     "create_logger", "Logger",
@@ -29,5 +34,6 @@ __all__ = [
     "add_config_entry", "remove_config_entry", "DEFAULT_CONFIG", "DEFAULT_CONFIG_ENTRY",
     "load_cli_config", "set_cli_config_option", "get_cli_config_option", 
     "unset_cli_config_option", "apply_cli_config", "list_cli_config_options",
-    "CLI_CONFIG_OPTIONS", "get_cli_config_dir", "get_cli_config_path"
+    "CLI_CONFIG_OPTIONS", "get_cli_config_dir", "get_cli_config_path",
+    "enhance_prompt_with_web_search", "get_web_search_results", "format_web_search_results_for_prompt"
 ]