ngpt 3.5.6__py3-none-any.whl → 3.6.0__py3-none-any.whl

ngpt/cli/modes/shell.py

@@ -1,11 +1,14 @@
 from ..formatters import COLORS
-from ..ui import spinner
+from ..ui import spinner, copy_to_clipboard
+from ..renderers import prettify_markdown, has_markdown_renderer
 from ...utils import enhance_prompt_with_web_search
 import subprocess
 import sys
 import threading
 import platform
 import os
+import shutil
+import re
 
 # System prompt for shell command generation
 SHELL_SYSTEM_PROMPT = """Your role: Provide only plain text without Markdown formatting. Do not show any warnings or information regarding your capabilities. Do not provide any description. If you need to store any data, assume it will be stored in the chat. Provide only {shell_name} command for {operating_system} without any description. If there is a lack of details, provide most logical solution. Ensure the output is a valid shell command. If multiple steps required try to combine them together.
@@ -34,6 +37,100 @@ Your role: Provide only plain text without Markdown formatting. Do not show any
 
 Command:"""
 
+def detect_shell():
+    """Detect the current shell type and OS more accurately.
+    
+    Returns:
+        tuple: (shell_name, highlight_language, operating_system) - the detected shell name,
+               appropriate syntax highlighting language, and operating system
+    """
+    os_type = platform.system()
+    
+    # Determine OS with detailed information
+    if os_type == "Darwin":
+        operating_system = "MacOS"
+    elif os_type == "Linux":
+        # Try to get Linux distribution name
+        try:
+            result = subprocess.run(["lsb_release", "-si"], capture_output=True, text=True)
+            distro = result.stdout.strip()
+            operating_system = f"Linux/{distro}" if distro else "Linux"
+        except:
+            operating_system = "Linux"
+    elif os_type == "Windows":
+        operating_system = "Windows"
+    else:
+        operating_system = os_type
+    
+    # Handle WSL specially - it looks like Linux but runs on Windows
+    is_wsl = False
+    try:
+        with open('/proc/version', 'r') as f:
+            if 'microsoft' in f.read().lower():
+                is_wsl = True
+                operating_system = "Windows/WSL"
+    except:
+        pass
+        
+    # Try to detect the shell by examining environment variables
+    try:
+        # Check for specific shell by examining SHELL_NAME or equivalent
+        if os_type == "Windows" and not is_wsl:
+            # Check for Git Bash or MSYS2/Cygwin
+            if "MINGW" in os.environ.get("MSYSTEM", "") or "MSYS" in os.environ.get("MSYSTEM", ""):
+                return "bash", "bash", operating_system
+                
+            # Check if we're in Git Bash by examining PATH for /mingw/
+            if any("/mingw/" in path.lower() for path in os.environ.get("PATH", "").split(os.pathsep)):
+                return "bash", "bash", operating_system
+                
+            # Check for WSL within Windows
+            if "WSL" in os.environ.get("PATH", "") or "Microsoft" in os.environ.get("PATH", ""):
+                return "bash", "bash", operating_system
+            
+            # Check for explicit shell path in environment
+            if os.environ.get("SHELL"):
+                shell_path = os.environ.get("SHELL").lower()
+                if "bash" in shell_path:
+                    return "bash", "bash", operating_system
+                elif "zsh" in shell_path:
+                    return "zsh", "zsh", operating_system
+                elif "powershell" in shell_path:
+                    return "powershell.exe", "powershell", operating_system
+                elif "cmd" in shell_path:
+                    return "cmd.exe", "batch", operating_system
+                    
+            # Check for PowerShell vs CMD
+            if os.environ.get("PSModulePath"):
+                # Further distinguish PowerShell vs PowerShell Core
+                if "pwsh" in os.environ.get("PSModulePath", "").lower():
+                    return "pwsh", "powershell", operating_system
+                else:
+                    return "powershell.exe", "powershell", operating_system
+            else:
+                return "cmd.exe", "batch", operating_system
+        else:
+            # Unix-like systems - try to get more specific
+            shell_path = os.environ.get("SHELL", "/bin/bash")
+            shell_name = os.path.basename(shell_path)
+            
+            # Map shell name to syntax highlight language
+            if shell_name == "zsh":
+                return shell_name, "zsh", operating_system
+            elif shell_name == "fish":
+                return shell_name, "fish", operating_system
+            elif "csh" in shell_name:
+                return shell_name, "csh", operating_system
+            else:
+                # Default to bash for sh, bash, and other shells
+                return shell_name, "bash", operating_system
+    except Exception as e:
+        # Fall back to simple detection if anything fails
+        if os_type == "Windows":
+            return "powershell.exe", "powershell", operating_system
+        else:
+            return "bash", "bash", operating_system
+
 def shell_mode(client, args, logger=None):
     """Handle the shell command generation mode.
     
@@ -94,29 +191,8 @@ def shell_mode(client, args, logger=None):
             print(f"{COLORS['yellow']}Warning: Failed to enhance prompt with web search: {str(e)}{COLORS['reset']}")
             # Continue with the original prompt if web search fails
     
-    # Determine OS type
-    os_type = platform.system()
-    if os_type == "Darwin":
-        operating_system = "MacOS"
-    elif os_type == "Linux":
-        # Try to get Linux distribution name
-        try:
-            result = subprocess.run(["lsb_release", "-si"], capture_output=True, text=True)
-            distro = result.stdout.strip()
-            operating_system = f"Linux/{distro}" if distro else "Linux"
-        except:
-            operating_system = "Linux"
-    elif os_type == "Windows":
-        operating_system = "Windows"
-    else:
-        operating_system = os_type
-            
-    # Determine shell type
-    if os_type == "Windows":
-        shell_name = "powershell.exe" if os.environ.get("PSModulePath") else "cmd.exe"
-    else:
-        shell_name = os.environ.get("SHELL", "/bin/bash")
-        shell_name = os.path.basename(shell_name)
+    # Detect shell type, highlight language, and operating system
+    shell_name, highlight_lang, operating_system = detect_shell()
     
     # Format the system prompt based on whether preprompt is provided
     if args.preprompt:
@@ -185,17 +261,42 @@ def shell_mode(client, args, logger=None):
     # Log the generated command if logging is enabled
     if logger:
         logger.log("assistant", command)
+    
+    # Get the most up-to-date shell type at command generation time
+    _, highlight_lang, _ = detect_shell()
+    
+    # Create a markdown-formatted display of the command with appropriate syntax highlighting
+    formatted_command = f"### Generated Command\n\n```{highlight_lang}\n{command}\n```"
+    
+    # Check if we can use rich rendering
+    if has_markdown_renderer('rich'):
+        # Use rich renderer for pretty output
+        prettify_markdown(formatted_command, 'rich')
+    else:
+        # Fallback to simpler formatting
+        term_width = shutil.get_terminal_size().columns
+        box_width = min(term_width - 4, len(command) + 8)
+        horizontal_line = "─" * box_width
         
-    print(f"\nGenerated command: {command}")
+        print(f"\n┌{horizontal_line}┐")
+        print(f"│ {COLORS['bold']}Generated Command:{COLORS['reset']}  {' ' * (box_width - 20)}│")
+        print(f"│ {COLORS['green']}{command}{COLORS['reset']}{' ' * (box_width - len(command) - 2)}│")
+        print(f"└{horizontal_line}┘\n")
+    
+    # Display options with better formatting
+    print(f"{COLORS['bold']}Options:{COLORS['reset']}")
+    print(f"  {COLORS['cyan']}c{COLORS['reset']} - Copy to clipboard")
+    print(f"  {COLORS['cyan']}e{COLORS['reset']} - Execute command")
+    print(f"  {COLORS['cyan']}n{COLORS['reset']} - Cancel (default)")
+    print(f"\nWhat would you like to do? [{COLORS['cyan']}c{COLORS['reset']}/{COLORS['cyan']}e{COLORS['reset']}/N] ", end='')
     
     try:
-        print("Do you want to execute this command? [y/N] ", end='')
         response = input().lower()
     except KeyboardInterrupt:
         print("\nCommand execution cancelled by user.")
         return
         
-    if response == 'y' or response == 'yes':
+    if response == 'e' or response == 'execute':
         # Log the execution if logging is enabled
         if logger:
             logger.log("system", f"Executing command: {command}")
@@ -224,4 +325,13 @@ def shell_mode(client, args, logger=None):
             if logger:
                 logger.log("system", f"Command error: {error}")
                 
-            print(f"\nError:\n{error}") 
+            print(f"\nError:\n{error}")
+    elif response == 'c' or response == 'copy':
+        # Copy command to clipboard without confirmation prompt
+        copied = copy_to_clipboard(command, skip_confirmation=True)
+        if not copied:
+            print(f"{COLORS['yellow']}Failed to copy to clipboard. Command: {COLORS['green']}{command}{COLORS['reset']}")
+        
+        # Log the copy if logging is enabled
+        if logger:
+            logger.log("system", "Command copied to clipboard") 

ngpt/cli/ui.py

@@ -174,12 +174,13 @@ def get_terminal_input():
         except (IOError, OSError):
             return None
 
-def copy_to_clipboard(content, prompt_message=None):
+def copy_to_clipboard(content, prompt_message=None, skip_confirmation=False):
     """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)")
+        skip_confirmation: When True, skips the confirmation prompt and copies directly
         
     Returns:
         bool: True if copied to clipboard successfully, False otherwise
@@ -189,17 +190,21 @@ def copy_to_clipboard(content, prompt_message=None):
         return False
         
     try:
-        # Default prompt message
-        if prompt_message is None:
-            prompt_message = "Copy to clipboard? (y/n)"
+        # Skip confirmation if requested
+        if skip_confirmation:
+            answer = 'y'
+        else:
+            # 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()
             
-        # 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()
+            # Cross-platform terminal input
+            answer = get_terminal_input()
         
         if answer == 'y':
             try:

{ngpt-3.5.6.dist-info → ngpt-3.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.5.6
+Version: 3.6.0
 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.6.dist-info → ngpt-3.6.0.dist-info}/RECORD

@@ -7,22 +7,22 @@ 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=H52yH2BQiYUNxeax4DFx9K3q77MamATZLukGRU-r3Ec,9345
+ngpt/cli/ui.py,sha256=tVJGTP1DWjCRq7ONFdOOKPHcVQz0MqiLyJtodKFabTk,9612
 ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,363
 ngpt/cli/modes/chat.py,sha256=jfKkrtSkx1gKPsKXDMxZ7BiJiMsCtFHyZCGIdmNQ0fk,7816
 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=EKCPZwvu0MTDpD-nj_oty8vjVQpaF4ucwmTG99LJT6M,10736
-ngpt/cli/modes/shell.py,sha256=FaFOzxTxPJCpYsiQJIttS69fZg-asV4LVA5TLaGVN0Y,8897
+ngpt/cli/modes/shell.py,sha256=kOfOi7uREd98FLHCcON3UuyeUcbQmk8ylOgsELoD810,14168
 ngpt/cli/modes/text.py,sha256=7t5WWXMFxGkBM5HMP4irbN9aQwxE2YgywjiVPep710k,6417
 ngpt/utils/__init__.py,sha256=qu_66I1Vtav2f1LDiPn5J3DUsbK7o1CSScMcTkYqxoM,1179
 ngpt/utils/cli_config.py,sha256=Ug8cECBTIuzOwkBWidLTfs-OAdOsCMJ2bNa70pOADfw,11195
 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.6.dist-info/METADATA,sha256=cyj7LzAMbu15UfjKmGtR7hnenYRfQgxBUAa7Eu_0t3s,23912
-ngpt-3.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.5.6.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.5.6.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.5.6.dist-info/RECORD,,
+ngpt-3.6.0.dist-info/METADATA,sha256=cUXBG4wlN36T0SsClQPpfT-SfeLYFdg2iy_n3Krrpx4,23912
+ngpt-3.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.6.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.6.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.6.0.dist-info/RECORD,,