From 4b9872e7e890885d637bae32c62eb82998827cfe Mon Sep 17 00:00:00 2001
From: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
Date: Wed, 5 Aug 2026 19:53:44 -0700
Subject: [PATCH] fix(managed_files): return unified ids from unscoped file
 listing

---
 .../proxy/hooks/managed_files.py              |  8 ++--
 .../proxy/test_managed_files_hook.py          | 39 +++++++++++++++++--
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/enterprise/litellm_enterprise/proxy/hooks/managed_files.py b/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
index ec47b6ac0e6..4c0b2b1d5cd 100644
--- a/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
+++ b/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
@@ -383,9 +383,11 @@ class _PROXY_LiteLLMManagedFiles(CustomLogger, BaseFileEndpoints):
             }
         )
         return [
-            OpenAIFileObject.model_validate(file_object.file_object)
-            for file_object in file_ids
-            if file_object.file_object is not None
+            OpenAIFileObject.model_validate(row.file_object).model_copy(
+                update={"id": row.unified_file_id}
+            )
+            for row in file_ids
+            if row.file_object is not None
         ]
 
     async def check_managed_file_id_access(
diff --git a/tests/test_litellm/enterprise/proxy/test_managed_files_hook.py b/tests/test_litellm/enterprise/proxy/test_managed_files_hook.py
index 4a4aa7aa5ea..5dc98640449 100644
--- a/tests/test_litellm/enterprise/proxy/test_managed_files_hook.py
+++ b/tests/test_litellm/enterprise/proxy/test_managed_files_hook.py
@@ -142,8 +142,11 @@ async def test_get_user_created_file_ids_skips_rows_without_file_object():
     managed_files = _make_managed_files_instance()
     managed_files.prisma_client.db.litellm_managedfiletable.find_many = AsyncMock(
         return_value=[
-            MagicMock(file_object=_make_file_object().model_dump()),
-            MagicMock(file_object=None),
+            MagicMock(
+                file_object=_make_file_object().model_dump(),
+                unified_file_id="unified-id-1",
+            ),
+            MagicMock(file_object=None, unified_file_id="unified-id-2"),
         ]
     )
 
@@ -151,7 +154,37 @@ async def test_get_user_created_file_ids_skips_rows_without_file_object():
         _make_user_api_key_dict(), ["file-output-abc"]
     )
 
-    assert [file.id for file in files] == ["file-output-abc"]
+    assert [file.id for file in files] == ["unified-id-1"]
+
+
+@pytest.mark.asyncio
+async def test_get_user_created_file_ids_remaps_stored_raw_provider_id_to_unified_id():
+    """
+    Rows registered from batch outputs store the provider's file object, whose
+    id is the raw provider id (e.g. file-abc). Listing must return the row's
+    unified_file_id so callers get ids that work on the managed routes.
+
+    Regression test for https://github.com/BerriAI/litellm/issues/35362.
+    """
+    unified_id = "bGl0ZWxsbV9wcm94eTt1bmlmaWVkX2lkLGRlYWRiZWVm"
+    raw_provider_object = _make_file_object("file-raw-provider-123")
+    managed_files = _make_managed_files_instance()
+    managed_files.prisma_client.db.litellm_managedfiletable.find_many = AsyncMock(
+        return_value=[
+            MagicMock(
+                file_object=raw_provider_object.model_dump(),
+                unified_file_id=unified_id,
+            ),
+        ]
+    )
+
+    files = await managed_files.get_user_created_file_ids(
+        _make_user_api_key_dict(), ["file-raw-provider-123"]
+    )
+
+    assert [file.id for file in files] == [unified_id]
+    assert files[0].filename == raw_provider_object.filename
+    assert files[0].purpose == raw_provider_object.purpose
 
 
 @pytest.mark.asyncio