ngpt 1.7.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

ngpt/cli.py

@@ -385,20 +385,38 @@ def main():
         print(f"Total configurations: {len(configs)}")
         print(f"Active configuration index: {args.config_index}")
 
+        # Temporarily initialize a client to get the detected provider for each config
+        def get_detected_provider(config):
+            base_url = config.get('base_url', '')
+            temp_client = NGPTClient(
+                api_key=config.get('api_key', ''),
+                base_url=base_url,
+                provider=config.get('provider', 'N/A'),
+                model=config.get('model', 'N/A')
+            )
+            detected = temp_client._detect_provider_from_url(base_url)
+            return detected if detected else config.get('provider', 'N/A')
+
         if args.all:
             # Show details for all configurations
             print("\nAll configuration details:")
             for i, cfg in enumerate(configs):
                 active_str = '(Active)' if i == args.config_index else ''
+                detected_provider = get_detected_provider(cfg)
+                provider_str = f" [{detected_provider}]" if detected_provider else ""
+                
                 print(f"\n--- Configuration Index {i} {active_str} ---")
-                print(f"  API Key: {'[Set]' if cfg.get('api_key') else '[Not Set]'}")
+                print(f"  API Key: {'[Set]' if cfg.get('api_key') else '[Not Set]'}{provider_str}")
                 print(f"  Base URL: {cfg.get('base_url', 'N/A')}")
                 print(f"  Provider: {cfg.get('provider', 'N/A')}")
                 print(f"  Model: {cfg.get('model', 'N/A')}")
         else:
             # Show active config details and summary list
+            detected_provider = get_detected_provider(active_config)
+            provider_str = f" [{detected_provider}]" if detected_provider else ""
+            
             print("\nActive configuration details:")
-            print(f"  API Key: {'[Set]' if active_config.get('api_key') else '[Not Set]'}")
+            print(f"  API Key: {'[Set]' if active_config.get('api_key') else '[Not Set]'}{provider_str}")
             print(f"  Base URL: {active_config.get('base_url', 'N/A')}")
             print(f"  Provider: {active_config.get('provider', 'N/A')}")
             print(f"  Model: {active_config.get('model', 'N/A')}")
@@ -407,7 +425,9 @@ def main():
                 print("\nAvailable configurations:")
                 for i, cfg in enumerate(configs):
                     active_marker = "*" if i == args.config_index else " "
-                    print(f"[{i}]{active_marker} {cfg.get('provider', 'N/A')} - {cfg.get('model', 'N/A')} ({'[API Key Set]' if cfg.get('api_key') else '[API Key Not Set]'})")
+                    detected = get_detected_provider(cfg)
+                    detected_str = f" [{detected}]" if detected else ""
+                    print(f"[{i}]{active_marker} {cfg.get('provider', 'N/A')} - {cfg.get('model', 'N/A')} ({'[API Key Set]' if cfg.get('api_key') else '[API Key Not Set]'}{detected_str})")
         
         return
     

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:
@@ -271,36 +339,77 @@ Code:"""
         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 []
-            
-        # Endpoint for models
-        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"]
+        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:
-                print("Error: Unexpected response format when retrieving models.")
+                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 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 retrieving Gemini models: {e}")
+                return []
+        else:
+            # Standard OpenAI-compatible endpoint
+            url = f"{self.base_url}models"
             
-        except Exception as e:
-            print(f"Error: An unexpected error occurred while retrieving models: {e}")
-            return [] 
+            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.7.0.dist-info → ngpt-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 1.7.0
+Version: 1.7.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-1.7.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+ngpt/__init__.py,sha256=ehInP9w0MZlS1vZ1g6Cm4YE1ftmgF72CnEddQ3Le9n4,368
+ngpt/cli.py,sha256=Ba3B4VAs-fnuSdfo22dAe2vmSy3ADVZlKYiDGTy6C6I,29818
+ngpt/client.py,sha256=qwAmBHSJvadbsvK5YPbY0By1M4bBvxd7j8piP5UdTgE,16553
+ngpt/config.py,sha256=BF0G3QeiPma8l7EQyc37bR7LWZog7FHJQNe7uj9cr4w,6896
+ngpt-1.7.2.dist-info/METADATA,sha256=uW2p_2ENm1OJLNW35nZcyDr_L0JvD5eeMrTvWGCPQmg,10568
+ngpt-1.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-1.7.2.dist-info/entry_points.txt,sha256=1cnAMujyy34DlOahrJg19lePSnb08bLbkUs_kVerqdk,39
+ngpt-1.7.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-1.7.2.dist-info/RECORD,,

ngpt-1.7.0.dist-info/RECORD

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