last fixes

Author: nishika26

backend/app/api/deps.py

@@ -123,18 +123,6 @@ def get_current_active_superuser_org(current_user: CurrentUserOrg) -> User:
     return current_user
 
 
-async def http_exception_handler(request: Request, exc: HTTPException):
-    """
-    Global handler for HTTPException to return standardized response format.
-    """
-    return JSONResponse(
-        status_code=exc.status_code,
-        content=APIResponse.failure_response(exc.detail).model_dump()
-        # TEMPORARY: Keep "detail" for backward compatibility
-        | {"detail": exc.detail},
-    )
-
-
 def verify_user_project_organization(
     db: SessionDep,
     current_user: CurrentUserOrg,

backend/app/api/main.py

@@ -33,5 +33,6 @@
 api_router.include_router(users.router)
 api_router.include_router(utils.router)
 
+
 if settings.ENVIRONMENT == "local":
     api_router.include_router(private.router)

backend/app/api/routes/api_keys.py

@@ -27,13 +27,15 @@ def create_key(
     """
     Generate a new API key for the user's organization.
     """
-    validate_organization(session, organization_id)
+    organization = validate_organization(session, organization_id)
+    if not organization:
+        raise HTTPException(404, "Organization not found")
 
     existing_api_key = get_api_key_by_user_org(session, organization_id, user_id)
     if existing_api_key:
         raise HTTPException(
-            status_code=400,
-            detail="API Key already exists for this user and organization",
+            400,
+            "API Key already exists for this user and organization",
         )
     api_key = create_api_key(session, organization_id=organization_id, user_id=user_id)
     return APIResponse.success_response(api_key)
@@ -48,7 +50,9 @@ def list_keys(
     """
     Retrieve all API keys for the user's organization.
     """
-    validate_organization(session, organization_id)
+    organization = validate_organization(session, organization_id)
+    if not organization:
+        raise HTTPException(404, "Organization not found")
     api_keys = get_api_keys_by_organization(session, organization_id)
     return APIResponse.success_response(api_keys)
 
@@ -64,7 +68,7 @@ def get_key(
     """
     api_key = get_api_key(session, api_key_id)
     if not api_key:
-        raise HTTPException(status_code=404, detail="API Key does not exist")
+        raise HTTPException(404, "API Key does not exist")
 
     return APIResponse.success_response(api_key)
 
@@ -78,5 +82,11 @@ def revoke_key(
     """
     Soft delete an API key (revoke access).
     """
+    api_key = get_api_key(session, api_key_id)
+
+    if not api_key:
+        raise HTTPException(404, "API key not found or already deleted")
+
     delete_api_key(session, api_key_id)
+
     return APIResponse.success_response({"message": "API key revoked successfully"})

backend/app/api/routes/credentials.py

@@ -11,6 +11,7 @@
     update_creds_for_org,
     remove_provider_credential,
 )
+from app.crud.organization import validate_organization
 from app.models import CredsCreate, CredsPublic, CredsUpdate
 from app.models.organization import Organization
 from app.models.project import Project
@@ -30,9 +31,7 @@
 )
 def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
     # Validate organization
-    organization = session.get(Organization, creds_in.organization_id)
-    if not organization:
-        raise HTTPException(status_code=404, detail="Organization not found")
+    validate_organization(session, creds_in.organization_id)
 
     # Validate project if provided
     if creds_in.project_id:
@@ -65,7 +64,7 @@ def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
     # Create credentials
     new_creds = set_creds_for_org(session=session, creds_add=creds_in)
     if not new_creds:
-        raise HTTPException(status_code=500, detail="Failed to create credentials")
+        raise Exception(status_code=500, detail="Failed to create credentials")
 
     return APIResponse.success_response([cred.to_public() for cred in new_creds])
 
@@ -116,10 +115,7 @@ def read_provider_credential(
     description="Updates credentials for a specific organization and project combination. Can update specific provider credentials or add new providers. If project_id is provided in the update, credentials will be moved to that project. This endpoint requires superuser privileges.",
 )
 def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate):
-    organization = session.get(Organization, org_id)
-    if not organization:
-        raise HTTPException(status_code=404, detail="Organization not found")
-
+    validate_organization(session, org_id)
     if not creds_in or not creds_in.provider or not creds_in.credential:
         raise HTTPException(
             status_code=400, detail="Provider and credential must be provided"
@@ -139,19 +135,25 @@ def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate
     dependencies=[Depends(get_current_active_superuser)],
     response_model=APIResponse[dict],
     summary="Delete specific provider credentials for an organization and project",
-    description="Removes credentials for a specific provider while keeping other provider credentials intact. If project_id is provided, only removes credentials for that project. This endpoint requires superuser privileges.",
 )
 def delete_provider_credential(
     *, session: SessionDep, org_id: int, provider: str, project_id: int | None = None
 ):
     provider_enum = validate_provider(provider)
-
-    updated_creds = remove_provider_credential(
+    if not provider_enum:
+        raise HTTPException(status_code=400, detail="Invalid provider")
+    provider_creds = get_provider_credential(
         session=session,
         org_id=org_id,
         provider=provider_enum,
         project_id=project_id,
     )
+    if provider_creds is None:
+        raise HTTPException(status_code=404, detail="Provider credentials not found")
+
+    updated_creds = remove_provider_credential(
+        session=session, org_id=org_id, provider=provider_enum, project_id=project_id
+    )
 
     return APIResponse.success_response(
         {"message": "Provider credentials removed successfully"}

backend/app/api/routes/responses.py

@@ -129,4 +129,4 @@ async def responses_sync(
             ),
         )
     except openai.OpenAIError as e:
-        return ResponsesAPIResponse.failure_response(error=handle_openai_error(e))
+        return Exception(error=handle_openai_error(e))

backend/app/api/routes/threads.py

@@ -2,7 +2,7 @@
 import openai
 import requests
 
-from fastapi import APIRouter, BackgroundTasks, Depends
+from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from openai import OpenAI
 from sqlmodel import Session
 from langfuse.decorators import observe, langfuse_context
@@ -229,9 +229,8 @@ async def threads(
         project_id=request.get("project_id"),
     )
     if not credentials or "api_key" not in credentials:
-        return APIResponse.failure_response(
-            error="OpenAI API key not configured for this organization."
-        )
+        raise HTTPException(404, "OpenAI API key not configured for this organization.")
+
     client = OpenAI(api_key=credentials["api_key"])
 
     langfuse_credentials = get_provider_credential(
@@ -241,9 +240,7 @@ async def threads(
         project_id=request.get("project_id"),
     )
     if not langfuse_credentials:
-        return APIResponse.failure_response(
-            error="LANGFUSE keys not configured for this organization."
-        )
+        raise HTTPException(404, "LANGFUSE keys not configured for this organization.")
 
     langfuse_context.configure(
         secret_key=langfuse_credentials["secret_key"],
@@ -253,12 +250,11 @@ async def threads(
     # Validate thread
     is_valid, error_message = validate_thread(client, request.get("thread_id"))
     if not is_valid:
-        return APIResponse.failure_response(error=error_message)
-
+        raise Exception(error_message)
     # Setup thread
     is_success, error_message = setup_thread(client, request)
     if not is_success:
-        return APIResponse.failure_response(error=error_message)
+        raise Exception(error_message)
 
     # Send immediate response
     initial_response = APIResponse.success_response(
@@ -291,21 +287,20 @@ async def threads_sync(
         project_id=request.get("project_id"),
     )
     if not credentials or "api_key" not in credentials:
-        return APIResponse.failure_response(
-            error="OpenAI API key not configured for this organization."
+        raise HTTPException(
+            404, error="OpenAI API key not configured for this organization."
         )
 
     client = OpenAI(api_key=credentials["api_key"])
 
     # Validate thread
     is_valid, error_message = validate_thread(client, request.get("thread_id"))
     if not is_valid:
-        return APIResponse.failure_response(error=error_message)
-
+        raise Exception(error_message)
     # Setup thread
     is_success, error_message = setup_thread(client, request)
     if not is_success:
-        return APIResponse.failure_response(error=error_message)
+        raise Exception(error_message)
 
     try:
         # Process run
@@ -337,7 +332,7 @@ async def threads_sync(
             )
 
     except openai.OpenAIError as e:
-        return APIResponse.failure_response(error=handle_openai_error(e))
+        raise Exception(error=handle_openai_error(e))
 
 
 @router.post("/threads/start")
@@ -355,7 +350,7 @@ async def start_thread(
 
     is_success, error = setup_thread(client, request)
     if not is_success:
-        return APIResponse.failure_response(error=error)
+        raise Exception(error)
 
     thread_id = request["thread_id"]
 
@@ -394,7 +389,7 @@ async def get_thread(
     result = get_thread_result(db, thread_id)
 
     if not result:
-        return APIResponse.failure_response(error="Thread not found.")
+        raise HTTPException(404, "thread not found")
 
     status = result.status or ("success" if result.response else "processing")
 

backend/app/crud/api_key.py

@@ -108,11 +108,6 @@ def delete_api_key(session: Session, api_key_id: int) -> None:
     """
     api_key = session.get(APIKey, api_key_id)
 
-    if not api_key or api_key.is_deleted:
-        raise HTTPException(
-            status_code=404, detail="API key not found or already deleted"
-        )
-
     api_key.is_deleted = True
     api_key.deleted_at = now()
     api_key.updated_at = now()

backend/app/crud/credentials.py

@@ -7,6 +7,7 @@
 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
@@ -18,7 +19,7 @@ def set_creds_for_org(*, session: Session, creds_add: CredsCreate) -> List[Crede
     created_credentials = []
 
     if not creds_add.credential:
-        raise ValueError("No credentials provided")
+        raise HTTPException(400, "No credentials provided")
 
     for provider, credentials in creds_add.credential.items():
         # Validate provider and credentials
@@ -136,9 +137,10 @@ def update_creds_for_org(
         else True,
     )
     creds = session.exec(statement).first()
-
-    if not creds:
-        raise ValueError(f"No credentials found for provider {creds_in.provider}")
+    if creds is None:
+        raise HTTPException(
+            status_code=404, detail="Credentials not found for this provider"
+        )
 
     creds.credential = encrypted_credentials
     creds.updated_at = now()
@@ -149,9 +151,6 @@ def update_creds_for_org(
     return [creds]
 
 
-from sqlalchemy.exc import IntegrityError
-
-
 def remove_provider_credential(
     session: Session, org_id: int, provider: str, project_id: Optional[int] = None
 ) -> Credential:
@@ -165,11 +164,6 @@ def remove_provider_credential(
     )
     creds = session.exec(statement).first()
 
-    if not creds:
-        raise HTTPException(
-            status_code=404, detail=f"Credentials not found for provider '{provider}'"
-        )
-
     # Soft delete
     creds.is_active = False
     creds.updated_at = now()

backend/app/crud/organization.py

@@ -1,6 +1,7 @@
 from typing import Any, Optional
 from datetime import datetime, timezone
 from sqlmodel import Session, select
+from fastapi import HTTPException
 
 from app.models import Organization, OrganizationCreate
 from app.core.util import now
@@ -36,9 +37,9 @@ def validate_organization(session: Session, org_id: int) -> Organization:
     """
     organization = get_organization_by_id(session, org_id)
     if not organization:
-        raise ValueError("Organization not found")
+        raise HTTPException(404, "Organization not found")
 
     if not organization.is_active:
-        raise ValueError("Organization is not active")
+        raise HTTPException("Organization is not active")
 
     return organization

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

@@ -223,10 +223,8 @@ def test_delete_provider_credential_not_found(
     )
 
     assert response.status_code == 404
-    assert (
-        response.json()["error"]
-        == f"Credentials not found for provider '{Provider.OPENAI}'"
-    )
+    print(response.json())
+    assert response.json()["error"] == f"Provider credentials not found"
 
 
 def test_delete_all_credentials(