ngpt 3.4.0__py3-none-any.whl → 3.4.1__py3-none-any.whl

ngpt/cli/args.py

@@ -79,14 +79,19 @@ def setup_argument_parser():
                       help='Set filepath to log conversation to, or create a temporary log file if no path provided')
     global_group.add_argument('--preprompt', 
                       help='Set custom system prompt to control AI behavior')
-    global_group.add_argument('--no-stream', action='store_true',
-                      help='Return the whole response without streaming')
-    global_group.add_argument('--prettify', action='store_const', const='auto',
-                      help='Render markdown responses and code with syntax highlighting and formatting')
-    global_group.add_argument('--stream-prettify', action='store_true',
-                      help='Enable streaming with markdown rendering (automatically uses Rich renderer)')
+    
+    # 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()
+    output_exclusive_group.add_argument('--no-stream', action='store_true',
+                      help='Return the whole response without streaming or formatting')
+    output_exclusive_group.add_argument('--prettify', action='store_const', const='auto',
+                      help='Render complete response with markdown and code formatting (non-streaming)')
+    output_exclusive_group.add_argument('--stream-prettify', action='store_true', default=True,
+                      help='Stream response with real-time markdown rendering (default)')
+    
     global_group.add_argument('--renderer', choices=['auto', 'rich', 'glow'], default='auto',
-                      help='Select which markdown renderer to use with --prettify (auto, rich, or glow)')
+                      help='Select which markdown renderer to use with --prettify or --stream-prettify (auto, rich, or glow)')
     
     # GitCommit message options
     gitcommsg_group = parser.add_argument_group('Git Commit Message Options')
@@ -134,9 +139,29 @@ def validate_args(args):
     if args.all and not args.show_config:
         raise ValueError("--all can only be used with --show-config")
     
-    # Check if --prettify is used with --stream-prettify (conflict)
-    if args.prettify and args.stream_prettify:
-        raise ValueError("--prettify and --stream-prettify cannot be used together. Choose one option.")
+    # These three options are mutually exclusive rendering modes
+    provided_modes = []
+    if '--no-stream' in sys.argv:
+        provided_modes.append('--no-stream')
+    if '--prettify' in sys.argv:
+        provided_modes.append('--prettify')
+    if '--stream-prettify' in sys.argv:
+        provided_modes.append('--stream-prettify')
+    
+    # If more than one rendering mode explicitly provided, raise error
+    if len(provided_modes) > 1:
+        raise ValueError(f"The options {', '.join(provided_modes)} cannot be used together. These options are mutually exclusive.")
+    
+    # Handle the conflict between default stream-prettify and explicitly provided options
+    if args.no_stream:
+        args.stream_prettify = False
+        args.prettify = False
+    elif args.prettify:
+        args.stream_prettify = False
+        args.no_stream = False
+    elif args.stream_prettify:
+        args.no_stream = False
+        args.prettify = False
     
     # Check if --stream-prettify is used but Rich is not available
     if args.stream_prettify and not has_markdown_renderer('rich'):

ngpt/utils/cli_config.py

@@ -15,7 +15,7 @@ CLI_CONFIG_OPTIONS = {
     "preprompt": {"type": "str", "default": None, "context": ["all"]},
     "no-stream": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["prettify", "stream-prettify"]},
     "prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "stream-prettify"]},
-    "stream-prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
+    "stream-prettify": {"type": "bool", "default": True, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
     "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"]},

{ngpt-3.4.0.dist-info → ngpt-3.4.1.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/__main__.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
 ngpt/client.py,sha256=1kn-kVQ2ZYhOlQ5OPM9c_btVKajfk1qb52QbMyGdYtU,14645
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=7ixh5anahTeHWsrEKwhaLA_dR3sJ-ZzO8NyGOeDmd3Q,11392
+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
@@ -17,12 +17,12 @@ ngpt/cli/modes/rewrite.py,sha256=ftD-6M9iQ7g4rLdlKyyLTRiJWYtbz64LIG4PIByxmOk,114
 ngpt/cli/modes/shell.py,sha256=fxE9LEEo4arSn5-q_6zxdnUH7RlqifWmk-_kcA76OhM,4070
 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=IlHnOEEGpLoGZInynM778wgpxLVcJ_STKWxg2Ypvir4,11196
+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=xHfAymkVkx5b7rOITee2smxpH7waRUpaX8aqTf5WBeA,11599
-ngpt-3.4.0.dist-info/METADATA,sha256=1xkrTK7mKFEVilhnLdkNqsRmuczpphjRCgSD8t89Gp8,29100
-ngpt-3.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.4.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.4.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.4.0.dist-info/RECORD,,
+ngpt-3.4.1.dist-info/METADATA,sha256=z2jPQJa1kWQZmTsYgoEbln4TREkW3YPbwdrU0gqTx40,29100
+ngpt-3.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.4.1.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.4.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.4.1.dist-info/RECORD,,