indoxrouter 0.1.11__tar.gz → 0.1.15__tar.gz

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

@@ -1,13 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: indoxrouter
-Version: 0.1.11
+Version: 0.1.15
 Summary: A unified client for various AI providers
-Home-page: https://github.com/indoxrouter/indoxrouter
-Author: indoxRouter Team
-Author-email: ashkan.eskandari.dev@gmail.com
+Author-email: indoxRouter Team <ashkan.eskandari.dev@gmail.com>
+Project-URL: Homepage, https://github.com/indoxrouter/indoxrouter
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -18,27 +16,10 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.0
 Requires-Dist: python-dotenv>=1.0.0
-Provides-Extra: dev
-Requires-Dist: pytest>=7.0.0; extra == "dev"
-Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
-Requires-Dist: black>=23.0.0; extra == "dev"
-Requires-Dist: isort>=5.0.0; extra == "dev"
-Requires-Dist: flake8>=6.0.0; extra == "dev"
-Requires-Dist: mypy>=1.0.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # IndoxRouter Client
 
-A unified client for various AI providers, including OpenAI, Anthropic, Google, and Mistral.
+A unified client for various AI providers, including OpenAI, anthropic, Google, and Mistral.
 
 ## Features
 

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

@@ -1,6 +1,6 @@
 # IndoxRouter Client
 
-A unified client for various AI providers, including OpenAI, Anthropic, Google, and Mistral.
+A unified client for various AI providers, including OpenAI, anthropic, Google, and Mistral.
 
 ## Features
 

{indoxrouter-0.1.11 → indoxrouter-0.1.15}/cookbook/README.md

@@ -41,4 +41,4 @@ python -c "from indoxrouter import Client; client = Client(api_key='your_api_key
 
 ## Note on API Keys
 
-The IndoxRouter API key is used to authenticate with the IndoxRouter server. You don't need to provide individual API keys for each provider (like OpenAI, Anthropic, etc.) as the IndoxRouter server handles that for you.
+The IndoxRouter API key is used to authenticate with the IndoxRouter server. You don't need to provide individual API keys for each provider (like OpenAI, anthropic, etc.) as the IndoxRouter server handles that for you.

{indoxrouter-0.1.11 → indoxrouter-0.1.15}/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.15}/indoxrouter/constants.py

@@ -4,7 +4,7 @@ Constants for the IndoxRouter client.
 
 # API settings
 DEFAULT_API_VERSION = "v1"
-DEFAULT_BASE_URL = "https://api.indox.org"  # Production server URL with HTTPS
+DEFAULT_BASE_URL = "https://api.indoxrouter.com"  # 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

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

@@ -1,13 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: indoxrouter
-Version: 0.1.11
+Version: 0.1.15
 Summary: A unified client for various AI providers
-Home-page: https://github.com/indoxrouter/indoxrouter
-Author: indoxRouter Team
-Author-email: ashkan.eskandari.dev@gmail.com
+Author-email: indoxRouter Team <ashkan.eskandari.dev@gmail.com>
+Project-URL: Homepage, https://github.com/indoxrouter/indoxrouter
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -18,27 +16,10 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.0
 Requires-Dist: python-dotenv>=1.0.0
-Provides-Extra: dev
-Requires-Dist: pytest>=7.0.0; extra == "dev"
-Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
-Requires-Dist: black>=23.0.0; extra == "dev"
-Requires-Dist: isort>=5.0.0; extra == "dev"
-Requires-Dist: flake8>=6.0.0; extra == "dev"
-Requires-Dist: mypy>=1.0.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # IndoxRouter Client
 
-A unified client for various AI providers, including OpenAI, Anthropic, Google, and Mistral.
+A unified client for various AI providers, including OpenAI, anthropic, Google, and Mistral.
 
 ## Features
 

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

@@ -1,13 +1,12 @@
 MANIFEST.in
 README.md
-setup.py
+pyproject.toml
 cookbook/README.md
 cookbook/indoxRouter_cookbook.ipynb
 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.15/indoxrouter.egg-info/requires.txt

@@ -0,0 +1,2 @@
+requests>=2.25.0
+python-dotenv>=1.0.0

indoxrouter-0.1.15/pyproject.toml

@@ -0,0 +1,34 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "indoxrouter"
+version = "0.1.15"
+authors = [
+    {name = "indoxRouter Team", email = "ashkan.eskandari.dev@gmail.com"},
+]
+description = "A unified client for various AI providers"
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+dependencies = [
+    "requests>=2.25.0",
+    "python-dotenv>=1.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/indoxrouter/indoxrouter"
+
+[tool.setuptools]
+packages = ["indoxrouter"]
+

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)

indoxrouter-0.1.11/indoxrouter.egg-info/requires.txt

@@ -1,10 +0,0 @@
-requests>=2.25.0
-python-dotenv>=1.0.0
-
-[dev]
-pytest>=7.0.0
-pytest-cov>=4.0.0
-black>=23.0.0
-isort>=5.0.0
-flake8>=6.0.0
-mypy>=1.0.0

indoxrouter-0.1.11/setup.py

@@ -1,46 +0,0 @@
-"""
-Setup script for indoxRouter client.
-"""
-
-from setuptools import setup, find_packages
-
-with open("README.md", "r", encoding="utf-8") as fh:
-    long_description = fh.read()
-
-setup(
-    name="indoxrouter",
-    version="0.1.11",
-    author="indoxRouter Team",
-    author_email="ashkan.eskandari.dev@gmail.com",
-    description="A unified client for various AI providers",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/indoxrouter/indoxrouter",
-    packages=["indoxrouter"],
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-    ],
-    python_requires=">=3.8",
-    install_requires=[
-        "requests>=2.25.0",
-        "python-dotenv>=1.0.0",
-    ],
-    extras_require={
-        "dev": [
-            "pytest>=7.0.0",
-            "pytest-cov>=4.0.0",
-            "black>=23.0.0",
-            "isort>=5.0.0",
-            "flake8>=6.0.0",
-            "mypy>=1.0.0",
-        ],
-    },
-)