ngpt 1.1.4__py3-none-any.whl → 1.3.0__py3-none-any.whl

ngpt/cli.py

@@ -2,9 +2,27 @@ 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__
 
+# Optional imports for enhanced UI
+try:
+    from prompt_toolkit import prompt as pt_prompt
+    from prompt_toolkit.styles import Style
+    from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.formatted_text import HTML
+    from prompt_toolkit.layout.containers import HSplit, Window
+    from prompt_toolkit.layout.layout import Layout
+    from prompt_toolkit.layout.controls import FormattedTextControl
+    from prompt_toolkit.application import Application
+    from prompt_toolkit.widgets import TextArea
+    from prompt_toolkit.layout.margins import ScrollbarMargin
+    from prompt_toolkit.filters import to_filter
+    import shutil
+    HAS_PROMPT_TOOLKIT = True
+except ImportError:
+    HAS_PROMPT_TOOLKIT = False
+
 def show_config_help():
     """Display help information about configuration."""
     print("\nConfiguration Help:")
@@ -40,11 +58,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 +90,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)')
     
@@ -86,6 +109,7 @@ def main():
     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')
+    mode_exclusive_group.add_argument('-t', '--text', action='store_true', help='Enter multi-line text input (submit with Ctrl+D)')
     # Note: --show-config is handled separately and implicitly acts as a mode
     
     # Language option for code mode
@@ -103,7 +127,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)
@@ -155,7 +228,7 @@ def main():
         return
     
     # Check if prompt is required but not provided
-    if not args.prompt and not (args.shell or args.code):
+    if not args.prompt and not (args.shell or args.code or args.text):
         parser.print_help()
         return
         
@@ -219,6 +292,117 @@ def main():
             if generated_code:
                 print(f"\nGenerated code:\n{generated_code}")
             
+        elif args.text:
+            # Multi-line text input mode
+            if args.prompt is not None:
+                prompt = args.prompt
+            else:
+                try:
+                    if HAS_PROMPT_TOOLKIT:
+                        print("\033[94m\033[1m" + "Multi-line Input Mode" + "\033[0m")
+                        print("Press Ctrl+D to submit, Ctrl+C to exit")
+                        print("Use arrow keys to navigate, Enter for new line")
+                        
+                        # Create key bindings
+                        kb = KeyBindings()
+                        
+                        # Explicitly bind Ctrl+D to exit
+                        @kb.add('c-d')
+                        def _(event):
+                            event.app.exit(result=event.app.current_buffer.text)
+                            
+                        # Explicitly bind Ctrl+C to exit
+                        @kb.add('c-c')
+                        def _(event):
+                            event.app.exit(result=None)
+                            print("\nInput cancelled by user. Exiting gracefully.")
+                            sys.exit(130)
+                        
+                        # Get terminal dimensions
+                        term_width, term_height = shutil.get_terminal_size()
+                        
+                        # Create a styled TextArea
+                        text_area = TextArea(
+                            style="class:input-area",
+                            multiline=True,
+                            wrap_lines=True,
+                            width=term_width - 4,
+                            height=min(20, term_height - 8),
+                            prompt=HTML("<ansicyan>>>> </ansicyan>"),
+                            scrollbar=True,
+                            focus_on_click=True,
+                            lexer=None,
+                        )
+                        text_area.window.right_margins = [ScrollbarMargin(display_arrows=True)]
+                        
+                        # Create a title bar
+                        title_bar = FormattedTextControl(
+                            HTML("<style bg='ansicyan' fg='ansiblack'><b> NGPT Multi-line Editor </b></style>")
+                        )
+                        
+                        # Create a status bar with key bindings info
+                        status_bar = FormattedTextControl(
+                            HTML("<ansiblue><b>Ctrl+D</b></ansiblue>: Submit | <ansiblue><b>Ctrl+C</b></ansiblue>: Cancel | <ansiblue><b>↑↓←→</b></ansiblue>: Navigate")
+                        )
+                        
+                        # Create the layout
+                        layout = Layout(
+                            HSplit([
+                                Window(title_bar, height=1),
+                                Window(height=1, char="-", style="class:separator"),
+                                text_area,
+                                Window(height=1, char="-", style="class:separator"),
+                                Window(status_bar, height=1),
+                            ])
+                        )
+                        
+                        # Create a style
+                        style = Style.from_dict({
+                            "separator": "ansigray",
+                            "input-area": "bg:ansiblack fg:ansiwhite",
+                            "cursor": "bg:ansiwhite fg:ansiblack",
+                        })
+                        
+                        # Create and run the application
+                        app = Application(
+                            layout=layout,
+                            full_screen=False,
+                            key_bindings=kb,
+                            style=style,
+                            mouse_support=True,
+                        )
+                        
+                        prompt = app.run()
+                        
+                        if not prompt or not prompt.strip():
+                            print("Empty prompt. Exiting.")
+                            return
+                    else:
+                        # Fallback to standard input with a better implementation
+                        print("Enter your multi-line prompt (press Ctrl+D to submit):")
+                        print("Note: Install 'prompt_toolkit' package for an enhanced input experience")
+                        
+                        # Use a more robust approach for multiline input without prompt_toolkit
+                        lines = []
+                        while True:
+                            try:
+                                line = input()
+                                lines.append(line)
+                            except EOFError:  # Ctrl+D was pressed
+                                break
+                        
+                        prompt = "\n".join(lines)
+                        if not prompt.strip():
+                            print("Empty prompt. Exiting.")
+                            return
+                        
+                except KeyboardInterrupt:
+                    print("\nInput cancelled by user. Exiting gracefully.")
+                    sys.exit(130)
+            
+            print("\nSubmission successful. Waiting for response...")
+            client.chat(prompt, web_search=args.web_search)
+            
         else:
             # Default to chat mode
             if args.prompt is None:

ngpt/config.py

@@ -157,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.4.dist-info → ngpt-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 1.1.4
+Version: 1.3.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
@@ -28,6 +28,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
+Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: requests>=2.31.0
 Description-Content-Type: text/markdown
 
@@ -68,6 +69,9 @@ ngpt --code "function to calculate the Fibonacci sequence"
 
 # Generate and execute shell commands
 ngpt --shell "list all files in the current directory"
+
+# Use multiline editor for complex prompts
+ngpt --text
 ```
 
 ## Features
@@ -80,6 +84,7 @@ ngpt --shell "list all files in the current directory"
 - ⚙️ **Multiple Configurations**: Cross-platform config system supporting different profiles
 - 💻 **Shell Command Generation**: OS-aware command execution
 - 🧩 **Clean Code Generation**: Output code without markdown or explanations
+- 📝 **Rich Multiline Editor**: Interactive multiline text input with syntax highlighting and intuitive controls
 
 ## Installation
 
@@ -121,6 +126,10 @@ ngpt -s "list all files in current directory"
 # Generate clean code (using -c or --code flag)
 # Returns only code without markdown formatting or explanations
 ngpt -c "create a python function that calculates fibonacci numbers"
+
+# Use multiline text editor for complex prompts (using -t or --text flag)
+# Opens an interactive editor with syntax highlighting and intuitive controls
+ngpt -t
 ```
 
 ### As a Library
@@ -195,10 +204,12 @@ You can configure the client using the following options:
 | `--web-search` | Enable web search capability |
 | `--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 |
+| `-t, --text` | Open interactive multiline editor for complex prompts |
 | `-v, --version` | Show version information |
 
 ### Interactive Configuration
@@ -211,12 +222,16 @@ 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-1.3.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
+ngpt/cli.py,sha256=U8A9JKOpp-GorBk9yMs2nPThSdUwm83P_e3sDgfqCYo,19880
+ngpt/client.py,sha256=O0dPYeQCJlpWZWBBsroo-5UxeyBVwqC6o3Pm8lRnDiY,10329
+ngpt/config.py,sha256=BF0G3QeiPma8l7EQyc37bR7LWZog7FHJQNe7uj9cr4w,6896
+ngpt-1.3.0.dist-info/METADATA,sha256=mGKNDQa1ppPnBp8lXILcSGYsS_40J0TQRQWLgpF_ewQ,9939
+ngpt-1.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-1.3.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-1.3.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-1.3.0.dist-info/RECORD,,

ngpt-1.1.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
-ngpt/cli.py,sha256=_nu7eY76_y4KQ59cKC91VijVvzSASAaSJI1FFfJ9l04,10655
-ngpt/client.py,sha256=O0dPYeQCJlpWZWBBsroo-5UxeyBVwqC6o3Pm8lRnDiY,10329
-ngpt/config.py,sha256=STnYKJor2nE_dKpK9NcnWlz3A8HeB8ufp-xOewGmRVo,5947
-ngpt-1.1.4.dist-info/METADATA,sha256=kCn6kuMVbjmD0_LTjVyq1D_5MXrB6aNJpgF7Qf9QopE,9240
-ngpt-1.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-1.1.4.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-1.1.4.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-1.1.4.dist-info/RECORD,,