ngpt 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

ngpt/__init__.py

@@ -1,9 +1,5 @@
-try:
-    from importlib.metadata import version as get_version
-    __version__ = get_version("ngpt")
-except ImportError:
-    # For Python < 3.8 or package not installed
-    __version__ = "1.0.0"  # fallback version
+from importlib.metadata import version as get_version
+__version__ = get_version("ngpt")
 
 from .client import NGPTClient
 from .config import load_config, get_config_path, get_config_dir

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
+from .config import load_config, get_config_path, load_configs, add_config_entry
 from . import __version__
 
 def show_config_help():
@@ -17,12 +17,20 @@ def show_config_help():
         print(f"     - ~/.config/ngpt/ngpt.conf")
     
     print("  2. Format your config file as JSON:")
-    print("""     {
-       "api_key": "your-api-key-here",
-       "base_url": "https://api.openai.com/v1/",
-       "provider": "OpenAI",
-       "model": "gpt-3.5-turbo"
-     }""")
+    print("""     [
+       {
+         "api_key": "your-api-key-here",
+         "base_url": "https://api.openai.com/v1/",
+         "provider": "OpenAI",
+         "model": "gpt-3.5-turbo"
+       },
+       {
+         "api_key": "your-second-api-key",
+         "base_url": "http://localhost:1337/v1/",
+         "provider": "Another Provider",
+         "model": "different-model"
+       }
+     ]""")
     
     print("  3. Or set environment variables:")
     print("     - OPENAI_API_KEY")
@@ -32,6 +40,12 @@ def show_config_help():
     
     print("  4. Or provide command line arguments:")
     print("     ngpt --api-key your-key --base-url https://api.example.com \"Your prompt\"")
+    
+    print("  5. Use --config-index to specify which configuration to use:")
+    print("     ngpt --config-index 1 \"Your prompt\"")
+    
+    print("  6. Use --config without arguments to add or edit a configuration:")
+    print("     ngpt --config --config-index 1")
 
 def check_config(config):
     """Check config for common issues and provide guidance."""
@@ -53,22 +67,27 @@ def main():
     # Version flag
     parser.add_argument('-v', '--version', action='version', version=f'nGPT {__version__}', help='Show version information and exit')
     
-    # Config option
-    parser.add_argument('--config', help='Path to a custom configuration file')
+    # 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('--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)')
     
     # Global options
-    parser.add_argument('--api-key', help='API key for the service')
-    parser.add_argument('--base-url', help='Base URL for the API')
-    parser.add_argument('--provider', help='Provider name')
-    parser.add_argument('--model', help='Model to use')
-    parser.add_argument('--web-search', action='store_true', 
+    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)')
     
     # Mode flags (mutually exclusive)
-    mode_group = parser.add_mutually_exclusive_group()
-    mode_group.add_argument('-s', '--shell', action='store_true', help='Generate and execute shell commands')
-    mode_group.add_argument('-c', '--code', action='store_true', help='Generate code')
-    mode_group.add_argument('--show-config', action='store_true', help='Show the current configuration and exit')
+    mode_group = parser.add_argument_group('Modes (mutually exclusive)')
+    mode_exclusive_group = mode_group.add_mutually_exclusive_group()
+    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')
+    # 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)')
@@ -78,27 +97,62 @@ def main():
     
     args = parser.parse_args()
     
-    # Load configuration
-    config = load_config(args.config)
+    # Validate --all usage
+    if args.all and not args.show_config:
+        parser.error("--all can only be used with --show-config")
+
+    # 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)
+        return
+    
+    # Load configuration using the specified index (needed for active config display)
+    active_config = load_config(args.config, args.config_index)
     
-    # Command-line arguments override config settings
+    # Command-line arguments override config settings for active config display
+    # This part is kept to ensure the active config display reflects potential overrides,
+    # even though the overrides don't affect the stored configurations displayed with --all.
     if args.api_key:
-        config["api_key"] = args.api_key
+        active_config["api_key"] = args.api_key
     if args.base_url:
-        config["base_url"] = args.base_url
-    if args.provider:
-        config["provider"] = args.provider
+        active_config["base_url"] = args.base_url
     if args.model:
-        config["model"] = args.model
+        active_config["model"] = args.model
     
     # Show config if requested
     if args.show_config:
         config_path = get_config_path(args.config)
+        configs = load_configs(args.config)
+        
         print(f"Configuration file: {config_path}")
-        print(f"API Key: {'[Set]' if config['api_key'] else '[Not Set]'}")
-        print(f"Base URL: {config['base_url']}")
-        print(f"Provider: {config['provider']}")
-        print(f"Model: {config['model']}")
+        print(f"Total configurations: {len(configs)}")
+        print(f"Active configuration index: {args.config_index}")
+
+        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} ---")
+                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"  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:")
+                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]'})")
+        
         return
     
     # Check if prompt is required but not provided
@@ -106,12 +160,12 @@ def main():
         parser.print_help()
         return
         
-    # Check configuration
-    if not check_config(config):
+    # Check configuration (using the potentially overridden active_config)
+    if not check_config(active_config):
         return
     
-    # Initialize client
-    client = NGPTClient(**config)
+    # Initialize client using the potentially overridden active_config
+    client = NGPTClient(**active_config)
     
     try:
         # Handle modes
@@ -162,6 +216,6 @@ def main():
         print("\nOperation cancelled by user.")
     except Exception as e:
         print(f"Error: {e}")
-        
+
 if __name__ == "__main__":
     main() 

ngpt/client.py

@@ -10,13 +10,12 @@ class NGPTClient:
         self,
         api_key: str = "",
         base_url: str = "https://api.openai.com/v1/",
-        provider: str = "OpenAI",
+        provider: str = "OpenAI",  # Provider is now just a label, kept for potential future use/logging
         model: str = "gpt-3.5-turbo"
     ):
         self.api_key = api_key
         # Ensure base_url ends with /
         self.base_url = base_url if base_url.endswith('/') else base_url + '/'
-        self.provider = provider
         self.model = model
         
         # Default headers
@@ -63,10 +62,12 @@ class NGPTClient:
             "messages": messages,
             "stream": stream,
             "temperature": temperature,
-            "provider": self.provider,
-            "web_search": web_search
         }
         
+        # Conditionally add web_search
+        if web_search:
+            payload["web_search"] = True
+        
         # Add max_tokens if provided
         if max_tokens is not None:
             payload["max_tokens"] = max_tokens

ngpt/config.py

@@ -2,16 +2,19 @@ import os
 import sys
 import json
 from pathlib import Path
-from typing import Dict, Optional, Any
+from typing import Dict, Optional, Any, List
 
 # Default configuration
-DEFAULT_CONFIG = {
+DEFAULT_CONFIG_ENTRY = {
     "api_key": "",
     "base_url": "https://api.openai.com/v1/",
     "provider": "OpenAI",
     "model": "gpt-3.5-turbo"
 }
 
+# Default configurations list
+DEFAULT_CONFIG = [DEFAULT_CONFIG_ENTRY]
+
 def get_config_dir() -> Path:
     """Get the appropriate config directory based on OS."""
     if sys.platform == "win32":
@@ -39,33 +42,85 @@ def get_config_path(custom_path: Optional[str] = None) -> Path:
     return get_config_dir() / "ngpt.conf"
 
 def create_default_config(config_path: Path) -> None:
-    """Create a default configuration file."""
+    """Create a default configuration file with a single config entry."""
     with open(config_path, "w") as f:
         json.dump(DEFAULT_CONFIG, f, indent=2)
     print(f"Created default configuration file at {config_path}")
 
-def load_config(custom_path: Optional[str] = None) -> Dict[str, Any]:
+def add_config_entry(config_path: Path, config_index: Optional[int] = None) -> None:
+    """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()
+    
+    # Interactive configuration
+    print("Enter configuration details (press Enter to use default values):")
+    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"]
+    
+    # Add or update the entry
+    if config_index is not None and config_index < len(configs):
+        configs[config_index] = new_entry
+        print(f"Updated configuration at index {config_index}")
+    else:
+        configs.append(new_entry)
+        print(f"Added new configuration at index {len(configs)-1}")
+    
+    # Save the updated configs
+    with open(config_path, "w") as f:
+        json.dump(configs, f, indent=2)
+
+def load_configs(custom_path: Optional[str] = None) -> List[Dict[str, Any]]:
     """
-    Load configuration from file and environment variables.
-    Environment variables take precedence over the config file.
+    Load all configurations from the config file.
+    Returns a list of configuration dictionaries.
     """
     config_path = get_config_path(custom_path)
     
-    # Start with default config
-    config = DEFAULT_CONFIG.copy()
+    # Start with default configs
+    configs = DEFAULT_CONFIG.copy()
     
     # Load from config file if it exists
     if config_path.exists():
         try:
             with open(config_path, "r") as f:
-                file_config = json.load(f)
-                config.update(file_config)
+                file_configs = json.load(f)
+                # Handle both old format (single dict) and new format (list of dicts)
+                if isinstance(file_configs, dict):
+                    # Convert old format to new format
+                    configs = [file_configs]
+                else:
+                    configs = file_configs
         except (json.JSONDecodeError, IOError) as e:
             print(f"Warning: Could not read config file: {e}", file=sys.stderr)
     else:
         # Create default config file if it doesn't exist
         create_default_config(config_path)
     
+    return configs
+
+def load_config(custom_path: Optional[str] = None, config_index: int = 0) -> Dict[str, Any]:
+    """
+    Load a specific configuration by index and apply environment variables.
+    Environment variables take precedence over the config file.
+    """
+    configs = load_configs(custom_path)
+    
+    # If config_index is out of range, use the first config
+    if config_index < 0 or config_index >= len(configs):
+        if len(configs) > 0:
+            config_index = 0
+            print(f"Warning: Config index {config_index} is out of range. Using index 0 instead.")
+        else:
+            # This should not happen as load_configs should always return at least DEFAULT_CONFIG
+            return DEFAULT_CONFIG_ENTRY.copy()
+    
+    # Get the selected config
+    config = configs[config_index]
+    
     # Override with environment variables if they exist
     env_mapping = {
         "OPENAI_API_KEY": "api_key",

{ngpt-1.0.0.dist-info → ngpt-1.1.0.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 1.0.0
-Summary: A Python CLI and library for interacting with custom OpenAI API endpoints
+Version: 1.1.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
 Project-URL: Bug Tracker, https://github.com/nazdridoy/ngpt/issues
@@ -28,12 +28,12 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
-Requires-Dist: requests>=2.28.0
+Requires-Dist: requests>=2.31.0
 Description-Content-Type: text/markdown
 
 # nGPT
 
-A lightweight Python CLI and library for interacting with custom OpenAI API endpoints.
+A lightweight Python CLI and library for interacting with OpenAI-compatible APIs, supporting both official and self-hosted LLM endpoints.
 
 ## Features
 
@@ -64,6 +64,12 @@ ngpt "Hello, how are you?"
 # Show version information
 ngpt -v
 
+# Show active configuration
+ngpt --show-config
+
+# Show all configurations
+ngpt --show-config --all
+
 # With custom options
 ngpt --api-key your-key --base-url http://your-endpoint "Hello"
 
@@ -82,8 +88,8 @@ ngpt -c "create a python function that calculates fibonacci numbers"
 ```python
 from ngpt import NGPTClient, load_config
 
-# Load from config file
-config = load_config()
+# Load the first configuration (index 0) from config file
+config = load_config(config_index=0)
 
 # Initialize the client with config
 client = NGPTClient(**config)
@@ -117,10 +123,12 @@ You can configure the client using the following options:
 
 - `--api-key`: API key for the service
 - `--base-url`: Base URL for the API
-- `--provider`: Provider name
 - `--model`: Model to use
 - `--web-search`: Enable web search capability (Note: Your API endpoint must support this feature)
 - `--config`: Path to a custom configuration file
+- `--config-index`: Index of the configuration to use from the config file (default: 0)
+- `--show-config`: Show configuration details and exit.
+- `--all`: Used with `--show-config` to display details for all configurations.
 
 ### Configuration File
 
@@ -130,35 +138,39 @@ nGPT uses a configuration file stored in the standard user config directory for
 - **macOS**: `~/Library/Application Support/ngpt/ngpt.conf`
 - **Windows**: `%APPDATA%\ngpt\ngpt.conf`
 
-The configuration file uses JSON format:
-
-#### OpenAI API Example
-```json
-{
-  "api_key": "your_openai_api_key_here",
-  "base_url": "https://api.openai.com/v1/",
-  "provider": "OpenAI",
-  "model": "gpt-3.5-turbo"
-}
-```
+The configuration file uses a JSON list format, allowing you to store multiple configurations. You can select which configuration to use with the `--config-index` argument (or by default, index 0 is used).
 
-#### Custom Endpoint Example
+#### Multiple Configurations Example (`ngpt.conf`)
 ```json
-{
-  "api_key": "your_api_key_here",
-  "base_url": "http://127.0.0.1:1337/v1/",
-  "provider": "Blackbox",
-  "model": "DeepSeek-V3"
-}
+[
+  {
+    "api_key": "your-openai-api-key-here",
+    "base_url": "https://api.openai.com/v1/",
+    "provider": "OpenAI",
+    "model": "gpt-4o"
+  },
+  {
+    "api_key": "your-groq-api-key-here",
+    "base_url": "https://api.groq.com/openai/v1/",
+    "provider": "Groq",
+    "model": "llama3-70b-8192"
+  },
+  {
+    "api_key": "your-ollama-key-if-needed",
+    "base_url": "http://localhost:11434/v1/",
+    "provider": "Ollama-Local",
+    "model": "llama3"
+  }
+]
 ```
 
 ### Configuration Priority
 
 nGPT determines configuration values in the following order (highest priority first):
 
-1. Command line arguments
-2. Environment variables (`OPENAI_API_KEY`, `OPENAI_BASE_URL`, `OPENAI_PROVIDER`, `OPENAI_MODEL`)
-3. Configuration file
+1. Command line arguments (`--api-key`, `--base-url`, `--model`)
+2. Environment variables (`OPENAI_API_KEY`, `OPENAI_BASE_URL`, `OPENAI_MODEL`)
+3. Configuration file (selected by `--config-index`, defaults to index 0)
 4. Default values
 
 ## Special Features

ngpt-1.1.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
+ngpt/cli.py,sha256=HA85u1-ajsOBO7Zp-Hngyr4NbYxdktn-uM1VuCvy4CU,9495
+ngpt/client.py,sha256=DfOjE2qQQZq3JF6wNa4YxEfUALq4B0ycP_3v9ZKw2ds,9940
+ngpt/config.py,sha256=qkOd4pNk8pW191u4EzHORecPpRDX2yVPrMQkJ35UsNw,5063
+ngpt-1.1.0.dist-info/METADATA,sha256=03E54-0_TucsoKBlE8U6AGLG6BhDjN4pbh4opiwFPA4,6299
+ngpt-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-1.1.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-1.1.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-1.1.0.dist-info/RECORD,,

ngpt-1.0.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-ngpt/__init__.py,sha256=j6IB_tZV11gpCvP1P8mEQMIocQgGhlz3154t0jkn2EA,495
-ngpt/cli.py,sha256=OmN9iVBAmtbS-tAeeUYMGwW7XcQP99TA8j8tZwr7eJM,6242
-ngpt/client.py,sha256=xsRwdLSbb4S0gucQNtEPHPeVEHyyYfFfZVuNDDuDWjY,9866
-ngpt/config.py,sha256=H1ckYaNaAtep3c-ZS0E8tCoz5Am-ewUtoUd4s3oNewY,2655
-ngpt-1.0.0.dist-info/METADATA,sha256=hzGaAvz2w9WPUA-5AIcWITXCXnNEn-OZxVZ6fQVJohw,5434
-ngpt-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-1.0.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-1.0.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-1.0.0.dist-info/RECORD,,