From c62c727aac0adc850d45fa65b74e380fc1784dec Mon Sep 17 00:00:00 2001
From: Talmaj Marinc <talmaj@comfy.org>
Date: Sun, 12 Jul 2026 21:58:08 +0200
Subject: [PATCH] Merge migrations.

---
 alembic_db/versions/0005_download_manager.py  | 35 +----------
 .../0006_drop_download_credentials.py         | 58 -------------------
 2 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 alembic_db/versions/0006_drop_download_credentials.py

diff --git a/alembic_db/versions/0005_download_manager.py b/alembic_db/versions/0005_download_manager.py
index 6efffe1d8..38f7783fd 100644
--- a/alembic_db/versions/0005_download_manager.py
+++ b/alembic_db/versions/0005_download_manager.py
@@ -1,9 +1,8 @@
 """
 Download manager schema.
 
-Adds the three tables that back the server-side model download manager
-: transient job/queue state (``downloads`` + per-segment
-``download_segments``) and one-API-key-per-host auth (``host_credentials``).
+Adds the two tables that back the server-side model download manager:
+transient job/queue state (``downloads`` + per-segment ``download_segments``).
 
 Revision ID: 0005_download_manager
 Revises: 0004_drop_tag_type
@@ -38,7 +37,6 @@ def upgrade() -> None:
             "accept_ranges", sa.Boolean(), nullable=False, server_default=sa.text("false")
         ),
         sa.Column("expected_sha256", sa.String(length=64), nullable=True),
-        sa.Column("credential_id", sa.String(length=36), nullable=True),
         sa.Column(
             "allow_any_extension",
             sa.Boolean(),
@@ -76,37 +74,8 @@ def upgrade() -> None:
         sa.CheckConstraint("end_offset >= start_offset", name="ck_segments_range"),
     )
 
-    op.create_table(
-        "host_credentials",
-        sa.Column("id", sa.String(length=36), primary_key=True),
-        sa.Column("host", sa.String(length=255), nullable=False),
-        sa.Column(
-            "match_subdomains",
-            sa.Boolean(),
-            nullable=False,
-            server_default=sa.text("false"),
-        ),
-        sa.Column("label", sa.String(length=255), nullable=True),
-        sa.Column(
-            "auth_scheme", sa.String(length=16), nullable=False, server_default="bearer"
-        ),
-        sa.Column("header_name", sa.String(length=255), nullable=True),
-        sa.Column("query_param", sa.String(length=255), nullable=True),
-        sa.Column("secret", sa.Text(), nullable=False),
-        sa.Column("secret_last4", sa.String(length=4), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=False, server_default=sa.text("true")),
-        sa.Column("created_at", sa.BigInteger(), nullable=False),
-        sa.Column("updated_at", sa.BigInteger(), nullable=False),
-    )
-    op.create_index(
-        "uq_host_credentials_host", "host_credentials", ["host"], unique=True
-    )
-
 
 def downgrade() -> None:
-    op.drop_index("uq_host_credentials_host", table_name="host_credentials")
-    op.drop_table("host_credentials")
-
     op.drop_table("download_segments")
 
     op.drop_index("ix_downloads_model_id", table_name="downloads")
diff --git a/alembic_db/versions/0006_drop_download_credentials.py b/alembic_db/versions/0006_drop_download_credentials.py
deleted file mode 100644
index 9c6a0f1e8..000000000
--- a/alembic_db/versions/0006_drop_download_credentials.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-Drop download credential storage.
-
-Removes ``downloads.credential_id`` and the ``host_credentials`` table: stored
-API keys are replaced by env-var keys plus an on-disk OAuth token store, neither
-of which lives in the database.
-
-Revision ID: 0006_drop_download_credentials
-Revises: 0005_download_manager
-Create Date: 2026-07-09
-"""
-
-from alembic import op
-import sqlalchemy as sa
-
-revision = "0006_drop_download_credentials"
-down_revision = "0005_download_manager"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("downloads") as batch_op:
-        batch_op.drop_column("credential_id")
-
-    op.drop_index("uq_host_credentials_host", table_name="host_credentials")
-    op.drop_table("host_credentials")
-
-
-def downgrade() -> None:
-    op.create_table(
-        "host_credentials",
-        sa.Column("id", sa.String(length=36), primary_key=True),
-        sa.Column("host", sa.String(length=255), nullable=False),
-        sa.Column(
-            "match_subdomains",
-            sa.Boolean(),
-            nullable=False,
-            server_default=sa.text("false"),
-        ),
-        sa.Column("label", sa.String(length=255), nullable=True),
-        sa.Column(
-            "auth_scheme", sa.String(length=16), nullable=False, server_default="bearer"
-        ),
-        sa.Column("header_name", sa.String(length=255), nullable=True),
-        sa.Column("query_param", sa.String(length=255), nullable=True),
-        sa.Column("secret", sa.Text(), nullable=False),
-        sa.Column("secret_last4", sa.String(length=4), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=False, server_default=sa.text("true")),
-        sa.Column("created_at", sa.BigInteger(), nullable=False),
-        sa.Column("updated_at", sa.BigInteger(), nullable=False),
-    )
-    op.create_index(
-        "uq_host_credentials_host", "host_credentials", ["host"], unique=True
-    )
-
-    with op.batch_alter_table("downloads") as batch_op:
-        batch_op.add_column(sa.Column("credential_id", sa.String(length=36), nullable=True))
\ No newline at end of file