From fa55e98a0ba5eb8bea6e035d19aede90d546ab6f Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 17 Jan 2024 07:07:45 -0300 Subject: [PATCH 1/2] Fix unique constraints and column nullability --- .../versions/006b3990db50_add_unique_constraints.py | 6 ++++-- .../versions/2ac71eb9c3ae_adds_credential_table.py | 8 +++++--- .../alembic/versions/7843803a87b5_store_updates.py | 3 ++- .../7d2162acc8b2_adds_updated_at_and_folder_cols.py | 7 +++---- .../eb5866d51fd2_change_columns_to_be_nullable.py | 12 ++++++++---- .../f5ee9749d1a6_user_id_can_be_null_in_flow.py | 10 +++++----- .../versions/fd531f8868b1_fix_credential_table.py | 6 ++++-- 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/backend/langflow/alembic/versions/006b3990db50_add_unique_constraints.py b/src/backend/langflow/alembic/versions/006b3990db50_add_unique_constraints.py index 692dc0413..dd3ccbe32 100644 --- a/src/backend/langflow/alembic/versions/006b3990db50_add_unique_constraints.py +++ b/src/backend/langflow/alembic/versions/006b3990db50_add_unique_constraints.py @@ -27,7 +27,8 @@ def upgrade() -> None: with op.batch_alter_table('user', schema=None) as batch_op: batch_op.create_unique_constraint('uq_user_id', ['id']) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### @@ -44,6 +45,7 @@ def downgrade() -> None: with op.batch_alter_table('apikey', schema=None) as batch_op: batch_op.drop_constraint('uq_apikey_id', type_='unique') - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### diff --git a/src/backend/langflow/alembic/versions/2ac71eb9c3ae_adds_credential_table.py b/src/backend/langflow/alembic/versions/2ac71eb9c3ae_adds_credential_table.py index 351b3d8f1..1ac3e1a13 100644 --- a/src/backend/langflow/alembic/versions/2ac71eb9c3ae_adds_credential_table.py +++ b/src/backend/langflow/alembic/versions/2ac71eb9c3ae_adds_credential_table.py @@ -29,9 +29,10 @@ def upgrade() -> None: sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), sa.Column('created_at', sa.DateTime(), nullable=False), sa.Column('updated_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('id', name=op.f('pk_credential')), + sa.PrimaryKeyConstraint('id'), ) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### @@ -40,6 +41,7 @@ def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### try: op.drop_table('credential') - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### diff --git a/src/backend/langflow/alembic/versions/7843803a87b5_store_updates.py b/src/backend/langflow/alembic/versions/7843803a87b5_store_updates.py index 54c418943..e0b844b61 100644 --- a/src/backend/langflow/alembic/versions/7843803a87b5_store_updates.py +++ b/src/backend/langflow/alembic/versions/7843803a87b5_store_updates.py @@ -45,6 +45,7 @@ def downgrade() -> None: with op.batch_alter_table("flow", schema=None) as batch_op: batch_op.drop_column("is_component") - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### diff --git a/src/backend/langflow/alembic/versions/7d2162acc8b2_adds_updated_at_and_folder_cols.py b/src/backend/langflow/alembic/versions/7d2162acc8b2_adds_updated_at_and_folder_cols.py index ddf8c67f2..01dd38cfd 100644 --- a/src/backend/langflow/alembic/versions/7d2162acc8b2_adds_updated_at_and_folder_cols.py +++ b/src/backend/langflow/alembic/versions/7d2162acc8b2_adds_updated_at_and_folder_cols.py @@ -37,7 +37,6 @@ def upgrade() -> None: with op.batch_alter_table('flow', schema=None) as batch_op: batch_op.add_column(sa.Column('updated_at', sa.DateTime(), nullable=True)) batch_op.add_column(sa.Column('folder', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - # ### end Alembic commands ### @@ -67,8 +66,8 @@ def downgrade() -> None: 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', name=op.f('pk_flowstyle')) - sa.UniqueConstraint('id', name=op.f('uq_flowstyle_id')) + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('id') ) op.create_table('component', sa.Column('id', sa.CHAR(length=32), nullable=False), @@ -81,7 +80,7 @@ def downgrade() -> None: 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', name=op.f('pk_component')) + sa.PrimaryKeyConstraint('id') ) with op.batch_alter_table('component', schema=None) as batch_op: diff --git a/src/backend/langflow/alembic/versions/eb5866d51fd2_change_columns_to_be_nullable.py b/src/backend/langflow/alembic/versions/eb5866d51fd2_change_columns_to_be_nullable.py index a92f3d7b2..59b94ecec 100644 --- a/src/backend/langflow/alembic/versions/eb5866d51fd2_change_columns_to_be_nullable.py +++ b/src/backend/langflow/alembic/versions/eb5866d51fd2_change_columns_to_be_nullable.py @@ -29,7 +29,8 @@ def upgrade() -> None: except exc.SQLAlchemyError: # connection.execute(text("ROLLBACK")) pass - except Exception: + except Exception as e: + print(e) pass try: @@ -37,7 +38,8 @@ def upgrade() -> None: except exc.SQLAlchemyError: # connection.execute(text("ROLLBACK")) pass - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### @@ -64,7 +66,8 @@ def downgrade() -> None: batch_op.create_index( "ix_component_frontend_node_id", ["frontend_node_id"], unique=False ) - except Exception: + except Exception as e: + print(e) pass try: @@ -81,6 +84,7 @@ def downgrade() -> None: sa.PrimaryKeyConstraint("id", name="pk_flowstyle"), sa.UniqueConstraint("id", name="uq_flowstyle_id"), ) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### diff --git a/src/backend/langflow/alembic/versions/f5ee9749d1a6_user_id_can_be_null_in_flow.py b/src/backend/langflow/alembic/versions/f5ee9749d1a6_user_id_can_be_null_in_flow.py index 60e19e69e..d9aab403f 100644 --- a/src/backend/langflow/alembic/versions/f5ee9749d1a6_user_id_can_be_null_in_flow.py +++ b/src/backend/langflow/alembic/versions/f5ee9749d1a6_user_id_can_be_null_in_flow.py @@ -7,10 +7,8 @@ Create Date: 2023-10-18 23:12:27.297016 """ from typing import Sequence, Union -from alembic import op import sqlalchemy as sa -import sqlmodel - +from alembic import op # revision identifiers, used by Alembic. revision: str = "f5ee9749d1a6" @@ -26,7 +24,8 @@ def upgrade() -> None: batch_op.alter_column( "user_id", existing_type=sa.CHAR(length=32), nullable=True ) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### @@ -39,7 +38,8 @@ def downgrade() -> None: batch_op.alter_column( "user_id", existing_type=sa.CHAR(length=32), nullable=False ) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### diff --git a/src/backend/langflow/alembic/versions/fd531f8868b1_fix_credential_table.py b/src/backend/langflow/alembic/versions/fd531f8868b1_fix_credential_table.py index db20f928b..2bcaacd68 100644 --- a/src/backend/langflow/alembic/versions/fd531f8868b1_fix_credential_table.py +++ b/src/backend/langflow/alembic/versions/fd531f8868b1_fix_credential_table.py @@ -21,7 +21,8 @@ def upgrade() -> None: try: with op.batch_alter_table('credential', schema=None) as batch_op: batch_op.create_foreign_key("fk_credential_user_id", 'user', ['user_id'], ['id']) - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### @@ -32,7 +33,8 @@ def downgrade() -> None: try: with op.batch_alter_table('credential', schema=None) as batch_op: batch_op.drop_constraint("fk_credential_user_id", type_='foreignkey') - except Exception: + except Exception as e: + print(e) pass # ### end Alembic commands ### From e4cbe9c85d79176acef50ec60b58e2637c5ee3dc Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 17 Jan 2024 07:08:38 -0300 Subject: [PATCH 2/2] Bump version to 0.6.5a7 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b2a04b277..f195bc032 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "0.6.5a6" +version = "0.6.5a7" description = "A Python package with a built-in web application" authors = ["Logspace "] maintainers = [