indoxrouter 0.1.11__py3-none-any.whl → 0.1.12__py3-none-any.whl

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.dist-info → indoxrouter-0.1.12.dist-info}/METADATA

@@ -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.dist-info → indoxrouter-0.1.12.dist-info}/RECORD

@@ -1,9 +1,9 @@
 indoxrouter/__init__.py,sha256=28pdx482uGFF_S1msov0LTTGsFTvVBKRqMkDmoXWUBY,1416
-indoxrouter/client.py,sha256=Bt8JuU7G_TSX2sVn3Voi6UBXeZnmG-vLCGniAGh_r5U,27387
+indoxrouter/client.py,sha256=ixzCJP28ddYFQxwRiqdY5Fp1CB978DJpI4yCiOI3s4o,28898
 indoxrouter/constants.py,sha256=D-l5qhEmeDIXOEfogvf6lJI1Sw_fXSKZy-Nj_l_MV7E,1184
 indoxrouter/exceptions.py,sha256=0ULxtK9va4718PGTO5VoClXYEJeojpiM-7AganeiZZ4,1263
 indoxrouter/test_api_key.py,sha256=u4fUTJwxC7-kTrLdCq8u5a1Mx66jeExfsBlHLhyzNmA,3229
-indoxrouter-0.1.11.dist-info/METADATA,sha256=3SEOZwK_ZKPQCfZc7BRKYQ8q3u4meMtmSIbSY4VYZxg,6004
-indoxrouter-0.1.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-indoxrouter-0.1.11.dist-info/top_level.txt,sha256=v6FGWkw0QAnXhyYtnXLI1cxzna0iveNvZUotVzCWabM,12
-indoxrouter-0.1.11.dist-info/RECORD,,
+indoxrouter-0.1.12.dist-info/METADATA,sha256=pRupY-6V6GrozkXidKGm_qf6fBY2clAqYwgKAU5OJww,6004
+indoxrouter-0.1.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+indoxrouter-0.1.12.dist-info/top_level.txt,sha256=v6FGWkw0QAnXhyYtnXLI1cxzna0iveNvZUotVzCWabM,12
+indoxrouter-0.1.12.dist-info/RECORD,,