ngpt 2.9.1__py3-none-any.whl → 2.9.2__py3-none-any.whl

ngpt/cli/main.py

@@ -27,6 +27,7 @@ def show_cli_config_help():
     """Display help information about CLI configuration."""
     print(f"\n{COLORS['green']}{COLORS['bold']}CLI Configuration Help:{COLORS['reset']}")
     print(f"  {COLORS['cyan']}Command syntax:{COLORS['reset']}")
+    print(f"    {COLORS['yellow']}ngpt --cli-config help{COLORS['reset']}                - Show this help message")
     print(f"    {COLORS['yellow']}ngpt --cli-config set OPTION VALUE{COLORS['reset']}    - Set a default value for OPTION")
     print(f"    {COLORS['yellow']}ngpt --cli-config get OPTION{COLORS['reset']}          - Get the current value of OPTION")
     print(f"    {COLORS['yellow']}ngpt --cli-config get{COLORS['reset']}                 - Show all CLI configuration settings")
@@ -83,16 +84,25 @@ def show_cli_config_help():
     print(f"    {COLORS['yellow']}ngpt --cli-config set language java{COLORS['reset']}        - Set default language to java for code generation")
     print(f"    {COLORS['yellow']}ngpt --cli-config set temperature 0.9{COLORS['reset']}      - Set default temperature to 0.9")
     print(f"    {COLORS['yellow']}ngpt --cli-config set no-stream true{COLORS['reset']}       - Disable streaming by default")
+    print(f"    {COLORS['yellow']}ngpt --cli-config get temperature{COLORS['reset']}          - Check the current temperature setting")
+    print(f"    {COLORS['yellow']}ngpt --cli-config get{COLORS['reset']}                      - Show all current CLI settings")
     print(f"    {COLORS['yellow']}ngpt --cli-config unset language{COLORS['reset']}           - Remove language setting")
     
     print(f"\n  {COLORS['cyan']}Notes:{COLORS['reset']}")
-    print(f"    - CLI configuration is stored in {COLORS['yellow']}~/.config/ngpt/ngpt-cli.conf{COLORS['reset']} (or equivalent for your OS)")
+    print(f"    - CLI configuration is stored in:")
+    print(f"      • Linux: {COLORS['yellow']}~/.config/ngpt/ngpt-cli.conf{COLORS['reset']}")
+    print(f"      • macOS: {COLORS['yellow']}~/Library/Application Support/ngpt/ngpt-cli.conf{COLORS['reset']}")
+    print(f"      • Windows: {COLORS['yellow']}%APPDATA%\\ngpt\\ngpt-cli.conf{COLORS['reset']}")
     print(f"    - Settings are applied based on context (e.g., language only applies to code generation mode)")
     print(f"    - Command-line arguments always override CLI configuration")
     print(f"    - Some options are mutually exclusive and will not be applied together")
 
 def handle_cli_config(action, option=None, value=None):
     """Handle CLI configuration commands."""
+    if action == "help":
+        show_cli_config_help()
+        return
+    
     if action == "list":
         # List all available options
         print(f"{COLORS['green']}{COLORS['bold']}Available CLI configuration options:{COLORS['reset']}")
@@ -254,7 +264,7 @@ def main():
         option = args.cli_config[1] if len(args.cli_config) > 1 else None
         value = args.cli_config[2] if len(args.cli_config) > 2 else None
         
-        if action in ("set", "get", "unset", "list"):
+        if action in ("set", "get", "unset", "list", "help"):
             handle_cli_config(action, option, value)
             return
         else:

ngpt/cli_config.py

@@ -7,7 +7,7 @@ from typing import Dict, Optional, Any, List, Union, Tuple
 # CLI config options with their types and default values
 CLI_CONFIG_OPTIONS = {
     "language": {"type": "str", "default": "python", "context": ["code"]},
-    "provider": {"type": "str", "default": None, "context": ["all"]},
+    "provider": {"type": "str", "default": None, "context": ["all"], "exclusive": ["config-index"]},
     "temperature": {"type": "float", "default": 0.7, "context": ["all"]},
     "top_p": {"type": "float", "default": 1.0, "context": ["all"]},
     "max_tokens": {"type": "int", "default": None, "context": ["all"]},
@@ -17,7 +17,7 @@ CLI_CONFIG_OPTIONS = {
     "prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "stream-prettify"]},
     "stream-prettify": {"type": "bool", "default": False, "context": ["all"], "exclusive": ["no-stream", "prettify"]},
     "renderer": {"type": "str", "default": "auto", "context": ["all"]},
-    "config-index": {"type": "int", "default": 0, "context": ["all"]},
+    "config-index": {"type": "int", "default": 0, "context": ["all"], "exclusive": ["provider"]},
     "web-search": {"type": "bool", "default": False, "context": ["all"]},
 }
 
@@ -113,13 +113,19 @@ def set_cli_config_option(option: str, value: Any) -> Tuple[bool, str]:
         else:
             return False, f"Error: Unsupported option type '{option_type}'"
         
-        # Handle mutual exclusivity for boolean options
-        if option_type == "bool" and "exclusive" in CLI_CONFIG_OPTIONS[option]:
-            if parsed_value:  # If setting this option to True
-                # Set all other exclusive options to False
+        # Handle mutual exclusivity for options
+        if "exclusive" in CLI_CONFIG_OPTIONS[option]:
+            if option_type == "bool":
+                # For boolean options: only apply exclusivity when setting to True
+                if parsed_value:
+                    for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
+                        config[excl_option] = False
+                # If setting to False, don't alter exclusive options
+            else:
+                # For non-boolean options: If setting this option to any value, remove exclusive options
                 for excl_option in CLI_CONFIG_OPTIONS[option]["exclusive"]:
-                    config[excl_option] = False
-            # No special handling needed if setting to False, just update the value
+                    if excl_option in config:
+                        del config[excl_option]
         
         # Set the value in the config
         config[option] = parsed_value
@@ -203,6 +209,9 @@ def apply_cli_config(args: Any, mode: str) -> Any:
     # Get command-line arguments provided by the user
     explicit_args = set(arg for arg in sys.argv[1:] if arg.startswith('--'))
 
+    # Keep track of applied exclusive options
+    applied_exclusives = set()
+
     # For each option in CLI config, check if it should be applied
     for option, value in cli_config.items():
         # Skip if not a valid option
@@ -221,6 +230,13 @@ def apply_cli_config(args: Any, mode: str) -> Any:
         # 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
+        if option in applied_exclusives:
             continue
         
         # Check exclusivity constraints against *explicitly set* args
@@ -234,6 +250,9 @@ 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

{ngpt-2.9.1.dist-info → ngpt-2.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.9.1
+Version: 2.9.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.9.1.dist-info → ngpt-2.9.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 ngpt/__init__.py,sha256=awvycdj3tgcOr0BO81L4XU6DOtnToxFqkPHe1Pyu0Bw,652
 ngpt/cli.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
-ngpt/cli_config.py,sha256=LatikOJTtohbmCfXM6AH44qplbpyAD-x1kMkmaJHRS0,9046
+ngpt/cli_config.py,sha256=Om8dXqdBqPCP5V4THQMkzZgHTQvN2rMAV6QjoVDQcZ4,10000
 ngpt/client.py,sha256=Rv-JO8RAmw1v3gdLkwaPe_PEw6p83cejO0YNT_DDjeg,15134
 ngpt/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
 ngpt/cli/config_manager.py,sha256=L091h99ntMBth_FM39npGCOtDCV5kVkukNSkCIj6dpI,3752
 ngpt/cli/formatters.py,sha256=1ofNEWEZtFr0MJ3oWomoL_mFmZHlUdT3I5qGtbDQ4g0,9378
 ngpt/cli/interactive.py,sha256=J6DFkJVBdJ6NjZllsDgJnY1J5RTiKW341p4Zn4wHpGc,11718
-ngpt/cli/main.py,sha256=HBa_FoyU3SOqtRz87qNAefk1CKoiSroYavR9qQMNhv0,30029
+ngpt/cli/main.py,sha256=6VvBg-PSVY8pm9WiPNXkyPQuzX-dCPNrEX5UPIZWXYk,30711
 ngpt/cli/renderers.py,sha256=U3Vef3nY1NF2JKtLUtUjdFomyqIrijGWdxRPm46urr4,10546
 ngpt/cli/ui.py,sha256=2JXkCRw5utaKpNZIy0u8F_Jh2zrWbm93dMz91wf9CkQ,5334
 ngpt/cli/modes/__init__.py,sha256=11znFpqzHyRsEtaTrms5M3q2SrscT9VvUgr7C2B1o-E,179
@@ -16,8 +16,8 @@ ngpt/cli/modes/code.py,sha256=_Z3cKYdeifYZSXZ4dMnQWcnVpM2TvYQd-7S7Q3blfEw,3998
 ngpt/cli/modes/shell.py,sha256=Fx83_JBc3P5vgCCPlXgXFSgzwTY0UMGfUwY4_CU10Ro,1654
 ngpt/cli/modes/text.py,sha256=YpNpcujPweO_Biwg4aYwGw4_ShefzaNVtf8d_QrcR_Q,2719
 ngpt/utils/__init__.py,sha256=NK8wlI9-YeaKPOaXBVfUj3mKOXohfD3GmNy5obOIXOM,20
-ngpt-2.9.1.dist-info/METADATA,sha256=2_YMBdFfN_vPlaI5d6ZTsr9MPfq0ldkvTtr2rEfJ-n8,20343
-ngpt-2.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.9.1.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-2.9.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.9.1.dist-info/RECORD,,
+ngpt-2.9.2.dist-info/METADATA,sha256=Re9hYNXfjtWAu4HIl220MSiRa2Ckgq2hTiDr3lPdZis,20343
+ngpt-2.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.9.2.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-2.9.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.9.2.dist-info/RECORD,,