ngpt 3.3.0__tar.gz → 3.4.1__tar.gz

{ngpt-3.3.0 → ngpt-3.4.1}/.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.3.0 → ngpt-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.3.0
+Version: 3.4.1
 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/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.3.0 → ngpt-3.4.1}/ngpt/cli/args.py

@@ -79,14 +79,19 @@ def setup_argument_parser():
                       help='Set filepath to log conversation to, or create a temporary log file if no path provided')
     global_group.add_argument('--preprompt', 
                       help='Set custom system prompt to control AI behavior')
-    global_group.add_argument('--no-stream', action='store_true',
-                      help='Return the whole response without streaming')
-    global_group.add_argument('--prettify', action='store_const', const='auto',
-                      help='Render markdown responses and code with syntax highlighting and formatting')
-    global_group.add_argument('--stream-prettify', action='store_true',
-                      help='Enable streaming with markdown rendering (automatically uses Rich renderer)')
+    
+    # Output display options (mutually exclusive group)
+    output_group = parser.add_argument_group('Output Display Options (mutually exclusive)')
+    output_exclusive_group = output_group.add_mutually_exclusive_group()
+    output_exclusive_group.add_argument('--no-stream', action='store_true',
+                      help='Return the whole response without streaming or formatting')
+    output_exclusive_group.add_argument('--prettify', action='store_const', const='auto',
+                      help='Render complete response with markdown and code formatting (non-streaming)')
+    output_exclusive_group.add_argument('--stream-prettify', action='store_true', default=True,
+                      help='Stream response with real-time markdown rendering (default)')
+    
     global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
-                      help='Select which markdown renderer to use with --prettify (auto, rich, or glow)')
+                      help='Select which markdown renderer to use with --prettify or --stream-prettify (auto, rich, or glow)')
     
     # GitCommit message options
     gitcommsg_group = parser.add_argument_group('Git Commit Message Options')
@@ -134,9 +139,29 @@ def validate_args(args):
     if args.all and not args.show_config:
         raise ValueError("--all can only be used with --show-config")
     
-    # Check if --prettify is used with --stream-prettify (conflict)
-    if args.prettify and args.stream_prettify:
-        raise ValueError("--prettify and --stream-prettify cannot be used together. Choose one option.")
+    # These three options are mutually exclusive rendering modes
+    provided_modes = []
+    if '--no-stream' in sys.argv:
+        provided_modes.append('--no-stream')
+    if '--prettify' in sys.argv:
+        provided_modes.append('--prettify')
+    if '--stream-prettify' in sys.argv:
+        provided_modes.append('--stream-prettify')
+    
+    # If more than one rendering mode explicitly provided, raise error
+    if len(provided_modes) > 1:
+        raise ValueError(f"The options {', '.join(provided_modes)} cannot be used together. These options are mutually exclusive.")
+    
+    # Handle the conflict between default stream-prettify and explicitly provided options
+    if args.no_stream:
+        args.stream_prettify = False
+        args.prettify = False
+    elif args.prettify:
+        args.stream_prettify = False
+        args.no_stream = False
+    elif args.stream_prettify:
+        args.no_stream = False
+        args.prettify = False
     
     # Check if --stream-prettify is used but Rich is not available
     if args.stream_prettify and not has_markdown_renderer('rich'):

{ngpt-3.3.0 → ngpt-3.4.1}/ngpt/utils/cli_config.py

@@ -15,7 +15,7 @@ CLI_CONFIG_OPTIONS = {
     "preprompt": {"type": "str", "default": None, "context": ["all"]},
     "no-stream": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["prettify", "stream-prettify"]},
     "prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "stream-prettify"]},
-    "stream-prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
+    "stream-prettify": {"type": "bool", "default": True, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
     "renderer": {"type": "str", "default": "auto", "context": ["all"]},
     "config-index": {"type": "int", "default": 0, "context": ["all"], "exclusive": ["provider"]},
     "web-search": {"type": "bool", "default": False, "context": ["all"]},

{ngpt-3.3.0 → ngpt-3.4.1}/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 → ngpt-3.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ngpt"
-version = "3.3.0"
+version = "3.4.1"
 description = "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."
 authors = [
     {name = "nazDridoy", email = "nazdridoy399@gmail.com"},

{ngpt-3.3.0 → ngpt-3.4.1}/uv.lock

@@ -431,7 +431,7 @@ wheels = [
 
 [[package]]
 name = "ngpt"
-version = "3.3.0"
+version = "3.4.1"
 source = { editable = "." }
 dependencies = [
     { name = "duckduckgo-search", version = "7.2.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.9'" },

ngpt-3.3.0/PKGBUILD

@@ -1,24 +0,0 @@
-# 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')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nazdridoy/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('SKIP')  # Automatically updated by CI on release
-
-build() {
-  cd "$pkgname-$pkgver"
-  python -m build --wheel --no-isolation
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  python -m installer --destdir="$pkgdir" dist/*.whl
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
-}