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

ngpt/__init__.py

@@ -2,8 +2,8 @@ from importlib.metadata import version as get_version
 __version__ = get_version("ngpt")
 
 from .client import NGPTClient
-from .config import load_config, get_config_path, get_config_dir
-from .cli_config import (
+from .utils.config import load_config, get_config_path, get_config_dir
+from .utils.cli_config import (
     load_cli_config,
     set_cli_config_option,
     get_cli_config_option,

ngpt/cli/config_manager.py

@@ -1,5 +1,5 @@
 import sys
-from ..config import get_config_path, load_configs, add_config_entry, remove_config_entry
+from ..utils.config import get_config_path, load_configs, add_config_entry, remove_config_entry
 from .formatters import COLORS
 
 def show_config_help():

ngpt/cli/interactive.py

@@ -5,7 +5,7 @@ import datetime
 import traceback
 from .formatters import COLORS
 from .renderers import prettify_markdown, prettify_streaming_markdown
-from ..log import create_logger
+from ..utils.log import create_logger
 
 # Optional imports for enhanced UI
 try:

ngpt/cli/main.py

@@ -2,8 +2,8 @@ import argparse
 import sys
 import os
 from ..client import NGPTClient
-from ..config import load_config, get_config_path, load_configs, add_config_entry, remove_config_entry
-from ..cli_config import (
+from ..utils.config import load_config, get_config_path, load_configs, add_config_entry, remove_config_entry
+from ..utils.cli_config import (
     set_cli_config_option, 
     get_cli_config_option, 
     unset_cli_config_option, 
@@ -12,7 +12,7 @@ from ..cli_config import (
     CLI_CONFIG_OPTIONS,
     load_cli_config
 )
-from ..log import create_logger
+from ..utils.log import create_logger
 from .. import __version__
 
 from .formatters import COLORS, ColoredHelpFormatter
@@ -330,10 +330,20 @@ def main():
             
             return
         
-        # Regular config addition/editing (existing code)
-        # If --config-index was not explicitly specified, create a new entry by passing None
-        # This will cause add_config_entry to create a new entry at the end of the list
-        # Otherwise, edit the existing config at the specified index
+        # Check if --config-index was explicitly specified in command line args
+        config_index_explicit = '--config-index' in sys.argv
+        provider_explicit = '--provider' in sys.argv
+        
+        # When only --config is used (without explicit --config-index or --provider),
+        # always create a new configuration regardless of CLI config settings
+        if not config_index_explicit and not provider_explicit:
+            # Always create a new config when just --config is used
+            configs = load_configs(str(config_path))
+            print(f"Creating new configuration at index {len(configs)}")
+            add_config_entry(config_path, None)
+            return
+        
+        # If explicitly specified indexes or provider, continue with editing behavior
         config_index = None
         
         # Determine if we're editing an existing config or creating a new one
@@ -361,7 +371,7 @@ def main():
                 config_index = matching_configs[0]
                 
             print(f"Editing existing configuration at index {config_index}")
-        elif effective_config_index != 0 or '--config-index' in sys.argv:
+        elif effective_config_index != 0 or config_index_explicit:
             # Check if the index is valid
             configs = load_configs(str(config_path))
             if effective_config_index >= 0 and effective_config_index < len(configs):

ngpt/cli/modes/chat.py

@@ -1,6 +1,6 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
-from ...log import create_logger
+from ...utils.log import create_logger
 import sys
 
 def chat_mode(client, args, logger=None):

ngpt/cli/modes/code.py

@@ -1,6 +1,6 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown, has_markdown_renderer, show_available_renderers
-from ...log import create_logger
+from ...utils.log import create_logger
 import sys
 
 def code_mode(client, args, logger=None):

ngpt/cli/modes/shell.py

@@ -1,5 +1,5 @@
 from ..formatters import COLORS
-from ...log import create_logger
+from ...utils.log import create_logger
 import subprocess
 import sys
 

ngpt/cli/modes/text.py

@@ -1,7 +1,7 @@
 from ..formatters import COLORS
 from ..renderers import prettify_markdown, prettify_streaming_markdown
 from ..ui import get_multiline_input
-from ...log import create_logger
+from ...utils.log import create_logger
 
 def text_mode(client, args, logger=None):
     """Handle the multi-line text input mode.

ngpt/utils/__init__.py

@@ -1 +1,33 @@
 # ngpt utils module
+
+from .log import create_logger, Logger
+from .config import (
+    load_config, 
+    get_config_path, 
+    get_config_dir, 
+    load_configs, 
+    add_config_entry, 
+    remove_config_entry,
+    DEFAULT_CONFIG,
+    DEFAULT_CONFIG_ENTRY
+)
+from .cli_config import (
+    load_cli_config,
+    set_cli_config_option,
+    get_cli_config_option,
+    unset_cli_config_option,
+    apply_cli_config,
+    list_cli_config_options,
+    CLI_CONFIG_OPTIONS,
+    get_cli_config_dir,
+    get_cli_config_path
+)
+
+__all__ = [
+    "create_logger", "Logger",
+    "load_config", "get_config_path", "get_config_dir", "load_configs", 
+    "add_config_entry", "remove_config_entry", "DEFAULT_CONFIG", "DEFAULT_CONFIG_ENTRY",
+    "load_cli_config", "set_cli_config_option", "get_cli_config_option", 
+    "unset_cli_config_option", "apply_cli_config", "list_cli_config_options",
+    "CLI_CONFIG_OPTIONS", "get_cli_config_dir", "get_cli_config_path"
+]

ngpt/{cli_config.py → 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.0.dist-info → ngpt-2.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.11.0
+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
@@ -231,7 +231,8 @@ For more CLI examples and detailed usage information, see the [CLI Usage Guide](
 ### As a Library
 
 ```python
-from ngpt import NGPTClient, load_config
+from ngpt import NGPTClient
+from ngpt.utils.config import load_config
 
 # Load the first configuration (index 0) from config file
 config = load_config(config_index=0)
@@ -295,7 +296,8 @@ For advanced usage patterns and integrations, check out the [Advanced Examples](
 nGPT can also be used as a framework to build your own AI-powered command-line tools. You can leverage nGPT's pre-built CLI components to quickly develop sophisticated CLI applications.
 
 ```python
-from ngpt import NGPTClient, load_config
+from ngpt import NGPTClient
+from ngpt.utils.config import load_config
 from ngpt.cli.interactive import interactive_chat_session
 from ngpt.cli.renderers import prettify_markdown
 from ngpt.cli.args import setup_argument_parser

ngpt-2.11.2.dist-info/RECORD

@@ -0,0 +1,25 @@
+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/config_manager.py,sha256=POjX3Asqap2N_Y6Qq0JC3OLZdzxRpFz3D0Lk19Now2U,3758
+ngpt/cli/formatters.py,sha256=1ofNEWEZtFr0MJ3oWomoL_mFmZHlUdT3I5qGtbDQ4g0,9378
+ngpt/cli/interactive.py,sha256=5xMMP1MuYW4jsbUEbjElE25fcJpgHVBbx2dIj8M39M8,10959
+ngpt/cli/main.py,sha256=wSFVkg42NYIJQLMI9iOkW9nz2c6uukmwZghbaw6fYDk,27533
+ngpt/cli/renderers.py,sha256=U3Vef3nY1NF2JKtLUtUjdFomyqIrijGWdxRPm46urr4,10546
+ngpt/cli/ui.py,sha256=2JXkCRw5utaKpNZIy0u8F_Jh2zrWbm93dMz91wf9CkQ,5334
+ngpt/cli/modes/__init__.py,sha256=11znFpqzHyRsEtaTrms5M3q2SrscT9VvUgr7C2B1o-E,179
+ngpt/cli/modes/chat.py,sha256=OtD0iNoSpJ79gojaaCDOr0WPpRmAwzPPG8kwDjESrXo,3177
+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=_epz6MzSBOiE6cMkQDggkzfRRV5gga4eg-2UW955GrM,10545
+ngpt/utils/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
+ngpt/utils/log.py,sha256=Bxv2-GbWtVYa3u94Zs_OVEvYk_CbuT5hrDH06KHLXa8,6369
+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,,

ngpt-2.11.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-ngpt/__init__.py,sha256=awvycdj3tgcOr0BO81L4XU6DOtnToxFqkPHe1Pyu0Bw,652
-ngpt/cli.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
-ngpt/cli_config.py,sha256=fUtahEUJlFt1cguIXrfHk0exn6O1qnm50uTKAgvtySc,9984
-ngpt/client.py,sha256=Rv-JO8RAmw1v3gdLkwaPe_PEw6p83cejO0YNT_DDjeg,15134
-ngpt/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
-ngpt/log.py,sha256=Bxv2-GbWtVYa3u94Zs_OVEvYk_CbuT5hrDH06KHLXa8,6369
-ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=2e13wYQGfHFXpxZz5wXuvmoYpIkK6PEZQamHxfHAdyY,8868
-ngpt/cli/config_manager.py,sha256=L091h99ntMBth_FM39npGCOtDCV5kVkukNSkCIj6dpI,3752
-ngpt/cli/formatters.py,sha256=1ofNEWEZtFr0MJ3oWomoL_mFmZHlUdT3I5qGtbDQ4g0,9378
-ngpt/cli/interactive.py,sha256=8TBDbAqgenu8JiIJzVEGN67bcDA71WKJBXmBhdcJl-E,10953
-ngpt/cli/main.py,sha256=N2vCeVKDGJFIkVVPxGYgE2wCq6n0vAhdIE3dil7Mqv4,27043
-ngpt/cli/renderers.py,sha256=U3Vef3nY1NF2JKtLUtUjdFomyqIrijGWdxRPm46urr4,10546
-ngpt/cli/ui.py,sha256=2JXkCRw5utaKpNZIy0u8F_Jh2zrWbm93dMz91wf9CkQ,5334
-ngpt/cli/modes/__init__.py,sha256=11znFpqzHyRsEtaTrms5M3q2SrscT9VvUgr7C2B1o-E,179
-ngpt/cli/modes/chat.py,sha256=dUyPG4wzUZYbCzfjXHpJvIocqbHMKSJuOMBNaJTAdsY,3171
-ngpt/cli/modes/code.py,sha256=o-dwPwom7cS6wwS1jlEzDoYwhwgh_ClwJYCFGvZw9es,4326
-ngpt/cli/modes/shell.py,sha256=zjfajH4BH2y18AzBlwvcryeke6hiS43rqPidNfJLKwQ,2715
-ngpt/cli/modes/text.py,sha256=QQr9dENJP35Xe8Ck0nbmD8gE7uVng4KEHcZkSHcQXCg,3173
-ngpt/utils/__init__.py,sha256=NK8wlI9-YeaKPOaXBVfUj3mKOXohfD3GmNy5obOIXOM,20
-ngpt-2.11.0.dist-info/METADATA,sha256=o9WAF9lC8DEqzJbP0_u1lz5qZLEPow6mzUSqPHKy6eY,20569
-ngpt-2.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.11.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-2.11.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.11.0.dist-info/RECORD,,