ngpt 2.12.0__py3-none-any.whl → 2.13.0__py3-none-any.whl

ngpt/cli/args.py

@@ -101,6 +101,8 @@ def setup_argument_parser():
                                       help='Enter multi-line text input (submit with Ctrl+D)')
     mode_exclusive_group.add_argument('--stdin', action='store_true',
                                       help='Read from stdin and use content with prompt. Use {} in prompt as placeholder for stdin content')
+    mode_exclusive_group.add_argument('--rewrite', action='store_true',
+                                      help='Rewrite text from stdin to be more natural while preserving tone and meaning')
     
     return parser
 

ngpt/cli/formatters.py

@@ -13,6 +13,7 @@ COLORS = {
     "cyan": "\033[36m",
     "green": "\033[32m", 
     "yellow": "\033[33m",
+    "red": "\033[31m",
     "blue": "\033[34m",
     "magenta": "\033[35m",
     "gray": "\033[90m",

ngpt/cli/main.py

@@ -23,6 +23,7 @@ from .modes.chat import chat_mode
 from .modes.code import code_mode
 from .modes.shell import shell_mode
 from .modes.text import text_mode
+from .modes.rewrite import rewrite_mode
 from .args import parse_args, validate_args, handle_cli_config_args, setup_argument_parser, validate_markdown_renderer
 
 def show_cli_config_help():
@@ -460,7 +461,7 @@ def main():
         return
     
     # For interactive mode, we'll allow continuing without a specific prompt
-    if not args.prompt and not (args.shell or args.code or args.text or args.interactive or args.show_config or args.list_models):
+    if not args.prompt and not (args.shell or args.code or args.text or args.interactive or args.show_config or args.list_models or args.rewrite):
         # Simply use the parser's help
         parser = setup_argument_parser()
         parser.print_help()
@@ -549,6 +550,13 @@ def main():
             # Stdin mode (using the chat mode with stdin input)
             chat_mode(client, args, logger=logger)
         
+        elif args.rewrite:
+            # Apply CLI config for rewrite mode
+            args = apply_cli_config(args, "all")
+            
+            # Rewrite mode (process stdin)
+            rewrite_mode(client, args, logger=logger)
+        
         else:
             # Default to chat mode
             # Apply CLI config for default chat mode

ngpt/cli/modes/__init__.py

@@ -2,5 +2,6 @@ from .chat import chat_mode
 from .code import code_mode
 from .shell import shell_mode
 from .text import text_mode
+from .rewrite import rewrite_mode
 
-__all__ = ['chat_mode', 'code_mode', 'shell_mode', 'text_mode']
+__all__ = ['chat_mode', 'code_mode', 'shell_mode', 'text_mode', 'rewrite_mode']

ngpt/cli/modes/rewrite.py

@@ -0,0 +1,209 @@
+import sys
+import platform
+from ..formatters import COLORS
+from ..renderers import prettify_markdown, prettify_streaming_markdown
+from ..ui import get_multiline_input
+
+# System prompt for rewriting text
+REWRITE_SYSTEM_PROMPT = """You are an expert text editor and rewriter. Your task is to rewrite the user's text to improve readability and flow while carefully preserving the original meaning, tone, and style.
+
+PRIMARY GOAL:
+Improve the quality and clarity of writing without changing the author's voice or intent.
+
+PRESERVATION RULES (HIGHEST PRIORITY):
+1. Preserve the exact meaning and information content
+2. Maintain the original tone (formal/casual/technical/friendly/serious/rude)
+3. Keep the author's perspective and point of view
+4. Respect the style of expression when intentional
+5. Retain technical terminology, jargon, and domain-specific language
+6. Keep all facts, data points, quotes, and references exactly as provided
+
+IMPROVEMENT FOCUS:
+1. Fix grammar, spelling, and punctuation errors
+2. Improve sentence structure and flow
+3. Enhance clarity and readability
+4. Make language more concise and precise
+5. Replace awkward phrasings with more natural alternatives
+6. Break up sentences longer than 25 words
+7. Convert passive voice to active when appropriate
+8. Remove redundancies, filler words, and unnecessary repetition
+
+FORMAT PRESERVATION:
+1. Maintain all paragraph breaks and section structures
+2. Preserve formatting of lists, bullet points, and numbering
+3. Keep code blocks (```) exactly as they appear with no changes to code
+4. Respect all markdown formatting (bold, italic, headers, etc.)
+5. Preserve URLs, email addresses, file paths, and variables exactly
+6. Maintain the structure of tables and other special formats
+
+CONTENT-SPECIFIC GUIDANCE:
+- For technical content: Prioritize precision and clarity over stylistic changes
+- For casual text: Maintain conversational flow and personality
+- For formal writing: Preserve professionalism while improving structure
+- For emotional content: Carefully maintain the emotional resonance and intensity
+
+STRICTLY AVOID:
+1. Adding new information not present in the original
+2. Removing key points or substantive content
+3. Significantly changing the formality level
+4. Inserting your own opinions or commentary
+5. Explaining what you changed (just provide the improved text)
+6. Altering the meaning of any sentence, even slightly
+7. Changing domain-specific terminology or jargon to general terms
+
+OUTPUT INSTRUCTION:
+Provide ONLY the rewritten text with no explanations, comments, or meta-text.
+
+EXAMPLES:
+
+ORIGINAL: "The implementation of the feature, which was delayed due to unforeseen technical complications, is now scheduled for next week's release."
+BETTER: "We delayed the feature implementation due to unforeseen technical complications. It's now scheduled for next week's release."
+
+ORIGINAL: "We was hoping you could help with this issue what we are having with the server."
+BETTER: "We were hoping you could help with this issue we're having with the server."
+
+ORIGINAL: "The user interface, which is built using React, Redux, and various other frontend technologies, needs to be redesigned to accommodate the new features that we want to add to the application."
+BETTER: "The React/Redux user interface needs redesigning to accommodate our planned new features."
+"""
+
+def get_terminal_input():
+    """Get input from terminal in a cross-platform way, even when stdin is redirected."""
+    if platform.system() == 'Windows':
+        # Windows-specific solution
+        try:
+            import msvcrt
+            print("Press Y/N...", end="")
+            sys.stdout.flush()
+            # Wait for a keypress
+            char = msvcrt.getch().decode('utf-8').lower()
+            print(char)  # Echo the character
+            return char
+        except ImportError:
+            # Fallback if msvcrt is not available
+            return None
+    else:
+        # Unix-like systems (Linux, macOS)
+        try:
+            with open('/dev/tty', 'r') as tty:
+                return tty.readline().strip().lower()
+        except (IOError, OSError):
+            return None
+
+def rewrite_mode(client, args, logger=None):
+    """Handle the text rewriting mode.
+    
+    Args:
+        client: The NGPTClient instance
+        args: The parsed command-line arguments
+        logger: Optional logger instance
+    """
+    # Determine the input source (stdin pipe, command-line argument, or multiline input)
+    if not sys.stdin.isatty():
+        # Read from stdin if data is piped
+        input_text = sys.stdin.read().strip()
+        
+        # If stdin is empty but prompt is provided, use the prompt
+        if not input_text and args.prompt:
+            input_text = args.prompt
+    elif args.prompt:
+        # Use the command-line argument if provided
+        input_text = args.prompt
+    else:
+        # No pipe or prompt - use multiline input
+        print("Enter or paste text to rewrite (Ctrl+D or Ctrl+Z to submit):")
+        input_text = get_multiline_input()
+        if input_text is None:
+            # Input was cancelled or empty
+            print("Exiting.")
+            return
+    
+    # Check if input is empty
+    if not input_text:
+        print(f"{COLORS['yellow']}Error: Empty input. Please provide text to rewrite.{COLORS['reset']}")
+        return
+    
+    # Set up messages array with system prompt and user content
+    messages = [
+        {"role": "system", "content": REWRITE_SYSTEM_PROMPT},
+        {"role": "user", "content": input_text}
+    ]
+    
+    print("\nSubmission successful. Waiting for response...")
+    
+    # Log the messages if logging is enabled
+    if logger:
+        logger.log("system", REWRITE_SYSTEM_PROMPT)
+        logger.log("user", input_text)
+    
+    # Set default streaming behavior based on --no-stream and --prettify arguments
+    should_stream = not args.no_stream and not args.prettify
+    
+    # If stream-prettify is enabled
+    stream_callback = None
+    live_display = None
+    
+    if args.stream_prettify:
+        should_stream = True  # Enable streaming
+        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=None,  # Not used when messages are provided
+        stream=should_stream, 
+        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_callback=stream_callback,
+        messages=messages  # Use messages array instead of prompt
+    )
+    
+    # Stop live display if using stream-prettify
+    if args.stream_prettify and live_display:
+        live_display.stop()
+        
+    # Log the AI response if logging is enabled
+    if logger and response:
+        logger.log("assistant", response)
+        
+    # 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)
+            
+    # Offer to copy to clipboard if not in a redirected output
+    if not args.no_stream and sys.stdout.isatty():
+        try:
+            # Make sure to flush output before asking for input
+            print("\nCopy to clipboard? (y/n) ", end="")
+            sys.stdout.flush()
+            
+            # Cross-platform terminal input
+            answer = get_terminal_input()
+            
+            if answer == 'y':
+                try:
+                    import pyperclip
+                    pyperclip.copy(response)
+                    print("Copied to clipboard.")
+                except ImportError:
+                    print(f"{COLORS['yellow']}pyperclip not installed. Try: pip install \"ngpt[clipboard]\" {COLORS['reset']}")
+            
+        except (KeyboardInterrupt, EOFError):
+            pass 

{ngpt-2.12.0.dist-info → ngpt-2.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.12.0
+Version: 2.13.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
@@ -29,6 +29,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Requires-Dist: prompt-toolkit>=3.0.0
+Requires-Dist: pyperclip>=1.8.0
 Requires-Dist: requests>=2.31.0
 Requires-Dist: rich>=10.0.0
 Description-Content-Type: text/markdown
@@ -103,6 +104,15 @@ ngpt --shell "list all files in the current directory"
 # Read from stdin and use the content in your prompt
 echo "What is this text about?" | ngpt --stdin "Analyze the following text: {}"
 
+# Rewrite text to improve quality while preserving tone and meaning
+echo "your text" | ngpt --rewrite
+
+# Rewrite text from a command-line argument
+ngpt --rewrite "your text to rewrite"
+
+# Use interactive multiline editor to enter text to rewrite
+ngpt --rewrite
+
 # Display markdown responses with beautiful formatting
 ngpt --prettify "Explain markdown syntax with examples"
 
@@ -138,10 +148,12 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 - 💬 **Interactive Chat**: Continuous conversation with memory in modern UI
 - 📊 **Streaming Responses**: Real-time output for better user experience
 - 🔍 **Web Search**: Integrated with compatible API endpoints
+- 📥 **Stdin Processing**: Process piped content by using `{}` placeholder in prompts
 - 🎨 **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
+- 🧠 **Text Rewriting**: Improve text quality while maintaining original tone and meaning
 - 🧩 **Clean Code Generation**: Output code without markdown or explanations
 - 📝 **Rich Multiline Editor**: Interactive multiline text input with syntax highlighting and intuitive controls
 - 🎭 **System Prompts**: Customize model behavior with custom system prompts
@@ -349,38 +361,52 @@ For detailed information about building CLI tools with nGPT, see the [CLI Framew
 
 ### Command Line Options
 
-You can configure the client using the following options:
+You can configure nGPT using the following options:
+
+#### Mode Options (Mutually Exclusive)
+
+| Option | Description |
+|--------|-------------|
+| `-i, --interactive` | Start an interactive chat session with conversation memory and special commands |
+| `-s, --shell` | Generate and execute shell commands appropriate for your operating system |
+| `-c, --code` | Generate clean code without markdown formatting or explanations |
+| `-t, --text` | Open interactive multiline editor for complex prompts with syntax highlighting |
+| `--stdin` | Read from stdin and use content with prompt. Use {} in prompt as placeholder for stdin content |
+| `--rewrite` | Rewrite text to improve quality while preserving original tone and meaning |
+
+#### Global Options
 
 | Option | Description |
 |--------|-------------|
-| `--api-key` | API key for the service |
-| `--base-url` | Base URL for the API |
-| `--model` | Model to use |
-| `--list-models` | List all available models for the selected configuration (can be combined with --config-index) |
-| `--web-search` | Enable web search capability |
+| `--api-key KEY` | API key for the service |
+| `--base-url URL` | Base URL for the API |
+| `--model MODEL` | Model to use |
+| `--web-search` | Enable web search capability (if your API endpoint supports it) |
+| `--temperature VALUE` | Set temperature (controls randomness, default: 0.7) |
+| `--top_p VALUE` | Set top_p (controls diversity, default: 1.0) |
+| `--max_tokens NUMBER` | Set maximum response length in tokens |
+| `--preprompt TEXT` | Set custom system prompt to control AI behavior |
+| `--language LANG` | Programming language to generate code in (for code mode, default: python) |
 | `--no-stream` | Return the whole response without streaming |
-| `--temperature` | Set temperature (controls randomness, default: 0.7) |
-| `--top_p` | Set top_p (controls diversity, default: 1.0) |
-| `--max_tokens` | Set maximum response length in tokens |
-| `--preprompt` | Set custom system prompt to control AI behavior |
-| `--log` | Enable logging: use `--log` to create a temporary log file, or `--log PATH` for a specific location |
-| `--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 |
-| `--config-index` | Index of the configuration to use (default: 0) |
-| `--provider` | Provider name to identify the configuration to use (alternative to --config-index) |
+| `--prettify` | Render markdown responses and code with syntax highlighting and formatting |
+| `--stream-prettify` | Enable streaming with markdown rendering (automatically uses Rich renderer) |
+| `--renderer {auto,rich,glow}` | Select which markdown renderer to use with --prettify (default: auto) |
+| `--log [FILE]` | Set filepath to log conversation to, or create a temporary log file if no path provided |
+
+#### Configuration Options
+
+| Option | Description |
+|--------|-------------|
+| `--config [PATH]` | Path to a custom config file or, if no value provided, enter interactive configuration mode |
+| `--config-index INDEX` | Index of the configuration to use or edit (default: 0) |
+| `--provider NAME` | Provider name to identify the configuration to use |
 | `--remove` | Remove the configuration at the specified index (requires --config and --config-index or --provider) |
-| `--show-config` | Show configuration details and exit |
-| `--all` | Used with `--show-config` to display all configurations |
-| `-i, --interactive` | Start an interactive chat session with stylish UI, conversation history, and special commands |
-| `-s, --shell` | Generate and execute shell commands |
-| `-c, --code` | Generate clean code output |
-| `-t, --text` | Open interactive multiline editor for complex prompts |
-| `--language` | Programming language to generate code in (for code mode, default: python) |
-| `--cli-config` | Manage CLI configuration settings (set, get, unset, list, help) |
-| `-v, --version` | Show version information |
+| `--show-config` | Show the current configuration(s) and exit |
+| `--all` | Show details for all configurations (requires --show-config) |
+| `--list-models` | List all available models for the current configuration and exit |
+| `--list-renderers` | Show available markdown renderers for use with --prettify |
+| `--cli-config [COMMAND]` | Manage CLI configuration (set, get, unset, list, help) |
+| `-v, --version` | Show version information and exit |
 
 For a complete reference of all available options, see the [CLI Usage Guide](https://nazdridoy.github.io/ngpt/usage/cli_usage.html).
 

{ngpt-2.12.0.dist-info → ngpt-2.13.0.dist-info}/RECORD

@@ -2,24 +2,25 @@ ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/__main__.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
 ngpt/client.py,sha256=rLgDPmJe8_yi13-XUiHJ45z54rJVrupxWmeb-fQZGF4,15129
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=5MxWHkE6bW6bH5IAITTj2WrkXf2sV3FPV8LJanb-yw0,9770
+ngpt/cli/args.py,sha256=1yuVgmBXPu3HrCkVtWBfJG5he90ij84UjPbY11TppPk,9965
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
-ngpt/cli/formatters.py,sha256=1ofNEWEZtFr0MJ3oWomoL_mFmZHlUdT3I5qGtbDQ4g0,9378
+ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
 ngpt/cli/interactive.py,sha256=DZFbExcXd7RylkpBiZBhiI6N8FBaT0m_lBes0Pvhi48,10894
-ngpt/cli/main.py,sha256=y0L-GlA3oDRup_4nDVTWtVCv70ijswKXx3m3kG0zkjI,27720
+ngpt/cli/main.py,sha256=E51XQFIT2NGC1nV1FTQ0GAy-Q6fm730vDXhArqJDwRU,28019
 ngpt/cli/renderers.py,sha256=gJ3WdVvCGkNxrLEkLCh6gk9HBFMK8y7an6CsEkqt2Z8,10535
 ngpt/cli/ui.py,sha256=iMinm_QdsmwrEUpb7CBRexyyBqf4sviFI9M3E8D-hhA,5303
-ngpt/cli/modes/__init__.py,sha256=11znFpqzHyRsEtaTrms5M3q2SrscT9VvUgr7C2B1o-E,179
+ngpt/cli/modes/__init__.py,sha256=i1ZKe7QsKkQ1g8Ip-NmyltZRQQI6nwXRq35bsmER8BU,229
 ngpt/cli/modes/chat.py,sha256=4a5EgM_5A1zCSrLrjgQMDnBwIHd1Rnu5_BjSKSm7p24,4255
 ngpt/cli/modes/code.py,sha256=RjOAj7BDO5vLUdIPkUfPtyIkI_W6qEHsZvYh-sIdVaM,4293
+ngpt/cli/modes/rewrite.py,sha256=Zb0PFvWRKXs4xJCF3GEdYc-LSmy6qRszz8-QJuldHc0,8595
 ngpt/cli/modes/shell.py,sha256=lF9f7w-0bl_FdZl-WJnZuV736BKrWQtrwoKr3ejPXFE,2682
 ngpt/cli/modes/text.py,sha256=ncYnfLFMdTPuHiOvAaHNiOWhox6GF6S-2fTwMIrAz-g,3140
 ngpt/utils/__init__.py,sha256=E46suk2-QgYBI0Qrs6WXOajOUOebF3ETAFY7ah8DTWs,942
 ngpt/utils/cli_config.py,sha256=A1TgO1rkRs6zgfNwIw5v8-N5jxqrHMZ4B6r3w48egi8,10687
 ngpt/utils/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
 ngpt/utils/log.py,sha256=3AJiry9vUbo9Rzzrgj6-NMM4lCbgoZhrGcXvdxMqtrs,6353
-ngpt-2.12.0.dist-info/METADATA,sha256=e9iyCtLNNs5dFaX35FlOa1XqeVQw6h-B8SiWHGe2QHU,20967
-ngpt-2.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.12.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-2.12.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.12.0.dist-info/RECORD,,
+ngpt-2.13.0.dist-info/METADATA,sha256=KseQZjNtDa7N5uJVZ0XFThyLh7fawca-6mEUHFzMcjY,21987
+ngpt-2.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.13.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-2.13.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.13.0.dist-info/RECORD,,