ngpt 2.3.3__tar.gz → 2.4.0__tar.gz

{ngpt-2.3.3 → ngpt-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.3.3
+Version: 2.4.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
@@ -264,11 +264,12 @@ You can configure the client using the following options:
 | `-n, --no-stream` | Return the whole response without streaming |
 | `--temperature` | Set temperature (controls randomness, default: 0.7) |
 | `--top_p` | Set top_p (controls diversity, default: 1.0) |
-| `--max_length` | Set maximum response length in tokens |
+| `--max_tokens` | Set maximum response length in tokens |
 | `--preprompt` | Set custom system prompt to control AI behavior |
 | `--log` | Set filepath to log conversation to (for interactive modes) |
 | `--config` | Path to a custom configuration file or, when used without a value, enters interactive configuration mode |
 | `--config-index` | Index of the configuration to use (default: 0) |
+| `--provider` | Provider name to identify the configuration to use (alternative to --config-index) |
 | `--remove` | Remove the configuration at the specified index (requires --config and --config-index) |
 | `--show-config` | Show configuration details and exit |
 | `--all` | Used with `--show-config` to display all configurations |
@@ -291,8 +292,17 @@ ngpt --config
 # Edit an existing configuration at index 1
 ngpt --config --config-index 1
 
+# Edit an existing configuration by provider name
+ngpt --config --provider Gemini
+
 # Remove a configuration at index 2
 ngpt --config --remove --config-index 2
+
+# Remove a configuration by provider name
+ngpt --config --remove --provider Gemini
+
+# Use a specific configuration by provider name
+ngpt --provider OpenAI "Tell me about quantum computing"
 ```
 
 In interactive mode:

{ngpt-2.3.3 → ngpt-2.4.0}/README.md

@@ -230,11 +230,12 @@ You can configure the client using the following options:
 | `-n, --no-stream` | Return the whole response without streaming |
 | `--temperature` | Set temperature (controls randomness, default: 0.7) |
 | `--top_p` | Set top_p (controls diversity, default: 1.0) |
-| `--max_length` | Set maximum response length in tokens |
+| `--max_tokens` | Set maximum response length in tokens |
 | `--preprompt` | Set custom system prompt to control AI behavior |
 | `--log` | Set filepath to log conversation to (for interactive modes) |
 | `--config` | Path to a custom configuration file or, when used without a value, enters interactive configuration mode |
 | `--config-index` | Index of the configuration to use (default: 0) |
+| `--provider` | Provider name to identify the configuration to use (alternative to --config-index) |
 | `--remove` | Remove the configuration at the specified index (requires --config and --config-index) |
 | `--show-config` | Show configuration details and exit |
 | `--all` | Used with `--show-config` to display all configurations |
@@ -257,8 +258,17 @@ ngpt --config
 # Edit an existing configuration at index 1
 ngpt --config --config-index 1
 
+# Edit an existing configuration by provider name
+ngpt --config --provider Gemini
+
 # Remove a configuration at index 2
 ngpt --config --remove --config-index 2
+
+# Remove a configuration by provider name
+ngpt --config --remove --provider Gemini
+
+# Use a specific configuration by provider name
+ngpt --provider OpenAI "Tell me about quantum computing"
 ```
 
 In interactive mode:

{ngpt-2.3.3 → ngpt-2.4.0}/docs/api/config.md

@@ -122,7 +122,7 @@ custom_configs = load_configs("/path/to/custom/config.json")
 
 ### load_config()
 
-Loads a specific configuration by index and applies environment variables.
+Loads a specific configuration by index or provider name and applies environment variables.
 
 ```python
 from ngpt.config import load_config
@@ -130,7 +130,8 @@ from typing import Dict, Any
 
 config: Dict[str, Any] = load_config(
     custom_path: Optional[str] = None,
-    config_index: int = 0
+    config_index: int = 0,
+    provider: Optional[str] = None
 )
 ```
 
@@ -140,6 +141,7 @@ config: Dict[str, Any] = load_config(
 |-----------|------|---------|-------------|
 | `custom_path` | `Optional[str]` | `None` | Optional custom path to the configuration file |
 | `config_index` | `int` | `0` | Index of the configuration to load (0-based) |
+| `provider` | `Optional[str]` | `None` | Provider name to identify the configuration to use (alternative to config_index) |
 
 #### Returns
 
@@ -160,6 +162,11 @@ config_1 = load_config(config_index=1)
 print(f"Using provider: {config_1.get('provider', 'Unknown')}")
 print(f"Using model: {config_1.get('model', 'Unknown')}")
 
+# Load a specific configuration by provider name
+gemini_config = load_config(provider="Gemini")
+print(f"Using provider: {gemini_config.get('provider', 'Unknown')}")
+print(f"Using model: {gemini_config.get('model', 'Unknown')}")
+
 # Load from a custom path
 custom_config = load_config(custom_path="/path/to/custom/config.json")
 ```
@@ -277,6 +284,57 @@ else:
     print("Failed to remove configuration")
 ```
 
+### is_provider_unique()
+
+Checks if a provider name is unique among configurations.
+
+```python
+from ngpt.config import is_provider_unique
+from typing import List, Dict, Any, Optional
+
+is_unique: bool = is_provider_unique(
+    configs: List[Dict[str, Any]],
+    provider: str,
+    exclude_index: Optional[int] = None
+)
+```
+
+#### Parameters
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `configs` | `List[Dict[str, Any]]` | Required | List of configuration dictionaries |
+| `provider` | `str` | Required | Provider name to check for uniqueness |
+| `exclude_index` | `Optional[int]` | `None` | Optional index to exclude from the check (useful when updating an existing config) |
+
+#### Returns
+
+`True` if the provider name is unique among all configurations, `False` otherwise.
+
+#### Examples
+
+```python
+from ngpt.config import load_configs, is_provider_unique
+
+# Load all configurations
+configs = load_configs()
+
+# Check if a provider name is unique
+provider_name = "New Provider"
+if is_provider_unique(configs, provider_name):
+    print(f"'{provider_name}' is a unique provider name")
+else:
+    print(f"'{provider_name}' is already used by another configuration")
+
+# Check if provider name is unique when updating an existing config
+existing_idx = 1
+update_provider = "Updated Provider"
+if is_provider_unique(configs, update_provider, exclude_index=existing_idx):
+    print(f"'{update_provider}' is unique and can be used to update config at index {existing_idx}")
+else:
+    print(f"'{update_provider}' is already used by another configuration")
+```
+
 ## Complete Examples
 
 ### Managing Multiple Configurations

{ngpt-2.3.3 → ngpt-2.4.0}/docs/configuration.md

@@ -87,8 +87,14 @@ ngpt --config
 # Edit an existing configuration at index 1
 ngpt --config --config-index 1
 
+# Edit an existing configuration by provider name
+ngpt --config --provider Gemini
+
 # Remove a configuration at index 2
 ngpt --config --remove --config-index 2
+
+# Remove a configuration by provider name
+ngpt --config --remove --provider Gemini
 ```
 
 The interactive configuration will prompt you for values and guide you through the process.
@@ -104,8 +110,11 @@ ngpt --api-key "your-key" --base-url "https://api.example.com/v1/" --model "cust
 # Select a specific configuration by index
 ngpt --config-index 2 "Your prompt here"
 
+# Select a specific configuration by provider name
+ngpt --provider Gemini "Your prompt here"
+
 # Control response generation parameters
-ngpt --temperature 0.8 --top_p 0.95 --max_length 300 "Write a creative story"
+ngpt --temperature 0.8 --top_p 0.95 --max_tokens 300 "Write a creative story"
 
 # Set a custom system prompt (preprompt)
 ngpt --preprompt "You are a Linux command line expert. Focus on efficient solutions." "How do I find the largest files in a directory?"
@@ -158,6 +167,11 @@ ngpt --config-index 1 "Tell me about quantum computing"
 
 # Use local Ollama (config at index 2)
 ngpt --config-index 2 "Tell me about quantum computing"
+
+# Or use provider names instead of indices (more intuitive)
+ngpt --provider OpenAI "Tell me about quantum computing"
+ngpt --provider Groq "Tell me about quantum computing"
+ngpt --provider Ollama-Local "Tell me about quantum computing"
 ```
 
 ### Programmatically Loading Configurations
@@ -167,12 +181,12 @@ In your Python code, you can load and use different configurations:
 ```python
 from ngpt import NGPTClient, load_config
 
-# Load OpenAI configuration
+# Load OpenAI configuration by index
 openai_config = load_config(config_index=0)
 openai_client = NGPTClient(**openai_config)
 
-# Load Groq configuration
-groq_config = load_config(config_index=1)
+# Load Groq configuration by provider name
+groq_config = load_config(provider="Groq")
 groq_client = NGPTClient(**groq_config)
 
 # Use the clients

{ngpt-2.3.3 → ngpt-2.4.0}/docs/usage/cli_usage.md

@@ -47,7 +47,9 @@ Here are the most commonly used options:
 | `--web-search` | Enable web search capability (if supported by your API) |
 | `--temperature` | Set temperature (controls randomness, default: 0.7) |
 | `--top_p` | Set top_p (controls diversity, default: 1.0) |
-| `--max_length` | Set maximum response length in tokens |
+| `--max_tokens` | Set maximum response length in tokens |
+| `--config-index` | Index of the configuration to use (default: 0) |
+| `--provider` | Provider name to identify the configuration to use (alternative to --config-index) |
 
 ## Feature Details
 
@@ -172,6 +174,12 @@ Select a specific configuration by index:
 ngpt --config-index 1 "Your prompt here"
 ```
 
+Select a specific configuration by provider name:
+
+```bash
+ngpt --provider Gemini "Your prompt here"
+```
+
 Specify API credentials directly:
 
 ```bash
@@ -186,18 +194,30 @@ Add a new configuration interactively:
 ngpt --config
 ```
 
-Edit an existing configuration:
+Edit an existing configuration by index:
 
 ```bash
 ngpt --config --config-index 1
 ```
 
-Remove a configuration:
+Edit an existing configuration by provider name:
+
+```bash
+ngpt --config --provider Gemini
+```
+
+Remove a configuration by index:
 
 ```bash
 ngpt --config --remove --config-index 2
 ```
 
+Remove a configuration by provider name:
+
+```bash
+ngpt --config --remove --provider Gemini
+```
+
 ### Model Management
 
 List all available models for the current configuration:
@@ -270,10 +290,10 @@ Set the maximum response length in tokens:
 
 ```bash
 # Get a concise response
-ngpt --max_length 100 "Explain quantum computing"
+ngpt --max_tokens 100 "Explain quantum computing"
 
 # Allow for a longer, more detailed response
-ngpt --max_length 500 "Write a comprehensive guide to machine learning"
+ngpt --max_tokens 500 "Write a comprehensive guide to machine learning"
 ```
 
 ## Examples by Task
@@ -338,7 +358,6 @@ ngpt --show-config
 # Try specifying the base URL directly
 ngpt --base-url "https://api.example.com/v1/" "Test connection"
 ```
-
 ### Authorization Problems
 
 If you're experiencing authentication issues:
@@ -384,4 +403,4 @@ If the `ngpt` command is not found after installation:
 5. **Improve efficiency**:
    - Use `-n` (no streaming) for faster responses in scripts
    - Use interactive mode when having a conversation
-   - Exit interactive sessions when not in use to save API costs 
+   - Exit interactive sessions when not in use to save API costs 

{ngpt-2.3.3 → ngpt-2.4.0}/ngpt/cli.py

@@ -302,13 +302,20 @@ def show_config_help():
     print(f"  5. {COLORS['cyan']}Use --config-index to specify which configuration to use or edit:{COLORS['reset']}")
     print(f"     {COLORS['yellow']}ngpt --config-index 1 \"Your prompt\"{COLORS['reset']}")
     
-    print(f"  6. {COLORS['cyan']}Use --config without arguments to add a new configuration:{COLORS['reset']}")
+    print(f"  6. {COLORS['cyan']}Use --provider to specify which configuration to use by provider name:{COLORS['reset']}")
+    print(f"     {COLORS['yellow']}ngpt --provider Gemini \"Your prompt\"{COLORS['reset']}")
+    
+    print(f"  7. {COLORS['cyan']}Use --config without arguments to add a new configuration:{COLORS['reset']}")
     print(f"     {COLORS['yellow']}ngpt --config{COLORS['reset']}")
-    print(f"     Or specify an index to edit an existing configuration:")
+    print(f"     Or specify an index or provider to edit an existing configuration:")
     print(f"     {COLORS['yellow']}ngpt --config --config-index 1{COLORS['reset']}")
-    print(f"  7. {COLORS['cyan']}Remove a configuration at a specific index:{COLORS['reset']}")
+    print(f"     {COLORS['yellow']}ngpt --config --provider Gemini{COLORS['reset']}")
+
+    print(f"  8. {COLORS['cyan']}Remove a configuration by index or provider:{COLORS['reset']}")
     print(f"     {COLORS['yellow']}ngpt --config --remove --config-index 1{COLORS['reset']}")
-    print(f"  8. {COLORS['cyan']}List available models for the current configuration:{COLORS['reset']}")
+    print(f"     {COLORS['yellow']}ngpt --config --remove --provider Gemini{COLORS['reset']}")
+
+    print(f"  9. {COLORS['cyan']}List available models for the current configuration:{COLORS['reset']}")
     print(f"     {COLORS['yellow']}ngpt --list-models{COLORS['reset']}")
 
 def check_config(config):
@@ -325,7 +332,7 @@ def check_config(config):
     
     return True
 
-def interactive_chat_session(client, web_search=False, no_stream=False, temperature=0.7, top_p=1.0, max_length=None, log_file=None, preprompt=None):
+def interactive_chat_session(client, web_search=False, no_stream=False, temperature=0.7, top_p=1.0, max_tokens=None, log_file=None, preprompt=None):
     """Run an interactive chat session with conversation history."""
     # Get terminal width for better formatting
     try:
@@ -467,6 +474,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             
             # Skip empty messages but don't raise an error
             if not user_input.strip():
+                print(f"{COLORS['yellow']}Empty message skipped. Type 'exit' to quit.{COLORS['reset']}")
                 continue
             
             # Add user message to conversation
@@ -492,7 +500,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                 web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
-                max_tokens=max_length
+                max_tokens=max_tokens
             )
             
             # Add AI response to conversation history
@@ -554,6 +562,7 @@ def main():
     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)')
@@ -572,12 +581,12 @@ def main():
                       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_length', type=int, 
+    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 preprompt')
+                      help='Set custom system prompt to control AI behavior')
     
     # Mode flags (mutually exclusive)
     mode_group = parser.add_argument_group('Modes (mutually exclusive)')
@@ -599,6 +608,10 @@ def main():
     # Validate --all usage
     if args.all and not args.show_config:
         parser.error("--all can only be used with --show-config")
+    
+    # Check for mutual exclusivity between --config-index and --provider
+    if args.config_index != 0 and args.provider:
+        parser.error("--config-index and --provider cannot be used together")
 
     # Handle interactive configuration mode
     if args.config is True:  # --config was used without a value
@@ -607,20 +620,46 @@ def main():
         # Handle configuration removal if --remove flag is present
         if args.remove:
             # Validate that config_index is explicitly provided
-            if '--config-index' not in sys.argv:
-                parser.error("--remove requires explicitly specifying --config-index")
+            if '--config-index' not in sys.argv and not args.provider:
+                parser.error("--remove requires explicitly specifying --config-index or --provider")
             
             # Show config details before asking for confirmation
             configs = load_configs(str(config_path))
             
+            # Determine the config index to remove
+            config_index = args.config_index
+            if args.provider:
+                # Find config index by provider name
+                matching_configs = [i for i, cfg in enumerate(configs) if cfg.get('provider', '').lower() == args.provider.lower()]
+                if not matching_configs:
+                    print(f"Error: No configuration found for provider '{args.provider}'")
+                    return
+                elif len(matching_configs) > 1:
+                    print(f"Multiple configurations found for provider '{args.provider}':")
+                    for i, idx in enumerate(matching_configs):
+                        print(f"  [{i}] Index {idx}: {configs[idx].get('model', 'Unknown model')}")
+                    
+                    try:
+                        choice = input("Choose a configuration to remove (or press Enter to cancel): ")
+                        if choice and choice.isdigit() and 0 <= int(choice) < len(matching_configs):
+                            config_index = matching_configs[int(choice)]
+                        else:
+                            print("Configuration removal cancelled.")
+                            return
+                    except (ValueError, IndexError, KeyboardInterrupt):
+                        print("\nConfiguration removal cancelled.")
+                        return
+                else:
+                    config_index = matching_configs[0]
+            
             # Check if index is valid
-            if args.config_index < 0 or args.config_index >= len(configs):
-                print(f"Error: Configuration index {args.config_index} is out of range. Valid range: 0-{len(configs)-1}")
+            if config_index < 0 or config_index >= len(configs):
+                print(f"Error: Configuration index {config_index} is out of range. Valid range: 0-{len(configs)-1}")
                 return
             
             # Show the configuration that will be removed
-            config = configs[args.config_index]
-            print(f"Configuration to remove (index {args.config_index}):")
+            config = configs[config_index]
+            print(f"Configuration to remove (index {config_index}):")
             print(f"  Provider: {config.get('provider', 'N/A')}")
             print(f"  Model: {config.get('model', 'N/A')}")
             print(f"  Base URL: {config.get('base_url', 'N/A')}")
@@ -631,7 +670,7 @@ def main():
                 print("\nAre you sure you want to remove this configuration? [y/N] ", end='')
                 response = input().lower()
                 if response in ('y', 'yes'):
-                    remove_config_entry(config_path, args.config_index)
+                    remove_config_entry(config_path, config_index)
                 else:
                     print("Configuration removal cancelled.")
             except KeyboardInterrupt:
@@ -643,20 +682,51 @@ def main():
         # If --config-index was not explicitly specified, create a new entry by passing None
         # This will cause add_config_entry to create a new entry at the end of the list
         # Otherwise, edit the existing config at the specified index
-        config_index = None if args.config_index == 0 and '--config-index' not in sys.argv else args.config_index
+        config_index = None
         
-        # Load existing configs to determine the new index if creating a new config
-        configs = load_configs(str(config_path))
-        if config_index is None:
-            print(f"Creating new configuration at index {len(configs)}")
-        else:
+        # Determine if we're editing an existing config or creating a new one
+        if args.provider:
+            # Find config by provider name
+            configs = load_configs(str(config_path))
+            matching_configs = [i for i, cfg in enumerate(configs) if cfg.get('provider', '').lower() == args.provider.lower()]
+            
+            if not matching_configs:
+                print(f"No configuration found for provider '{args.provider}'. Creating a new configuration.")
+            elif len(matching_configs) > 1:
+                print(f"Multiple configurations found for provider '{args.provider}':")
+                for i, idx in enumerate(matching_configs):
+                    print(f"  [{i}] Index {idx}: {configs[idx].get('model', 'Unknown model')}")
+                
+                try:
+                    choice = input("Choose a configuration to edit (or press Enter for the first one): ")
+                    if choice and choice.isdigit() and 0 <= int(choice) < len(matching_configs):
+                        config_index = matching_configs[int(choice)]
+                    else:
+                        config_index = matching_configs[0]
+                except (ValueError, IndexError, KeyboardInterrupt):
+                    config_index = matching_configs[0]
+            else:
+                config_index = matching_configs[0]
+                
             print(f"Editing existing configuration at index {config_index}")
+        elif args.config_index != 0 or '--config-index' in sys.argv:
+            # Check if the index is valid
+            configs = load_configs(str(config_path))
+            if args.config_index >= 0 and args.config_index < len(configs):
+                config_index = args.config_index
+                print(f"Editing existing configuration at index {config_index}")
+            else:
+                print(f"Configuration index {args.config_index} is out of range. Creating a new configuration.")
+        else:
+            # Creating a new config
+            configs = load_configs(str(config_path))
+            print(f"Creating new configuration at index {len(configs)}")
         
         add_config_entry(config_path, config_index)
         return
     
-    # Load configuration using the specified index (needed for active config display)
-    active_config = load_config(args.config, args.config_index)
+    # Load configuration using the specified index or provider (needed for active config display)
+    active_config = load_config(args.config, args.config_index, args.provider)
     
     # Command-line arguments override config settings for active config display
     # This part is kept to ensure the active config display reflects potential overrides,
@@ -675,31 +745,57 @@ def main():
         
         print(f"Configuration file: {config_path}")
         print(f"Total configurations: {len(configs)}")
-        print(f"Active configuration index: {args.config_index}")
+        
+        # Determine active configuration and display identifier
+        active_identifier = f"index {args.config_index}"
+        if args.provider:
+            active_identifier = f"provider '{args.provider}'"
+        print(f"Active configuration: {active_identifier}")
 
         if args.all:
             # Show details for all configurations
             print("\nAll configuration details:")
             for i, cfg in enumerate(configs):
-                active_str = '(Active)' if i == args.config_index else ''
-                print(f"\n--- Configuration Index {i} {active_str} ---")
+                provider = cfg.get('provider', 'N/A')
+                active_str = '(Active)' if (
+                    (args.provider and provider.lower() == args.provider.lower()) or 
+                    (not args.provider and i == args.config_index)
+                ) else ''
+                print(f"\n--- Configuration Index {i} / Provider: {COLORS['green']}{provider}{COLORS['reset']} {active_str} ---")
                 print(f"  API Key: {'[Set]' if cfg.get('api_key') else '[Not Set]'}")
                 print(f"  Base URL: {cfg.get('base_url', 'N/A')}")
-                print(f"  Provider: {cfg.get('provider', 'N/A')}")
                 print(f"  Model: {cfg.get('model', 'N/A')}")
         else:
             # Show active config details and summary list
             print("\nActive configuration details:")
+            print(f"  Provider: {COLORS['green']}{active_config.get('provider', 'N/A')}{COLORS['reset']}")
             print(f"  API Key: {'[Set]' if active_config.get('api_key') else '[Not Set]'}")
             print(f"  Base URL: {active_config.get('base_url', 'N/A')}")
-            print(f"  Provider: {active_config.get('provider', 'N/A')}")
             print(f"  Model: {active_config.get('model', 'N/A')}")
             
             if len(configs) > 1:
                 print("\nAvailable configurations:")
+                # Check for duplicate provider names for warning
+                provider_counts = {}
+                for cfg in configs:
+                    provider = cfg.get('provider', 'N/A').lower()
+                    provider_counts[provider] = provider_counts.get(provider, 0) + 1
+                
                 for i, cfg in enumerate(configs):
-                    active_marker = "*" if i == args.config_index else " "
-                    print(f"[{i}]{active_marker} {cfg.get('provider', 'N/A')} - {cfg.get('model', 'N/A')} ({'[API Key Set]' if cfg.get('api_key') else '[API Key Not Set]'})")
+                    provider = cfg.get('provider', 'N/A')
+                    provider_display = provider
+                    # Add warning for duplicate providers
+                    if provider_counts.get(provider.lower(), 0) > 1:
+                        provider_display = f"{provider} {COLORS['yellow']}(duplicate){COLORS['reset']}"
+                    
+                    active_marker = "*" if (
+                        (args.provider and provider.lower() == args.provider.lower()) or 
+                        (not args.provider and i == args.config_index)
+                    ) else " "
+                    print(f"[{i}]{active_marker} {COLORS['green']}{provider_display}{COLORS['reset']} - {cfg.get('model', 'N/A')} ({'[API Key Set]' if cfg.get('api_key') else '[API Key Not Set]'})")
+                
+                # Show instruction for using --provider
+                print(f"\nTip: Use {COLORS['yellow']}--provider NAME{COLORS['reset']} to select a configuration by provider name.")
         
         return
     
@@ -738,7 +834,7 @@ def main():
             # Interactive chat mode
             interactive_chat_session(client, web_search=args.web_search, no_stream=args.no_stream,
                                    temperature=args.temperature, top_p=args.top_p, 
-                                   max_length=args.max_length, log_file=args.log, preprompt=args.preprompt)
+                                   max_tokens=args.max_tokens, log_file=args.log, preprompt=args.preprompt)
         elif args.shell:
             if args.prompt is None:
                 try:
@@ -752,7 +848,7 @@ def main():
                 
             command = client.generate_shell_command(prompt, web_search=args.web_search, 
                                                  temperature=args.temperature, top_p=args.top_p,
-                                                 max_length=args.max_length)
+                                                 max_tokens=args.max_tokens)
             if not command:
                 return  # Error already printed by client
                 
@@ -790,7 +886,7 @@ def main():
                 
             generated_code = client.generate_code(prompt, args.language, web_search=args.web_search,
                                               temperature=args.temperature, top_p=args.top_p,
-                                              max_length=args.max_length)
+                                              max_tokens=args.max_tokens)
             if generated_code:
                 print(f"\nGenerated code:\n{generated_code}")
             
@@ -913,7 +1009,7 @@ def main():
                 
             response = client.chat(prompt, stream=not args.no_stream, web_search=args.web_search,
                                temperature=args.temperature, top_p=args.top_p,
-                               max_tokens=args.max_length, messages=messages)
+                               max_tokens=args.max_tokens, messages=messages)
             if args.no_stream and response:
                 print(response)
             
@@ -939,7 +1035,7 @@ def main():
                 
             response = client.chat(prompt, stream=not args.no_stream, web_search=args.web_search,
                                temperature=args.temperature, top_p=args.top_p,
-                               max_tokens=args.max_length, messages=messages)
+                               max_tokens=args.max_tokens, messages=messages)
             if args.no_stream and response:
                 print(response)
     

{ngpt-2.3.3 → ngpt-2.4.0}/ngpt/client.py

@@ -167,7 +167,7 @@ class NGPTClient:
         web_search: bool = False,
         temperature: float = 0.4,
         top_p: float = 0.95,
-        max_length: Optional[int] = None
+        max_tokens: Optional[int] = None
     ) -> str:
         """
         Generate a shell command based on the prompt.
@@ -177,7 +177,7 @@ class NGPTClient:
             web_search: Whether to enable web search capability
             temperature: Controls randomness in the response
             top_p: Controls diversity via nucleus sampling
-            max_length: Maximum number of tokens to generate
+            max_tokens: Maximum number of tokens to generate
             
         Returns:
             The generated shell command
@@ -228,7 +228,7 @@ Command:"""
                 web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
-                max_tokens=max_length
+                max_tokens=max_tokens
             )
         except Exception as e:
             print(f"Error generating shell command: {e}")
@@ -241,7 +241,7 @@ Command:"""
         web_search: bool = False,
         temperature: float = 0.4,
         top_p: float = 0.95,
-        max_length: Optional[int] = None
+        max_tokens: Optional[int] = None
     ) -> str:
         """
         Generate code based on the prompt.
@@ -252,7 +252,7 @@ Command:"""
             web_search: Whether to enable web search capability
             temperature: Controls randomness in the response
             top_p: Controls diversity via nucleus sampling
-            max_length: Maximum number of tokens to generate
+            max_tokens: Maximum number of tokens to generate
             
         Returns:
             The generated code
@@ -285,7 +285,7 @@ Code:"""
                 web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
-                max_tokens=max_length
+                max_tokens=max_tokens
             )
         except Exception as e:
             print(f"Error generating code: {e}")

{ngpt-2.3.3 → ngpt-2.4.0}/ngpt/config.py

@@ -75,9 +75,29 @@ def add_config_entry(config_path: Path, config_index: Optional[int] = None) -> N
         if user_input:
             entry["base_url"] = user_input
         
-        user_input = input(f"Provider [{entry['provider']}]: ")
-        if user_input:
-            entry["provider"] = user_input
+        # For provider, check for uniqueness when creating new config
+        provider_unique = False
+        original_provider = entry['provider']
+        while not provider_unique:
+            user_input = input(f"Provider [{entry['provider']}]: ")
+            if user_input:
+                provider = user_input
+            else:
+                provider = entry['provider']
+            
+            # When creating new config or changing provider, check uniqueness
+            if is_existing_config and provider.lower() == original_provider.lower():
+                # No change in provider name, so keep it
+                provider_unique = True
+            elif is_provider_unique(configs, provider, config_index if is_existing_config else None):
+                provider_unique = True
+            else:
+                print(f"Error: Provider '{provider}' already exists. Please choose a unique provider name.")
+                # If it's the existing provider, allow keeping it (for existing configs)
+                if is_existing_config and provider.lower() == original_provider.lower():
+                    provider_unique = True
+        
+        entry["provider"] = provider
         
         user_input = input(f"Model [{entry['model']}]: ")
         if user_input:
@@ -127,13 +147,46 @@ def load_configs(custom_path: Optional[str] = None) -> List[Dict[str, Any]]:
     
     return configs
 
-def load_config(custom_path: Optional[str] = None, config_index: int = 0) -> Dict[str, Any]:
+def load_config(custom_path: Optional[str] = None, config_index: int = 0, provider: Optional[str] = None) -> Dict[str, Any]:
     """
-    Load a specific configuration by index and apply environment variables.
+    Load a specific configuration by index or provider name and apply environment variables.
     Environment variables take precedence over the config file.
+    
+    Args:
+        custom_path: Optional path to a custom config file
+        config_index: Index of the configuration to use (default: 0)
+        provider: Provider name to identify the configuration
+        
+    Returns:
+        The selected configuration with environment variables applied
     """
     configs = load_configs(custom_path)
     
+    # If provider is specified, try to find a matching config
+    if provider:
+        matching_configs = [i for i, cfg in enumerate(configs) if cfg.get('provider', '').lower() == provider.lower()]
+        
+        if not matching_configs:
+            print(f"Warning: No configuration found for provider '{provider}'. Using default configuration.")
+            config_index = 0
+        elif len(matching_configs) > 1:
+            print(f"Warning: Multiple configurations found for provider '{provider}'.")
+            for i, idx in enumerate(matching_configs):
+                print(f"  [{i}] Index {idx}: {configs[idx].get('model', 'Unknown model')}")
+            
+            try:
+                choice = input("Choose a configuration (or press Enter for the first one): ")
+                if choice and choice.isdigit() and 0 <= int(choice) < len(matching_configs):
+                    config_index = matching_configs[int(choice)]
+                else:
+                    config_index = matching_configs[0]
+                    print(f"Using first matching configuration (index {config_index}).")
+            except (ValueError, IndexError, KeyboardInterrupt):
+                config_index = matching_configs[0]
+                print(f"Using first matching configuration (index {config_index}).")
+        else:
+            config_index = matching_configs[0]
+    
     # If config_index is out of range, use the first config
     if config_index < 0 or config_index >= len(configs):
         if len(configs) > 0:
@@ -157,7 +210,7 @@ def load_config(custom_path: Optional[str] = None, config_index: int = 0) -> Dic
         if env_var in os.environ and os.environ[env_var]:
             config[config_key] = os.environ[env_var]
     
-    return config 
+    return config
 
 def remove_config_entry(config_path: Path, config_index: int) -> bool:
     """
@@ -182,4 +235,24 @@ def remove_config_entry(config_path: Path, config_index: int) -> bool:
         return True
     except Exception as e:
         print(f"Error saving configuration: {e}")
-        return False 
+        return False
+
+def is_provider_unique(configs: List[Dict[str, Any]], provider: str, exclude_index: Optional[int] = None) -> bool:
+    """
+    Check if a provider name is unique among configurations.
+    
+    Args:
+        configs: List of configuration dictionaries
+        provider: Provider name to check
+        exclude_index: Optional index to exclude from the check (for updating existing config)
+        
+    Returns:
+        True if the provider name is unique, False otherwise
+    """
+    provider = provider.lower()
+    for i, cfg in enumerate(configs):
+        if i == exclude_index:
+            continue
+        if cfg.get('provider', '').lower() == provider:
+            return False
+    return True 

{ngpt-2.3.3 → ngpt-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ngpt"
-version = "2.3.3"
+version = "2.4.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.3.3 → ngpt-2.4.0}/uv.lock

@@ -113,7 +113,7 @@ wheels = [
 
 [[package]]
 name = "ngpt"
-version = "2.3.3"
+version = "2.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "prompt-toolkit" },