fixes

Author: nishika26

backend/app/crud/credentials.py

@@ -7,7 +7,6 @@
 from app.core.providers import (
     validate_provider,
     validate_provider_credentials,
-    get_supported_providers,
 )
 from app.core.security import encrypt_credentials, decrypt_credentials
 from app.core.util import now

backend/app/main.py

@@ -5,7 +5,6 @@
 from starlette.middleware.cors import CORSMiddleware
 
 from app.api.main import api_router
-from app.api.deps import http_exception_handler
 from app.core.config import settings
 from app.core.exception_handlers import register_exception_handlers
 

backend/app/tests/crud/documents/test_crud_document_delete.py

@@ -6,6 +6,7 @@
 from app.models import Document
 
 from app.tests.utils.document import DocumentStore
+from app.core.exception_handlers import HTTPException
 
 
 @pytest.fixture
@@ -36,5 +37,8 @@ def test_cannot_delete_others_documents(self, db: Session):
         other_owner_id = store.documents.index.peek()
 
         crud = DocumentCrud(db, other_owner_id)
-        with pytest.raises(NoResultFound):
+        with pytest.raises(HTTPException) as exc_info:
             crud.delete(document.id)
+
+        assert exc_info.value.status_code == 404
+        assert "Document not found" in str(exc_info.value.detail)

backend/app/tests/crud/documents/test_crud_document_read_one.py

@@ -5,6 +5,7 @@
 from app.crud import DocumentCrud
 
 from app.tests.utils.document import DocumentStore
+from app.core.exception_handlers import HTTPException
 
 
 @pytest.fixture
@@ -25,9 +26,13 @@ def test_cannot_select_invalid_id(self, db: Session, store: DocumentStore):
         document = next(store.documents)
 
         crud = DocumentCrud(db, store.owner)
-        with pytest.raises(NoResultFound):
+
+        with pytest.raises(HTTPException) as exc_info:
             crud.read_one(document.id)
 
+        assert exc_info.value.status_code == 404
+        assert "Document not found" in str(exc_info.value.detail)
+
     def test_cannot_read_others_documents(
         self,
         db: Session,
@@ -37,5 +42,8 @@ def test_cannot_read_others_documents(
         other = DocumentStore(db)
 
         crud = DocumentCrud(db, other.owner)
-        with pytest.raises(NoResultFound):
+        with pytest.raises(HTTPException) as exc_info:
             crud.read_one(document.id)
+
+        assert exc_info.value.status_code == 404
+        assert "Document not found" in str(exc_info.value.detail)

backend/app/tests/crud/test_api_key.py

@@ -5,6 +5,7 @@
 from app.models import APIKey, User, Organization
 from app.tests.utils.utils import random_email
 from app.core.security import get_password_hash, verify_password, decrypt_api_key
+from app.core.exception_handlers import HTTPException
 
 
 # Helper function to create a user
@@ -77,18 +78,18 @@ def test_get_api_keys_by_organization(db: Session) -> None:
         assert key.user_id in [user1.id, user2.id]
 
 
-def test_delete_api_key(db: Session) -> None:
+def test_delete_api_key_already_deleted(db: Session) -> None:
     user = create_test_user(db)
     org = create_test_organization(db)
 
     api_key = api_key_crud.create_api_key(db, org.id, user.id)
     api_key_crud.delete_api_key(db, api_key.id)
 
-    deleted_key = db.exec(select(APIKey).where(APIKey.id == api_key.id)).first()
+    with pytest.raises(HTTPException) as exc_info:
+        api_key_crud.delete_api_key(db, api_key.id)
 
-    assert deleted_key is not None
-    assert deleted_key.is_deleted is True
-    assert deleted_key.deleted_at is not None
+    assert exc_info.value.status_code == 404
+    assert "already deleted" in str(exc_info.value.detail)
 
 
 def test_delete_api_key_already_deleted(db: Session) -> None:
@@ -98,9 +99,12 @@ def test_delete_api_key_already_deleted(db: Session) -> None:
     api_key = api_key_crud.create_api_key(db, org.id, user.id)
     api_key_crud.delete_api_key(db, api_key.id)
 
-    with pytest.raises(ValueError, match="API key not found or already deleted"):
+    with pytest.raises(HTTPException) as exc_info:
         api_key_crud.delete_api_key(db, api_key.id)
 
+    assert exc_info.value.status_code == 404
+    assert "already deleted" in exc_info.value.detail
+
 
 def test_get_api_key_by_value(db: Session) -> None:
     user = create_test_user(db)