From 1636b228db6ea8046ee9a9acf428b29bd9aa6476 Mon Sep 17 00:00:00 2001 From: Charles Yao Date: Tue, 25 Nov 2025 17:24:49 -0600 Subject: [PATCH] ECO-183: fix migration file conflits --- ...a7b4e8f2c9d1_add_enduser_authentication_provider.py | 4 ++-- api/models/tools.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/migrations/versions/2025_11_18_1400-a7b4e8f2c9d1_add_enduser_authentication_provider.py b/api/migrations/versions/2025_11_18_1400-a7b4e8f2c9d1_add_enduser_authentication_provider.py index be652e7fc8..b651dffbc8 100644 --- a/api/migrations/versions/2025_11_18_1400-a7b4e8f2c9d1_add_enduser_authentication_provider.py +++ b/api/migrations/versions/2025_11_18_1400-a7b4e8f2c9d1_add_enduser_authentication_provider.py @@ -1,7 +1,7 @@ """add enduser authentication provider Revision ID: a7b4e8f2c9d1 -Revises: 132392a2635f +Revises: fecff1c3da27 Create Date: 2025-11-18 14:00:00.000000 """ @@ -11,7 +11,7 @@ from alembic import op # revision identifiers, used by Alembic. revision = "a7b4e8f2c9d1" -down_revision = "132392a2635f" +down_revision = "fecff1c3da27" branch_labels = None depends_on = None diff --git a/api/models/tools.py b/api/models/tools.py index 95cadeb030..54c56d6a20 100644 --- a/api/models/tools.py +++ b/api/models/tools.py @@ -124,17 +124,17 @@ class EndUserAuthenticationProvider(TypeBase): # id of the authentication provider id: Mapped[str] = mapped_column(StringUUID, primary_key=True, default=lambda: str(uuid4()), init=False) - name: Mapped[str] = mapped_column( - String(256), - nullable=False, - default="API KEY 1", - ) # id of the tenant tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False) # id of the end user end_user_id: Mapped[str] = mapped_column(StringUUID, nullable=False) # name of the tool provider provider: Mapped[str] = mapped_column(LongText, nullable=False) + name: Mapped[str] = mapped_column( + String(256), + nullable=False, + default="API KEY 1", + ) # encrypted credentials for the end user encrypted_credentials: Mapped[str] = mapped_column(LongText, nullable=False, default="") created_at: Mapped[datetime] = mapped_column(