Fix: Restore get_provider_credential behavior to return None when Langfuse credentials are missing (#415)

* Revert to old version when creds return none

* fix return type

* fix test

Author: avirajsingh7

backend/app/api/routes/credentials.py

@@ -66,6 +66,9 @@ def read_credential(
         org_id=_current_user.organization_id,
         project_id=_current_user.project_id,
     )
+    if not creds:
+        raise HTTPException(status_code=404, detail="Credentials not found")
+
     return APIResponse.success_response([cred.to_public() for cred in creds])
 
 
@@ -88,6 +91,9 @@ def read_provider_credential(
         provider=provider_enum,
         project_id=_current_user.project_id,
     )
+    if credential is None:
+        raise HTTPException(status_code=404, detail="Provider credentials not found")
+
     return APIResponse.success_response(credential)
 
 

backend/app/crud/credentials.py

@@ -115,16 +115,6 @@ def get_creds_by_org(
         Credential.project_id == project_id,
     )
     creds = session.exec(statement).all()
-
-    if not creds:
-        logger.error(
-            f"[get_creds_by_org] No credentials found | organization_id {org_id}, project_id {project_id}"
-        )
-        raise HTTPException(
-            status_code=404,
-            detail="Credentials not found for this organization and project",
-        )
-
     return creds
 
 
@@ -135,7 +125,7 @@ def get_provider_credential(
     project_id: int,
     provider: str,
     full: bool = False,
-) -> dict[str, Any] | Credential:
+) -> dict[str, Any] | Credential | None:
     """
     Fetch credentials for a specific provider within a project.
 
@@ -166,12 +156,7 @@ def get_provider_credential(
     if creds and creds.credential:
         return creds if full else decrypt_credentials(creds.credential)
 
-    logger.error(
-        f"[get_provider_credential] Credentials not found | organization_id {org_id}, provider {provider}, project_id {project_id}"
-    )
-    raise HTTPException(
-        status_code=404, detail=f"Credentials not found for provider '{provider}'"
-    )
+    return None
 
 
 def get_providers(*, session: Session, org_id: int, project_id: int) -> list[str]:
@@ -234,12 +219,16 @@ def remove_provider_credential(
     validate_provider(provider)
 
     # Verify credentials exist before attempting delete
-    get_provider_credential(
+    creds = get_provider_credential(
         session=session,
         org_id=org_id,
         project_id=project_id,
         provider=provider,
     )
+    if creds is None:
+        raise HTTPException(
+            status_code=404, detail="Credentials not found for this provider"
+        )
 
     # Build delete statement
     statement = delete(Credential).where(
@@ -279,6 +268,10 @@ def remove_creds_for_org(*, session: Session, org_id: int, project_id: int) -> N
         org_id=org_id,
         project_id=project_id,
     )
+    if existing_creds is None or len(existing_creds) == 0:
+        raise HTTPException(
+            status_code=404, detail="No credentials found for this organization"
+        )
     expected_count = len(existing_creds)
     statement = delete(Credential).where(
         Credential.organization_id == org_id,

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

@@ -126,7 +126,6 @@ def test_read_credentials_not_found(client: TestClient, user_api_key: TestAuthCo
         headers={"X-API-KEY": user_api_key.key},
     )
     assert response.status_code == 404
-    assert "Credentials not found" in response.json()["error"]
 
 
 def test_read_provider_credential(
@@ -159,7 +158,6 @@ def test_read_provider_credential_not_found(
     )
 
     assert response.status_code == 404
-    assert "Credentials not found for provider" in response.json()["error"]
 
 
 def test_update_credentials(
@@ -258,7 +256,6 @@ def test_delete_provider_credential_not_found(
     )
 
     assert response.status_code == 404
-    assert "Credentials not found for provider" in response.json()["error"]
 
 
 def test_delete_all_credentials(
@@ -285,7 +282,6 @@ def test_delete_all_credentials(
         headers={"X-API-KEY": user_api_key.key},
     )
     assert response.status_code == 404  # Expect 404 as credentials are deleted
-    assert "Credentials not found" in response.json()["error"]
 
 
 def test_delete_all_credentials_not_found(
@@ -301,10 +297,6 @@ def test_delete_all_credentials_not_found(
     )
 
     assert response.status_code == 404
-    assert (
-        "Credentials not found for this organization and project"
-        in response.json()["error"]
-    )
 
 
 def test_duplicate_credential_creation(

backend/app/tests/crud/test_credentials.py

@@ -168,15 +168,13 @@ def test_remove_provider_credential(db: Session) -> None:
         project_id=project.id,
     )
 
-    # Verify the credentials are no longer retrievable
-    with pytest.raises(HTTPException) as exc_info:
-        get_provider_credential(
-            session=db,
-            org_id=credential.organization_id,
-            provider="openai",
-            project_id=project.id,
-        )
-    assert exc_info.value.status_code == 404
+    creds = get_provider_credential(
+        session=db,
+        org_id=credential.organization_id,
+        provider="openai",
+        project_id=project.id,
+    )
+    assert creds is None
 
 
 def test_remove_creds_for_org(db: Session) -> None:
@@ -209,12 +207,10 @@ def test_remove_creds_for_org(db: Session) -> None:
         session=db, org_id=project.organization_id, project_id=project.id
     )
 
-    # Verify no credentials are retrievable
-    with pytest.raises(HTTPException) as exc_info:
-        get_creds_by_org(
-            session=db, org_id=project.organization_id, project_id=project.id
-        )
-    assert exc_info.value.status_code == 404
+    creds = get_creds_by_org(
+        session=db, org_id=project.organization_id, project_id=project.id
+    )
+    assert creds == []
 
 
 def test_invalid_provider(db: Session) -> None: