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

ngpt/utils/cli_config.py

@@ -212,7 +212,13 @@ def apply_cli_config(args: Any, mode: str) -> Any:
     # 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 +233,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 +242,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 +251,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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.11.1
+Version: 2.11.2
 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

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

@@ -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=_epz6MzSBOiE6cMkQDggkzfRRV5gga4eg-2UW955GrM,10545
 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.2.dist-info/METADATA,sha256=XpjOCWolqeW9YKDL_VQCITLYcDxedgDCQCrxnzlcLr4,20627
+ngpt-2.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.11.2.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-2.11.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.11.2.dist-info/RECORD,,