ngpt 2.11.1__py3-none-any.whl → 2.11.3__py3-none-any.whl

ngpt/cli/args.py

@@ -48,7 +48,7 @@ def setup_argument_parser():
     global_group.add_argument('--model', help='Model to use')
     global_group.add_argument('--web-search', action='store_true', 
                       help='Enable web search capability (Note: Your API endpoint must support this feature)')
-    global_group.add_argument('-n', '--no-stream', action='store_true',
+    global_group.add_argument('--no-stream', action='store_true',
                       help='Return the whole response without streaming')
     global_group.add_argument('--temperature', type=float, default=0.7,
                       help='Set temperature (controls randomness, default: 0.7)')

ngpt/utils/cli_config.py

@@ -206,13 +206,23 @@ def apply_cli_config(args: Any, mode: str) -> Any:
     # Load CLI config
     cli_config = load_cli_config()
     
-    # Get command-line arguments provided by the user
-    explicit_args = set(arg for arg in sys.argv[1:] if arg.startswith('--'))
+    # Get command-line arguments provided by the user (both long and short forms)
+    explicit_args = set()
+    for arg in sys.argv[1:]:
+        if arg.startswith('--'):
+            explicit_args.add(arg)
+        # We've removed -n, but this pattern would handle other short options
 
     # Keep track of applied exclusive options
     applied_exclusives = set()
 
-    # For each option in CLI config, check if it should be applied
+    # First pass: Check explicitly set args and track their exclusive options
+    for option in CLI_CONFIG_OPTIONS:
+        cli_option = f"--{option}"
+        if cli_option in explicit_args and "exclusive" in CLI_CONFIG_OPTIONS[option]:
+            applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
+
+    # Second pass: Apply CLI config options
     for option, value in cli_config.items():
         # Skip if not a valid option
         if option not in CLI_CONFIG_OPTIONS:
@@ -227,12 +237,8 @@ def apply_cli_config(args: Any, mode: str) -> Any:
         arg_name = option.replace("-", "_")
         
         # Skip if explicitly set via command line
-        # Check common variants like --option
         cli_option = f"--{option}"
         if cli_option in explicit_args:
-            # Add to applied_exclusives if this option has exclusivity constraints
-            if "exclusive" in CLI_CONFIG_OPTIONS[option]:
-                applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
             continue
         
         # Skip if an exclusive option has already been applied
@@ -240,7 +246,6 @@ def apply_cli_config(args: Any, mode: str) -> Any:
             continue
         
         # Check exclusivity constraints against *explicitly set* args
-        # Don't apply a CLI config option if an exclusive option was explicitly set
         if "exclusive" in CLI_CONFIG_OPTIONS[option]:
             skip = False
             for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
@@ -250,14 +255,23 @@ def apply_cli_config(args: Any, mode: str) -> Any:
                     break # Skip applying this CLI config value
             if skip:
                 continue
-            
-            # If we're applying this option, add its exclusives to the tracking set
-            applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
-                
+        
         # Apply the value from CLI config
         # Ensure the attribute exists on args before setting
         if hasattr(args, arg_name):
             setattr(args, arg_name, value)
+            
+            # For boolean options that are True, explicitly disable their exclusive options
+            option_type = CLI_CONFIG_OPTIONS[option]["type"]
+            if option_type == "bool" and value is True and "exclusive" in CLI_CONFIG_OPTIONS[option]:
+                for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
+                    # Convert to argparse naming and set to False if the attribute exists
+                    excl_arg_name = excl_option.replace("-", "_")
+                    if hasattr(args, excl_arg_name):
+                        setattr(args, excl_arg_name, False)
+                        
+                # Add exclusives to tracking set to prevent them from being applied
+                applied_exclusives.update(CLI_CONFIG_OPTIONS[option]["exclusive"])
     
     return args
 

{ngpt-2.11.1.dist-info → ngpt-2.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.11.1
+Version: 2.11.3
 Summary: A lightweight Python CLI and library for interacting with OpenAI-compatible APIs, supporting both official and self-hosted LLM endpoints.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt
@@ -83,7 +83,7 @@ ngpt "Tell me about quantum computing"
 ngpt -i
 
 # Return response without streaming
-ngpt -n "Tell me about quantum computing"
+ngpt --no-stream "Tell me about quantum computing"
 
 # Generate code
 ngpt --code "function to calculate the Fibonacci sequence"
@@ -349,7 +349,7 @@ You can configure the client using the following options:
 | `--model` | Model to use |
 | `--list-models` | List all available models for the selected configuration (can be combined with --config-index) |
 | `--web-search` | Enable web search capability |
-| `-n, --no-stream` | Return the whole response without streaming |
+| `--no-stream` | Return the whole response without streaming |
 | `--temperature` | Set temperature (controls randomness, default: 0.7) |
 | `--top_p` | Set top_p (controls diversity, default: 1.0) |
 | `--max_tokens` | Set maximum response length in tokens |

{ngpt-2.11.1.dist-info → ngpt-2.11.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/cli.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
 ngpt/client.py,sha256=Rv-JO8RAmw1v3gdLkwaPe_PEw6p83cejO0YNT_DDjeg,15134
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=2e13wYQGfHFXpxZz5wXuvmoYpIkK6PEZQamHxfHAdyY,8868
+ngpt/cli/args.py,sha256=y8bjlmxzKucx7-uVbqlqLgneIMMBTDYzgA_sxd8e-Xw,8862
 ngpt/cli/config_manager.py,sha256=POjX3Asqap2N_Y6Qq0JC3OLZdzxRpFz3D0Lk19Now2U,3758
 ngpt/cli/formatters.py,sha256=1ofNEWEZtFr0MJ3oWomoL_mFmZHlUdT3I5qGtbDQ4g0,9378
 ngpt/cli/interactive.py,sha256=5xMMP1MuYW4jsbUEbjElE25fcJpgHVBbx2dIj8M39M8,10959
@@ -15,11 +15,11 @@ ngpt/cli/modes/code.py,sha256=bFE6x_CUncOM0gyAHOpcJs6nxj_ljFK0AYwJiT1Ndaw,4332
 ngpt/cli/modes/shell.py,sha256=oqqEqWdqcH5q4pmis-hT9ZEFNk9-kaKHHdpRu217u5A,2721
 ngpt/cli/modes/text.py,sha256=sUhgE5XubYxksnQDUvnCFrEbqz1G-CS_iWZZMGkULcI,3179
 ngpt/utils/__init__.py,sha256=E46suk2-QgYBI0Qrs6WXOajOUOebF3ETAFY7ah8DTWs,942
-ngpt/utils/cli_config.py,sha256=fUtahEUJlFt1cguIXrfHk0exn6O1qnm50uTKAgvtySc,9984
+ngpt/utils/cli_config.py,sha256=7T5JDQPZG_qJnRa2FJM3_hhAFWiglIeHHlkLybRXXxU,10697
 ngpt/utils/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
 ngpt/utils/log.py,sha256=Bxv2-GbWtVYa3u94Zs_OVEvYk_CbuT5hrDH06KHLXa8,6369
-ngpt-2.11.1.dist-info/METADATA,sha256=8M9Vs0Me23qWxlCcuaynSHwC_xVuNOOfI4_s69OXN08,20627
-ngpt-2.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.11.1.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-2.11.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.11.1.dist-info/RECORD,,
+ngpt-2.11.3.dist-info/METADATA,sha256=dNmpBqL6H1HHUKvf5i_uiRS_t45q0l2bo61SHyrA_tw,20632
+ngpt-2.11.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.11.3.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-2.11.3.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.11.3.dist-info/RECORD,,