ngpt 1.1.3__py3-none-any.whl → 1.2.0__py3-none-any.whl

ngpt/cli.py

@@ -2,7 +2,7 @@ import argparse
 import sys
 import os
 from .client import NGPTClient
-from .config import load_config, get_config_path, load_configs, add_config_entry
+from .config import load_config, get_config_path, load_configs, add_config_entry, remove_config_entry
 from . import __version__
 
 def show_config_help():
@@ -40,11 +40,15 @@ def show_config_help():
     print("  4. Or provide command line arguments:")
     print("     ngpt --api-key your-key --base-url https://api.example.com --model your-model \"Your prompt\"")
     
-    print("  5. Use --config-index to specify which configuration to use:")
+    print("  5. Use --config-index to specify which configuration to use or edit:")
     print("     ngpt --config-index 1 \"Your prompt\"")
     
-    print("  6. Use --config without arguments to add or edit a configuration:")
+    print("  6. Use --config without arguments to add a new configuration:")
+    print("     ngpt --config")
+    print("     Or specify an index to edit an existing configuration:")
     print("     ngpt --config --config-index 1")
+    print("  7. Remove a configuration at a specific index:")
+    print("     ngpt --config --remove --config-index 1")
 
 def check_config(config):
     """Check config for common issues and provide guidance."""
@@ -68,8 +72,9 @@ def main():
     
     # 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')
-    config_group.add_argument('--config-index', type=int, default=0, help='Index of the configuration to use (default: 0)')
+    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('--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)')
     
@@ -103,7 +108,56 @@ def main():
     # Handle interactive configuration mode
     if args.config is True:  # --config was used without a value
         config_path = get_config_path()
-        add_config_entry(config_path, args.config_index)
+        
+        # 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")
+            
+            # Show config details before asking for confirmation
+            configs = load_configs(str(config_path))
+            
+            # 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}")
+                return
+            
+            # Show the configuration that will be removed
+            config = configs[args.config_index]
+            print(f"Configuration to remove (index {args.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')}")
+            print(f"  API Key: {'[Set]' if config.get('api_key') else '[Not Set]'}")
+            
+            # Ask for confirmation
+            try:
+                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)
+                else:
+                    print("Configuration removal cancelled.")
+            except KeyboardInterrupt:
+                print("\nConfiguration removal cancelled by user.")
+            
+            return
+        
+        # Regular config addition/editing (existing code)
+        # 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
+        
+        # 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:
+            print(f"Editing existing configuration at index {config_index}")
+        
+        add_config_entry(config_path, config_index)
         return
     
     # Load configuration using the specified index (needed for active config display)

ngpt/client.py

@@ -10,7 +10,7 @@ class NGPTClient:
         self,
         api_key: str = "",
         base_url: str = "https://api.openai.com/v1/",
-        provider: str = "OpenAI",  # Provider is now just a label, kept for potential future use/logging
+        provider: str = "OpenAI",
         model: str = "gpt-3.5-turbo"
     ):
         self.api_key = api_key

ngpt/config.py

@@ -51,23 +51,44 @@ def add_config_entry(config_path: Path, config_index: Optional[int] = None) -> N
     """Add a new configuration entry or update existing one at the specified index."""
     configs = load_configs(custom_path=str(config_path))
     
-    # Create a new entry based on the default
-    new_entry = DEFAULT_CONFIG_ENTRY.copy()
+    # Determine if we're editing an existing config or creating a new one
+    is_existing_config = config_index is not None and config_index < len(configs)
+    
+    # Set up entry based on whether we're editing or creating
+    if is_existing_config:
+        # Use existing config as the base when editing
+        entry = configs[config_index].copy()
+        print("Enter configuration details (press Enter to keep current values):")
+    else:
+        # Use default config as the base when creating new
+        entry = DEFAULT_CONFIG_ENTRY.copy()
+        print("Enter configuration details (press Enter to use default values):")
     
-    # Interactive configuration
-    print("Enter configuration details (press Enter to use default values):")
     try:
-        new_entry["api_key"] = input(f"API Key: ") or new_entry["api_key"]
-        new_entry["base_url"] = input(f"Base URL [{new_entry['base_url']}]: ") or new_entry["base_url"]
-        new_entry["provider"] = input(f"Provider [{new_entry['provider']}]: ") or new_entry["provider"]
-        new_entry["model"] = input(f"Model [{new_entry['model']}]: ") or new_entry["model"]
+        # For API key, just show the prompt without the current value for security
+        user_input = input(f"API Key: ")
+        if user_input:
+            entry["api_key"] = user_input
+        
+        # For other fields, show current/default value and keep it if Enter is pressed
+        user_input = input(f"Base URL [{entry['base_url']}]: ")
+        if user_input:
+            entry["base_url"] = user_input
+        
+        user_input = input(f"Provider [{entry['provider']}]: ")
+        if user_input:
+            entry["provider"] = user_input
+        
+        user_input = input(f"Model [{entry['model']}]: ")
+        if user_input:
+            entry["model"] = user_input
         
         # Add or update the entry
-        if config_index is not None and config_index < len(configs):
-            configs[config_index] = new_entry
+        if is_existing_config:
+            configs[config_index] = entry
             print(f"Updated configuration at index {config_index}")
         else:
-            configs.append(new_entry)
+            configs.append(entry)
             print(f"Added new configuration at index {len(configs)-1}")
         
         # Save the updated configs
@@ -128,8 +149,7 @@ def load_config(custom_path: Optional[str] = None, config_index: int = 0) -> Dic
     # Override with environment variables if they exist
     env_mapping = {
         "OPENAI_API_KEY": "api_key",
-        "OPENAI_BASE_URL": "base_url",
-        "OPENAI_PROVIDER": "provider", 
+        "OPENAI_BASE_URL": "base_url", 
         "OPENAI_MODEL": "model"
     }
     
@@ -137,4 +157,29 @@ 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:
+    """
+    Remove a configuration entry at the specified index.
+    Returns True if successful, False otherwise.
+    """
+    configs = load_configs(custom_path=str(config_path))
+    
+    # Check if index is valid
+    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 False
+    
+    # Remove the config at the specified index
+    removed_config = configs.pop(config_index)
+    
+    try:
+        # Save the updated configs
+        with open(config_path, "w") as f:
+            json.dump(configs, f, indent=2)
+        print(f"Removed configuration at index {config_index} for provider '{removed_config.get('provider', 'Unknown')}'")
+        return True
+    except Exception as e:
+        print(f"Error saving configuration: {e}")
+        return False 

{ngpt-1.1.3.dist-info → ngpt-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 1.1.3
+Version: 1.2.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
@@ -48,8 +48,10 @@ A lightweight Python CLI and library for interacting with OpenAI-compatible APIs
   - [Python Library](#as-a-library)
 - [Configuration](#configuration)
   - [Command Line Options](#command-line-options)
+  - [Interactive Configuration](#interactive-configuration)
   - [Configuration File](#configuration-file)
   - [Configuration Priority](#configuration-priority)
+- [Contributing](#contributing)
 - [License](#license)
 
 ## Quick Start
@@ -191,14 +193,36 @@ You can configure the client using the following options:
 | `--base-url` | Base URL for the API |
 | `--model` | Model to use |
 | `--web-search` | Enable web search capability |
-| `--config` | Path to a custom configuration file |
+| `--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) |
+| `--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 |
 | `-s, --shell` | Generate and execute shell commands |
 | `-c, --code` | Generate clean code output |
 | `-v, --version` | Show version information |
 
+### Interactive Configuration
+
+The `--config` option without arguments enters interactive configuration mode, allowing you to add or edit configurations:
+
+```bash
+# Add a new configuration
+ngpt --config
+
+# Edit an existing configuration at index 1
+ngpt --config --config-index 1
+
+# Remove a configuration at index 2
+ngpt --config --remove --config-index 2
+```
+
+In interactive mode:
+- When editing an existing configuration, press Enter to keep the current values
+- When creating a new configuration, press Enter to use default values
+- For security, your API key is not displayed when editing configurations
+- When removing a configuration, you'll be asked to confirm before deletion
+
 ### Configuration File
 
 nGPT uses a configuration file stored in the standard user config directory for your operating system:
@@ -242,6 +266,20 @@ nGPT determines configuration values in the following order (highest priority fi
 3. Configuration file (selected by `--config-index`, defaults to index 0)
 4. Default values
 
+## Contributing
+
+We welcome contributions to nGPT! Whether it's bug fixes, feature additions, or documentation improvements, your help is appreciated.
+
+To contribute:
+
+1. Fork the repository
+2. Create a feature branch: `git checkout -b feature/your-feature-name`
+3. Make your changes
+4. Commit with clear messages following conventional commit guidelines
+5. Push to your fork and submit a pull request
+
+Please check the [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines on code style, pull request process, and development setup.
+
 ## License
 
 This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.

ngpt-1.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
+ngpt/cli.py,sha256=tIKXjKfh4K19UcZ0uG8JqTVz-9Lxg-p16dkYTiOmp7o,13582
+ngpt/client.py,sha256=O0dPYeQCJlpWZWBBsroo-5UxeyBVwqC6o3Pm8lRnDiY,10329
+ngpt/config.py,sha256=BF0G3QeiPma8l7EQyc37bR7LWZog7FHJQNe7uj9cr4w,6896
+ngpt-1.2.0.dist-info/METADATA,sha256=o8iptGfiLJbibZZLKYFrg584Ppw6BMLkZuZQfvOzAFk,9497
+ngpt-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-1.2.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-1.2.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-1.2.0.dist-info/RECORD,,

ngpt-1.1.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
-ngpt/cli.py,sha256=_nu7eY76_y4KQ59cKC91VijVvzSASAaSJI1FFfJ9l04,10655
-ngpt/client.py,sha256=j7UCX_nkFRQJ_15ynxdu0Tj3HxxsI7Ll4__HdTbD7zE,10400
-ngpt/config.py,sha256=JWCEp1aMq96i8owi4z_poKigaA_s2UTfzY0fjBM5MoQ,5295
-ngpt-1.1.3.dist-info/METADATA,sha256=QTx1AssxeYEUlGOUpDdvssIVlvh2Xl8tqp9-a4wXwWs,8002
-ngpt-1.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-1.1.3.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-1.1.3.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-1.1.3.dist-info/RECORD,,