cutover to utils.client.py

tests/e2e/conftest.py

@@ -1,32 +1,14 @@
-import os
-import warnings
-import pytest
-
 from openai import OpenAI
+import pytest
 
-from .utils import create_test_user
-
-DEFAULT_LEAPFROGAI_MODEL = "llama-cpp-python"
+from leapfrogai.tests.utils.client import leapfrogai_client, get_leapfrogai_model
 
 
 @pytest.fixture(scope="module")
-def client():
-    return OpenAI(
-        base_url="https://leapfrogai-api.uds.dev/openai/v1", api_key=create_test_user()
-    )
-
-
-def get_model_name():
-    model_name = os.getenv("LEAPFROGAI_MODEL")
-    if model_name is None:
-        warnings.warn(
-            f"LEAPFROGAI_MODEL environment variable not set. Defaulting to '{DEFAULT_LEAPFROGAI_MODEL}'.\n"
-            "Consider setting LEAPFROGAI_MODEL explicitly. Examples: 'vllm', 'repeater', 'llama-cpp-python'."
-        )
-        model_name = DEFAULT_LEAPFROGAI_MODEL
-    return model_name
+def client() -> OpenAI:
+    return leapfrogai_client()
 
 
 @pytest.fixture(scope="module")
-def model_name():
-    return get_model_name()
+def model_name() -> str:
+    return get_leapfrogai_model()

tests/utils/client.py

@@ -1,9 +1,99 @@
+import json
+import logging
+import traceback
 from urllib.parse import urljoin
 from openai import OpenAI
 import os
+import pytest
 import requests
 from requests import Response
 
+ANON_KEY = os.environ["ANON_KEY"]
+SERVICE_KEY = os.environ["SERVICE_KEY"]
+DEFAULT_TEST_EMAIL = "[email protected]"
+DEFAULT_TEST_PASSWORD = "password"
+
+
+def create_test_user(
+    anon_key: str = ANON_KEY,
+    email: str = DEFAULT_TEST_EMAIL,
+    password: str = DEFAULT_TEST_PASSWORD,
+) -> str:
+    """
+    Create a test user in the authentication system.
+
+    This function attempts to create a new user with the given email and password using the specified
+    anonymous API key. If the user already exists, the error is logged. It returns the JWT token
+    for the created or existing user.
+
+    Args:
+        anon_key (str): The anonymous API key for authentication service.
+        email (str): The email address of the test user. Default is "[email protected]".
+        password (str): The password for the test user. Default is "password".
+
+    Returns:
+        str: The JWT token for the created or existing user.
+    """
+    headers = {
+        "apikey": f"{anon_key}",
+        "Authorization": f"Bearer {anon_key}",
+        "Content-Type": "application/json",
+    }
+
+    try:
+        requests.post(
+            url="https://supabase-kong.uds.dev/auth/v1/signup",
+            headers=headers,
+            json={
+                "email": email,
+                "password": password,
+                "confirmPassword": password,
+            },
+        )
+    except Exception:
+        logging.error(
+            "Error creating user (likely because the user already exists): %s",
+            traceback.format_exc(),
+        )
+
+    return get_jwt_token(anon_key, email, password)
+
+
+def get_jwt_token(
+    api_key: str,
+    test_email: str = DEFAULT_TEST_EMAIL,
+    test_password: str = DEFAULT_TEST_PASSWORD,
+) -> str:
+    """
+    Retrieve a JWT token for a test user using email and password.
+
+    This function sends a request to the authentication service to obtain a JWT token using
+    the provided API key, email, and password.
+
+    Args:
+        api_key (str): The API key for the authentication service.
+        test_email (str): The email address of the test user. Default is "[email protected]".
+        test_password (str): The password for the test user. Default is "password".
+
+    Returns:
+        str: The JWT access token for the authenticated user.
+
+    Raises:
+        AssertionError: If the request fails or the response status code is not 200.
+    """
+    url = "https://supabase-kong.uds.dev/auth/v1/token?grant_type=password"
+    headers = {"apikey": f"{api_key}", "Content-Type": "application/json"}
+    data = {"email": test_email, "password": test_password}
+
+    response = requests.post(url, headers=headers, json=data)
+    if response.status_code != 200:
+        pytest.fail(
+            f"Request for the JWT token failed with status code {response.status_code} expected 200",
+            False,
+        )
+
+    return json.loads(response.content)["access_token"]
+
 
 def get_leapfrogai_model() -> str:
     """Get the model to use for LeapfrogAI.
@@ -49,14 +139,18 @@ def get_leapfrogai_api_key() -> str:
 
     Returns:
         str: The API key for the LeapfrogAI API.
+
     Raises:
         ValueError: If LEAPFROGAI_API_KEY or SUPABASE_USER_JWT is not set.
     """
 
     api_key = os.getenv("LEAPFROGAI_API_KEY") or os.getenv("SUPABASE_USER_JWT")
 
     if api_key is None:
-        raise ValueError("LEAPFROGAI_API_KEY or SUPABASE_USER_JWT not set")
+        logging.warning(
+            "LEAPFROGAI_API_KEY or SUPABASE_USER_JWT not set, automatically generating test user."
+        )
+        api_key = create_test_user()
 
     return api_key
 
@@ -74,9 +168,9 @@ def get_leapfrogai_api_url() -> str:
 def get_leapfrogai_api_url_base() -> str:
     """Get the base URL for the LeapfrogAI API.
 
-    Set via the LEAPFRAGAI_API_URL environment variable.
+    Set via the LEAPFROGAI_API_URL environment variable.
 
-    If LEAPFRAGAI_API_URL is set to "https://leapfrogai-api.uds.dev/openai/v1", this will trim off the "/openai/v1" part.
+    If LEAPFROGAI_API_URL is set to "https://leapfrogai-api.uds.dev/openai/v1", this will trim off the "/openai/v1" part.
 
     Returns:
         str: The base URL for the LeapfrogAI API. (default: "https://leapfrogai-api.uds.dev")