ngpt 2.9.1__tar.gz → 2.10.0__tar.gz

{ngpt-2.9.1 → ngpt-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.9.1
+Version: 2.10.0
 Summary: A lightweight Python CLI and library for interacting with OpenAI-compatible APIs, supporting both official and self-hosted LLM endpoints.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt
@@ -135,6 +135,7 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 - 🎭 **System Prompts**: Customize model behavior with custom system prompts
 - 📃 **Conversation Logging**: Save your conversations to text files for later reference
 - 🧰 **CLI Components**: Reusable components for building custom AI-powered command-line tools
+- 🔌 **Modular Architecture**: Well-structured codebase with clean separation of concerns
 
 See the [Feature Overview](https://nazdridoy.github.io/ngpt/overview.html) for more details.
 
@@ -292,16 +293,14 @@ nGPT can also be used as a framework to build your own AI-powered command-line t
 
 ```python
 from ngpt import NGPTClient, load_config
-from ngpt.cli.main import interactive_chat_session
+from ngpt.cli.interactive import interactive_chat_session
 from ngpt.cli.renderers import prettify_markdown
-from ngpt.cli.formatters import ColoredHelpFormatter
-import argparse
+from ngpt.cli.args import setup_argument_parser
+import sys
 
 # Create a custom CLI tool with colorized help
-parser = argparse.ArgumentParser(
-    description="Specialized Code Assistant",
-    formatter_class=ColoredHelpFormatter
-)
+parser = setup_argument_parser()
+parser.description = "Specialized Code Assistant"
 parser.add_argument("prompt", nargs="?", help="Code description")
 parser.add_argument("--language", "-l", default="python", help="Programming language")
 parser.add_argument("--interactive", "-i", action="store_true", help="Start interactive mode")
@@ -318,6 +317,9 @@ elif args.prompt:
     # Generate and prettify code
     code = client.generate_code(args.prompt, language=args.language)
     print(prettify_markdown(f"```{args.language}\n{code}\n```"))
+else:
+    parser.print_help()
+    sys.exit(1)
 ```
 
 This allows you to build specialized AI tools like:

{ngpt-2.9.1 → ngpt-2.10.0}/README.md

@@ -100,6 +100,7 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 - 🎭 **System Prompts**: Customize model behavior with custom system prompts
 - 📃 **Conversation Logging**: Save your conversations to text files for later reference
 - 🧰 **CLI Components**: Reusable components for building custom AI-powered command-line tools
+- 🔌 **Modular Architecture**: Well-structured codebase with clean separation of concerns
 
 See the [Feature Overview](https://nazdridoy.github.io/ngpt/overview.html) for more details.
 
@@ -257,16 +258,14 @@ nGPT can also be used as a framework to build your own AI-powered command-line t
 
 ```python
 from ngpt import NGPTClient, load_config
-from ngpt.cli.main import interactive_chat_session
+from ngpt.cli.interactive import interactive_chat_session
 from ngpt.cli.renderers import prettify_markdown
-from ngpt.cli.formatters import ColoredHelpFormatter
-import argparse
+from ngpt.cli.args import setup_argument_parser
+import sys
 
 # Create a custom CLI tool with colorized help
-parser = argparse.ArgumentParser(
-    description="Specialized Code Assistant",
-    formatter_class=ColoredHelpFormatter
-)
+parser = setup_argument_parser()
+parser.description = "Specialized Code Assistant"
 parser.add_argument("prompt", nargs="?", help="Code description")
 parser.add_argument("--language", "-l", default="python", help="Programming language")
 parser.add_argument("--interactive", "-i", action="store_true", help="Start interactive mode")
@@ -283,6 +282,9 @@ elif args.prompt:
     # Generate and prettify code
     code = client.generate_code(args.prompt, language=args.language)
     print(prettify_markdown(f"```{args.language}\n{code}\n```"))
+else:
+    parser.print_help()
+    sys.exit(1)
 ```
 
 This allows you to build specialized AI tools like:

{ngpt-2.9.1 → ngpt-2.10.0}/docs/examples/cli_components.md

@@ -18,19 +18,17 @@ Here's a simple CLI tool that uses nGPT to generate and explain code:
 
 ```python
 #!/usr/bin/env python3
-import argparse
 import sys
 from ngpt import NGPTClient, load_config
-from ngpt.cli.formatters import ColoredHelpFormatter
+from ngpt.cli.args import setup_argument_parser, validate_args
 from ngpt.cli.renderers import prettify_markdown, has_markdown_renderer
 
 def main():
     # Create parser with colorized help
-    parser = argparse.ArgumentParser(
-        description="Simple code generation tool",
-        formatter_class=ColoredHelpFormatter
-    )
+    parser = setup_argument_parser()
     
+    # Customize the parser for our specific needs
+    parser.description = "Simple code generation tool"
     parser.add_argument("prompt", help="Code description")
     parser.add_argument("--language", "-l", default="python", help="Programming language")
     parser.add_argument("--explain", "-e", action="store_true", help="Include explanation")

{ngpt-2.9.1 → ngpt-2.10.0}/docs/usage/cli_framework.md

@@ -10,6 +10,7 @@ nGPT's CLI module has been modularized into several components that you can inco
 - **Markdown Rendering**: Beautiful formatting for markdown with syntax highlighting (`ngpt.cli.renderers`)
 - **Real-time Streaming**: Tools for handling streaming content with live updates (`ngpt.cli.ui`)
 - **CLI Configuration System**: Robust configuration management (`ngpt.cli.main`)
+- **Argument Parsing**: Sophisticated argument parsing and validation (`ngpt.cli.args`)
 - **Terminal Utilities**: Helpers for colorized output and terminal formatting (`ngpt.cli.formatters`)
 - **Mode-specific functionality**: Specialized code, shell, chat and text mode handlers (`ngpt.cli.modes`)
 
@@ -28,6 +29,40 @@ This will install nGPT with all required dependencies, including:
 
 ## Available Components
 
+### Argument Parsing
+
+The `args` module provides utilities for building colorful, sophisticated command-line interfaces:
+
+```python
+from ngpt.cli.args import setup_argument_parser, validate_args, validate_markdown_renderer
+
+# Create and configure the parser
+parser = setup_argument_parser()
+args = parser.parse_args()
+
+# Validate arguments for correctness and compatibility
+try:
+    args = validate_args(args)
+except ValueError as e:
+    print(f"Error: {e}")
+    sys.exit(1)
+    
+# Check if markdown renderer is available
+has_renderer, args = validate_markdown_renderer(args)
+if not has_renderer:
+    print("Warning: No markdown renderer available. Using plain text.")
+```
+
+The argument parsing module provides these key functions:
+
+- `setup_argument_parser()`: Creates a fully configured argument parser with rich formatting
+- `parse_args()`: Parses command-line arguments
+- `validate_args(args)`: Validates parsed arguments for correctness and compatibility
+- `validate_markdown_renderer(args)`: Checks if markdown rendering is available
+- `handle_cli_config_args(args)`: Processes CLI configuration commands
+
+This modular approach makes it easy to create sophisticated CLI tools with consistent behavior.
+
 ### Interactive Chat Session
 
 The `interactive_chat_session` function provides a complete interactive chat experience:

ngpt-2.10.0/ngpt/cli/args.py

@@ -0,0 +1,161 @@
+import argparse
+import sys
+from .. import __version__
+from .formatters import COLORS, ColoredHelpFormatter
+from .renderers import has_markdown_renderer, warn_if_no_markdown_renderer
+
+def setup_argument_parser():
+    """Set up and return a fully configured argument parser for nGPT CLI."""
+    # Colorize description - use a shorter description to avoid line wrapping issues
+    description = f"{COLORS['cyan']}{COLORS['bold']}nGPT{COLORS['reset']} - Interact with AI language models via OpenAI-compatible APIs"
+    
+    # Minimalist, clean epilog design
+    epilog = f"\n{COLORS['yellow']}nGPT {COLORS['bold']}v{__version__}{COLORS['reset']}  •  {COLORS['green']}Docs: {COLORS['bold']}https://nazdridoy.github.io/ngpt/usage/cli_usage.html{COLORS['reset']}"
+    
+    parser = argparse.ArgumentParser(description=description, formatter_class=ColoredHelpFormatter, epilog=epilog)
+    
+    # Add custom error method with color
+    original_error = parser.error
+    def error_with_color(message):
+        parser.print_usage(sys.stderr)
+        parser.exit(2, f"{COLORS['bold']}{COLORS['yellow']}error: {COLORS['reset']}{message}\n")
+    parser.error = error_with_color
+    
+    # Custom version action with color
+    class ColoredVersionAction(argparse.Action):
+        def __call__(self, parser, namespace, values, option_string=None):
+            print(f"{COLORS['green']}{COLORS['bold']}nGPT{COLORS['reset']} version {COLORS['yellow']}{__version__}{COLORS['reset']}")
+            parser.exit()
+    
+    # Version flag
+    parser.add_argument('-v', '--version', action=ColoredVersionAction, nargs=0, help='Show version information and exit')
+    
+    # Config options
+    config_group = parser.add_argument_group('Configuration Options')
+    config_group.add_argument('--config', nargs='?', const=True, help='Path to a custom config file or, if no value provided, enter interactive configuration mode to create a new config')
+    config_group.add_argument('--config-index', type=int, default=0, help='Index of the configuration to use or edit (default: 0)')
+    config_group.add_argument('--provider', help='Provider name to identify the configuration to use')
+    config_group.add_argument('--remove', action='store_true', help='Remove the configuration at the specified index (requires --config and --config-index)')
+    config_group.add_argument('--show-config', action='store_true', help='Show the current configuration(s) and exit')
+    config_group.add_argument('--all', action='store_true', help='Show details for all configurations (requires --show-config)')
+    config_group.add_argument('--list-models', action='store_true', help='List all available models for the current configuration and exit')
+    config_group.add_argument('--list-renderers', action='store_true', help='Show available markdown renderers for use with --prettify')
+    
+    # Global options
+    global_group = parser.add_argument_group('Global Options')
+    global_group.add_argument('--api-key', help='API key for the service')
+    global_group.add_argument('--base-url', help='Base URL for the API')
+    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)')
+    global_group.add_argument('-n', '--no-stream', action='store_true',
+                      help='Return the whole response without streaming')
+    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,
+                      help='Set top_p (controls diversity, default: 1.0)')
+    global_group.add_argument('--max_tokens', type=int, 
+                      help='Set max response length in tokens')
+    global_group.add_argument('--log', metavar='FILE',
+                      help='Set filepath to log conversation to (For interactive modes)')
+    global_group.add_argument('--preprompt', 
+                      help='Set custom system prompt to control AI behavior')
+    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)')
+    global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
+                      help='Select which markdown renderer to use with --prettify (auto, rich, or glow)')
+    
+    # Mode flags (mutually exclusive)
+    mode_group = parser.add_argument_group('Modes (mutually exclusive)')
+    mode_exclusive_group = mode_group.add_mutually_exclusive_group()
+    mode_exclusive_group.add_argument('-i', '--interactive', action='store_true', help='Start an interactive chat session')
+    mode_exclusive_group.add_argument('-s', '--shell', action='store_true', help='Generate and execute shell commands')
+    mode_exclusive_group.add_argument('-c', '--code', action='store_true', help='Generate code')
+    mode_exclusive_group.add_argument('-t', '--text', action='store_true', help='Enter multi-line text input (submit with Ctrl+D)')
+    # Note: --show-config is handled separately and implicitly acts as a mode
+    
+    # Language option for code mode
+    parser.add_argument('--language', default="python", help='Programming language to generate code in (for code mode)')
+    
+    # Prompt argument
+    parser.add_argument('prompt', nargs='?', default=None, help='The prompt to send')
+    
+    # Add CLI configuration command
+    config_group.add_argument('--cli-config', nargs='*', metavar='COMMAND',
+                      help='Manage CLI configuration (set, get, unset, list)')
+    
+    return parser
+
+def parse_args():
+    """Parse command line arguments using the configured parser."""
+    parser = setup_argument_parser()
+    return parser.parse_args()
+
+def validate_args(args):
+    """Validate parsed arguments for correctness and compatibility."""
+    # Validate --all usage
+    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.")
+    
+    # Check if --stream-prettify is used but Rich is not available
+    if args.stream_prettify and not has_markdown_renderer('rich'):
+        raise ValueError("--stream-prettify requires Rich to be installed. Install with: pip install \"ngpt[full]\" or pip install rich")
+    
+    return args
+
+def validate_markdown_renderer(args):
+    """Validate that required markdown renderers are available.
+    
+    Args:
+        args: The parsed command line arguments.
+    
+    Returns:
+        tuple: (has_renderer, args)
+            - has_renderer: Boolean indicating if a renderer is available
+            - args: Potentially modified args with prettify disabled if no renderer is available
+    """
+    has_renderer = True
+    if args.prettify:
+        has_renderer = warn_if_no_markdown_renderer(args.renderer)
+        if not has_renderer:
+            # Set a flag to disable prettify since we already warned the user
+            print(f"{COLORS['yellow']}Continuing without markdown rendering.{COLORS['reset']}")
+            args.prettify = False
+    
+    return has_renderer, args
+
+def handle_cli_config_args(args):
+    """Process CLI configuration arguments and determine command parameters.
+    
+    Args:
+        args: The parsed command line arguments.
+        
+    Returns:
+        tuple: (should_handle, action, option, value)
+            - should_handle: True if --cli-config was specified and should be handled
+            - action: The action to perform (set, get, unset, list, help)
+            - option: The option name (or None)
+            - value: The option value (or None)
+    """
+    if args.cli_config is None:
+        return (False, None, None, None)
+    
+    # Show help if no arguments or "help" argument
+    if len(args.cli_config) == 0 or (len(args.cli_config) > 0 and args.cli_config[0].lower() == "help"):
+        return (True, "help", None, None)
+    
+    action = args.cli_config[0].lower()
+    option = args.cli_config[1] if len(args.cli_config) > 1 else None
+    value = args.cli_config[2] if len(args.cli_config) > 2 else None
+    
+    if action in ("set", "get", "unset", "list", "help"):
+        return (True, action, option, value)
+    else:
+        # Unknown action, show help
+        return (True, "help", None, None) 

{ngpt-2.9.1 → ngpt-2.10.0}/ngpt/cli/main.py

@@ -22,11 +22,13 @@ from .modes.chat import chat_mode
 from .modes.code import code_mode
 from .modes.shell import shell_mode
 from .modes.text import text_mode
+from .args import parse_args, validate_args, handle_cli_config_args, setup_argument_parser, validate_markdown_renderer
 
 def show_cli_config_help():
     """Display help information about CLI configuration."""
     print(f"\n{COLORS['green']}{COLORS['bold']}CLI Configuration Help:{COLORS['reset']}")
     print(f"  {COLORS['cyan']}Command syntax:{COLORS['reset']}")
+    print(f"    {COLORS['yellow']}ngpt --cli-config help{COLORS['reset']}                - Show this help message")
     print(f"    {COLORS['yellow']}ngpt --cli-config set OPTION VALUE{COLORS['reset']}    - Set a default value for OPTION")
     print(f"    {COLORS['yellow']}ngpt --cli-config get OPTION{COLORS['reset']}          - Get the current value of OPTION")
     print(f"    {COLORS['yellow']}ngpt --cli-config get{COLORS['reset']}                 - Show all CLI configuration settings")
@@ -83,16 +85,25 @@ def show_cli_config_help():
     print(f"    {COLORS['yellow']}ngpt --cli-config set language java{COLORS['reset']}        - Set default language to java for code generation")
     print(f"    {COLORS['yellow']}ngpt --cli-config set temperature 0.9{COLORS['reset']}      - Set default temperature to 0.9")
     print(f"    {COLORS['yellow']}ngpt --cli-config set no-stream true{COLORS['reset']}       - Disable streaming by default")
+    print(f"    {COLORS['yellow']}ngpt --cli-config get temperature{COLORS['reset']}          - Check the current temperature setting")
+    print(f"    {COLORS['yellow']}ngpt --cli-config get{COLORS['reset']}                      - Show all current CLI settings")
     print(f"    {COLORS['yellow']}ngpt --cli-config unset language{COLORS['reset']}           - Remove language setting")
     
     print(f"\n  {COLORS['cyan']}Notes:{COLORS['reset']}")
-    print(f"    - CLI configuration is stored in {COLORS['yellow']}~/.config/ngpt/ngpt-cli.conf{COLORS['reset']} (or equivalent for your OS)")
+    print(f"    - CLI configuration is stored in:")
+    print(f"      • Linux: {COLORS['yellow']}~/.config/ngpt/ngpt-cli.conf{COLORS['reset']}")
+    print(f"      • macOS: {COLORS['yellow']}~/Library/Application Support/ngpt/ngpt-cli.conf{COLORS['reset']}")
+    print(f"      • Windows: {COLORS['yellow']}%APPDATA%\\ngpt\\ngpt-cli.conf{COLORS['reset']}")
     print(f"    - Settings are applied based on context (e.g., language only applies to code generation mode)")
     print(f"    - Command-line arguments always override CLI configuration")
     print(f"    - Some options are mutually exclusive and will not be applied together")
 
 def handle_cli_config(action, option=None, value=None):
     """Handle CLI configuration commands."""
+    if action == "help":
+        show_cli_config_help()
+        return
+    
     if action == "list":
         # List all available options
         print(f"{COLORS['green']}{COLORS['bold']}Available CLI configuration options:{COLORS['reset']}")
@@ -161,109 +172,20 @@ def handle_cli_config(action, option=None, value=None):
     show_cli_config_help()
 
 def main():
-    # Colorize description - use a shorter description to avoid line wrapping issues
-    description = f"{COLORS['cyan']}{COLORS['bold']}nGPT{COLORS['reset']} - Interact with AI language models via OpenAI-compatible APIs"
-    
-    # Minimalist, clean epilog design
-    epilog = f"\n{COLORS['yellow']}nGPT {COLORS['bold']}v{__version__}{COLORS['reset']}  •  {COLORS['green']}Docs: {COLORS['bold']}https://nazdridoy.github.io/ngpt/usage/cli_usage.html{COLORS['reset']}"
-    
-    parser = argparse.ArgumentParser(description=description, formatter_class=ColoredHelpFormatter, epilog=epilog)
-    
-    # Add custom error method with color
-    original_error = parser.error
-    def error_with_color(message):
-        parser.print_usage(sys.stderr)
-        parser.exit(2, f"{COLORS['bold']}{COLORS['yellow']}error: {COLORS['reset']}{message}\n")
-    parser.error = error_with_color
-    
-    # Custom version action with color
-    class ColoredVersionAction(argparse.Action):
-        def __call__(self, parser, namespace, values, option_string=None):
-            print(f"{COLORS['green']}{COLORS['bold']}nGPT{COLORS['reset']} version {COLORS['yellow']}{__version__}{COLORS['reset']}")
-            parser.exit()
-    
-    # Version flag
-    parser.add_argument('-v', '--version', action=ColoredVersionAction, nargs=0, help='Show version information and exit')
+    # Parse command line arguments using args.py
+    args = parse_args()
     
-    # Config options
-    config_group = parser.add_argument_group('Configuration Options')
-    config_group.add_argument('--config', nargs='?', const=True, help='Path to a custom config file or, if no value provided, enter interactive configuration mode to create a new config')
-    config_group.add_argument('--config-index', type=int, default=0, help='Index of the configuration to use or edit (default: 0)')
-    config_group.add_argument('--provider', help='Provider name to identify the configuration to use')
-    config_group.add_argument('--remove', action='store_true', help='Remove the configuration at the specified index (requires --config and --config-index)')
-    config_group.add_argument('--show-config', action='store_true', help='Show the current configuration(s) and exit')
-    config_group.add_argument('--all', action='store_true', help='Show details for all configurations (requires --show-config)')
-    config_group.add_argument('--list-models', action='store_true', help='List all available models for the current configuration and exit')
-    config_group.add_argument('--list-renderers', action='store_true', help='Show available markdown renderers for use with --prettify')
-    
-    # Global options
-    global_group = parser.add_argument_group('Global Options')
-    global_group.add_argument('--api-key', help='API key for the service')
-    global_group.add_argument('--base-url', help='Base URL for the API')
-    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)')
-    global_group.add_argument('-n', '--no-stream', action='store_true',
-                      help='Return the whole response without streaming')
-    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,
-                      help='Set top_p (controls diversity, default: 1.0)')
-    global_group.add_argument('--max_tokens', type=int, 
-                      help='Set max response length in tokens')
-    global_group.add_argument('--log', metavar='FILE',
-                      help='Set filepath to log conversation to (For interactive modes)')
-    global_group.add_argument('--preprompt', 
-                      help='Set custom system prompt to control AI behavior')
-    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)')
-    global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
-                      help='Select which markdown renderer to use with --prettify (auto, rich, or glow)')
-    
-    # Mode flags (mutually exclusive)
-    mode_group = parser.add_argument_group('Modes (mutually exclusive)')
-    mode_exclusive_group = mode_group.add_mutually_exclusive_group()
-    mode_exclusive_group.add_argument('-i', '--interactive', action='store_true', help='Start an interactive chat session')
-    mode_exclusive_group.add_argument('-s', '--shell', action='store_true', help='Generate and execute shell commands')
-    mode_exclusive_group.add_argument('-c', '--code', action='store_true', help='Generate code')
-    mode_exclusive_group.add_argument('-t', '--text', action='store_true', help='Enter multi-line text input (submit with Ctrl+D)')
-    # Note: --show-config is handled separately and implicitly acts as a mode
-    
-    # Language option for code mode
-    parser.add_argument('--language', default="python", help='Programming language to generate code in (for code mode)')
-    
-    # Prompt argument
-    parser.add_argument('prompt', nargs='?', default=None, help='The prompt to send')
-    
-    # Add CLI configuration command
-    config_group.add_argument('--cli-config', nargs='*', metavar='COMMAND',
-                      help='Manage CLI configuration (set, get, unset, list)')
-    
-    args = parser.parse_args()
+    try:
+        args = validate_args(args)
+    except ValueError as e:
+        print(f"{COLORS['bold']}{COLORS['yellow']}error: {COLORS['reset']}{str(e)}\n")
+        sys.exit(2)
     
     # Handle CLI configuration command
-    if args.cli_config is not None:
-        # Show help if no arguments or "help" argument
-        if len(args.cli_config) == 0 or (len(args.cli_config) > 0 and args.cli_config[0].lower() == "help"):
-            show_cli_config_help()
-            return
-            
-        action = args.cli_config[0].lower()
-        option = args.cli_config[1] if len(args.cli_config) > 1 else None
-        value = args.cli_config[2] if len(args.cli_config) > 2 else None
-        
-        if action in ("set", "get", "unset", "list"):
-            handle_cli_config(action, option, value)
-            return
-        else:
-            show_cli_config_help()
-            return
-    
-    # Validate --all usage
-    if args.all and not args.show_config:
-        parser.error("--all can only be used with --show-config")
+    should_handle_cli_config, action, option, value = handle_cli_config_args(args)
+    if should_handle_cli_config:
+        handle_cli_config(action, option, value)
+        return
     
     # Handle --renderers flag to show available markdown renderers
     if args.list_renderers:
@@ -283,15 +205,23 @@ def main():
     effective_config_index = args.config_index
     
     # Only apply CLI config for provider/config-index if not explicitly set on command line
-    if not effective_provider and 'provider' in cli_config and '--provider' not in sys.argv:
+    # If --config-index is explicitly provided, we should ignore provider from CLI config
+    config_index_from_cli = '--config-index' in sys.argv
+    provider_from_cli = '--provider' in sys.argv
+    
+    if not provider_from_cli and 'provider' in cli_config and not config_index_from_cli:
         effective_provider = cli_config['provider']
     
-    if effective_config_index == 0 and 'config-index' in cli_config and '--config-index' not in sys.argv:
+    if not config_index_from_cli and 'config-index' in cli_config and not provider_from_cli:
         effective_config_index = cli_config['config-index']
     
     # Check for mutual exclusivity between provider and config-index
     if effective_config_index != 0 and effective_provider:
-        parser.error("--config-index and --provider cannot be used together")
+        from_cli_config = not provider_from_cli and 'provider' in cli_config
+        provider_source = "CLI config file (ngpt-cli.conf)" if from_cli_config else "command-line arguments"
+        error_msg = f"--config-index and --provider cannot be used together. Provider from {provider_source}."
+        print(f"{COLORS['bold']}{COLORS['yellow']}error: {COLORS['reset']}{error_msg}\n")
+        sys.exit(2)
 
     # Handle interactive configuration mode
     if args.config is True:  # --config was used without a value
@@ -301,7 +231,8 @@ def main():
         if args.remove:
             # Validate that config_index is explicitly provided
             if '--config-index' not in sys.argv and not effective_provider:
-                parser.error("--remove requires explicitly specifying --config-index or --provider")
+                print(f"{COLORS['bold']}{COLORS['yellow']}error: {COLORS['reset']}--remove requires explicitly specifying --config-index or --provider\n")
+                sys.exit(2)
             
             # Show config details before asking for confirmation
             configs = load_configs(str(config_path))
@@ -479,6 +410,8 @@ def main():
     
     # For interactive mode, we'll allow continuing without a specific prompt
     if not args.prompt and not (args.shell or args.code or args.text or args.interactive or args.show_config or args.list_models):
+        # Simply use the parser's help
+        parser = setup_argument_parser()
         parser.print_help()
         return
         
@@ -488,23 +421,10 @@ def main():
     
     # Check if --prettify is used but no markdown renderer is available
     # This will warn the user immediately if they request prettify but don't have the tools
-    has_renderer = True
-    if args.prettify:
-        has_renderer = warn_if_no_markdown_renderer(args.renderer)
-        if not has_renderer:
-            # Set a flag to disable prettify since we already warned the user
-            print(f"{COLORS['yellow']}Continuing without markdown rendering.{COLORS['reset']}")
-            show_available_renderers()
-            args.prettify = False
-        
-    # Check if --prettify is used with --stream-prettify (conflict)
-    if args.prettify and args.stream_prettify:
-        parser.error("--prettify and --stream-prettify cannot be used together. Choose one option.")
-
-    # Check if --stream-prettify is used but Rich is not available
-    if args.stream_prettify and not has_markdown_renderer('rich'):
-        parser.error("--stream-prettify requires Rich to be installed. Install with: pip install \"ngpt[full]\" or pip install rich")
-
+    has_renderer, args = validate_markdown_renderer(args)
+    if not has_renderer:
+        show_available_renderers()
+    
     # Initialize client using the potentially overridden active_config
     client = NGPTClient(**active_config)
     

{ngpt-2.9.1 → ngpt-2.10.0}/ngpt/cli_config.py

@@ -7,7 +7,7 @@ from typing import Dict, Optional, Any, List, Union, Tuple
 # CLI config options with their types and default values
 CLI_CONFIG_OPTIONS = {
     "language": {"type": "str", "default": "python", "context": ["code"]},
-    "provider": {"type": "str", "default": None, "context": ["all"]},
+    "provider": {"type": "str", "default": None, "context": ["all"], "exclusive": ["config-index"]},
     "temperature": {"type": "float", "default": 0.7, "context": ["all"]},
     "top_p": {"type": "float", "default": 1.0, "context": ["all"]},
     "max_tokens": {"type": "int", "default": None, "context": ["all"]},
@@ -17,7 +17,7 @@ CLI_CONFIG_OPTIONS = {
     "prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "stream-prettify"]},
     "stream-prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
     "renderer": {"type": "str", "default": "auto", "context": ["all"]},
-    "config-index": {"type": "int", "default": 0, "context": ["all"]},
+    "config-index": {"type": "int", "default": 0, "context": ["all"], "exclusive": ["provider"]},
     "web-search": {"type": "bool", "default": False, "context": ["all"]},
 }
 
@@ -113,13 +113,19 @@ def set_cli_config_option(option: str, value: Any) -> Tuple[bool, str]:
         else:
             return False, f"Error: Unsupported option type '{option_type}'"
         
-        # Handle mutual exclusivity for boolean options
-        if option_type == "bool" and "exclusive" in CLI_CONFIG_OPTIONS[option]:
-            if parsed_value:  # If setting this option to True
-                # Set all other exclusive options to False
+        # Handle mutual exclusivity for options
+        if "exclusive" in CLI_CONFIG_OPTIONS[option]:
+            if option_type == "bool":
+                # For boolean options: only apply exclusivity when setting to True
+                if parsed_value:
+                    for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
+                        config[excl_option] = False
+                # If setting to False, don't alter exclusive options
+            else:
+                # For non-boolean options: If setting this option to any value, remove exclusive options
                 for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
-                    config[excl_option] = False
-            # No special handling needed if setting to False, just update the value
+                    if excl_option in config:
+                        del config[excl_option]
         
         # Set the value in the config
         config[option] = parsed_value
@@ -203,6 +209,9 @@ def apply_cli_config(args: Any, mode: str) -> Any:
     # Get command-line arguments provided by the user
     explicit_args = set(arg for arg in sys.argv[1:] if arg.startswith('--'))
 
+    # Keep track of applied exclusive options
+    applied_exclusives = set()
+
     # For each option in CLI config, check if it should be applied
     for option, value in cli_config.items():
         # Skip if not a valid option
@@ -221,6 +230,13 @@ def apply_cli_config(args: Any, mode: str) -> Any:
         # Check common variants like --option
         cli_option = f"--{option}"
         if cli_option in explicit_args:
+            # Add to applied_exclusives if this option has exclusivity constraints
+            if "exclusive" in CLI_CONFIG_OPTIONS[option]:
+                applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
+            continue
+        
+        # Skip if an exclusive option has already been applied
+        if option in applied_exclusives:
             continue
         
         # Check exclusivity constraints against *explicitly set* args
@@ -234,6 +250,9 @@ def apply_cli_config(args: Any, mode: str) -> Any:
                     break # Skip applying this CLI config value
             if skip:
                 continue
+            
+            # If we're applying this option, add its exclusives to the tracking set
+            applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
                 
         # Apply the value from CLI config
         # Ensure the attribute exists on args before setting

{ngpt-2.9.1 → ngpt-2.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ngpt"
-version = "2.9.1"
+version = "2.10.0"
 description = "A lightweight Python CLI and library for interacting with OpenAI-compatible APIs, supporting both official and self-hosted LLM endpoints."
 authors = [
     {name = "nazDridoy", email = "nazdridoy399@gmail.com"},

{ngpt-2.9.1 → ngpt-2.10.0}/uv.lock

@@ -134,7 +134,7 @@ wheels = [
 
 [[package]]
 name = "ngpt"
-version = "2.9.1"
+version = "2.10.0"
 source = { editable = "." }
 dependencies = [
     { name = "prompt-toolkit" },