ngpt 1.6.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

ngpt/cli.py

@@ -68,6 +68,8 @@ def show_config_help():
     print("     ngpt --config --config-index 1")
     print("  7. Remove a configuration at a specific index:")
     print("     ngpt --config --remove --config-index 1")
+    print("  8. List available models for the current configuration:")
+    print("     ngpt --list-models")
 
 def check_config(config):
     """Check config for common issues and provide guidance."""
@@ -273,6 +275,7 @@ def main():
     config_group.add_argument('--remove', action='store_true', help='Remove the configuration at the specified index (requires --config and --config-index)')
     config_group.add_argument('--show-config', action='store_true', help='Show the current configuration(s) and exit')
     config_group.add_argument('--all', action='store_true', help='Show details for all configurations (requires --show-config)')
+    config_group.add_argument('--list-models', action='store_true', help='List all available models for the current configuration and exit')
     
     # Global options
     global_group = parser.add_argument_group('Global Options')
@@ -409,18 +412,35 @@ def main():
         return
     
     # For interactive mode, we'll allow continuing without a specific prompt
-    if not args.prompt and not (args.shell or args.code or args.text or args.interactive):
+    if not args.prompt and not (args.shell or args.code or args.text or args.interactive or args.show_config or args.list_models):
         parser.print_help()
         return
         
     # Check configuration (using the potentially overridden active_config)
-    if not check_config(active_config):
+    if not args.show_config and not args.list_models and not check_config(active_config):
         return
     
     # Initialize client using the potentially overridden active_config
     client = NGPTClient(**active_config)
     
     try:
+        # Handle listing models
+        if args.list_models:
+            print("Retrieving available models...")
+            models = client.list_models()
+            if models:
+                print(f"\nAvailable models for {active_config.get('provider', 'API')}:")
+                print("-" * 50)
+                for model in models:
+                    if "id" in model:
+                        owned_by = f" ({model.get('owned_by', 'Unknown')})" if "owned_by" in model else ""
+                        current = " [active]" if model["id"] == active_config["model"] else ""
+                        print(f"- {model['id']}{owned_by}{current}")
+                print("\nUse --model MODEL_NAME to select a specific model")
+            else:
+                print("No models available or could not retrieve models.")
+            return
+        
         # Handle modes
         if args.interactive:
             # Interactive chat mode

ngpt/client.py

@@ -18,12 +18,65 @@ class NGPTClient:
         self.base_url = base_url if base_url.endswith('/') else base_url + '/'
         self.model = model
         
+        # Detect provider based on base_url domain first
+        detected_provider = self._detect_provider_from_url(self.base_url)
+        self.provider = detected_provider if detected_provider else provider
+        
         # Default headers
         self.headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {self.api_key}"
         }
 
+    def _detect_provider_from_url(self, url: str) -> str:
+        """
+        Detect the API provider based on the base URL domain.
+        
+        Args:
+            url: The base URL to analyze
+            
+        Returns:
+            Detected provider name or empty string if not detected
+        """
+        import re
+        from urllib.parse import urlparse
+        
+        # Extract domain from URL
+        try:
+            parsed_url = urlparse(url)
+            domain = parsed_url.netloc.lower()
+            
+            # Check for known API provider domains
+            if 'openai.com' in domain:
+                return 'OpenAI'
+            elif 'anthropic.com' in domain:
+                return 'Anthropic'
+            elif 'generativelanguage.googleapis.com' in domain:
+                return 'Gemini'
+            elif 'groq.com' in domain:
+                return 'Groq'
+            elif 'cohere.com' in domain or 'cohere.ai' in domain:
+                return 'Cohere'
+            elif 'mistral.ai' in domain:
+                return 'Mistral'
+            elif 'claude.ai' in domain:
+                return 'Claude'
+            elif re.match(r'(127\.0\.0\.1|localhost)', domain):
+                # Local APIs, check path components for clues
+                path = parsed_url.path.lower()
+                if '/ollama' in path:
+                    return 'Ollama'
+                elif '/llama' in path:
+                    return 'Llama'
+                # Default to the explicitly provided provider for local APIs
+                return ''
+            
+            # Return empty string if no match found, will fall back to provided provider
+            return ''
+        except Exception:
+            # In case of any parsing error, fall back to provided provider
+            return ''
+
     def chat(
         self,
         prompt: str,
@@ -79,11 +132,26 @@ class NGPTClient:
         endpoint = "chat/completions"
         url = f"{self.base_url}{endpoint}"
         
+        # Set headers based on provider
+        headers = self.headers.copy()
+        provider = self.provider.lower() if hasattr(self, 'provider') else ""
+        
+        # Provider-specific customizations
+        if 'gemini' in provider:
+            # Gemini uses X-Goog-Api-Key instead of Bearer token
+            headers = {
+                "Content-Type": "application/json",
+                "X-Goog-Api-Key": self.api_key
+            }
+            
+            # Gemini may require a different endpoint or payload structure
+            # This is a simplistic approach - may need further customization
+        
         try:
             if not stream:
                 # Regular request
                 try:
-                    response = requests.post(url, headers=self.headers, json=payload)
+                    response = requests.post(url, headers=headers, json=payload)
                     response.raise_for_status()  # Raise exception for HTTP errors
                     result = response.json()
                     
@@ -97,7 +165,7 @@ class NGPTClient:
             else:
                 # Streaming request
                 collected_content = ""
-                with requests.post(url, headers=self.headers, json=payload, stream=True) as response:
+                with requests.post(url, headers=headers, json=payload, stream=True) as response:
                     response.raise_for_status()  # Raise exception for HTTP errors
                     
                     try:
@@ -259,4 +327,89 @@ Code:"""
             )
         except Exception as e:
             print(f"Error generating code: {e}")
-            return "" 
+            return ""
+
+    def list_models(self) -> list:
+        """
+        Retrieve the list of available models from the API.
+        
+        Returns:
+            List of available model objects or empty list if failed
+        """
+        if not self.api_key:
+            print("Error: API key is not set. Please configure your API key in the config file or provide it with --api-key.")
+            return []
+        
+        provider = getattr(self, 'provider', '').lower()
+        
+        # Handle provider-specific API differences
+        if 'gemini' in provider:
+            # Gemini API specific handling
+            # Base URL typically ends with /v1beta or similar - we want to add /models
+            base_url = self.base_url.rstrip('/')
+            if base_url.endswith('/v1beta'):
+                url = f"{base_url}/models"
+            else:
+                url = f"{base_url}/models"
+            
+            # Gemini uses X-Goog-Api-Key instead of Bearer token
+            headers = {
+                "Content-Type": "application/json",
+                "X-Goog-Api-Key": self.api_key
+            }
+            
+            try:
+                response = requests.get(url, headers=headers)
+                response.raise_for_status()
+                result = response.json()
+                
+                # Gemini API returns models in a different format
+                if "models" in result:
+                    # Transform to match our expected format
+                    return [{"id": model.get("name", "").split("/")[-1], 
+                             "owned_by": "Google"} 
+                            for model in result["models"]]
+                else:
+                    print("Error: Unexpected response format when retrieving Gemini models.")
+                    return []
+                    
+            except requests.exceptions.HTTPError as e:
+                print(f"HTTP Error with Gemini API: {e}")
+                return []
+                
+            except Exception as e:
+                print(f"Error retrieving Gemini models: {e}")
+                return []
+        else:
+            # Standard OpenAI-compatible endpoint
+            url = f"{self.base_url}models"
+            
+            try:
+                response = requests.get(url, headers=self.headers)
+                response.raise_for_status()  # Raise exception for HTTP errors
+                result = response.json()
+                
+                if "data" in result:
+                    return result["data"]
+                else:
+                    print("Error: Unexpected response format when retrieving models.")
+                    return []
+                    
+            except requests.exceptions.HTTPError as e:
+                if e.response.status_code == 401:
+                    print("Error: Authentication failed. Please check your API key.")
+                elif e.response.status_code == 404:
+                    print(f"Error: Models endpoint not found at {url}")
+                elif e.response.status_code == 429:
+                    print("Error: Rate limit exceeded. Please try again later.")
+                else:
+                    print(f"HTTP Error: {e}")
+                return []
+                
+            except requests.exceptions.ConnectionError:
+                print(f"Error: Could not connect to {self.base_url}. Please check your internet connection and base URL.")
+                return []
+                
+            except Exception as e:
+                print(f"Error: An unexpected error occurred while retrieving models: {e}")
+                return [] 

{ngpt-1.6.0.dist-info → ngpt-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 1.6.0
+Version: 1.7.1
 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
@@ -121,6 +121,9 @@ ngpt --show-config
 # Show all configurations
 ngpt --show-config --all
 
+# List available models for the current configuration
+ngpt --list-models
+
 # With custom options
 ngpt --api-key your-key --base-url http://your-endpoint --model your-model "Hello"
 
@@ -211,6 +214,7 @@ You can configure the client using the following options:
 | `--api-key` | API key for the service |
 | `--base-url` | Base URL for the API |
 | `--model` | Model to use |
+| `--list-models` | List all available models for the current configuration |
 | `--web-search` | Enable web search capability |
 | `-n, --no-stream` | Return the whole response without streaming |
 | `--config` | Path to a custom configuration file or, when used without a value, enters interactive configuration mode |

ngpt-1.7.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
+ngpt/cli.py,sha256=AyIraZFq7icPot0moqPVJer72iqbtJxKBhy6VH-dwAA,28746
+ngpt/client.py,sha256=qwAmBHSJvadbsvK5YPbY0By1M4bBvxd7j8piP5UdTgE,16553
+ngpt/config.py,sha256=BF0G3QeiPma8l7EQyc37bR7LWZog7FHJQNe7uj9cr4w,6896
+ngpt-1.7.1.dist-info/METADATA,sha256=ffoVoKaC58f-SKImuqxLfGOv9Umlpmou82aCFWpsfIM,10568
+ngpt-1.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-1.7.1.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-1.7.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-1.7.1.dist-info/RECORD,,

ngpt-1.6.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
-ngpt/cli.py,sha256=brSdM8uFBbVktbpK6CDAFEzmKzBKb47OSK1G9ludDYg,27564
-ngpt/client.py,sha256=O0dPYeQCJlpWZWBBsroo-5UxeyBVwqC6o3Pm8lRnDiY,10329
-ngpt/config.py,sha256=BF0G3QeiPma8l7EQyc37bR7LWZog7FHJQNe7uj9cr4w,6896
-ngpt-1.6.0.dist-info/METADATA,sha256=hqt6-L2cmyQ_GgoYEOf-_MVUlrm6n1JoxzgAqmVgFkc,10416
-ngpt-1.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-1.6.0.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
-ngpt-1.6.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-1.6.0.dist-info/RECORD,,