From 7965cfdd2bc37861b049b35154bb823f75ae13f7 Mon Sep 17 00:00:00 2001
From: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
Date: Tue, 25 Aug 2026 16:51:03 -0700
Subject: [PATCH] fix(proxy): keep listing a keyless user's own models when
 their user row is missing

Keys minted by /key/generate get no LiteLLM_UserTable row, so /v2/model/info?user_models_only=true for such a user hit the new None guard and returned 400 where the merge base returned the user's own models. Skip the team-model merge for a missing row instead of raising, since a user with no row belongs to no team
---
 litellm/proxy/proxy_server.py                 | 12 +++----
 tests/test_litellm/proxy/test_proxy_server.py | 35 +++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index c1bf7e676e5..9ae53bebf0a 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -12227,14 +12227,12 @@ async def non_admin_all_models(
         except Exception:
             raise HTTPException(status_code=400, detail={"error": "User not found"})
 
-        if user_row is None:
-            raise HTTPException(status_code=400, detail={"error": "User not found"})
-
         # Get all models that are team models, when model team_id == user_row.teams
-        all_models += _check_if_model_is_team_model(
-            models=llm_router.get_model_list() or [],
-            user_row=user_row,
-        )
+        if user_row is not None:
+            all_models += _check_if_model_is_team_model(
+                models=llm_router.get_model_list() or [],
+                user_row=user_row,
+            )
 
     # de-duplicate models. Only return unique model ids
     unique_models: Final = _deduplicate_litellm_router_models(models=all_models)
diff --git a/tests/test_litellm/proxy/test_proxy_server.py b/tests/test_litellm/proxy/test_proxy_server.py
index 9525c19f984..afc42e8db45 100644
--- a/tests/test_litellm/proxy/test_proxy_server.py
+++ b/tests/test_litellm/proxy/test_proxy_server.py
@@ -1861,36 +1861,35 @@ def test_add_team_models_to_all_models_excludes_other_teams_byok_with_shared_nam
 
 
 @pytest.mark.asyncio
-async def test_non_admin_all_models_raises_400_when_user_row_missing():
+async def test_non_admin_all_models_returns_user_models_when_user_row_missing():
     """
-    Regression test: a key whose user row no longer exists made find_unique return
-    None, and _check_if_model_is_team_model then dereferenced it
-    (`model_team_id in user_row.teams`) and raised AttributeError, surfacing as a
-    500. The miss must reuse the 400 "User not found" contract the neighbouring
-    except-branch already raises.
+    Regression test: /key/generate mints keys without a LiteLLM_UserTable row, so
+    find_unique returns None for such a user. That miss must neither raise (a 400
+    here, or the AttributeError on `user_row.teams` that used to surface as a 500)
+    nor leak team models: the user belongs to no team, so only the models they
+    added themselves come back.
     """
-    from fastapi import HTTPException
-
     from litellm.proxy.proxy_server import non_admin_all_models
 
+    user_added_model = {"model_name": "my-model", "model_info": {"id": "user-model-1"}}
     prisma_client = MagicMock()
     prisma_client.db.litellm_usertable.find_unique = AsyncMock(return_value=None)
+    prisma_client.db.litellm_proxymodeltable.find_unique = AsyncMock(return_value=MagicMock(created_by="ghost-user"))
 
     llm_router = MagicMock()
     llm_router.get_model_list.return_value = [
-        {"model_info": {"id": "gpt-4-model-1", "team_id": "team-a"}},
+        user_added_model,
+        {"model_name": "team-model", "model_info": {"id": "team-model-1", "team_id": "team-a"}},
     ]
 
-    with pytest.raises(HTTPException) as exc_info:
-        await non_admin_all_models(
-            all_models=[],
-            llm_router=llm_router,
-            user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", user_id="deleted-user"),
-            prisma_client=prisma_client,
-        )
+    result = await non_admin_all_models(
+        all_models=[user_added_model],
+        llm_router=llm_router,
+        user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", user_id="ghost-user"),
+        prisma_client=prisma_client,
+    )
 
-    assert exc_info.value.status_code == 400
-    assert exc_info.value.detail == {"error": "User not found"}
+    assert result == [user_added_model]
 
 
 @pytest.mark.asyncio