From 41ef2fd2f72cc82d5bd4314704b7cf60b84a1311 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 24 Aug 2023 17:42:53 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(alembic):=20fix=20indentatio?= =?UTF-8?q?n=20and=20formatting=20issues=20in=20add=5Fapikey=5Ftable=20mig?= =?UTF-8?q?ration=20script=20=E2=9C=A8=20feat(alembic):=20add=20support=20?= =?UTF-8?q?for=20creating=20apikey=20and=20user=20tables=20in=20the=20data?= =?UTF-8?q?base=20=F0=9F=94=A5=20chore(alembic):=20remove=20flowstyle=20an?= =?UTF-8?q?d=20component=20tables=20from=20the=20database=20schema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versions/5512e39b4012_add_apikey_table.py | 126 ++++++++++-------- 1 file changed, 71 insertions(+), 55 deletions(-) diff --git a/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py index 8c8ae75fd..02db82e71 100644 --- a/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py +++ b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py @@ -5,6 +5,8 @@ Revises: 0a534bdfd84b Create Date: 2023-08-23 21:05:51.042203 """ + +import contextlib from typing import Sequence, Union from alembic import op @@ -13,72 +15,86 @@ import sqlmodel # revision identifiers, used by Alembic. -revision: str = '5512e39b4012' -down_revision: Union[str, None] = '0a534bdfd84b' +revision: str = "5512e39b4012" +down_revision: Union[str, None] = "0a534bdfd84b" branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.create_table('apikey', - sa.Column('api_key', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('create_at', sa.DateTime(), nullable=False), - sa.Column('last_used_at', sa.DateTime(), nullable=True), - sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') - ) - op.create_index(op.f('ix_apikey_api_key'), 'apikey', ['api_key'], unique=True) - op.create_table('user', - sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), - sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('password', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('is_active', sa.Boolean(), nullable=False), - sa.Column('is_superuser', sa.Boolean(), nullable=False), - sa.Column('create_at', sa.DateTime(), nullable=False), - sa.Column('updated_at', sa.DateTime(), nullable=False), - sa.Column('last_login_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') - ) - op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True) - op.drop_table('flowstyle') - op.drop_index('ix_component_frontend_node_id', table_name='component') - op.drop_index('ix_component_name', table_name='component') - op.drop_table('component') + with contextlib.suppress(sa.exc.OperationalError): + op.create_table( + "apikey", + sa.Column("api_key", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("create_at", sa.DateTime(), nullable=False), + sa.Column("last_used_at", sa.DateTime(), nullable=True), + sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.create_index(op.f("ix_apikey_api_key"), "apikey", ["api_key"], unique=True) + + with contextlib.suppress(sa.exc.OperationalError): + op.create_table( + "user", + sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.Column("username", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("password", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("is_active", sa.Boolean(), nullable=False), + sa.Column("is_superuser", sa.Boolean(), nullable=False), + sa.Column("create_at", sa.DateTime(), nullable=False), + sa.Column("updated_at", sa.DateTime(), nullable=False), + sa.Column("last_login_at", sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.create_index(op.f("ix_user_username"), "user", ["username"], unique=True) + with contextlib.suppress(sa.exc.OperationalError): + op.drop_table("flowstyle") + with contextlib.suppress(sa.exc.OperationalError): + op.drop_index("ix_component_frontend_node_id", table_name="component") + op.drop_index("ix_component_name", table_name="component") + op.drop_table("component") # ### end Alembic commands ### def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.create_table('component', - sa.Column('id', sa.CHAR(length=32), nullable=False), - sa.Column('frontend_node_id', sa.CHAR(length=32), nullable=False), - sa.Column('name', sa.VARCHAR(), nullable=False), - sa.Column('description', sa.VARCHAR(), nullable=True), - sa.Column('python_code', sa.VARCHAR(), nullable=True), - sa.Column('return_type', sa.VARCHAR(), nullable=True), - sa.Column('is_disabled', sa.BOOLEAN(), nullable=False), - sa.Column('is_read_only', sa.BOOLEAN(), nullable=False), - sa.Column('create_at', sa.DATETIME(), nullable=False), - sa.Column('update_at', sa.DATETIME(), nullable=False), - sa.PrimaryKeyConstraint('id') + op.create_table( + "component", + sa.Column("id", sa.CHAR(length=32), nullable=False), + sa.Column("frontend_node_id", sa.CHAR(length=32), nullable=False), + sa.Column("name", sa.VARCHAR(), nullable=False), + sa.Column("description", sa.VARCHAR(), nullable=True), + sa.Column("python_code", sa.VARCHAR(), nullable=True), + sa.Column("return_type", sa.VARCHAR(), nullable=True), + sa.Column("is_disabled", sa.BOOLEAN(), nullable=False), + sa.Column("is_read_only", sa.BOOLEAN(), nullable=False), + sa.Column("create_at", sa.DATETIME(), nullable=False), + sa.Column("update_at", sa.DATETIME(), nullable=False), + sa.PrimaryKeyConstraint("id"), ) - op.create_index('ix_component_name', 'component', ['name'], unique=False) - op.create_index('ix_component_frontend_node_id', 'component', ['frontend_node_id'], unique=False) - op.create_table('flowstyle', - sa.Column('color', sa.VARCHAR(), nullable=False), - sa.Column('emoji', sa.VARCHAR(), nullable=False), - sa.Column('flow_id', sa.CHAR(length=32), nullable=True), - sa.Column('id', sa.CHAR(length=32), nullable=False), - sa.ForeignKeyConstraint(['flow_id'], ['flow.id'], ), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') + op.create_index("ix_component_name", "component", ["name"], unique=False) + op.create_index( + "ix_component_frontend_node_id", "component", ["frontend_node_id"], unique=False ) - op.drop_index(op.f('ix_user_username'), table_name='user') - op.drop_table('user') - op.drop_index(op.f('ix_apikey_api_key'), table_name='apikey') - op.drop_table('apikey') + op.create_table( + "flowstyle", + sa.Column("color", sa.VARCHAR(), nullable=False), + sa.Column("emoji", sa.VARCHAR(), nullable=False), + sa.Column("flow_id", sa.CHAR(length=32), nullable=True), + sa.Column("id", sa.CHAR(length=32), nullable=False), + sa.ForeignKeyConstraint( + ["flow_id"], + ["flow.id"], + ), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.drop_index(op.f("ix_user_username"), table_name="user") + op.drop_table("user") + op.drop_index(op.f("ix_apikey_api_key"), table_name="apikey") + op.drop_table("apikey") # ### end Alembic commands ###