ngpt 3.5.3__py3-none-any.whl → 3.5.4__py3-none-any.whl

ngpt/cli/modes/code.py

@@ -1,32 +1,9 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown, has_markdown_renderer, show_available_renderers
-from ..ui import spinner
+from ..ui import spinner, copy_to_clipboard
 from ...utils import enhance_prompt_with_web_search
 import sys
 import threading
-import platform
-
-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
-            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
 
 # System prompt for code generation with markdown formatting
 CODE_SYSTEM_PROMPT_MARKDOWN = """Your Role: Provide only code as output without any description with proper markdown formatting.
@@ -323,25 +300,6 @@ def code_mode(client, args, logger=None):
             # Should only happen if --no-stream was used without prettify
             print(f"\nGenerated code:\n{generated_code}") 
             
-    # Offer to copy to clipboard if not in a redirected output
-    if generated_code and not args.no_stream and sys.stdout.isatty():
-        try:
-            # Make sure to flush output before asking for input
-            # Make the prompt more visible with colors and formatting
-            clipboard_prompt = f"{COLORS['cyan']}{COLORS['bold']}Copy to clipboard? (y/n){COLORS['reset']} "
-            print(clipboard_prompt, end="")
-            sys.stdout.flush()
-            
-            # Cross-platform terminal input
-            answer = get_terminal_input()
-            
-            if answer == 'y':
-                try:
-                    import pyperclip
-                    pyperclip.copy(generated_code)
-                    print(f"{COLORS['green']}Copied to clipboard.{COLORS['reset']}")
-                except ImportError:
-                    print(f"{COLORS['yellow']}pyperclip not installed. Try: pip install \"ngpt[clipboard]\" {COLORS['reset']}")
-            
-        except (KeyboardInterrupt, EOFError):
-            pass 
+    # Offer to copy to clipboard
+    if generated_code and not args.no_stream:
+        copy_to_clipboard(generated_code) 

ngpt/cli/modes/gitcommsg.py

@@ -8,7 +8,7 @@ import threading
 from datetime import datetime
 import logging
 from ..formatters import COLORS
-from ..ui import spinner
+from ..ui import spinner, copy_to_clipboard
 from ...utils.log import create_gitcommsg_logger
 from ...utils.cli_config import get_cli_config_option
 
@@ -1128,15 +1128,9 @@ def gitcommsg_mode(client, args, logger=None):
             active_logger.log_content("INFO", "FINAL_COMMIT_MESSAGE", result)
         
         # Try to copy to clipboard
-        try:
-            import pyperclip
-            pyperclip.copy(result)
-            print(f"\n{COLORS['green']}(Copied to clipboard){COLORS['reset']}")
-            if active_logger:
-                active_logger.info("Commit message copied to clipboard")
-        except ImportError:
-            if active_logger:
-                active_logger.debug("pyperclip not available, couldn't copy to clipboard")
+        copy_to_clipboard(result)
+        if active_logger:
+            active_logger.info("Offered to copy commit message to clipboard")
     
     except Exception as e:
         print(f"{COLORS['red']}Error: {str(e)}{COLORS['reset']}")

ngpt/cli/modes/rewrite.py

@@ -1,10 +1,9 @@
 import sys
-import platform
 import threading
 import time
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
-from ..ui import get_multiline_input, spinner
+from ..ui import get_multiline_input, spinner, copy_to_clipboard
 from ...utils import enhance_prompt_with_web_search
 
 # System prompt for rewriting text
@@ -71,28 +70,6 @@ ORIGINAL: "The user interface, which is built using React, Redux, and various ot
 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
-            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.
     
@@ -267,24 +244,5 @@ def rewrite_mode(client, args, logger=None):
             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
-            # Make the prompt more visible with colors and formatting
-            clipboard_prompt = f"{COLORS['cyan']}{COLORS['bold']}Copy to clipboard? (y/n){COLORS['reset']} "
-            print(clipboard_prompt, end="")
-            sys.stdout.flush()
-            
-            # Cross-platform terminal input
-            answer = get_terminal_input()
-            
-            if answer == 'y':
-                try:
-                    import pyperclip
-                    pyperclip.copy(response)
-                    print(f"{COLORS['green']}Copied to clipboard.{COLORS['reset']}")
-                except ImportError:
-                    print(f"{COLORS['yellow']}pyperclip not installed. Try: pip install \"ngpt[clipboard]\" {COLORS['reset']}")
-            
-        except (KeyboardInterrupt, EOFError):
-            pass 
+    if not args.no_stream and response:
+        copy_to_clipboard(response) 

ngpt/cli/ui.py

@@ -1,6 +1,7 @@
 import sys
 import time
 import shutil
+import platform
 from .formatters import COLORS
 
 # Optional imports for enhanced UI
@@ -155,6 +156,68 @@ def get_multiline_input():
             print("\nInput cancelled by user. Exiting gracefully.")
             return None
 
+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
+            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 copy_to_clipboard(content, prompt_message=None):
+    """Copy content to clipboard with user confirmation.
+    
+    Args:
+        content: The text content to copy to clipboard
+        prompt_message: Optional custom message for the prompt (default: "Copy to clipboard? (y/n)")
+        
+    Returns:
+        bool: True if copied to clipboard successfully, False otherwise
+    """
+    # Only prompt if stdout is connected to a terminal
+    if not sys.stdout.isatty():
+        return False
+        
+    try:
+        # Default prompt message
+        if prompt_message is None:
+            prompt_message = "Copy to clipboard? (y/n)"
+            
+        # Make the prompt more visible with colors and formatting
+        clipboard_prompt = f"{COLORS['cyan']}{COLORS['bold']}{prompt_message}{COLORS['reset']} "
+        print(clipboard_prompt, end="")
+        sys.stdout.flush()
+        
+        # Cross-platform terminal input
+        answer = get_terminal_input()
+        
+        if answer == 'y':
+            try:
+                import pyperclip
+                pyperclip.copy(content)
+                print(f"{COLORS['green']}Copied to clipboard.{COLORS['reset']}")
+                return True
+            except ImportError:
+                print(f"{COLORS['yellow']}pyperclip not installed. Try: pip install \"ngpt[clipboard]\" {COLORS['reset']}")
+                return False
+        return False
+    except (KeyboardInterrupt, EOFError):
+        return False
+
 def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color=None, stop_event=None, clean_exit=False):
     """Display a spinner animation with a message.
     

{ngpt-3.5.3.dist-info → ngpt-3.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.5.3
+Version: 3.5.4
 Summary: Swiss army knife for LLMs: powerful CLI and interactive chatbot in one package. Seamlessly work with OpenAI, Ollama, Groq, Claude, Gemini, or any OpenAI-compatible API to generate code, craft git commits, rewrite text, and execute shell commands.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-3.5.3.dist-info → ngpt-3.5.4.dist-info}/RECORD

@@ -7,13 +7,13 @@ ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,36
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
 ngpt/cli/main.py,sha256=oKX7ryTIrsvQRJHVnH2a763pGyNZthq81wkrRILwHLw,28932
 ngpt/cli/renderers.py,sha256=m71BeUXKynpKKGXFzwRSW1XngvyKiZ_xEsdujUbU0MA,16597
-ngpt/cli/ui.py,sha256=HoHDFpLiwMBP5wtMb8YYo244FMiqiPFRoBNcNGp6N0A,7310
+ngpt/cli/ui.py,sha256=5is8RiYEDB4W2YYwaA4V1-2RojuKeRofrKbQRfSguHM,9545
 ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,363
 ngpt/cli/modes/chat.py,sha256=jfKkrtSkx1gKPsKXDMxZ7BiJiMsCtFHyZCGIdmNQ0fk,7816
-ngpt/cli/modes/code.py,sha256=RvVojJIm0jQnwzJ4tlKd4j4CFZuJOGc_YJ3RDjUNXOs,14181
-ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
+ngpt/cli/modes/code.py,sha256=3avR9OM-D3r4HHfVm2bTfCOlsYQoqgtvU49zGzYfUqw,12513
+ngpt/cli/modes/gitcommsg.py,sha256=Alm1OLxXkuteiDSnDxjmnPvlSggGG2sTlUBAqJaYaN4,46739
 ngpt/cli/modes/interactive.py,sha256=TtBrZUX45CVfKOPvkb1ya7dIQhXLILtn7ajmfM9ohso,17419
-ngpt/cli/modes/rewrite.py,sha256=9o37-o5Q8SGfJ91-8pD4h7d5RsJeu85OEdv3nXKzQiA,12361
+ngpt/cli/modes/rewrite.py,sha256=EKCPZwvu0MTDpD-nj_oty8vjVQpaF4ucwmTG99LJT6M,10736
 ngpt/cli/modes/shell.py,sha256=FaFOzxTxPJCpYsiQJIttS69fZg-asV4LVA5TLaGVN0Y,8897
 ngpt/cli/modes/text.py,sha256=7t5WWXMFxGkBM5HMP4irbN9aQwxE2YgywjiVPep710k,6417
 ngpt/utils/__init__.py,sha256=qu_66I1Vtav2f1LDiPn5J3DUsbK7o1CSScMcTkYqxoM,1179
@@ -21,8 +21,8 @@ ngpt/utils/cli_config.py,sha256=Ug8cECBTIuzOwkBWidLTfs-OAdOsCMJ2bNa70pOADfw,1119
 ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
 ngpt/utils/web_search.py,sha256=w5ke4KJMRxq7r5jtbUXvspja6XhjoPZloVkZ0IvBXIE,30731
-ngpt-3.5.3.dist-info/METADATA,sha256=_Z2B2bvNXf-h03702SQ85UFPWLJUTFqcfXBJRtr2fTE,23912
-ngpt-3.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.5.3.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.5.3.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.5.3.dist-info/RECORD,,
+ngpt-3.5.4.dist-info/METADATA,sha256=WsWK9nXRRHXbsHaeC28mdNEaw3GrSlwripN_LPJ1Mco,23912
+ngpt-3.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.5.4.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.5.4.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.5.4.dist-info/RECORD,,