[Fix] Remove dangerous schema diff force-apply from Prisma migration startup

litellm-proxy-extras/litellm_proxy_extras/migrations/20260311180521_schema_sync/migration.sql

@@ -0,0 +1,11 @@
+-- DropIndex
+DROP INDEX "LiteLLM_MCPServerTable_approval_status_idx";
+
+-- AlterTable
+ALTER TABLE "LiteLLM_MCPServerTable" DROP COLUMN "approval_status",
+DROP COLUMN "review_notes",
+DROP COLUMN "reviewed_at",
+DROP COLUMN "source_url",
+DROP COLUMN "submitted_at",
+DROP COLUMN "submitted_by";
+

litellm-proxy-extras/litellm_proxy_extras/schema.prisma

@@ -388,9 +388,6 @@ model LiteLLM_VerificationToken {
 
     // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (("public"."LiteLLM_VerificationToken"."expires" IS NULL OR "public"."LiteLLM_VerificationToken"."expires" > $1) AND "public"."LiteLLM_VerificationToken"."budget_reset_at" < $2) OFFSET $3
     @@index([budget_reset_at, expires])
-
-    // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (...) ORDER BY "public"."LiteLLM_VerificationToken"."key_alias" ASC
-    @@index([key_alias])
 }
 
 model LiteLLM_JWTKeyMapping {
@@ -556,9 +553,6 @@ model LiteLLM_SpendLogs {
   @@index([startTime, request_id])
   @@index([end_user])
   @@index([session_id])
-
-  // SELECT ... FROM "LiteLLM_SpendLogs" WHERE ("startTime" >= $1 AND "startTime" <= $2 AND "user" = $3) GROUP BY ...
-  @@index([user, startTime])
 }
 
 // View spend, model, api_key per request

litellm-proxy-extras/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "litellm-proxy-extras"
-version = "0.4.53"
+version = "0.4.55"
 description = "Additional files for the LiteLLM Proxy. Reduces the size of the main litellm package."
 authors = ["BerriAI"]
 readme = "README.md"
@@ -22,7 +22,7 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.commitizen]
-version = "0.4.53"
+version = "0.4.55"
 version_files = [
     "pyproject.toml:version",
     "../requirements.txt:litellm-proxy-extras==",

litellm/proxy/schema.prisma

@@ -397,9 +397,6 @@ model LiteLLM_VerificationToken {
 
     // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (("public"."LiteLLM_VerificationToken"."expires" IS NULL OR "public"."LiteLLM_VerificationToken"."expires" > $1) AND "public"."LiteLLM_VerificationToken"."budget_reset_at" < $2) OFFSET $3
     @@index([budget_reset_at, expires])
-
-    // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (...) ORDER BY "public"."LiteLLM_VerificationToken"."key_alias" ASC
-    @@index([key_alias])
 }
 
 model LiteLLM_JWTKeyMapping {
@@ -565,9 +562,6 @@ model LiteLLM_SpendLogs {
   @@index([startTime, request_id])
   @@index([end_user])
   @@index([session_id])
-
-  // SELECT ... FROM "LiteLLM_SpendLogs" WHERE ("startTime" >= $1 AND "startTime" <= $2 AND "user" = $3) GROUP BY ...
-  @@index([user, startTime])
 }
 
 // View spend, model, api_key per request

pyproject.toml

@@ -61,7 +61,7 @@ boto3 = { version = "^1.40.76", optional = true }
 redisvl = {version = "^0.4.1", optional = true, markers = "python_version >= '3.9' and python_version < '3.14'"}
 mcp = {version = ">=1.25.0,<2.0.0", optional = true, python = ">=3.10"}
 a2a-sdk = {version = "^0.3.22", optional = true, python = ">=3.10"}
-litellm-proxy-extras = {version = "^0.4.53", optional = true}
+litellm-proxy-extras = {version = "^0.4.55", optional = true}
 rich = {version = "^13.7.1", optional = true}
 litellm-enterprise = {version = "^0.1.33", optional = true}
 diskcache = {version = "^5.6.1", optional = true}

requirements.txt

@@ -57,7 +57,7 @@ grpcio>=1.75.0; python_version >= "3.14"
 sentry_sdk==2.21.0 # for sentry error handling
 detect-secrets==1.5.0 # Enterprise - secret detection / masking in LLM requests
 tzdata==2025.1 # IANA time zone database
-litellm-proxy-extras==0.4.53 # for proxy extras - e.g. prisma migrations
+litellm-proxy-extras==0.4.55 # for proxy extras - e.g. prisma migrations
 llm-sandbox==0.3.31 # for skill execution in sandbox
 ### LITELLM PACKAGE DEPENDENCIES
 python-dotenv==1.0.1 # for env

schema.prisma

@@ -388,9 +388,6 @@ model LiteLLM_VerificationToken {
 
     // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (("public"."LiteLLM_VerificationToken"."expires" IS NULL OR "public"."LiteLLM_VerificationToken"."expires" > $1) AND "public"."LiteLLM_VerificationToken"."budget_reset_at" < $2) OFFSET $3
     @@index([budget_reset_at, expires])
-
-    // SELECT ... FROM "public"."LiteLLM_VerificationToken" WHERE (...) ORDER BY "public"."LiteLLM_VerificationToken"."key_alias" ASC
-    @@index([key_alias])
 }
 
 model LiteLLM_JWTKeyMapping {
@@ -556,9 +553,6 @@ model LiteLLM_SpendLogs {
   @@index([startTime, request_id])
   @@index([end_user])
   @@index([session_id])
-
-  // SELECT ... FROM "LiteLLM_SpendLogs" WHERE ("startTime" >= $1 AND "startTime" <= $2 AND "user" = $3) GROUP BY ...
-  @@index([user, startTime])
 }
 
 // View spend, model, api_key per request

tests/litellm-proxy-extras/test_litellm_proxy_extras_utils.py

@@ -1,5 +1,9 @@
 import os
+import subprocess
 import sys
+from unittest.mock import MagicMock, patch
+
+import pytest
 
 sys.path.insert(
     0,
@@ -82,10 +86,10 @@ def test_is_idempotent_error_column_already_exists(self):
         error_message = "column 'email' already exists"
         assert ProxyExtrasDBManager._is_idempotent_error(error_message) is True
 
-    def test_is_idempotent_error_duplicate_key(self):
-        """Test detection of duplicate key violation error"""
+    def test_duplicate_key_violation_not_idempotent(self):
+        """Duplicate key violations (e.g., CREATE INDEX with duplicate data) are NOT idempotent"""
         error_message = "duplicate key value violates unique constraint"
-        assert ProxyExtrasDBManager._is_idempotent_error(error_message) is True
+        assert ProxyExtrasDBManager._is_idempotent_error(error_message) is False
 
     def test_is_idempotent_error_relation_already_exists(self):
         """Test detection of 'relation already exists' error"""
@@ -138,3 +142,203 @@ def test_unknown_error_classified_as_neither(self):
         error_message = "connection timeout"
         assert ProxyExtrasDBManager._is_permission_error(error_message) is False
         assert ProxyExtrasDBManager._is_idempotent_error(error_message) is False
+
+
+class TestMarkAllMigrationsApplied:
+    """Test that _mark_all_migrations_applied only marks migrations without applying diffs"""
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    @patch.object(
+        ProxyExtrasDBManager,
+        "_get_migration_names",
+        return_value=["20250326162113_baseline", "20250329084805_new_cron_job_table"],
+    )
+    def test_marks_each_migration_as_applied(self, mock_get_names, mock_run):
+        """Verify each migration is marked as applied via prisma migrate resolve"""
+        ProxyExtrasDBManager._mark_all_migrations_applied("/fake/migrations/dir")
+
+        assert mock_run.call_count == 2
+        for call_args in mock_run.call_args_list:
+            cmd = call_args[0][0]
+            assert "migrate" in cmd
+            assert "resolve" in cmd
+            assert "--applied" in cmd
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    @patch.object(
+        ProxyExtrasDBManager,
+        "_get_migration_names",
+        return_value=["20250326162113_baseline"],
+    )
+    def test_does_not_generate_or_apply_diffs(self, mock_get_names, mock_run):
+        """Verify no diff generation or db execute commands are run"""
+        ProxyExtrasDBManager._mark_all_migrations_applied("/fake/migrations/dir")
+
+        for call_args in mock_run.call_args_list:
+            cmd = call_args[0][0]
+            # Should never run diff or db execute
+            assert "diff" not in cmd
+            assert "execute" not in cmd
+            assert "push" not in cmd
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    @patch.object(
+        ProxyExtrasDBManager,
+        "_get_migration_names",
+        return_value=["20250326162113_baseline"],
+    )
+    def test_skips_already_applied_migration(self, mock_get_names, mock_run):
+        """Verify already-applied migrations are silently skipped"""
+        mock_run.side_effect = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="Migration `20250326162113_baseline` is already recorded as applied in the database.",
+        )
+        # Should not raise
+        ProxyExtrasDBManager._mark_all_migrations_applied("/fake/migrations/dir")
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    @patch.object(
+        ProxyExtrasDBManager,
+        "_get_migration_names",
+        return_value=["20250326162113_baseline"],
+    )
+    def test_raises_on_unexpected_error(self, mock_get_names, mock_run):
+        """Verify non-'already applied' errors are propagated, not silently swallowed"""
+        mock_run.side_effect = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="connection refused",
+        )
+        with pytest.raises(RuntimeError, match="Failed to mark migration"):
+            ProxyExtrasDBManager._mark_all_migrations_applied("/fake/migrations/dir")
+
+
+class TestDeployWithIdempotentResolution:
+    """Test _deploy_with_idempotent_resolution loops through multiple idempotent failures"""
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_resolves_multiple_idempotent_migrations_in_one_pass(self, mock_run):
+        """Multiple P3018 idempotent errors should all be resolved without consuming outer retries"""
+        p3018_error_1 = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3018\nMigration name: 20251113000000_add_project_table\nERROR: relation \"LiteLLM_ProjectTable\" already exists",
+            output="",
+        )
+        p3018_error_2 = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3018\nMigration name: 20251113000001_add_project_fields\nERROR: column \"description\" already exists",
+            output="",
+        )
+        # deploy fails, rollback, resolve, deploy fails again, rollback, resolve, deploy succeeds
+        mock_run.side_effect = [
+            p3018_error_1,
+            MagicMock(returncode=0),  # roll_back
+            MagicMock(returncode=0),  # resolve
+            p3018_error_2,
+            MagicMock(returncode=0),  # roll_back
+            MagicMock(returncode=0),  # resolve
+            MagicMock(stdout="All migrations applied", returncode=0),  # final deploy
+        ]
+
+        ProxyExtrasDBManager._deploy_with_idempotent_resolution()
+
+        assert mock_run.call_count == 7
+        # First, fourth, and seventh calls should be deploy
+        for idx in [0, 3, 6]:
+            cmd = mock_run.call_args_list[idx][0][0]
+            assert cmd == ["prisma", "migrate", "deploy"]
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_p3009_non_idempotent_raises_runtime_error(self, mock_run):
+        """P3009 with non-idempotent error should raise RuntimeError"""
+        deploy_error = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3009: migrate found failed migrations in the target database, `20250329084805_new_cron_job_table` migration. Error: syntax error at or near 'ALTR'",
+            output="",
+        )
+        mock_run.side_effect = [deploy_error, MagicMock(returncode=0)]
+
+        with pytest.raises(RuntimeError, match="requires manual intervention"):
+            ProxyExtrasDBManager._deploy_with_idempotent_resolution()
+
+        # deploy + rollback
+        assert mock_run.call_count == 2
+        rollback_cmd = mock_run.call_args_list[1][0][0]
+        assert "--rolled-back" in rollback_cmd
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_p3009_unmatched_regex_raises_runtime_error(self, mock_run):
+        """P3009 with unparseable migration name should fail fast"""
+        error = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3009: migrate found failed migrations in the target database, unexpected format",
+            output="",
+        )
+        mock_run.side_effect = error
+
+        with pytest.raises(RuntimeError, match="could not extract migration name"):
+            ProxyExtrasDBManager._deploy_with_idempotent_resolution()
+
+        assert mock_run.call_count == 1
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_p3009_idempotent_redeploys(self, mock_run):
+        """P3009 with idempotent error should resolve then re-deploy"""
+        deploy_error = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3009: migrate found failed migrations in the target database, `20250329084805_new_cron_job_table` migration. Error: column 'status' already exists",
+            output="",
+        )
+        mock_run.side_effect = [
+            deploy_error,
+            MagicMock(returncode=0),  # roll_back
+            MagicMock(returncode=0),  # resolve
+            MagicMock(stdout="All migrations applied", returncode=0),  # re-deploy
+        ]
+
+        ProxyExtrasDBManager._deploy_with_idempotent_resolution()
+
+        assert mock_run.call_count == 4
+        last_cmd = mock_run.call_args_list[3][0][0]
+        assert last_cmd == ["prisma", "migrate", "deploy"]
+
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_p3018_permission_error_raises(self, mock_run):
+        """P3018 with permission error should raise RuntimeError"""
+        deploy_error = subprocess.CalledProcessError(
+            1,
+            "prisma",
+            stderr="P3018\nMigration name: 20251113000000_add_project_table\nDatabase error code: 42501\npermission denied for table users",
+            output="",
+        )
+        mock_run.side_effect = [deploy_error, MagicMock(returncode=0)]
+
+        with pytest.raises(RuntimeError, match="permission error"):
+            ProxyExtrasDBManager._deploy_with_idempotent_resolution()
+
+
+class TestSetupDatabase:
+    """Test setup_database integration with deploy and resolution"""
+
+    @patch("litellm_proxy_extras.utils.os.chdir")
+    @patch("litellm_proxy_extras.utils.os.getcwd", return_value="/original")
+    @patch.object(
+        ProxyExtrasDBManager, "_get_prisma_dir", return_value="/fake/prisma/dir"
+    )
+    @patch("litellm_proxy_extras.utils.subprocess.run")
+    def test_successful_deploy(self, mock_run, mock_dir, mock_getcwd, mock_chdir):
+        """After successful prisma migrate deploy, no diff/resolve should be called"""
+        mock_run.return_value = MagicMock(stdout="All migrations applied", returncode=0)
+
+        result = ProxyExtrasDBManager.setup_database(use_migrate=True)
+
+        assert result is True
+        assert mock_run.call_count == 1
+        cmd = mock_run.call_args[0][0]
+        assert cmd == ["prisma", "migrate", "deploy"]