indoxrouter 0.1.9__tar.gz → 0.1.11__tar.gz

{indoxrouter-0.1.9/indoxrouter.egg-info → indoxrouter-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: indoxrouter
-Version: 0.1.9
+Version: 0.1.11
 Summary: A unified client for various AI providers
 Home-page: https://github.com/indoxrouter/indoxrouter
 Author: indoxRouter Team
@@ -78,14 +78,33 @@ client = Client(
 
 ### Authentication
 
-IndoxRouter uses cookie-based authentication, which securely transmits your API key in cookies rather than headers. This is handled automatically by the client.
+IndoxRouter uses cookie-based authentication with JWT tokens. The client handles this automatically by:
+
+1. Taking your API key and exchanging it for JWT tokens using the server's authentication endpoints
+2. Storing the JWT tokens in cookies
+3. Using the cookies for subsequent requests
+4. Automatically refreshing tokens when they expire
 
 ```python
 # Authentication is handled automatically when creating the client
 client = Client(api_key="your_api_key")
 ```
 
-> **Note**: The `use_cookies` parameter is kept for backward compatibility but should always be set to `True` as the server no longer supports header-based authentication.
+### Testing Your API Key
+
+The package includes a test script to verify your API key and connection:
+
+```bash
+# Run the test script with your API key
+python -m indoxrouter.test_api_key --api-key YOUR_API_KEY
+
+# Or set the environment variable and run
+export INDOX_ROUTER_API_KEY=YOUR_API_KEY
+python -m indoxrouter.test_api_key
+
+# To see detailed debugging information
+python -m indoxrouter.test_api_key --debug
+```
 
 ### Chat Completions
 

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/README.md

@@ -40,14 +40,33 @@ client = Client(
 
 ### Authentication
 
-IndoxRouter uses cookie-based authentication, which securely transmits your API key in cookies rather than headers. This is handled automatically by the client.
+IndoxRouter uses cookie-based authentication with JWT tokens. The client handles this automatically by:
+
+1. Taking your API key and exchanging it for JWT tokens using the server's authentication endpoints
+2. Storing the JWT tokens in cookies
+3. Using the cookies for subsequent requests
+4. Automatically refreshing tokens when they expire
 
 ```python
 # Authentication is handled automatically when creating the client
 client = Client(api_key="your_api_key")
 ```
 
-> **Note**: The `use_cookies` parameter is kept for backward compatibility but should always be set to `True` as the server no longer supports header-based authentication.
+### Testing Your API Key
+
+The package includes a test script to verify your API key and connection:
+
+```bash
+# Run the test script with your API key
+python -m indoxrouter.test_api_key --api-key YOUR_API_KEY
+
+# Or set the environment variable and run
+export INDOX_ROUTER_API_KEY=YOUR_API_KEY
+python -m indoxrouter.test_api_key
+
+# To see detailed debugging information
+python -m indoxrouter.test_api_key --debug
+```
 
 ### Chat Completions
 

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/cookbook/indoxRouter_cookbook.ipynb

@@ -1362,7 +1362,7 @@
   ],
   "metadata": {
     "kernelspec": {
-      "display_name": "Python 3",
+      "display_name": "base",
       "language": "python",
       "name": "python3"
     },

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/indoxrouter/client.py

@@ -6,8 +6,7 @@ interface to multiple AI providers and models. The client handles authentication
 error handling, and provides a standardized response format across different AI services.
 
 IMPORTANT: The IndoxRouter server now supports only cookie-based authentication. This client
-will use cookie-based authentication by default. The 'use_cookies' parameter is kept for
-backward compatibility but should always be set to True for newer server versions.
+automatically handles authentication by exchanging your API key for a JWT token through the login endpoint.
 
 The Client class offers methods for:
 - Authentication and session management
@@ -97,7 +96,6 @@ class Client:
         Args:
             api_key: API key for authentication. If not provided, the client will look for the
                 INDOX_ROUTER_API_KEY environment variable.
-            base_url: Custom base URL for the API. If not provided, the default base URL will be used.
             timeout: Request timeout in seconds.
         """
 
@@ -113,23 +111,64 @@ class Client:
         self.use_cookies = use_cookies
         self.session = requests.Session()
 
-        # Set up authentication method based on preference
-        if use_cookies:
-            # Set cookie for authentication - using access_token as that's what the server expects
-            self.session.cookies.set(
-                "access_token", self.api_key, domain=self._get_domain(), path="/"
-            )
-        else:
-            # Warning: Authorization header is no longer supported by the server
-            logger.warning(
-                "WARNING: The IndoxRouter server no longer supports Authorization header authentication. "
-                "Using cookie-based authentication instead."
-            )
-            # Still set the cookie despite the use_cookies=False setting
-            self.session.cookies.set(
-                "access_token", self.api_key, domain=self._get_domain(), path="/"
+        # Authenticate and get JWT tokens
+        self._authenticate()
+
+    def _authenticate(self):
+        """
+        Authenticate with the server and get JWT tokens.
+        This uses the /auth/token endpoint to get JWT tokens using the API key.
+        """
+        try:
+            # First try using the API key as a username with empty password (API key flow)
+            logger.debug("Authenticating with API key as username")
+            response = self.session.post(
+                f"{self.base_url}/api/v1/auth/token",
+                data={
+                    "username": self.api_key,
+                    "password": "",
+                },
+                timeout=self.timeout,
             )
 
+            if response.status_code != 200:
+                # Try using email:api_key format if the first method fails
+                logger.debug(
+                    "First auth method failed, trying with API key as password"
+                )
+                response = self.session.post(
+                    f"{self.base_url}/api/v1/auth/login",
+                    json={
+                        "username": "pip_client",
+                        "password": self.api_key,
+                    },
+                    timeout=self.timeout,
+                )
+
+            if response.status_code != 200:
+                error_data = {}
+                try:
+                    error_data = response.json()
+                except:
+                    error_data = {"detail": response.text}
+
+                raise AuthenticationError(
+                    f"Authentication failed: {error_data.get('detail', 'Unknown error')}"
+                )
+
+            # At this point, the cookies should be set in the session
+            logger.debug("Authentication successful")
+
+            # Check if we have the cookies we need
+            if "access_token" not in self.session.cookies:
+                logger.warning(
+                    "Authentication succeeded but no access_token cookie was set"
+                )
+
+        except requests.RequestException as e:
+            logger.error(f"Authentication request failed: {str(e)}")
+            raise NetworkError(f"Network error during authentication: {str(e)}")
+
     def _get_domain(self):
         """
         Extract domain from the base URL for cookie setting.
@@ -213,6 +252,24 @@ class Client:
             if stream:
                 return response
 
+            # Check if we need to reauthenticate (401 Unauthorized)
+            if response.status_code == 401:
+                logger.debug("Received 401, attempting to reauthenticate")
+                self._authenticate()
+
+                # Retry the request after reauthentication
+                response = self.session.request(
+                    method,
+                    url,
+                    headers=headers,
+                    json=data,
+                    timeout=self.timeout,
+                    stream=stream,
+                )
+
+                if stream:
+                    return response
+
             response.raise_for_status()
             return response.json()
         except requests.HTTPError as e:

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/indoxrouter/constants.py

@@ -7,6 +7,7 @@ DEFAULT_API_VERSION = "v1"
 DEFAULT_BASE_URL = "https://api.indox.org"  # Production server URL with HTTPS
 # DEFAULT_BASE_URL = "http://localhost:8000"  # Local development server
 DEFAULT_TIMEOUT = 60
+USE_COOKIES = True  # Always use cookie-based authentication
 
 # Default models
 DEFAULT_MODEL = "openai/gpt-4o-mini"
@@ -29,6 +30,3 @@ ERROR_PROVIDER_NOT_FOUND = "Provider not found"
 ERROR_MODEL_NOT_FOUND = "Model not found"
 ERROR_INVALID_PARAMETERS = "Invalid parameters provided"
 ERROR_INSUFFICIENT_CREDITS = "Insufficient credits"
-
-
-USE_COOKIES = True

indoxrouter-0.1.11/indoxrouter/test_api_key.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+"""
+Test script for the IndoxRouter client.
+This script tests authentication and basic functionality of the client.
+"""
+
+import os
+import sys
+import logging
+from indoxrouter import Client, AuthenticationError, NetworkError
+
+# Set up logging
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+logger = logging.getLogger("indoxrouter_test")
+
+
+def test_client(api_key=None, debug=False):
+    """
+    Test the IndoxRouter client with the provided API key.
+
+    Args:
+        api_key: API key to use for authentication
+        debug: Whether to enable debug logging
+    """
+    if debug:
+        logging.getLogger("indoxrouter").setLevel(logging.DEBUG)
+
+    logger.info("Testing IndoxRouter client...")
+
+    # If no API key is provided, try to get it from environment variable
+    if not api_key:
+        api_key = os.environ.get("INDOX_ROUTER_API_KEY")
+        if not api_key:
+            logger.error(
+                "No API key provided. Please provide an API key as an argument or set the INDOX_ROUTER_API_KEY environment variable."
+            )
+            sys.exit(1)
+
+    try:
+        # Initialize client
+        logger.info("Initializing client...")
+        client = Client(api_key=api_key)
+
+        # Test connection
+        logger.info("Testing connection...")
+        connection_info = client.test_connection()
+        logger.info(f"Connection test: {connection_info['status']}")
+
+        # Try to get available models
+        logger.info("Fetching available models...")
+        models = client.models()
+
+        # Display some models
+        providers = [p.get("name") for p in models]
+        logger.info(f"Available providers: {', '.join(providers)}")
+
+        # Try a simple chat completion
+        logger.info("Testing chat completion...")
+        response = client.chat(
+            messages=[{"role": "user", "content": "Hello, who are you?"}],
+            model="openai/gpt-3.5-turbo",
+            max_tokens=30,
+        )
+
+        logger.info("Chat completion successful!")
+        logger.info(f"Response: {response['choices'][0]['message']['content']}")
+
+        logger.info("All tests passed! The client is working correctly.")
+
+    except AuthenticationError as e:
+        logger.error(f"Authentication error: {e}")
+        logger.error("Please check that your API key is correct.")
+        sys.exit(1)
+    except NetworkError as e:
+        logger.error(f"Network error: {e}")
+        logger.error(
+            "Please check your internet connection and that the IndoxRouter server is accessible."
+        )
+        sys.exit(1)
+    except Exception as e:
+        logger.error(f"Unexpected error: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    import argparse
+
+    parser = argparse.ArgumentParser(description="Test the IndoxRouter client")
+    parser.add_argument("--api-key", "-k", help="API key to use for authentication")
+    parser.add_argument(
+        "--debug", "-d", action="store_true", help="Enable debug logging"
+    )
+
+    args = parser.parse_args()
+
+    test_client(api_key=args.api_key, debug=args.debug)

{indoxrouter-0.1.9 → indoxrouter-0.1.11/indoxrouter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: indoxrouter
-Version: 0.1.9
+Version: 0.1.11
 Summary: A unified client for various AI providers
 Home-page: https://github.com/indoxrouter/indoxrouter
 Author: indoxRouter Team
@@ -78,14 +78,33 @@ client = Client(
 
 ### Authentication
 
-IndoxRouter uses cookie-based authentication, which securely transmits your API key in cookies rather than headers. This is handled automatically by the client.
+IndoxRouter uses cookie-based authentication with JWT tokens. The client handles this automatically by:
+
+1. Taking your API key and exchanging it for JWT tokens using the server's authentication endpoints
+2. Storing the JWT tokens in cookies
+3. Using the cookies for subsequent requests
+4. Automatically refreshing tokens when they expire
 
 ```python
 # Authentication is handled automatically when creating the client
 client = Client(api_key="your_api_key")
 ```
 
-> **Note**: The `use_cookies` parameter is kept for backward compatibility but should always be set to `True` as the server no longer supports header-based authentication.
+### Testing Your API Key
+
+The package includes a test script to verify your API key and connection:
+
+```bash
+# Run the test script with your API key
+python -m indoxrouter.test_api_key --api-key YOUR_API_KEY
+
+# Or set the environment variable and run
+export INDOX_ROUTER_API_KEY=YOUR_API_KEY
+python -m indoxrouter.test_api_key
+
+# To see detailed debugging information
+python -m indoxrouter.test_api_key --debug
+```
 
 ### Chat Completions
 

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/indoxrouter.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ indoxrouter/__init__.py
 indoxrouter/client.py
 indoxrouter/constants.py
 indoxrouter/exceptions.py
+indoxrouter/test_api_key.py
 indoxrouter.egg-info/PKG-INFO
 indoxrouter.egg-info/SOURCES.txt
 indoxrouter.egg-info/dependency_links.txt

{indoxrouter-0.1.9 → indoxrouter-0.1.11}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="indoxrouter",
-    version="0.1.9",
+    version="0.1.11",
     author="indoxRouter Team",
     author_email="ashkan.eskandari.dev@gmail.com",
     description="A unified client for various AI providers",