ngpt 2.5.1__tar.gz → 2.7.1__tar.gz

{ngpt-2.5.1 → ngpt-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.5.1
+Version: 2.7.1
 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,10 +28,10 @@ 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
-Provides-Extra: prettify
-Requires-Dist: rich>=10.0.0; extra == 'prettify'
+Provides-Extra: full
+Requires-Dist: prompt-toolkit>=3.0.0; extra == 'full'
+Requires-Dist: rich>=10.0.0; extra == 'full'
 Description-Content-Type: text/markdown
 
 # nGPT
@@ -66,6 +66,9 @@ A lightweight Python CLI and library for interacting with OpenAI-compatible APIs
 # Install
 pip install ngpt
 
+# Install with additional features
+pip install "ngpt[full]"
+
 # Chat with default settings
 ngpt "Tell me about quantum computing"
 
@@ -81,12 +84,18 @@ ngpt --code "function to calculate the Fibonacci sequence"
 # Generate code with syntax highlighting
 ngpt --code --prettify "function to calculate the Fibonacci sequence"
 
+# Generate code with real-time syntax highlighting
+ngpt --code --stream-prettify "function to calculate the Fibonacci sequence"
+
 # Generate and execute shell commands
 ngpt --shell "list all files in the current directory"
 
 # Display markdown responses with beautiful formatting
 ngpt --prettify "Explain markdown syntax with examples"
 
+# Display markdown responses with real-time formatting
+ngpt --stream-prettify "Explain markdown syntax with examples"
+
 # Use a specific markdown renderer
 ngpt --prettify --renderer=rich "Create a markdown table"
 
@@ -111,6 +120,7 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 - 📊 **Streaming Responses**: Real-time output for better user experience
 - 🔍 **Web Search**: Integrated with compatible API endpoints
 - 🎨 **Markdown Rendering**: Beautiful formatting of markdown and code with syntax highlighting
+- ⚡ **Real-time Markdown**: Stream responses with live updating syntax highlighting and formatting
 - ⚙️ **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
@@ -136,11 +146,19 @@ Key documentation sections:
 ## Installation
 
 ```bash
+# Basic installation (minimal dependencies)
 pip install ngpt
+
+# Full installation with all features (recommended)
+pip install "ngpt[full]"
 ```
 
 Requires Python 3.8 or newer.
 
+The full installation includes:
+- Enhanced markdown rendering with syntax highlighting
+- Improved interactive input experience with multiline editing
+
 For detailed installation instructions, see the [Installation Guide](https://nazdridoy.github.io/ngpt/installation.html).
 
 ## Usage
@@ -280,6 +298,7 @@ You can configure the client using the following options:
 | `--preprompt` | Set custom system prompt to control AI behavior |
 | `--log` | Set filepath to log conversation to (for interactive modes) |
 | `--prettify` | Render markdown responses and code with syntax highlighting |
+| `--stream-prettify` | Enable real-time markdown rendering with syntax highlighting while streaming |
 | `--renderer` | Select which markdown renderer to use with --prettify (auto, rich, or glow) |
 | `--list-renderers` | Show available markdown renderers for use with --prettify |
 | `--config` | Path to a custom configuration file or, when used without a value, enters interactive configuration mode |

{ngpt-2.5.1 → ngpt-2.7.1}/README.md

@@ -30,6 +30,9 @@ A lightweight Python CLI and library for interacting with OpenAI-compatible APIs
 # Install
 pip install ngpt
 
+# Install with additional features
+pip install "ngpt[full]"
+
 # Chat with default settings
 ngpt "Tell me about quantum computing"
 
@@ -45,12 +48,18 @@ ngpt --code "function to calculate the Fibonacci sequence"
 # Generate code with syntax highlighting
 ngpt --code --prettify "function to calculate the Fibonacci sequence"
 
+# Generate code with real-time syntax highlighting
+ngpt --code --stream-prettify "function to calculate the Fibonacci sequence"
+
 # Generate and execute shell commands
 ngpt --shell "list all files in the current directory"
 
 # Display markdown responses with beautiful formatting
 ngpt --prettify "Explain markdown syntax with examples"
 
+# Display markdown responses with real-time formatting
+ngpt --stream-prettify "Explain markdown syntax with examples"
+
 # Use a specific markdown renderer
 ngpt --prettify --renderer=rich "Create a markdown table"
 
@@ -75,6 +84,7 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 - 📊 **Streaming Responses**: Real-time output for better user experience
 - 🔍 **Web Search**: Integrated with compatible API endpoints
 - 🎨 **Markdown Rendering**: Beautiful formatting of markdown and code with syntax highlighting
+- ⚡ **Real-time Markdown**: Stream responses with live updating syntax highlighting and formatting
 - ⚙️ **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
@@ -100,11 +110,19 @@ Key documentation sections:
 ## Installation
 
 ```bash
+# Basic installation (minimal dependencies)
 pip install ngpt
+
+# Full installation with all features (recommended)
+pip install "ngpt[full]"
 ```
 
 Requires Python 3.8 or newer.
 
+The full installation includes:
+- Enhanced markdown rendering with syntax highlighting
+- Improved interactive input experience with multiline editing
+
 For detailed installation instructions, see the [Installation Guide](https://nazdridoy.github.io/ngpt/installation.html).
 
 ## Usage
@@ -244,6 +262,7 @@ You can configure the client using the following options:
 | `--preprompt` | Set custom system prompt to control AI behavior |
 | `--log` | Set filepath to log conversation to (for interactive modes) |
 | `--prettify` | Render markdown responses and code with syntax highlighting |
+| `--stream-prettify` | Enable real-time markdown rendering with syntax highlighting while streaming |
 | `--renderer` | Select which markdown renderer to use with --prettify (auto, rich, or glow) |
 | `--list-renderers` | Show available markdown renderers for use with --prettify |
 | `--config` | Path to a custom configuration file or, when used without a value, enters interactive configuration mode |

{ngpt-2.5.1 → ngpt-2.7.1}/docs/examples/advanced.md

@@ -316,6 +316,28 @@ print(response_high)
 
 ## Advanced CLI Usage
 
+### Working with Real-time Markdown Rendering
+
+Use the stream-prettify feature for an enhanced user experience with formatted markdown in real-time:
+
+```bash
+# Basic streaming markdown
+ngpt --stream-prettify "Compare and contrast different sorting algorithms with examples"
+
+# Real-time code generation with syntax highlighting
+ngpt -c --stream-prettify --language typescript "implement a React hook for managing form state"
+
+# Interactive session with real-time markdown rendering
+ngpt -i --stream-prettify
+```
+
+Combining stream-prettify with web search for up-to-date formatted information:
+
+```bash
+# Get latest news with beautified formatting in real-time
+ngpt --stream-prettify --web-search "What are the latest developments in AI research?"
+```
+
 ### Custom Script with argparse
 
 Create a custom script that uses nGPT with argparse for a better CLI experience:

{ngpt-2.5.1 → ngpt-2.7.1}/docs/examples/basic.md

@@ -129,6 +129,12 @@ ngpt "Tell me about quantum computing"
 
 # No streaming (wait for full response)
 ngpt -n "Explain the theory of relativity"
+
+# Prettify markdown output
+ngpt --prettify "Create a markdown table comparing different programming languages"
+
+# Real-time markdown formatting with streaming
+ngpt --stream-prettify "Explain machine learning algorithms with examples"
 ```
 
 ### Code Generation
@@ -139,6 +145,12 @@ ngpt -c "function to calculate prime numbers"
 
 # Generate specific language code
 ngpt -c "create a React component that displays a counter" --language jsx
+
+# Generate code with syntax highlighting
+ngpt -c --prettify "implement a binary search tree"
+
+# Generate code with real-time syntax highlighting
+ngpt -c --stream-prettify "write a function to sort an array using quicksort"
 ```
 
 ### Shell Commands

{ngpt-2.5.1 → ngpt-2.7.1}/docs/installation.md

@@ -6,11 +6,11 @@ There are several ways to install nGPT depending on your needs and environment.
 
 - Python 3.8 or newer
 - `requests` library (automatically installed as a dependency)
-- `prompt_toolkit` library (automatically installed as a dependency)
 
 ## Optional Dependencies
 
 - `rich` library - For enhanced markdown rendering with syntax highlighting
+- `prompt_toolkit` library - For improved interactive input experience with multiline editing
 
 ## Installing from PyPI (Recommended)
 
@@ -20,18 +20,20 @@ The simplest way to install nGPT is through the Python Package Index (PyPI):
 pip install ngpt
 ```
 
-This will install the latest stable release of nGPT and all its dependencies.
+This will install the latest stable release of nGPT with basic functionality.
 
-For markdown rendering capabilities, install with the prettify extra:
+For additional capabilities like markdown rendering, syntax highlighting, and enhanced interactive input experience, install with the full extras:
 
 ```bash
-pip install ngpt[prettify]
+pip install "ngpt[full]"
 ```
 
-Alternatively, you can install the optional dependency separately:
+Note that quotes around the package name are required due to the square brackets.
+
+Alternatively, you can install the optional dependencies separately:
 
 ```bash
-pip install rich
+pip install rich prompt_toolkit
 ```
 
 ## Installing in a Virtual Environment
@@ -52,6 +54,9 @@ source ngpt-env/bin/activate
 
 # Install nGPT
 pip install ngpt
+
+# Or with all features
+pip install "ngpt[full]"
 ```
 
 ### Using conda
@@ -65,6 +70,9 @@ conda activate ngpt-env
 
 # Install nGPT
 pip install ngpt
+
+# Or with all features
+pip install "ngpt[full]"
 ```
 
 ## Installing from Source
@@ -80,6 +88,9 @@ cd ngpt
 
 # Install the package in development mode
 pip install -e .
+
+# Or with all features
+pip install -e ".[full]"
 ```
 
 ## Upgrading
@@ -88,6 +99,9 @@ To upgrade to the latest version:
 
 ```bash
 pip install --upgrade ngpt
+
+# Or with all features
+pip install --upgrade "ngpt[full]"
 ```
 
 ## Verifying the Installation

{ngpt-2.5.1 → ngpt-2.7.1}/docs/overview.md

@@ -20,6 +20,8 @@ nGPT is a lightweight Python library and command-line interface (CLI) tool desig
 
 - **Markdown Rendering**: Beautiful formatting of markdown responses and syntax highlighting for code.
 
+- **Real-time Markdown Rendering**: Stream responses with live updating syntax highlighting and formatting using the `--stream-prettify` option.
+
 - **Multiple Configuration Support**: Maintain different API configurations for various services or models.
 
 - **Shell Command Generation**: Generate OS-aware commands that work on your specific platform.

{ngpt-2.5.1 → ngpt-2.7.1}/docs/usage/cli_usage.md

@@ -49,6 +49,7 @@ Here are the most commonly used options:
 | `--top_p` | Set top_p (controls diversity, default: 1.0) |
 | `--max_tokens` | Set maximum response length in tokens |
 | `--prettify` | Render markdown responses and code with syntax highlighting |
+| `--stream-prettify` | Enable real-time markdown rendering with syntax highlighting while streaming |
 | `--renderer` | Select which markdown renderer to use (auto, rich, or glow) |
 | `--list-renderers` | Show available markdown renderers on your system |
 | `--config-index` | Index of the configuration to use (default: 0) |
@@ -177,6 +178,30 @@ ngpt -c --prettify "function to calculate the Fibonacci sequence"
 
 When using `--prettify` with code generation, the AI will output code in markdown format with proper syntax highlighting based on the language.
 
+### Real-time Markdown Rendering
+
+Display markdown responses with real-time formatting and syntax highlighting while streaming:
+
+```bash
+ngpt --stream-prettify "Explain quantum computing with code examples"
+```
+
+This provides an enhanced experience by rendering markdown in real-time as content arrives, offering both the benefits of streaming and formatted output simultaneously. This feature uses Rich for live updates and beautiful formatting.
+
+You can also combine this with code generation:
+
+```bash
+ngpt -c --stream-prettify "write a function to implement merge sort in Python"
+```
+
+This is particularly useful for longer code generation tasks, as you can see the code being formatted with syntax highlighting in real-time.
+
+Notes on `--stream-prettify`:
+- Requires Rich to be installed (`pip install "ngpt[full]"` or `pip install rich`)
+- Only works with the Rich renderer (even if you specify another renderer)
+- Works in both regular and interactive modes
+- Creates a more dynamic and responsive UI experience
+
 See available renderers on your system:
 
 ```bash
@@ -294,11 +319,17 @@ ngpt -i --preprompt "You are a data science tutor" --log datasci_tutoring.txt
 # Generate code with syntax highlighting
 ngpt -c --prettify "create a sorting algorithm"
 
+# Generate code with real-time syntax highlighting
+ngpt -c --stream-prettify "implement a binary search tree in JavaScript"
+
 # Render markdown with web search for up-to-date information
 ngpt --prettify --web-search "Create a markdown table of recent SpaceX launches"
 
 # Interactive session with markdown rendering
 ngpt -i --prettify --renderer=rich
+
+# Interactive session with real-time markdown rendering
+ngpt -i --stream-prettify
 ```
 
 ### Using a Custom Configuration File

{ngpt-2.5.1 → ngpt-2.7.1}/ngpt/cli.py

@@ -115,10 +115,11 @@ def show_available_renderers():
     if HAS_RICH:
         print(f"  {COLORS['green']}✓ Rich{COLORS['reset']} - Python library for terminal formatting (Recommended)")
     else:
-        print(f"  {COLORS['yellow']}✗ Rich{COLORS['reset']} - Not installed (pip install rich)")
+        print(f"  {COLORS['yellow']}✗ Rich{COLORS['reset']} - Not installed (pip install \"ngpt[full]\" or pip install rich)")
         
     if not HAS_GLOW and not HAS_RICH:
         print(f"\n{COLORS['yellow']}To enable prettified markdown output, install one of the above renderers.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}For Rich: pip install \"ngpt[full]\" or pip install rich{COLORS['reset']}")
     else:
         renderers = []
         if HAS_RICH:
@@ -148,11 +149,11 @@ def warn_if_no_markdown_renderer(renderer='auto'):
     
     if renderer == 'auto':
         print(f"{COLORS['yellow']}Warning: No markdown rendering library available.{COLORS['reset']}")
-        print(f"{COLORS['yellow']}Install 'rich' package with: pip install rich{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Install with: pip install \"ngpt[full]\"{COLORS['reset']}")
         print(f"{COLORS['yellow']}Or install 'glow' from https://github.com/charmbracelet/glow{COLORS['reset']}")
     elif renderer == 'rich':
         print(f"{COLORS['yellow']}Warning: Rich is not available.{COLORS['reset']}")
-        print(f"{COLORS['yellow']}Install with: pip install rich{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Install with: pip install \"ngpt[full]\" or pip install rich{COLORS['reset']}")
     elif renderer == 'glow':
         print(f"{COLORS['yellow']}Warning: Glow is not available.{COLORS['reset']}")
         print(f"{COLORS['yellow']}Install from https://github.com/charmbracelet/glow{COLORS['reset']}")
@@ -219,7 +220,8 @@ def prettify_markdown(text, renderer='auto'):
     # Use rich for rendering
     elif renderer == 'rich':
         if not HAS_RICH:
-            print(f"{COLORS['yellow']}Warning: Rich is not available. Install with: pip install rich{COLORS['reset']}")
+            print(f"{COLORS['yellow']}Warning: Rich is not available.{COLORS['reset']}")
+            print(f"{COLORS['yellow']}Install with: pip install \"ngpt[full]\" or pip install rich{COLORS['reset']}")
             # Fall back to glow if available
             if HAS_GLOW:
                 print(f"{COLORS['yellow']}Falling back to Glow renderer.{COLORS['reset']}")
@@ -505,8 +507,22 @@ 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_tokens=None, log_file=None, preprompt=None, prettify=False, renderer='auto'):
-    """Run an interactive chat session with conversation history."""
+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, prettify=False, renderer='auto', stream_prettify=False):
+    """Start an interactive chat session with the AI.
+    
+    Args:
+        client: The NGPTClient instance
+        web_search: Whether to enable web search capability
+        no_stream: Whether to disable streaming
+        temperature: Controls randomness in the response
+        top_p: Controls diversity via nucleus sampling
+        max_tokens: Maximum number of tokens to generate in each response
+        log_file: Optional filepath to log conversation to
+        preprompt: Custom system prompt to control AI behavior
+        prettify: Whether to enable markdown rendering
+        renderer: Which markdown renderer to use
+        stream_prettify: Whether to enable streaming with prettify
+    """
     # Get terminal width for better formatting
     try:
         term_width = shutil.get_terminal_size().columns
@@ -668,18 +684,38 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                 log_handle.flush()
             
             # Print assistant indicator with formatting
-            if not no_stream:
+            if not no_stream and not stream_prettify:
                 print(f"\n{ngpt_header()}: {COLORS['reset']}", end="", flush=True)
-            else:
+            elif not stream_prettify:
                 print(f"\n{ngpt_header()}: {COLORS['reset']}", flush=True)
             
-            # If prettify is enabled, we need to disable streaming to collect the full response
-            should_stream = not no_stream and not prettify
-            
-            # If prettify is enabled with streaming, inform the user
-            if prettify and not no_stream:
+            # If prettify is enabled with regular streaming
+            if prettify and not no_stream and not stream_prettify:
                 print(f"\n{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
                 print(f"\n{ngpt_header()}: {COLORS['reset']}", flush=True)
+                should_stream = False
+            else:
+                # Regular behavior with stream-prettify taking precedence
+                should_stream = not no_stream
+            
+            # Setup for stream-prettify
+            stream_callback = None
+            live_display = None
+            
+            if stream_prettify and should_stream:
+                # Get the correct header for interactive mode
+                header = ngpt_header()
+                live_display, stream_callback = prettify_streaming_markdown(renderer, is_interactive=True, header_text=header)
+                if not live_display:
+                    # Fallback to normal prettify if live display setup failed
+                    prettify = True
+                    stream_prettify = False
+                    should_stream = False
+                    print(f"{COLORS['yellow']}Falling back to regular prettify mode.{COLORS['reset']}")
+            
+            # Start live display if using stream-prettify
+            if stream_prettify and live_display:
+                live_display.start()
             
             # Get AI response with conversation history
             response = client.chat(
@@ -690,9 +726,14 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                 temperature=temperature,
                 top_p=top_p,
                 max_tokens=max_tokens,
-                markdown_format=prettify
+                markdown_format=prettify or stream_prettify,
+                stream_callback=stream_callback
             )
             
+            # Stop live display if using stream-prettify
+            if stream_prettify and live_display:
+                live_display.stop()
+            
             # Add AI response to conversation history
             if response:
                 assistant_message = {"role": "assistant", "content": response}
@@ -726,6 +767,83 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             log_handle.write(f"\n--- End of Session ---\n")
             log_handle.close()
 
+def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_text=None):
+    """Set up streaming markdown rendering.
+    
+    This function creates a live display context for rendering markdown
+    that can be updated in real-time as streaming content arrives.
+    
+    Args:
+        renderer (str): Which renderer to use (currently only 'rich' is supported for streaming)
+        is_interactive (bool): Whether this is being used in interactive mode
+        header_text (str): Header text to include at the top (for interactive mode)
+        
+    Returns:
+        tuple: (live_display, update_function) if successful, (None, None) otherwise
+    """
+    # Only warn if explicitly specifying a renderer other than 'rich' or 'auto'
+    if renderer != 'rich' and renderer != 'auto':
+        print(f"{COLORS['yellow']}Warning: Streaming prettify only supports 'rich' renderer currently.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Falling back to Rich renderer.{COLORS['reset']}")
+    
+    # Always use rich for streaming prettify
+    renderer = 'rich'
+    
+    if not HAS_RICH:
+        print(f"{COLORS['yellow']}Warning: Rich is not available for streaming prettify.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Install with: pip install \"ngpt[full]\" or pip install rich{COLORS['reset']}")
+        return None, None
+        
+    try:
+        from rich.live import Live
+        from rich.markdown import Markdown
+        from rich.console import Console
+        from rich.text import Text
+        from rich.panel import Panel
+        import rich.box
+        
+        console = Console()
+        
+        # Create an empty markdown object to start with
+        if is_interactive and header_text:
+            # For interactive mode, include header in a panel
+            # Clean up the header text to avoid duplication - use just "🤖 nGPT" instead of "╭─ 🤖 nGPT"
+            clean_header = "🤖 nGPT"
+            panel_title = Text(clean_header, style="cyan bold")
+            
+            # Create a nicer, more compact panel
+            padding = (1, 1)  # Less horizontal padding (left, right)
+            md_obj = Panel(
+                Markdown(""),
+                title=panel_title,
+                title_align="left",
+                border_style="cyan",
+                padding=padding,
+                width=console.width - 4,  # Make panel slightly narrower than console
+                box=rich.box.ROUNDED
+            )
+        else:
+            md_obj = Markdown("")
+        
+        # Initialize the Live display with an empty markdown
+        live = Live(md_obj, console=console, refresh_per_second=10)
+        
+        # Define an update function that will be called with new content
+        def update_content(content):
+            nonlocal md_obj
+            if is_interactive and header_text:
+                # Update the panel content
+                md_obj.renderable = Markdown(content)
+                live.update(md_obj)
+            else:
+                md_obj = Markdown(content)
+                live.update(md_obj)
+            
+        return live, update_content
+    except Exception as e:
+        print(f"{COLORS['yellow']}Error setting up Rich streaming display: {str(e)}{COLORS['reset']}")
+        return None, None
+
 def main():
     # Colorize description - use a shorter description to avoid line wrapping issues
     description = f"{COLORS['cyan']}{COLORS['bold']}nGPT{COLORS['reset']} - Interact with AI language models via OpenAI-compatible APIs"
@@ -783,6 +901,8 @@ def main():
                       help='Set custom system prompt to control AI behavior')
     global_group.add_argument('--prettify', action='store_const', const='auto',
                       help='Render markdown responses and code with syntax highlighting and formatting')
+    global_group.add_argument('--stream-prettify', action='store_true',
+                      help='Enable streaming with markdown rendering (automatically uses Rich renderer)')
     global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
                       help='Select which markdown renderer to use with --prettify (auto, rich, or glow)')
     
@@ -1022,6 +1142,14 @@ def main():
             show_available_renderers()
             args.prettify = False
         
+    # Check if --prettify is used with --stream-prettify (conflict)
+    if args.prettify and args.stream_prettify:
+        parser.error("--prettify and --stream-prettify cannot be used together. Choose one option.")
+
+    # Check if --stream-prettify is used but Rich is not available
+    if args.stream_prettify and not has_markdown_renderer('rich'):
+        parser.error("--stream-prettify requires Rich to be installed. Install with: pip install \"ngpt[full]\" or pip install rich")
+
     # Initialize client using the potentially overridden active_config
     client = NGPTClient(**active_config)
     
@@ -1046,9 +1174,19 @@ def main():
         # Handle modes
         if args.interactive:
             # 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_tokens=args.max_tokens, log_file=args.log, preprompt=args.preprompt, prettify=args.prettify, renderer=args.renderer)
+            interactive_chat_session(
+                client,
+                web_search=args.web_search,
+                no_stream=args.no_stream, 
+                temperature=args.temperature,
+                top_p=args.top_p,
+                max_tokens=args.max_tokens,
+                log_file=args.log,
+                preprompt=args.preprompt,
+                prettify=args.prettify,
+                renderer=args.renderer,
+                stream_prettify=args.stream_prettify
+            )
         elif args.shell:
             if args.prompt is None:
                 try:
@@ -1097,12 +1235,50 @@ def main():
                     sys.exit(130)
             else:
                 prompt = args.prompt
+
+            # Setup for stream-prettify with code generation
+            stream_callback = None
+            live_display = None
+            should_stream = False
+            
+            if args.stream_prettify:
+                should_stream = True  # Enable streaming
+                # This is the code generation mode, not interactive
+                live_display, stream_callback = prettify_streaming_markdown(args.renderer)
+                if not live_display:
+                    # Fallback to normal prettify if live display setup failed
+                    args.prettify = True
+                    args.stream_prettify = False
+                    should_stream = False
+                    print(f"{COLORS['yellow']}Falling back to regular prettify mode.{COLORS['reset']}")
+            
+            # If regular prettify is enabled with streaming, inform the user
+            if args.prettify and not args.no_stream:
+                print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
+            
+            print("\nGenerating code...")
+            
+            # Start live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.start()
+                
+            generated_code = client.generate_code(
+                prompt=prompt, 
+                language=args.language, 
+                web_search=args.web_search,
+                temperature=args.temperature, 
+                top_p=args.top_p,
+                max_tokens=args.max_tokens,
+                markdown_format=args.prettify or args.stream_prettify,
+                stream=should_stream,
+                stream_callback=stream_callback
+            )
+            
+            # Stop live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.stop()
                 
-            generated_code = client.generate_code(prompt, args.language, web_search=args.web_search,
-                                              temperature=args.temperature, top_p=args.top_p,
-                                              max_tokens=args.max_tokens,
-                                              markdown_format=args.prettify)
-            if generated_code:
+            if generated_code and not args.stream_prettify:
                 if args.prettify:
                     print("\nGenerated code:")
                     prettify_markdown(generated_code, args.renderer)
@@ -1226,25 +1402,46 @@ def main():
                     {"role": "user", "content": prompt}
                 ]
             
-            # If prettify is enabled, we need to disable streaming to collect the full response
-            should_stream = not args.no_stream and not args.prettify
+            # If stream-prettify is enabled
+            stream_callback = None
+            live_display = None
             
-            # If prettify is enabled with streaming, inform the user
+            if args.stream_prettify:
+                should_stream = True  # Enable streaming
+                # This is the standard mode, not interactive
+                live_display, stream_callback = prettify_streaming_markdown(args.renderer)
+                if not live_display:
+                    # Fallback to normal prettify if live display setup failed
+                    args.prettify = True
+                    args.stream_prettify = False
+                    should_stream = False
+                    print(f"{COLORS['yellow']}Falling back to regular prettify mode.{COLORS['reset']}")
+            
+            # If regular prettify is enabled with streaming, inform the user
             if args.prettify and not args.no_stream:
                 print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
-                
+            
+            # Start live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.start()
+            
             response = client.chat(prompt, stream=should_stream, web_search=args.web_search,
                                temperature=args.temperature, top_p=args.top_p,
                                max_tokens=args.max_tokens, messages=messages,
-                               markdown_format=args.prettify)
+                               markdown_format=args.prettify or args.stream_prettify,
+                               stream_callback=stream_callback)
             
-            # Handle non-stream response (either because no_stream was set or prettify forced it)
+            # Stop live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.stop()
+                
+            # Handle non-stream response or regular prettify
             if (args.no_stream or args.prettify) and response:
                 if args.prettify:
                     prettify_markdown(response, args.renderer)
                 else:
                     print(response)
-            
+        
         else:
             # Default to chat mode
             if args.prompt is None:
@@ -1265,19 +1462,40 @@ def main():
                     {"role": "user", "content": prompt}
                 ]
             
-            # If prettify is enabled, we need to disable streaming to collect the full response
-            should_stream = not args.no_stream and not args.prettify
+            # If stream-prettify is enabled
+            stream_callback = None
+            live_display = None
             
-            # If prettify is enabled with streaming, inform the user
+            if args.stream_prettify:
+                should_stream = True  # Enable streaming
+                # This is the standard mode, not interactive
+                live_display, stream_callback = prettify_streaming_markdown(args.renderer)
+                if not live_display:
+                    # Fallback to normal prettify if live display setup failed
+                    args.prettify = True
+                    args.stream_prettify = False
+                    should_stream = False
+                    print(f"{COLORS['yellow']}Falling back to regular prettify mode.{COLORS['reset']}")
+            
+            # If regular prettify is enabled with streaming, inform the user
             if args.prettify and not args.no_stream:
                 print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
-                
+            
+            # Start live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.start()
+            
             response = client.chat(prompt, stream=should_stream, web_search=args.web_search,
                                temperature=args.temperature, top_p=args.top_p,
                                max_tokens=args.max_tokens, messages=messages,
-                               markdown_format=args.prettify)
+                               markdown_format=args.prettify or args.stream_prettify,
+                               stream_callback=stream_callback)
             
-            # Handle non-stream response (either because no_stream was set or prettify forced it)
+            # Stop live display if using stream-prettify
+            if args.stream_prettify and live_display:
+                live_display.stop()
+                
+            # Handle non-stream response or regular prettify
             if (args.no_stream or args.prettify) and response:
                 if args.prettify:
                     prettify_markdown(response, args.renderer)

{ngpt-2.5.1 → ngpt-2.7.1}/ngpt/client.py

@@ -34,6 +34,7 @@ class NGPTClient:
         messages: Optional[List[Dict[str, str]]] = None,
         web_search: bool = False,
         markdown_format: bool = False,
+        stream_callback: Optional[callable] = None,
         **kwargs
     ) -> str:
         """
@@ -48,6 +49,7 @@ class NGPTClient:
             messages: Optional list of message objects to override default behavior
             web_search: Whether to enable web search capability
             markdown_format: If True, allow markdown-formatted responses, otherwise plain text
+            stream_callback: Optional callback function for streaming mode updates
             **kwargs: Additional arguments to pass to the API
             
         Returns:
@@ -129,15 +131,23 @@ class NGPTClient:
                                         delta = chunk["choices"][0].get("delta", {})
                                         content = delta.get("content", "")
                                         if content:
-                                            print(content, end="", flush=True)
-                                            collected_content += content
+                                            if stream_callback:
+                                                # If we have a callback, use it and don't print here
+                                                collected_content += content
+                                                stream_callback(collected_content)
+                                            else:
+                                                # Default behavior: print to console
+                                                print(content, end="", flush=True)
+                                                collected_content += content
                                 except json.JSONDecodeError:
                                     pass  # Skip invalid JSON
                     except KeyboardInterrupt:
                         print("\nGeneration cancelled by user.")
                         return collected_content
                 
-                print()  # Add a final newline
+                # Only print a newline if we're not using a callback
+                if not stream_callback:
+                    print()  # Add a final newline
                 return collected_content
                 
         except requests.exceptions.HTTPError as e:
@@ -248,7 +258,9 @@ Command:"""
         temperature: float = 0.4,
         top_p: float = 0.95,
         max_tokens: Optional[int] = None,
-        markdown_format: bool = False
+        markdown_format: bool = False,
+        stream: bool = False,
+        stream_callback: Optional[callable] = None
     ) -> str:
         """
         Generate code based on the prompt.
@@ -261,6 +273,8 @@ Command:"""
             top_p: Controls diversity via nucleus sampling
             max_tokens: Maximum number of tokens to generate
             markdown_format: If True, request markdown-formatted code, otherwise plain text
+            stream: Whether to stream the response
+            stream_callback: Optional callback function for streaming mode updates
             
         Returns:
             The generated code
@@ -299,12 +313,13 @@ Code:"""
         try:
             return self.chat(
                 prompt=prompt,
-                stream=False,
+                stream=stream,
                 messages=messages,
                 web_search=web_search,
                 temperature=temperature,
                 top_p=top_p,
-                max_tokens=max_tokens
+                max_tokens=max_tokens,
+                stream_callback=stream_callback
             )
         except Exception as e:
             print(f"Error generating code: {e}")

{ngpt-2.5.1 → ngpt-2.7.1}/pyproject.toml

@@ -1,13 +1,12 @@
 [project]
 name = "ngpt"
-version = "2.5.1"
+version = "2.7.1"
 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.31.0",
-    "prompt_toolkit>=3.0.0",
 ]
 requires-python = ">=3.8"
 readme = "README.md"
@@ -35,8 +34,9 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
-prettify = [
+full = [
     "rich>=10.0.0",
+    "prompt_toolkit>=3.0.0",
 ]
 
 [project.urls]

{ngpt-2.5.1 → ngpt-2.7.1}/uv.lock

@@ -134,25 +134,25 @@ wheels = [
 
 [[package]]
 name = "ngpt"
-version = "2.5.1"
+version = "2.7.1"
 source = { editable = "." }
 dependencies = [
-    { name = "prompt-toolkit" },
     { name = "requests" },
 ]
 
 [package.optional-dependencies]
-prettify = [
+full = [
+    { name = "prompt-toolkit" },
     { name = "rich" },
 ]
 
 [package.metadata]
 requires-dist = [
-    { name = "prompt-toolkit", specifier = ">=3.0.0" },
+    { name = "prompt-toolkit", marker = "extra == 'full'", specifier = ">=3.0.0" },
     { name = "requests", specifier = ">=2.31.0" },
-    { name = "rich", marker = "extra == 'prettify'", specifier = ">=10.0.0" },
+    { name = "rich", marker = "extra == 'full'", specifier = ">=10.0.0" },
 ]
-provides-extras = ["prettify"]
+provides-extras = ["full"]
 
 [[package]]
 name = "prompt-toolkit"