ngpt 3.11.3__py3-none-any.whl → 3.12.1__py3-none-any.whl

ngpt/cli/args.py

@@ -30,9 +30,6 @@ def setup_argument_parser():
     # Version flag
     parser.add_argument('-v', '--version', action=ColoredVersionAction, nargs=0, 
                         help='Show version information and exit')
-    # Language option for code mode
-    parser.add_argument('--language', default="python", 
-                        help='Programming language to generate code in (for code mode)')
     
     # Prompt argument
     parser.add_argument('prompt', nargs='?', default=None, 
@@ -104,6 +101,11 @@ def setup_argument_parser():
     global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
                       help='Select which markdown renderer to use with --prettify or --stream-prettify (auto, rich, or glow)')
     
+    # Code Mode Options
+    code_group = parser.add_argument_group('Code Mode Options')
+    code_group.add_argument('--language', default="python", 
+                      help='Programming language to generate code in (for code mode)')
+    
     # GitCommit message options
     gitcommsg_group = parser.add_argument_group('Git Commit Message Options')
     gitcommsg_group.add_argument('--rec-chunk', action='store_true',
@@ -124,6 +126,11 @@ def setup_argument_parser():
     rewrite_group.add_argument('--humanize', action='store_true',
                               help='Transform AI-generated text into human-like content that passes AI detection tools')
     
+    # Interactive mode options
+    interactive_group = parser.add_argument_group('Interactive Mode Options')
+    interactive_group.add_argument('--multiline', action='store_true',
+                              help='Enable multiline text input with the "ml" command in interactive mode')
+    
     # Mode flags (mutually exclusive)
     mode_group = parser.add_argument_group('Modes (mutually exclusive)')
     mode_exclusive_group = mode_group.add_mutually_exclusive_group()

ngpt/cli/main.py

@@ -63,29 +63,25 @@ def show_cli_config_help():
     # Print general options (available in all contexts)
     print(f"    {COLORS['yellow']}General options (all modes):{COLORS['reset']}")
     for option in sorted(context_groups["all"]):
-        meta = CLI_CONFIG_OPTIONS[option]
-        default = f"(default: {meta['default']})" if meta['default'] is not None else ""
-        exclusive = f" [exclusive with: {', '.join(meta['exclusive'])}]" if "exclusive" in meta else ""
-        print(f"      {COLORS['green']}{option}{COLORS['reset']} - {meta['type']} {default}{exclusive}")
-    
-    # Print mode-specific options
-    for mode, options in [
-        ("code", "Code generation mode"),
-        ("interactive", "Interactive mode"),
-        ("text", "Text mode"),
-        ("shell", "Shell mode"),
-        ("gitcommsg", "Git commit message mode")  # Add gitcommsg mode
-    ]:
-        if context_groups[mode]:
-            print(f"\n    {COLORS['yellow']}Options for {options}:{COLORS['reset']}")
-            for option in sorted(context_groups[mode]):
-                # Skip if already listed in general options
-                if option in context_groups["all"]:
-                    continue
-                meta = CLI_CONFIG_OPTIONS[option]
-                default = f"(default: {meta['default']})" if meta['default'] is not None else ""
-                exclusive = f" [exclusive with: {', '.join(meta['exclusive'])}]" if "exclusive" in meta else ""
-                print(f"      {COLORS['green']}{option}{COLORS['reset']} - {meta['type']} {default}{exclusive}")
+        print(f"      {option}")
+    
+    # Print code options
+    if context_groups["code"]:
+        print(f"\n    {COLORS['yellow']}Code mode options (-c/--code):{COLORS['reset']}")
+        for option in sorted(context_groups["code"]):
+            print(f"      {option}")
+    
+    # Print interactive mode options
+    if context_groups["interactive"]:
+        print(f"\n    {COLORS['yellow']}Interactive mode options (-i/--interactive):{COLORS['reset']}")
+        for option in sorted(context_groups["interactive"]):
+            print(f"      {option}")
+    
+    # Print gitcommsg options
+    if context_groups["gitcommsg"]:
+        print(f"\n    {COLORS['yellow']}Git commit message options (-g/--gitcommsg):{COLORS['reset']}")
+        for option in sorted(context_groups["gitcommsg"]):
+            print(f"      {option}")
     
     print(f"\n  {COLORS['cyan']}Example usage:{COLORS['reset']}")
     print(f"    {COLORS['yellow']}ngpt --cli-config set language java{COLORS['reset']}        - Set default language to java for code generation")
@@ -543,7 +539,8 @@ def main():
                 prettify=args.prettify,
                 renderer=args.renderer,
                 stream_prettify=args.stream_prettify,
-                logger=logger
+                logger=logger,
+                multiline_enabled=args.multiline
             )
         elif args.shell:
             # Apply CLI config for shell mode

ngpt/cli/modes/interactive.py

@@ -6,7 +6,7 @@ import sys
 import time
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown, TERMINAL_RENDER_LOCK
-from ..ui import spinner
+from ..ui import spinner, get_multiline_input
 from ...utils import enhance_prompt_with_web_search
 
 # Optional imports for enhanced UI
@@ -20,7 +20,7 @@ try:
 except ImportError:
     HAS_PROMPT_TOOLKIT = False
 
-def interactive_chat_session(client, web_search=False, no_stream=False, temperature=0.7, top_p=1.0, max_tokens=None, preprompt=None, prettify=False, renderer='auto', stream_prettify=False, logger=None):
+def interactive_chat_session(client, web_search=False, no_stream=False, temperature=0.7, top_p=1.0, max_tokens=None, preprompt=None, prettify=False, renderer='auto', stream_prettify=False, logger=None, multiline_enabled=False):
     """Start an interactive chat session with the AI.
     
     Args:
@@ -35,6 +35,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
         renderer: Which markdown renderer to use
         stream_prettify: Whether to enable streaming with prettify
         logger: Logger instance for logging the conversation
+        multiline_enabled: Whether to enable the multiline input command
     """
     # Get terminal width for better formatting
     try:
@@ -60,6 +61,9 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
     print(f"  {COLORS['yellow']}clear{COLORS['reset']}   : Reset conversation")
     print(f"  {COLORS['yellow']}exit{COLORS['reset']}    : End session")
     
+    if multiline_enabled:
+        print(f"  {COLORS['yellow']}ml{COLORS['reset']}      : Open multiline editor")
+    
     print(f"\n{separator}\n")
     
     # Show logging info if logger is available
@@ -184,6 +188,22 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             if user_input.lower() == 'clear':
                 clear_history()
                 continue
+                
+            if multiline_enabled and user_input.lower() == 'ml':
+                print(f"{COLORS['cyan']}Opening multiline editor. Press Ctrl+D to submit.{COLORS['reset']}")
+                multiline_input = get_multiline_input()
+                if multiline_input is None:
+                    # Input was cancelled
+                    print(f"{COLORS['yellow']}Multiline input cancelled.{COLORS['reset']}")
+                    continue
+                elif not multiline_input.strip():
+                    print(f"{COLORS['yellow']}Empty message skipped.{COLORS['reset']}")
+                    continue
+                else:
+                    # Use the multiline input as user_input
+                    user_input = multiline_input
+                    print(f"{user_header()}")
+                    print(f"{COLORS['cyan']}│ {COLORS['reset']}{user_input}")
             
             # Skip empty messages but don't raise an error
             if not user_input.strip():

ngpt/utils/cli_config.py

@@ -19,6 +19,8 @@ CLI_CONFIG_OPTIONS = {
     "renderer": {"type": "str", "default": "auto", "context": ["all"]},
     "config-index": {"type": "int", "default": 0, "context": ["all"], "exclusive": ["provider"]},
     "web-search": {"type": "bool", "default": False, "context": ["all"]},
+    # Interactive mode options
+    "interactive-multiline": {"type": "bool", "default": False, "context": ["interactive"]},
     # GitCommit message options
     "rec-chunk": {"type": "bool", "default": False, "context": ["gitcommsg"]},
     "diff": {"type": "str", "default": None, "context": ["gitcommsg"]},
@@ -243,6 +245,10 @@ def apply_cli_config(args: Any, mode: str) -> Any:
         # Convert dashes to underscores for argparse compatibility
         arg_name = option.replace("-", "_")
         
+        # Special case for interactive-multiline which maps to multiline argument
+        if option == "interactive-multiline":
+            arg_name = "multiline"
+        
         # Skip if explicitly set via command line
         cli_option = f"--{option}"
         if cli_option in explicit_args:

{ngpt-3.11.3.dist-info → ngpt-3.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.11.3
+Version: 3.12.1
 Summary: A Swiss army knife for LLMs: A fast, lightweight CLI and interactive chat tool that brings the power of any OpenAI-compatible LLM (OpenAI, Ollama, Groq, Claude, Gemini, etc.) straight to your terminal. rewrite texts or refine code, craft git commit messages, generate and run OS-aware shell commands.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt
@@ -281,14 +281,14 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 ```console
 ❯ ngpt -h
 
-usage: ngpt [-h] [-v] [--language LANGUAGE] [--config [CONFIG]] [--config-index CONFIG_INDEX] [--provider PROVIDER]
-            [--remove] [--show-config] [--all] [--list-models] [--list-renderers] [--cli-config [COMMAND ...]]
-            [--role-config [ACTION ...]] [--api-key API_KEY] [--base-url BASE_URL] [--model MODEL] [--web-search]
-            [--pipe] [--temperature TEMPERATURE] [--top_p TOP_P] [--max_tokens MAX_TOKENS] [--log [FILE]]
+usage: ngpt [-h] [-v] [--config [CONFIG]] [--config-index CONFIG_INDEX] [--provider PROVIDER] [--remove] [--show-config]
+            [--all] [--list-models] [--list-renderers] [--cli-config [COMMAND ...]] [--role-config [ACTION ...]]
+            [--api-key API_KEY] [--base-url BASE_URL] [--model MODEL] [--web-search] [--pipe]
+            [--temperature TEMPERATURE] [--top_p TOP_P] [--max_tokens MAX_TOKENS] [--log [FILE]]
             [--preprompt PREPROMPT | --role ROLE] [--no-stream | --prettify | --stream-prettify]
-            [--renderer {auto,rich,glow}] [--rec-chunk] [--diff [FILE]] [--chunk-size CHUNK_SIZE]
+            [--renderer {auto,rich,glow}] [--language LANGUAGE] [--rec-chunk] [--diff [FILE]] [--chunk-size CHUNK_SIZE]
             [--analyses-chunk-size ANALYSES_CHUNK_SIZE] [--max-msg-lines MAX_MSG_LINES]
-            [--max-recursion-depth MAX_RECURSION_DEPTH] [-i | -s | -c | -t | -r | -g] [--humanize]
+            [--max-recursion-depth MAX_RECURSION_DEPTH] [--humanize] [--multiline] [-i | -s | -c | -t | -r | -g]
             [prompt]
 
 nGPT - Interact with AI language models via OpenAI-compatible APIs
@@ -301,14 +301,15 @@ options::
 
 -h, --help                          show this help message and exit
 -v, --version                       Show version information and exit
---language LANGUAGE                 Programming language to generate code in (for code mode)
 
 Configuration Options::
 
---config [CONFIG]                   Path to a custom config file or, if no value provided, enter interactive configuration mode to create a new config
+--config [CONFIG]                   Path to a custom config file or, if no value provided, enter interactive
+                                    configuration mode to create a new config
 --config-index CONFIG_INDEX         Index of the configuration to use or edit (default: 0)
 --provider PROVIDER                 Provider name to identify the configuration to use
---remove                            Remove the configuration at the specified index (requires --config and --config-index or --provider)
+--remove                            Remove the configuration at the specified index (requires --config and
+                                    --config-index or --provider)
 --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
@@ -321,15 +322,21 @@ Global Options::
 --api-key API_KEY                   API key for the service
 --base-url BASE_URL                 Base URL for the API
 --model MODEL                       Model to use
---web-search                        Enable web search capability using DuckDuckGo to enhance prompts with relevant information
---pipe                              Read from stdin and use content with prompt. Use {} in prompt as placeholder for stdin content. Can be used with any mode option except --text and --interactive
+--web-search                        Enable web search capability using DuckDuckGo to enhance prompts with relevant
+                                    information
+--pipe                              Read from stdin and use content with prompt. Use {} in prompt as placeholder
+                                    for stdin content. Can be used with any mode option except --text and
+                                    --interactive
 --temperature TEMPERATURE           Set temperature (controls randomness, default: 0.7)
 --top_p TOP_P                       Set top_p (controls diversity, default: 1.0)
 --max_tokens MAX_TOKENS             Set max response length in tokens
---log [FILE]                        Set filepath to log conversation to, or create a temporary log file if no path provided
+--log [FILE]                        Set filepath to log conversation to, or create a temporary log file if no path
+                                    provided
 --preprompt PREPROMPT               Set custom system prompt to control AI behavior
---role ROLE                         Use a predefined role to set system prompt (mutually exclusive with --preprompt)
---renderer {auto,rich,glow}         Select which markdown renderer to use with --prettify or --stream-prettify (auto, rich, or glow)
+--role ROLE                         Use a predefined role to set system prompt (mutually exclusive with
+                                    --preprompt)
+--renderer {auto,rich,glow}         Select which markdown renderer to use with --prettify or --stream-prettify
+                                    (auto, rich, or glow)
 
 Output Display Options (mutually exclusive)::
 
@@ -337,14 +344,30 @@ Output Display Options (mutually exclusive)::
 --prettify                          Render complete response with markdown and code formatting (non-streaming)
 --stream-prettify                   Stream response with real-time markdown rendering (default)
 
+Code Mode Options::
+
+--language LANGUAGE                 Programming language to generate code in (for code mode)
+
 Git Commit Message Options::
 
 --rec-chunk                         Process large diffs in chunks with recursive analysis if needed
---diff [FILE]                       Use diff from specified file instead of staged changes. If used without a path, uses the path from CLI config.
+--diff [FILE]                       Use diff from specified file instead of staged changes. If used without a path,
+                                    uses the path from CLI config.
 --chunk-size CHUNK_SIZE             Number of lines per chunk when chunking is enabled (default: 200)
---analyses-chunk-size ANALYSES_CHUNK_SIZE Number of lines per chunk when recursively chunking analyses (default: 200)
+--analyses-chunk-size ANALYSES_CHUNK_SIZE
+                                    Number of lines per chunk when recursively chunking analyses (default: 200)
 --max-msg-lines MAX_MSG_LINES       Maximum number of lines in commit message before condensing (default: 20)
---max-recursion-depth MAX_RECURSION_DEPTH Maximum recursion depth for commit message condensing (default: 3)
+--max-recursion-depth MAX_RECURSION_DEPTH
+                                    Maximum recursion depth for commit message condensing (default: 3)
+
+Rewrite Mode Options::
+
+--humanize                          Transform AI-generated text into human-like content that passes AI detection
+                                    tools
+
+Interactive Mode Options::
+
+--multiline                         Enable multiline text input with the "ml" command in interactive mode
 
 Modes (mutually exclusive)::
 
@@ -355,10 +378,6 @@ Modes (mutually exclusive)::
 -r, --rewrite                       Rewrite text from stdin to be more natural while preserving tone and meaning
 -g, --gitcommsg                     Generate AI-powered git commit messages from staged changes or diff file
 
-Rewrite Mode Options::
-
---humanize                          Transform AI-generated text into human-like content that passes AI detection tools
-
 ```
 
 > **Note**: For better visualization of conventional commit messages on GitHub, you can use the [GitHub Commit Labels](https://greasyfork.org/en/scripts/526153-github-commit-labels) userscript, which adds colorful labels to your commits.

{ngpt-3.11.3.dist-info → ngpt-3.12.1.dist-info}/RECORD

@@ -2,10 +2,10 @@ ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/__main__.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
 ngpt/client.py,sha256=XjpA2UnvrRvzk6_DzVEddUTzoPlF8koQ-cZURpHoT7c,9041
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=tHx5CwSzmynbdPV5D-ly3Hs7OInZXjrvnNodtW_Eypk,15048
+ngpt/cli/args.py,sha256=LYz4MhJUg_4G0qps1QR22vp1_3riMbz6TdA85jL9aKQ,15400
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
-ngpt/cli/main.py,sha256=36mi8uYDcl56IhTkt-TJTRRhwHeF157xMAYgufLRAMo,29256
+ngpt/cli/main.py,sha256=P5ljHSRoWsmHBDKbY3WxMNNZB19ntZ3NURd7CWfHtOg,28811
 ngpt/cli/renderers.py,sha256=vAoDkpvgG2Fl81zkJDk_-zM1Fsw8E4Uv6m1AI81Fawo,17049
 ngpt/cli/roles.py,sha256=jtARS_XgZ1_UW8eAdLLMe7trpYhDnzEyCH9PYAiH-Og,9675
 ngpt/cli/ui.py,sha256=8-WyPMwgQiqLXWO0mGfBhKTRnIDDtPUtm_XCvOnqBJA,11334
@@ -13,18 +13,18 @@ ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,36
 ngpt/cli/modes/chat.py,sha256=x1leClKq7UupA_CdW4tym0AivY2o_II123-I5IcAkxQ,7091
 ngpt/cli/modes/code.py,sha256=Qj59xq6fZqgUDw7SbvmPKX_gdpc7DHJhNkn1sB5qgUU,12932
 ngpt/cli/modes/gitcommsg.py,sha256=qFOrll333ebFOkzLP_WD1Qw0VfpphYqeiuHumkP6OB4,54833
-ngpt/cli/modes/interactive.py,sha256=E0c38NA8xnuRKAce40F35uFYcohFDvaqSB8nf1ywS-4,17958
+ngpt/cli/modes/interactive.py,sha256=bfXE7S3pSBgtazzmmOElbrRMZd7ahuZUB1uic1RDD-w,19073
 ngpt/cli/modes/rewrite.py,sha256=RaN4NOItKrGy5ilRrTa2amK4zmNo59j6K7plUf5SJPM,20290
 ngpt/cli/modes/shell.py,sha256=it1Brq1-LGeNfPKYBeVAwF-a78g9UP-KscofBZQkbr4,41589
 ngpt/cli/modes/text.py,sha256=NOikaU9YVCBgyaCl6pwy9EVt-YY5Q4jBx0l47izpVTA,6986
 ngpt/utils/__init__.py,sha256=_92f8eGMMOtQQA3uwgSRVwUEl1EIRFjWPUjcfGgI-eI,1244
-ngpt/utils/cli_config.py,sha256=Ug8cECBTIuzOwkBWidLTfs-OAdOsCMJ2bNa70pOADfw,11195
+ngpt/utils/cli_config.py,sha256=2RX0PIiz9z6DCYe2fpWIPSRC8JQmzRLY4RTApJRVWe4,11491
 ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
 ngpt/utils/pipe.py,sha256=qRHF-Ma7bbU0cOcb1Yhe4S-kBavivtnnvLA3EYS4FY4,2162
 ngpt/utils/web_search.py,sha256=w5ke4KJMRxq7r5jtbUXvspja6XhjoPZloVkZ0IvBXIE,30731
-ngpt-3.11.3.dist-info/METADATA,sha256=V8jJuKwIMdwPM3PMxTuPhPldJJH-4IegwcIgx-NqBeU,31332
-ngpt-3.11.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.11.3.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.11.3.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.11.3.dist-info/RECORD,,
+ngpt-3.12.1.dist-info/METADATA,sha256=faQ_akxkNy8w9dORvyHQPMV8f1xtsVhOWn9nvoSkPxM,31935
+ngpt-3.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.12.1.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.12.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.12.1.dist-info/RECORD,,