indoxrouter 0.1.11__tar.gz → 0.1.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: indoxrouter
-Version: 0.1.11
+Version: 0.1.12
 Summary: A unified client for various AI providers
 Home-page: https://github.com/indoxrouter/indoxrouter
 Author: indoxRouter Team

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

@@ -120,31 +120,38 @@ class Client:
         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")
+            # First try with the dedicated API key endpoint
+            logger.debug("Authenticating with dedicated API key endpoint")
             response = self.session.post(
-                f"{self.base_url}/api/v1/auth/token",
-                data={
-                    "username": self.api_key,
-                    "password": "",
-                },
+                f"{self.base_url}/api/v1/auth/api-key",
+                headers={"X-API-Key": self.api_key},
                 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"
-                )
+                # If dedicated endpoint fails, try using the API key as a username
+                logger.debug("API key endpoint failed, trying with API key as username")
                 response = self.session.post(
-                    f"{self.base_url}/api/v1/auth/login",
-                    json={
-                        "username": "pip_client",
-                        "password": self.api_key,
+                    f"{self.base_url}/api/v1/auth/token",
+                    data={
+                        "username": self.api_key,
+                        "password": self.api_key,  # Try using API key as both username and password
                     },
                     timeout=self.timeout,
                 )
 
+                if response.status_code != 200:
+                    # Try one more method - the token endpoint with different format
+                    logger.debug("Trying with API key as token parameter")
+                    response = self.session.post(
+                        f"{self.base_url}/api/v1/auth/token",
+                        data={
+                            "username": "pip_client",
+                            "password": self.api_key,
+                        },
+                        timeout=self.timeout,
+                    )
+
             if response.status_code != 200:
                 error_data = {}
                 try:
@@ -156,6 +163,17 @@ class Client:
                     f"Authentication failed: {error_data.get('detail', 'Unknown error')}"
                 )
 
+            # Check if we have a token in the response body
+            try:
+                response_data = response.json()
+                if "access_token" in response_data:
+                    # Store token in the session object for later use
+                    self.access_token = response_data["access_token"]
+                    logger.debug("Retrieved access token from response body")
+            except:
+                # If we couldn't parse JSON, that's fine - we'll rely on cookies
+                logger.debug("No token found in response body, will rely on cookies")
+
             # At this point, the cookies should be set in the session
             logger.debug("Authentication successful")
 
@@ -227,6 +245,10 @@ class Client:
         url = f"{self.base_url}/{endpoint}"
         headers = {"Content-Type": "application/json"}
 
+        # Add Authorization header if we have an access token
+        if hasattr(self, "access_token") and self.access_token:
+            headers["Authorization"] = f"Bearer {self.access_token}"
+
         # logger.debug(f"Making {method} request to {url}")
         # if data:
         #     logger.debug(f"Request data: {json.dumps(data, indent=2)}")
@@ -257,6 +279,10 @@ class Client:
                 logger.debug("Received 401, attempting to reauthenticate")
                 self._authenticate()
 
+                # Update Authorization header with new token if available
+                if hasattr(self, "access_token") and self.access_token:
+                    headers["Authorization"] = f"Bearer {self.access_token}"
+
                 # Retry the request after reauthentication
                 response = self.session.request(
                     method,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: indoxrouter
-Version: 0.1.11
+Version: 0.1.12
 Summary: A unified client for various AI providers
 Home-page: https://github.com/indoxrouter/indoxrouter
 Author: indoxRouter Team

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

@@ -7,7 +7,6 @@ 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.11 → indoxrouter-0.1.12}/setup.py

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

indoxrouter-0.1.11/indoxrouter/test_api_key.py

@@ -1,98 +0,0 @@
-#!/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)