normal users

Author: nishika26

backend/app/seed_data/seed_data.json

@@ -21,12 +21,14 @@
   ],
   "users": [
     {
+      "email": "{{SUPERUSER_EMAIL}}",
       "password": "changethis",
       "full_name": "SUPERUSER",
       "is_active": true,
       "is_superuser": true
     },
     {
+      "email": "{{ADMIN_EMAIL}}",
       "password": "admin123",
       "full_name": "ADMIN",
       "is_active": true,

backend/app/seed_data/seed_data.py

@@ -309,26 +309,15 @@ def seed_database(session: Session) -> None:
                 f"Created organization: {organization.name} (ID: {organization.id})"
             )
 
-        # Create users
-        users = []
         for user_data in seed_data["users"]:
-            # Directly map the emails from environment variables based on the user name
-            if user_data["full_name"] == "SUPERUSER":
+            if user_data["email"] == "{{SUPERUSER_EMAIL}}":
                 user_data["email"] = settings.FIRST_SUPERUSER
-            elif user_data["full_name"] == "ADMIN":
+            elif user_data["email"] == "{{ADMIN_EMAIL}}":
                 user_data["email"] = settings.EMAIL_TEST_USER
-            else:
-                # If the user is not SUPERUSER or ADMIN, allow manual email assignment
-                if "email" not in user_data:
-                    logging.warning(
-                        f"Email not provided for user {user_data['full_name']}. Skipping user creation."
-                    )
-                    continue  # Skip if no email is provided for new users
-                logging.info(
-                    f"Email manually provided for user: {user_data['full_name']}"
-                )
-
-            # Create the user in the database
+
+        # Create users
+        users = []
+        for user_data in seed_data["users"]:
             user = create_user(session, user_data)
             users.append(user)
             logging.info(f"Created user: {user.email} (ID: {user.id})")

backend/app/tests/api/routes/collections/test_collection_info.py

@@ -37,9 +37,9 @@ def create_collection(
 
 
 def test_collection_info_processing(
-    db: Session, client: TestClient, superuser_api_key_headers
+    db: Session, client: TestClient, normal_user_api_key_headers
 ):
-    headers = superuser_api_key_headers
+    headers = normal_user_api_key_headers
     user = get_user_from_api_key(db, headers)
     collection = create_collection(db, user, status=CollectionStatus.processing)
 
@@ -58,9 +58,9 @@ def test_collection_info_processing(
 
 
 def test_collection_info_successful(
-    db: Session, client: TestClient, superuser_api_key_headers
+    db: Session, client: TestClient, normal_user_api_key_headers
 ):
-    headers = superuser_api_key_headers
+    headers = normal_user_api_key_headers
     user = get_user_from_api_key(db, headers)
     collection = create_collection(
         db, user, status=CollectionStatus.successful, with_llm=True
@@ -81,9 +81,9 @@ def test_collection_info_successful(
 
 
 def test_collection_info_failed(
-    db: Session, client: TestClient, superuser_api_key_headers
+    db: Session, client: TestClient, normal_user_api_key_headers
 ):
-    headers = superuser_api_key_headers
+    headers = normal_user_api_key_headers
     user = get_user_from_api_key(db, headers)
     collection = create_collection(db, user, status=CollectionStatus.failed)
 

backend/app/tests/api/routes/collections/test_create_collections.py

@@ -47,7 +47,7 @@ class TestCollectionRouteCreate:
 
     @openai_responses.mock()
     def test_create_collection_success(
-        self, client: TestClient, db: Session, superuser_api_key_headers
+        self, client: TestClient, db: Session, normal_user_api_key_headers
     ):
         store = DocumentStore(db)
         documents = store.fill(self._n_documents)
@@ -60,7 +60,7 @@ def test_create_collection_success(
             "instructions": "Test collection assistant.",
             "temperature": 0.1,
         }
-        headers = superuser_api_key_headers
+        headers = normal_user_api_key_headers
 
         response = client.post(
             f"{settings.API_V1_STR}/collections/create", json=body, headers=headers

backend/app/tests/api/routes/documents/test_route_document_upload.py

@@ -25,7 +25,7 @@ def put(self, route: Route, scratch: Path):
         with scratch.open("rb") as fp:
             return self.client.post(
                 str(route),
-                headers=self.superuser_token_headers,
+                headers=self.normal_user_api_key_headers,
                 files={
                     "src": (str(scratch), fp, mtype),
                 },
@@ -45,8 +45,8 @@ def route():
 
 
 @pytest.fixture
-def uploader(client: TestClient, superuser_token_headers: dict[str, str]):
-    return WebUploader(client, superuser_token_headers)
+def uploader(client: TestClient, normal_user_api_key_headers: dict[str, str]):
+    return WebUploader(client, normal_user_api_key_headers)
 
 
 @pytest.fixture(scope="class")

backend/app/tests/api/routes/test_responses.py

@@ -16,7 +16,7 @@
 @patch("app.api.routes.responses.OpenAI")
 @patch("app.api.routes.responses.get_provider_credential")
 def test_responses_endpoint_success(
-    mock_get_credential, mock_openai, db, superuser_api_key_headers: dict[str, str]
+    mock_get_credential, mock_openai, db, normal_user_api_key_headers: dict[str, str]
 ):
     """Test the /responses endpoint for successful response creation."""
     # Setup mock credentials
@@ -49,7 +49,7 @@ def test_responses_endpoint_success(
     }
 
     response = client.post(
-        "/responses", json=request_data, headers=superuser_api_key_headers
+        "/responses", json=request_data, headers=normal_user_api_key_headers
     )
     assert response.status_code == 200
     response_json = response.json()
@@ -62,7 +62,11 @@ def test_responses_endpoint_success(
 @patch("app.api.routes.responses.get_provider_credential")
 @patch("app.api.routes.responses.get_assistant_by_id")
 def test_responses_endpoint_without_vector_store(
-    mock_get_assistant, mock_get_credential, mock_openai, db, superuser_api_key_headers
+    mock_get_assistant,
+    mock_get_credential,
+    mock_openai,
+    db,
+    normal_user_api_key_headers,
 ):
     """Test the /responses endpoint when assistant has no vector store configured."""
     # Setup mock credentials
@@ -103,7 +107,7 @@ def test_responses_endpoint_without_vector_store(
     }
 
     response = client.post(
-        "/responses", json=request_data, headers=superuser_api_key_headers
+        "/responses", json=request_data, headers=normal_user_api_key_headers
     )
     assert response.status_code == 200
     response_json = response.json()

backend/app/tests/utils/document.py

@@ -113,18 +113,18 @@ def append(self, doc: Document, suffix: str = None):
 @dataclass
 class WebCrawler:
     client: TestClient
-    superuser_token_headers: dict[str, str]
+    normal_user_api_key_headers: dict[str, str]
 
     def get(self, route: Route):
         return self.client.get(
             str(route),
-            headers=self.superuser_token_headers,
+            headers=self.normal_user_api_key_headers,
         )
 
     def delete(self, route: Route):
         return self.client.delete(
             str(route),
-            headers=self.superuser_token_headers,
+            headers=self.normal_user_api_key_headers,
         )
 
 
@@ -158,5 +158,5 @@ def to_dict(self):
 
 
 @pytest.fixture
-def crawler(client: TestClient, superuser_token_headers: dict[str, str]):
-    return WebCrawler(client, superuser_token_headers)
+def crawler(client: TestClient, normal_user_api_key_headers: dict[str, str]):
+    return WebCrawler(client, normal_user_api_key_headers)

backend/app/tests/utils/utils.py

@@ -54,7 +54,7 @@ def get_api_key_by_email(db: Session, email: EmailStr) -> str:
 
 
 def get_user_id_by_email(db: Session) -> int:
-    user = get_user_by_email(session=db, email=settings.FIRST_SUPERUSER)
+    user = get_user_by_email(session=db, email=settings.EMAIL_TEST_USER)
     return user.id