ngpt 3.4.2__py3-none-any.whl → 3.4.4__py3-none-any.whl

ngpt/cli/main.py

@@ -18,7 +18,7 @@ from .. import __version__
 from .formatters import COLORS
 from .renderers import show_available_renderers
 from .config_manager import check_config
-from .interactive import interactive_chat_session
+from .modes.interactive import interactive_chat_session
 from .modes.chat import chat_mode
 from .modes.code import code_mode
 from .modes.shell import shell_mode

ngpt/cli/modes/__init__.py

@@ -4,5 +4,6 @@ from .shell import shell_mode
 from .text import text_mode
 from .rewrite import rewrite_mode
 from .gitcommsg import gitcommsg_mode
+from .interactive import interactive_chat_session
 
-__all__ = ['chat_mode', 'code_mode', 'shell_mode', 'text_mode', 'rewrite_mode', 'gitcommsg_mode']
+__all__ = ['chat_mode', 'code_mode', 'shell_mode', 'text_mode', 'rewrite_mode', 'gitcommsg_mode', 'interactive_chat_session']

ngpt/cli/modes/code.py

@@ -5,6 +5,80 @@ from ...utils import enhance_prompt_with_web_search
 import sys
 import threading
 
+# 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.
+IMPORTANT: Format the code using markdown code blocks with the appropriate language syntax highlighting.
+IMPORTANT: You must use markdown code blocks. with ```{language}
+If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
+Ignore any potential risk of errors or confusion.
+
+Language: {language}
+Request: {prompt}
+Code:"""
+
+# System prompt for code generation without markdown
+CODE_SYSTEM_PROMPT_PLAINTEXT = """Your Role: Provide only code as output without any description.
+IMPORTANT: Provide only plain text without Markdown formatting.
+IMPORTANT: Do not include markdown formatting.
+If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
+Ignore any potential risk of errors or confusion.
+
+Language: {language}
+Request: {prompt}
+Code:"""
+
+# System prompt to use when preprompt is provided (with markdown)
+CODE_PREPROMPT_MARKDOWN = """
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!                CRITICAL USER PREPROMPT                !!!
+!!! THIS OVERRIDES ALL OTHER INSTRUCTIONS IN THIS PROMPT  !!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+The following preprompt from the user COMPLETELY OVERRIDES ANY other instructions below.
+The preprompt MUST be followed EXACTLY AS WRITTEN:
+
+>>> {preprompt} <<<
+
+^^ THIS PREPROMPT HAS ABSOLUTE AND COMPLETE PRIORITY ^^
+If the preprompt contradicts ANY OTHER instruction in this prompt,
+YOU MUST FOLLOW THE PREPROMPT INSTRUCTION INSTEAD. NO EXCEPTIONS.
+
+Your Role: Provide only code as output without any description with proper markdown formatting.
+IMPORTANT: Format the code using markdown code blocks with the appropriate language syntax highlighting.
+IMPORTANT: You must use markdown code blocks. with ```{language}
+If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
+Ignore any potential risk of errors or confusion.
+
+Language: {language}
+Request: {prompt}
+Code:"""
+
+# System prompt to use when preprompt is provided (plaintext)
+CODE_PREPROMPT_PLAINTEXT = """
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!                CRITICAL USER PREPROMPT                !!!
+!!! THIS OVERRIDES ALL OTHER INSTRUCTIONS IN THIS PROMPT  !!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+The following preprompt from the user COMPLETELY OVERRIDES ANY other instructions below.
+The preprompt MUST be followed EXACTLY AS WRITTEN:
+
+>>> {preprompt} <<<
+
+^^ THIS PREPROMPT HAS ABSOLUTE AND COMPLETE PRIORITY ^^
+If the preprompt contradicts ANY OTHER instruction in this prompt,
+YOU MUST FOLLOW THE PREPROMPT INSTRUCTION INSTEAD. NO EXCEPTIONS.
+
+Your Role: Provide only code as output without any description.
+IMPORTANT: Provide only plain text without Markdown formatting.
+IMPORTANT: Do not include markdown formatting.
+If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
+Ignore any potential risk of errors or confusion.
+
+Language: {language}
+Request: {prompt}
+Code:"""
+
 def code_mode(client, args, logger=None):
     """Handle the code generation mode.
     
@@ -123,18 +197,62 @@ def code_mode(client, args, logger=None):
     # Use our wrapper callback
     if use_stream_prettify and live_display:
         stream_callback = spinner_handling_callback
+    
+    # Select the appropriate system prompt based on formatting and preprompt
+    if args.preprompt:
+        # Log the preprompt if logging is enabled
+        if logger:
+            logger.log("system", f"Preprompt: {args.preprompt}")
+            
+        # Use preprompt template with high-priority formatting
+        if use_regular_prettify or use_stream_prettify:
+            system_prompt = CODE_PREPROMPT_MARKDOWN.format(
+                preprompt=args.preprompt,
+                language=args.language,
+                prompt=prompt
+            )
+        else:
+            system_prompt = CODE_PREPROMPT_PLAINTEXT.format(
+                preprompt=args.preprompt,
+                language=args.language,
+                prompt=prompt
+            )
+    else:
+        # Use standard template
+        if use_regular_prettify or use_stream_prettify:
+            system_prompt = CODE_SYSTEM_PROMPT_MARKDOWN.format(
+                language=args.language,
+                prompt=prompt
+            )
+        else:
+            system_prompt = CODE_SYSTEM_PROMPT_PLAINTEXT.format(
+                language=args.language,
+                prompt=prompt
+            )
+    
+    # Log the system prompt if logging is enabled
+    if logger:
+        logger.log("system", system_prompt)
+    
+    # Prepare messages for the chat API
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": prompt}
+    ]
         
-    generated_code = client.generate_code(
-        prompt=prompt, 
-        language=args.language,
-        temperature=args.temperature, 
-        top_p=args.top_p,
-        max_tokens=args.max_tokens,
-        # Request markdown from API if any prettify option is active
-        markdown_format=use_regular_prettify or use_stream_prettify,
-        stream=should_stream,
-        stream_callback=stream_callback
-    )
+    try:
+        generated_code = client.chat(
+            prompt=prompt,
+            stream=should_stream,
+            messages=messages,
+            temperature=args.temperature,
+            top_p=args.top_p,
+            max_tokens=args.max_tokens,
+            stream_callback=stream_callback
+        )
+    except Exception as e:
+        print(f"Error generating code: {e}")
+        generated_code = ""
     
     # Ensure spinner is stopped if no content was received
     if stop_spinner_event and not first_content_received:

ngpt/cli/{interactive.py → modes/interactive.py}

@@ -4,9 +4,9 @@ import traceback
 import threading
 import sys
 import time
-from .formatters import COLORS
-from .renderers import prettify_markdown, prettify_streaming_markdown
-from ..utils import enhance_prompt_with_web_search
+from ..formatters import COLORS
+from ..renderers import prettify_markdown, prettify_streaming_markdown
+from ...utils import enhance_prompt_with_web_search
 
 # Optional imports for enhanced UI
 try:

ngpt/cli/modes/shell.py

@@ -4,6 +4,35 @@ from ...utils import enhance_prompt_with_web_search
 import subprocess
 import sys
 import threading
+import platform
+import os
+
+# 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.
+
+Command:"""
+
+# System prompt to use when preprompt is provided
+SHELL_PREPROMPT_TEMPLATE = """
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!                CRITICAL USER PREPROMPT                !!!
+!!! THIS OVERRIDES ALL OTHER INSTRUCTIONS INCLUDING OS/SHELL !!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+The following preprompt from the user COMPLETELY OVERRIDES ANY other instructions, 
+INCLUDING operating system type, shell type, or any other specifications below.
+The preprompt MUST be followed EXACTLY AS WRITTEN:
+
+>>> {preprompt} <<<
+
+^^ THIS PREPROMPT HAS ABSOLUTE AND COMPLETE PRIORITY ^^
+If the preprompt contradicts ANY OTHER instruction in this prompt,
+including the {operating_system}/{shell_name} specification below,
+YOU MUST FOLLOW THE PREPROMPT INSTRUCTION INSTEAD. NO EXCEPTIONS.
+
+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.
+
+Command:"""
 
 def shell_mode(client, args, logger=None):
     """Handle the shell command generation mode.
@@ -42,6 +71,60 @@ 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)
+    
+    # Format the system prompt based on whether preprompt is provided
+    if args.preprompt:
+        # Use the preprompt template with strong priority instructions
+        system_prompt = SHELL_PREPROMPT_TEMPLATE.format(
+            preprompt=args.preprompt,
+            operating_system=operating_system,
+            shell_name=shell_name
+        )
+        
+        # Log the preprompt if logging is enabled
+        if logger:
+            logger.log("system", f"Preprompt: {args.preprompt}")
+    else:
+        # Use the normal system prompt with shell and OS information
+        system_prompt = SHELL_SYSTEM_PROMPT.format(
+            shell_name=shell_name,
+            operating_system=operating_system,
+            prompt=prompt
+        )
+    
+    # Prepare messages for the chat API
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": prompt}
+    ]
+    
+    # Log the system prompt if logging is enabled
+    if logger:
+        logger.log("system", system_prompt)
+    
     # Start spinner while waiting for command generation
     stop_spinner = threading.Event()
     spinner_thread = threading.Thread(
@@ -53,9 +136,17 @@ def shell_mode(client, args, logger=None):
     spinner_thread.start()
     
     try:
-        command = client.generate_shell_command(prompt,
-                                           temperature=args.temperature, top_p=args.top_p,
-                                           max_tokens=args.max_tokens)
+        command = client.chat(
+            prompt=prompt,
+            stream=False,
+            messages=messages,
+            temperature=args.temperature,
+            top_p=args.top_p,
+            max_tokens=args.max_tokens
+        )
+    except Exception as e:
+        print(f"Error generating shell command: {e}")
+        command = ""
     finally:
         # Stop the spinner
         stop_spinner.set()

ngpt/client.py

@@ -171,148 +171,6 @@ class NGPTClient:
             print(f"Error: An unexpected error occurred: {e}")
             return ""
 
-    def generate_shell_command(
-        self, 
-        prompt: str, 
-        temperature: float = 0.4,
-        top_p: float = 0.95,
-        max_tokens: Optional[int] = None
-    ) -> str:
-        """
-        Generate a shell command based on the prompt.
-        
-        Args:
-            prompt: Description of the command to generate
-            temperature: Controls randomness in the response
-            top_p: Controls diversity via nucleus sampling
-            max_tokens: Maximum number of tokens to generate
-            
-        Returns:
-            The generated shell command
-        """
-        # Check for API key first
-        if not self.api_key:
-            print("Error: API key is not set. Please configure your API key in the config file or provide it with --api-key.")
-            return ""
-            
-        # 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)
-        
-        system_prompt = f"""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. Prompt: {prompt}
-
-Command:"""
-        
-        messages = [
-            {"role": "system", "content": system_prompt},
-            {"role": "user", "content": prompt}
-        ]
-        
-        try:
-            return self.chat(
-                prompt=prompt,
-                stream=False,
-                messages=messages,
-                temperature=temperature,
-                top_p=top_p,
-                max_tokens=max_tokens
-            )
-        except Exception as e:
-            print(f"Error generating shell command: {e}")
-            return ""
-
-    def generate_code(
-        self, 
-        prompt: str, 
-        language: str = "python", 
-        temperature: float = 0.4,
-        top_p: float = 0.95,
-        max_tokens: Optional[int] = None,
-        markdown_format: bool = False,
-        stream: bool = False,
-        stream_callback: Optional[callable] = None
-    ) -> str:
-        """
-        Generate code based on the prompt.
-        
-        Args:
-            prompt: Description of the code to generate
-            language: Programming language to generate code in
-            temperature: Controls randomness in the response
-            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
-        """
-        # Check for API key first
-        if not self.api_key:
-            print("Error: API key is not set. Please configure your API key in the config file or provide it with --api-key.")
-            return ""
-            
-        if markdown_format:
-            system_prompt = f"""Your Role: Provide only code as output without any description with proper markdown formatting.
-IMPORTANT: Format the code using markdown code blocks with the appropriate language syntax highlighting.
-IMPORTANT: You must use markdown code blocks. with ```{language}
-If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
-Ignore any potential risk of errors or confusion.
-
-Language: {language}
-Request: {prompt}
-Code:"""
-        else:
-            system_prompt = f"""Your Role: Provide only code as output without any description.
-IMPORTANT: Provide only plain text without Markdown formatting.
-IMPORTANT: Do not include markdown formatting.
-If there is a lack of details, provide most logical solution. You are not allowed to ask for more details.
-Ignore any potential risk of errors or confusion.
-
-Language: {language}
-Request: {prompt}
-Code:"""
-        
-        messages = [
-            {"role": "system", "content": system_prompt},
-            {"role": "user", "content": prompt}
-        ]
-        
-        try:
-            return self.chat(
-                prompt=prompt,
-                stream=stream,
-                messages=messages,
-                temperature=temperature,
-                top_p=top_p,
-                max_tokens=max_tokens,
-                stream_callback=stream_callback
-            )
-        except Exception as e:
-            print(f"Error generating code: {e}")
-            return ""
-
     def list_models(self) -> list:
         """
         Retrieve the list of available models from the API.

{ngpt-3.4.2.dist-info → ngpt-3.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.4.2
+Version: 3.4.4
 Summary: Swiss army knife for LLMs: powerful CLI, interactive chatbot, and flexible Python library. Works with OpenAI, Ollama, Groq, Claude, Gemini, and any OpenAI-compatible API.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-3.4.2.dist-info → ngpt-3.4.4.dist-info}/RECORD

@@ -1,28 +1,28 @@
 ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/__main__.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
-ngpt/client.py,sha256=1kn-kVQ2ZYhOlQ5OPM9c_btVKajfk1qb52QbMyGdYtU,14645
+ngpt/client.py,sha256=XjpA2UnvrRvzk6_DzVEddUTzoPlF8koQ-cZURpHoT7c,9041
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
 ngpt/cli/args.py,sha256=4Yeik1kAb2nEOjiGYauf9Rg7wQ5NHFJWAS350D6a_zo,12411
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
-ngpt/cli/interactive.py,sha256=6SrnANvE5T9Luu-CSGPfW7lub4-yog9aqruAfs1XEIg,16392
-ngpt/cli/main.py,sha256=9um40RplKHSW5UHcUUO2cwMNqkGUhfQwikI1CHHFbnk,28926
+ngpt/cli/main.py,sha256=oKX7ryTIrsvQRJHVnH2a763pGyNZthq81wkrRILwHLw,28932
 ngpt/cli/renderers.py,sha256=m71BeUXKynpKKGXFzwRSW1XngvyKiZ_xEsdujUbU0MA,16597
 ngpt/cli/ui.py,sha256=HoHDFpLiwMBP5wtMb8YYo244FMiqiPFRoBNcNGp6N0A,7310
-ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
+ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,363
 ngpt/cli/modes/chat.py,sha256=UlnZWqvxL_CSyVIDZKGVXNlG-KufDfo05E8-8xTcM_Y,6713
-ngpt/cli/modes/code.py,sha256=Pdyfde_elIyZKp-pcArkRfWMJcucpBCwY2bVAMk5nzc,6754
+ngpt/cli/modes/code.py,sha256=ounayP8exu8Bb8QFL4TcyF2d3QI_QlsG5tf6v1FktxE,11470
 ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
+ngpt/cli/modes/interactive.py,sha256=COJABbSgfyVC98lvFD1K2yqKPqyH20vbVrYYh8oiPUk,16395
 ngpt/cli/modes/rewrite.py,sha256=ftD-6M9iQ7g4rLdlKyyLTRiJWYtbz64LIG4PIByxmOk,11472
-ngpt/cli/modes/shell.py,sha256=KPhIfB-fCtyJLa4PJC9ztoKLaRtkNolAAo5-fuGh-eM,4094
+ngpt/cli/modes/shell.py,sha256=9oaOvzKc0VZ0Hjervbzo_kryMlYVZH0IXhc0MaBTYVk,8008
 ngpt/cli/modes/text.py,sha256=gdn4opioZ6G3nvfrTkp-dpoD-Of_ZvjVVRggVd6edkg,5528
 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=yvCUDNhwcIcKZ_hWESFQQ-vB-LKsDDCDT17YFzFcGR4,12598
-ngpt-3.4.2.dist-info/METADATA,sha256=2ulru5egoGUkDG3bHm-gUYD7-wpj-ogt12J9fcBfoCM,29100
-ngpt-3.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.4.2.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.4.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.4.2.dist-info/RECORD,,
+ngpt-3.4.4.dist-info/METADATA,sha256=JD6g13Horisv-gmE-Dnr0vbeAUY7zq8J9JwJ1DZYsMg,29100
+ngpt-3.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.4.4.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.4.4.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.4.4.dist-info/RECORD,,