ngpt 3.12.2__py3-none-any.whl → 4.0.1__py3-none-any.whl

ngpt/cli/args.py

@@ -12,7 +12,8 @@ def setup_argument_parser():
     # Minimalist, clean epilog design
     epilog = f"\n{COLORS['yellow']}nGPT {COLORS['bold']}v{__version__}{COLORS['reset']}  •  {COLORS['green']}Docs: {COLORS['bold']}https://nazdridoy.github.io/ngpt/usage/cli_usage{COLORS['reset']}"
     
-    parser = argparse.ArgumentParser(description=description, formatter_class=ColoredHelpFormatter, epilog=epilog)
+    parser = argparse.ArgumentParser(description=description, formatter_class=ColoredHelpFormatter, 
+                                    epilog=epilog, add_help=False)
     
     # Add custom error method with color
     original_error = parser.error
@@ -27,41 +28,16 @@ def setup_argument_parser():
             print(f"{COLORS['green']}{COLORS['bold']}nGPT{COLORS['reset']} version {COLORS['yellow']}{__version__}{COLORS['reset']}")
             parser.exit()
     
-    # Version flag
-    parser.add_argument('-v', '--version', action=ColoredVersionAction, nargs=0, 
-                        help='Show version information and exit')
-    
-    # Prompt argument
-    parser.add_argument('prompt', nargs='?', default=None, 
-                        help='The prompt to send')
-
-    # Config options
-    config_group = parser.add_argument_group('Configuration Options')
-    config_group.add_argument('--config', nargs='?', const=True, 
-                              help='Path to a custom config file or, if no value provided, enter interactive configuration mode to create a new config')
-    config_group.add_argument('--config-index', type=int, default=0, 
-                              help='Index of the configuration to use or edit (default: 0)')
-    config_group.add_argument('--provider', 
-                              help='Provider name to identify the configuration to use')
-    config_group.add_argument('--remove', action='store_true', 
-                              help='Remove the configuration at the specified index (requires --config and --config-index or --provider)')
-    config_group.add_argument('--show-config', action='store_true', 
-                              help='Show the current configuration(s) and exit')
-    config_group.add_argument('--all', action='store_true', 
-                              help='Show details for all configurations (requires --show-config)')
-    config_group.add_argument('--list-models', action='store_true', 
-                              help='List all available models for the current configuration and exit')
-    config_group.add_argument('--list-renderers', action='store_true', 
-                              help='Show available markdown renderers for use with --prettify')
-    config_group.add_argument('--cli-config', nargs='*', metavar='COMMAND', 
-                              help='Manage CLI configuration (set, get, unset, list, help)')
-    
-    # Role configuration options
-    config_group.add_argument('--role-config', nargs='*', metavar='ACTION', 
-                              help='Manage custom roles (help, create, show, edit, list, remove) [role_name]')
-
     # Global options
     global_group = parser.add_argument_group('Global Options')
+    
+    # Add help and version to the global group
+    global_group.add_argument('-h', '--help', action='help',
+                             help='show this help message and exit')
+    global_group.add_argument('-v', '--version', action=ColoredVersionAction, nargs=0, 
+                             help='Show version information and exit')
+    
+    # Then add the other global options
     global_group.add_argument('--api-key', 
                               help='API key for the service')
     global_group.add_argument('--base-url', 
@@ -88,6 +64,29 @@ def setup_argument_parser():
     prompt_exclusive_group.add_argument('--role', 
                       help='Use a predefined role to set system prompt (mutually exclusive with --preprompt)')
     
+    # Config options
+    config_group = parser.add_argument_group('Configuration Options')
+    config_group.add_argument('--config', nargs='?', const=True, 
+                              help='Path to a custom config file or, if no value provided, enter interactive configuration mode to create a new config')
+    config_group.add_argument('--config-index', type=int, default=0, 
+                              help='Index of the configuration to use or edit (default: 0)')
+    config_group.add_argument('--provider', 
+                              help='Provider name to identify the configuration to use')
+    config_group.add_argument('--remove', action='store_true', 
+                              help='Remove the configuration at the specified index (requires --config and --config-index or --provider)')
+    config_group.add_argument('--show-config', action='store_true', 
+                              help='Show the current configuration(s) and exit')
+    config_group.add_argument('--all', action='store_true', 
+                              help='Show details for all configurations (requires --show-config)')
+    config_group.add_argument('--list-models', action='store_true', 
+                              help='List all available models for the current configuration and exit')
+    config_group.add_argument('--list-renderers', action='store_true', 
+                              help='Show available markdown renderers for use with --prettify')
+    config_group.add_argument('--cli-config', nargs='*', metavar='COMMAND', 
+                              help='Manage CLI configuration (set, get, unset, list, help)')
+    config_group.add_argument('--role-config', nargs='*', metavar='ACTION', 
+                              help='Manage custom roles (help, create, show, edit, list, remove) [role_name]')
+
     # Output display options (mutually exclusive group)
     output_group = parser.add_argument_group('Output Display Options (mutually exclusive)')
     output_exclusive_group = output_group.add_mutually_exclusive_group()
@@ -128,8 +127,6 @@ def setup_argument_parser():
     
     # 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)')

ngpt/cli/main.py

@@ -510,7 +510,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 or args.rewrite or args.gitcommsg):
+    if not getattr(args, 'prompt', None) and not (args.shell or args.code or args.text or args.interactive or args.show_config or args.list_models or args.rewrite or args.gitcommsg):
         # Simply use the parser's help
         parser = setup_argument_parser()
         parser.print_help()
@@ -578,8 +578,7 @@ def main():
                 prettify=args.prettify,
                 renderer=args.renderer,
                 stream_prettify=args.stream_prettify,
-                logger=logger,
-                multiline_enabled=args.multiline
+                logger=logger
             )
         elif args.shell:
             # Apply CLI config for shell mode

ngpt/cli/modes/interactive.py

@@ -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, multiline_enabled=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, multiline_enabled=True):
     """Start an interactive chat session with the AI.
     
     Args:

ngpt/utils/cli_config.py

@@ -19,8 +19,6 @@ 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"]},
@@ -245,10 +243,6 @@ 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.12.2.dist-info → ngpt-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.12.2
+Version: 4.0.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,44 +281,21 @@ For more examples and detailed usage, visit the [CLI Usage Guide](https://nazdri
 ```console
 ❯ ngpt -h
 
-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]
+usage: ngpt [-h] [-v] [--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]
+            [--preprompt PREPROMPT | --role ROLE] [--config [CONFIG]] [--config-index CONFIG_INDEX]
+            [--provider PROVIDER] [--remove] [--show-config] [--all] [--list-models] [--list-renderers]
+            [--cli-config [COMMAND ...]] [--role-config [ACTION ...]] [--no-stream | --prettify | --stream-prettify]
             [--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] [--humanize] [--multiline] [-i | -s | -c | -t | -r | -g]
-            [prompt]
+            [--max-recursion-depth MAX_RECURSION_DEPTH] [--humanize] [-i | -s | -c | -t | -r | -g]
 
 nGPT - Interact with AI language models via OpenAI-compatible APIs
 
-positional arguments::
-
-[PROMPT]                            The prompt to send
-
-options::
+Global Options::
 
 -h, --help                          show this help message and exit
 -v, --version                       Show version information and exit
-
-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-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)
---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)
---role-config [ACTION ...]          Manage custom roles (help, create, show, edit, list, remove) [role_name]
-
-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
@@ -338,6 +315,21 @@ Global Options::
 --renderer {auto,rich,glow}         Select which markdown renderer to use with --prettify or --stream-prettify
                                     (auto, rich, or glow)
 
+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-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)
+--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)
+--role-config [ACTION ...]          Manage custom roles (help, create, show, edit, list, remove) [role_name]
+
 Output Display Options (mutually exclusive)::
 
 --no-stream                         Return the whole response without streaming or formatting
@@ -365,10 +357,6 @@ 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)::
 
 -i, --interactive                   Start an interactive chat session
@@ -475,9 +463,6 @@ CLI Configuration Help:
     Code mode options (-c/--code):
       language - Type: str (default: python)
 
-    Interactive mode options (-i/--interactive):
-      interactive-multiline - Type: bool (default: False)
-
     Git commit message options (-g/--gitcommsg):
       analyses-chunk-size - Type: int (default: 200)
       chunk-size - Type: int (default: 200)

{ngpt-3.12.2.dist-info → ngpt-4.0.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=LYz4MhJUg_4G0qps1QR22vp1_3riMbz6TdA85jL9aKQ,15400
+ngpt/cli/args.py,sha256=0ClIMzfY_qCuIVApphPDQNb8yDz1zA83mJtJwNrsfCE,15316
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
-ngpt/cli/main.py,sha256=hMcxW3-pxfmdPj3Qmcr3Hi2Se0fATpP0egaSfFih1Vw,31161
+ngpt/cli/main.py,sha256=SERPyiniRDbqcEcyAmAcP1Uo1E4VFXpdaM_1r9cRCiA,31129
 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=bfXE7S3pSBgtazzmmOElbrRMZd7ahuZUB1uic1RDD-w,19073
+ngpt/cli/modes/interactive.py,sha256=kBs1TIaMOYR6SBWXhgK-etXxI0zYF1-g3_25zwI2DtQ,19072
 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=669EpFX87uZdjZuxEZ1KXrPEpds9czcLI00OaGSZKyQ,11926
+ngpt/utils/cli_config.py,sha256=bP-1shJZ2Oshqpjpe0ZVNHKBRjRCFMfCYHzhwOUIHJY,11630
 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.12.2.dist-info/METADATA,sha256=oX-MMj4L-SftqRvWxvDIA5P4Jod0cYH-2p-jw9fFU6I,31990
-ngpt-3.12.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.12.2.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.12.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.12.2.dist-info/RECORD,,
+ngpt-4.0.1.dist-info/METADATA,sha256=8wH1Ls5-0R-AgAELLFDGTj24TKX6kTHMyoRj4ruFUH0,31619
+ngpt-4.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-4.0.1.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-4.0.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-4.0.1.dist-info/RECORD,,