ngpt 1.0.0__tar.gz → 1.1.0__tar.gz

{ngpt-1.0.0 → ngpt-1.1.0}/PKG-INFO

@@ -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.0.0 → ngpt-1.1.0}/README.md

@@ -1,6 +1,6 @@
 # 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
 
@@ -31,6 +31,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"
 
@@ -49,8 +55,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)
@@ -84,10 +90,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
 
@@ -97,35 +105,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.0.0 → ngpt-1.1.0}/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-1.1.0/ngpt/cli.py

@@ -0,0 +1,221 @@
+import argparse
+import sys
+import os
+from .client import NGPTClient
+from .config import load_config, get_config_path, load_configs, add_config_entry
+from . import __version__
+
+def show_config_help():
+    """Display help information about configuration."""
+    print("\nConfiguration Help:")
+    print("  1. Create a config file at one of these locations:")
+    if sys.platform == "win32":
+        print(f"     - %APPDATA%\\ngpt\\ngpt.conf")
+    elif sys.platform == "darwin":
+        print(f"     - ~/Library/Application Support/ngpt/ngpt.conf")
+    else:
+        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"
+       },
+       {
+         "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")
+    print("     - OPENAI_BASE_URL")
+    print("     - OPENAI_PROVIDER")
+    print("     - OPENAI_MODEL")
+    
+    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."""
+    if not config.get("api_key"):
+        print("Error: API key is not set.")
+        show_config_help()
+        return False
+        
+    # Check for common URL mistakes
+    base_url = config.get("base_url", "")
+    if base_url and not (base_url.startswith("http://") or base_url.startswith("https://")):
+        print(f"Warning: Base URL '{base_url}' doesn't start with http:// or https://")
+    
+    return True
+
+def main():
+    parser = argparse.ArgumentParser(description="nGPT - A CLI tool for interacting with custom OpenAI API endpoints")
+    
+    # Version flag
+    parser.add_argument('-v', '--version', action='version', version=f'nGPT {__version__}', 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')
+    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
+    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_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)')
+    
+    # Prompt argument
+    parser.add_argument('prompt', nargs='?', default=None, help='The prompt to send')
+    
+    args = parser.parse_args()
+    
+    # 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 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:
+        active_config["api_key"] = args.api_key
+    if args.base_url:
+        active_config["base_url"] = args.base_url
+    if 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"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
+    if not args.prompt and not (args.shell or args.code):
+        parser.print_help()
+        return
+        
+    # Check configuration (using the potentially overridden active_config)
+    if not check_config(active_config):
+        return
+    
+    # Initialize client using the potentially overridden active_config
+    client = NGPTClient(**active_config)
+    
+    try:
+        # Handle modes
+        if args.shell:
+            if args.prompt is None:
+                print("Enter shell command description: ", end='')
+                prompt = input()
+            else:
+                prompt = args.prompt
+                
+            command = client.generate_shell_command(prompt, web_search=args.web_search)
+            if not command:
+                return  # Error already printed by client
+                
+            print(f"\nGenerated command: {command}")
+            
+            print("Do you want to execute this command? [y/N] ", end='')
+            response = input().lower()
+            if response == 'y' or response == 'yes':
+                import subprocess
+                try:
+                    result = subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
+                    print(f"\nOutput:\n{result.stdout}")
+                except subprocess.CalledProcessError as e:
+                    print(f"\nError:\n{e.stderr}")
+                    
+        elif args.code:
+            if args.prompt is None:
+                print("Enter code description: ", end='')
+                prompt = input()
+            else:
+                prompt = args.prompt
+                
+            generated_code = client.generate_code(prompt, args.language, web_search=args.web_search)
+            if generated_code:
+                print(f"\nGenerated code:\n{generated_code}")
+            
+        else:
+            # Default to chat mode
+            if args.prompt is None:
+                print("Enter your prompt: ", end='')
+                prompt = input()
+            else:
+                prompt = args.prompt
+            client.chat(prompt, web_search=args.web_search)
+    
+    except KeyboardInterrupt:
+        print("\nOperation cancelled by user.")
+    except Exception as e:
+        print(f"Error: {e}")
+
+if __name__ == "__main__":
+    main() 

{ngpt-1.0.0 → ngpt-1.1.0}/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-1.1.0/ngpt/config.py

@@ -0,0 +1,136 @@
+import os
+import sys
+import json
+from pathlib import Path
+from typing import Dict, Optional, Any, List
+
+# Default configuration
+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":
+        # Windows
+        config_dir = Path(os.environ.get("APPDATA", "")) / "ngpt"
+    elif sys.platform == "darwin":
+        # macOS
+        config_dir = Path.home() / "Library" / "Application Support" / "ngpt"
+    else:
+        # Linux and other Unix-like systems
+        xdg_config_home = os.environ.get("XDG_CONFIG_HOME")
+        if xdg_config_home:
+            config_dir = Path(xdg_config_home) / "ngpt"
+        else:
+            config_dir = Path.home() / ".config" / "ngpt"
+    
+    # Ensure the directory exists
+    config_dir.mkdir(parents=True, exist_ok=True)
+    return config_dir
+
+def get_config_path(custom_path: Optional[str] = None) -> Path:
+    """Get the path to the config file."""
+    if custom_path:
+        return Path(custom_path)
+    return get_config_dir() / "ngpt.conf"
+
+def create_default_config(config_path: Path) -> None:
+    """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 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 all configurations from the config file.
+    Returns a list of configuration dictionaries.
+    """
+    config_path = get_config_path(custom_path)
+    
+    # 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_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",
+        "OPENAI_BASE_URL": "base_url",
+        "OPENAI_PROVIDER": "provider", 
+        "OPENAI_MODEL": "model"
+    }
+    
+    for env_var, config_key in env_mapping.items():
+        if env_var in os.environ and os.environ[env_var]:
+            config[config_key] = os.environ[env_var]
+    
+    return config 

{ngpt-1.0.0 → ngpt-1.1.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "ngpt"
-version = "1.0.0"
-description = "A Python CLI and library for interacting with custom OpenAI API endpoints"
+version = "1.1.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"},
 ]
 dependencies = [
-    "requests>=2.28.0",
+    "requests>=2.31.0",
 ]
 requires-python = ">=3.8"
 readme = "README.md"
@@ -44,6 +44,3 @@ ngpt = "ngpt.cli:main"
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
-
-[dependency-groups]
-dev = []

{ngpt-1.0.0 → ngpt-1.1.0}/uv.lock

@@ -113,17 +113,14 @@ wheels = [
 
 [[package]]
 name = "ngpt"
-version = "1.0.0"
+version = "1.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "requests" },
 ]
 
 [package.metadata]
-requires-dist = [{ name = "requests", specifier = ">=2.28.0" }]
-
-[package.metadata.requires-dev]
-dev = []
+requires-dist = [{ name = "requests", specifier = ">=2.31.0" }]
 
 [[package]]
 name = "requests"

ngpt-1.0.0/ngpt/cli.py

@@ -1,167 +0,0 @@
-import argparse
-import sys
-import os
-from .client import NGPTClient
-from .config import load_config, get_config_path
-from . import __version__
-
-def show_config_help():
-    """Display help information about configuration."""
-    print("\nConfiguration Help:")
-    print("  1. Create a config file at one of these locations:")
-    if sys.platform == "win32":
-        print(f"     - %APPDATA%\\ngpt\\ngpt.conf")
-    elif sys.platform == "darwin":
-        print(f"     - ~/Library/Application Support/ngpt/ngpt.conf")
-    else:
-        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("  3. Or set environment variables:")
-    print("     - OPENAI_API_KEY")
-    print("     - OPENAI_BASE_URL")
-    print("     - OPENAI_PROVIDER")
-    print("     - OPENAI_MODEL")
-    
-    print("  4. Or provide command line arguments:")
-    print("     ngpt --api-key your-key --base-url https://api.example.com \"Your prompt\"")
-
-def check_config(config):
-    """Check config for common issues and provide guidance."""
-    if not config.get("api_key"):
-        print("Error: API key is not set.")
-        show_config_help()
-        return False
-        
-    # Check for common URL mistakes
-    base_url = config.get("base_url", "")
-    if base_url and not (base_url.startswith("http://") or base_url.startswith("https://")):
-        print(f"Warning: Base URL '{base_url}' doesn't start with http:// or https://")
-    
-    return True
-
-def main():
-    parser = argparse.ArgumentParser(description="nGPT - A CLI tool for interacting with custom OpenAI API endpoints")
-    
-    # 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')
-    
-    # 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', 
-                      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')
-    
-    # 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')
-    
-    args = parser.parse_args()
-    
-    # Load configuration
-    config = load_config(args.config)
-    
-    # Command-line arguments override config settings
-    if args.api_key:
-        config["api_key"] = args.api_key
-    if args.base_url:
-        config["base_url"] = args.base_url
-    if args.provider:
-        config["provider"] = args.provider
-    if args.model:
-        config["model"] = args.model
-    
-    # Show config if requested
-    if args.show_config:
-        config_path = get_config_path(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']}")
-        return
-    
-    # Check if prompt is required but not provided
-    if not args.prompt and not (args.shell or args.code):
-        parser.print_help()
-        return
-        
-    # Check configuration
-    if not check_config(config):
-        return
-    
-    # Initialize client
-    client = NGPTClient(**config)
-    
-    try:
-        # Handle modes
-        if args.shell:
-            if args.prompt is None:
-                print("Enter shell command description: ", end='')
-                prompt = input()
-            else:
-                prompt = args.prompt
-                
-            command = client.generate_shell_command(prompt, web_search=args.web_search)
-            if not command:
-                return  # Error already printed by client
-                
-            print(f"\nGenerated command: {command}")
-            
-            print("Do you want to execute this command? [y/N] ", end='')
-            response = input().lower()
-            if response == 'y' or response == 'yes':
-                import subprocess
-                try:
-                    result = subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
-                    print(f"\nOutput:\n{result.stdout}")
-                except subprocess.CalledProcessError as e:
-                    print(f"\nError:\n{e.stderr}")
-                    
-        elif args.code:
-            if args.prompt is None:
-                print("Enter code description: ", end='')
-                prompt = input()
-            else:
-                prompt = args.prompt
-                
-            generated_code = client.generate_code(prompt, args.language, web_search=args.web_search)
-            if generated_code:
-                print(f"\nGenerated code:\n{generated_code}")
-            
-        else:
-            # Default to chat mode
-            if args.prompt is None:
-                print("Enter your prompt: ", end='')
-                prompt = input()
-            else:
-                prompt = args.prompt
-            client.chat(prompt, web_search=args.web_search)
-    
-    except KeyboardInterrupt:
-        print("\nOperation cancelled by user.")
-    except Exception as e:
-        print(f"Error: {e}")
-        
-if __name__ == "__main__":
-    main() 

ngpt-1.0.0/ngpt/config.py

@@ -1,81 +0,0 @@
-import os
-import sys
-import json
-from pathlib import Path
-from typing import Dict, Optional, Any
-
-# Default configuration
-DEFAULT_CONFIG = {
-    "api_key": "",
-    "base_url": "https://api.openai.com/v1/",
-    "provider": "OpenAI",
-    "model": "gpt-3.5-turbo"
-}
-
-def get_config_dir() -> Path:
-    """Get the appropriate config directory based on OS."""
-    if sys.platform == "win32":
-        # Windows
-        config_dir = Path(os.environ.get("APPDATA", "")) / "ngpt"
-    elif sys.platform == "darwin":
-        # macOS
-        config_dir = Path.home() / "Library" / "Application Support" / "ngpt"
-    else:
-        # Linux and other Unix-like systems
-        xdg_config_home = os.environ.get("XDG_CONFIG_HOME")
-        if xdg_config_home:
-            config_dir = Path(xdg_config_home) / "ngpt"
-        else:
-            config_dir = Path.home() / ".config" / "ngpt"
-    
-    # Ensure the directory exists
-    config_dir.mkdir(parents=True, exist_ok=True)
-    return config_dir
-
-def get_config_path(custom_path: Optional[str] = None) -> Path:
-    """Get the path to the config file."""
-    if custom_path:
-        return Path(custom_path)
-    return get_config_dir() / "ngpt.conf"
-
-def create_default_config(config_path: Path) -> None:
-    """Create a default configuration file."""
-    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]:
-    """
-    Load configuration from file and environment variables.
-    Environment variables take precedence over the config file.
-    """
-    config_path = get_config_path(custom_path)
-    
-    # Start with default config
-    config = 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)
-        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)
-    
-    # Override with environment variables if they exist
-    env_mapping = {
-        "OPENAI_API_KEY": "api_key",
-        "OPENAI_BASE_URL": "base_url",
-        "OPENAI_PROVIDER": "provider", 
-        "OPENAI_MODEL": "model"
-    }
-    
-    for env_var, config_key in env_mapping.items():
-        if env_var in os.environ and os.environ[env_var]:
-            config[config_key] = os.environ[env_var]
-    
-    return config