Refactor error page layout and fixes migration scripts (#1485)

This pull request introduces a comprehensive refactor of our
application's error page layout. The primary goal of these changes is to
enhance user experience during error states by providing clearer, more
helpful information and improving the overall aesthetics of the error
page.

Fixes #1274

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow"
-version = "0.6.8"
+version = "0.6.9"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <[email protected]>"]
 maintainers = [

src/backend/langflow/__main__.py

@@ -109,7 +109,11 @@ def version_callback(value: bool):
 @app.callback()
 def main_entry_point(
  version: bool = typer.Option(
- None, "--version", callback=version_callback, is_eager=True, help="Show the version and exit."
+ None,
+ "--version",
+ callback=version_callback,
+ is_eager=True,
+ help="Show the version and exit.",
  ),
 ):
  """

src/backend/langflow/alembic.ini

@@ -63,7 +63,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne
 # This is the path to the db in the root of the project.
 # When the user runs the Langflow the database url will
 # be set dinamically.
-sqlalchemy.url = sqlite:///../../../langflow.db
+sqlalchemy.url = sqlite:///./langflow.db
 
 
 [post_write_hooks]
@@ -98,7 +98,7 @@ handlers =
 qualname = sqlalchemy.engine
 
 [logger_alembic]
-level = INFO
+level = DEBUG
 handlers =
 qualname = alembic
 

src/backend/langflow/alembic/env.py

@@ -1,10 +1,11 @@
+import os
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
 from alembic import context
+from loguru import logger
+from sqlalchemy import engine_from_config, pool
 
+from langflow.services.database.models import * # noqa
 from langflow.services.database.service import SQLModel
 
 # this is the Alembic Config object, which provides
@@ -40,7 +41,8 @@ def run_migrations_offline() -> None:
  script output.
 
  """
- url = config.get_main_option("sqlalchemy.url")
+ url = os.getenv("LANGFLOW_DATABASE_URL")
+ url = url or config.get_main_option("sqlalchemy.url")
  context.configure(
  url=url,
  target_metadata=target_metadata,
@@ -60,12 +62,17 @@ def run_migrations_online() -> None:
  and associate a connection with the context.
 
  """
- connectable = engine_from_config(
- config.get_section(config.config_ini_section, {}),
- prefix="sqlalchemy.",
- poolclass=pool.NullPool,
- )
-
+ from langflow.services.deps import get_db_service
+
+ try:
+ connectable = get_db_service().engine
+ except Exception as e:
+ logger.error(f"Error getting database engine: {e}")
+ connectable = engine_from_config(
+ config.get_section(config.config_ini_section, {}),
+ prefix="sqlalchemy.",
+ poolclass=pool.NullPool,
+ )
  with connectable.connect() as connection:
  context.configure(
  connection=connection, target_metadata=target_metadata, render_as_batch=True

src/backend/langflow/alembic/script.py.mako

@@ -10,6 +10,7 @@ from typing import Sequence, Union
 from alembic import op
 import sqlalchemy as sa
 import sqlmodel
+from sqlalchemy.engine.reflection import Inspector
 ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
@@ -20,8 +21,12 @@ depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 
 
 def upgrade() -> None:
+ conn = op.get_bind()
+ inspector = Inspector.from_engine(conn) # type: ignore
  ${upgrades if upgrades else "pass"}
 
 
 def downgrade() -> None:
+ conn = op.get_bind()
+ inspector = Inspector.from_engine(conn) # type: ignore
  ${downgrades if downgrades else "pass"}

src/backend/langflow/alembic/versions/006b3990db50_add_unique_constraints.py

@@ -5,28 +5,43 @@
 Create Date: 2023-12-13 18:55:52.587360
 
 """
+
 from typing import Sequence, Union
 
 from alembic import op
+from sqlalchemy.engine.reflection import Inspector
 
 # revision identifiers, used by Alembic.
-revision: str = '006b3990db50'
-down_revision: Union[str, None] = '1ef9c4f3765d'
+revision: str = "006b3990db50"
+down_revision: Union[str, None] = "1ef9c4f3765d"
 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! ###
+ conn = op.get_bind()
+ inspector = Inspector.from_engine(conn) # type: ignore
+ api_key_constraints = inspector.get_unique_constraints("apikey")
+ flow_constraints = inspector.get_unique_constraints("flow")
+ user_constraints = inspector.get_unique_constraints("user")
  try:
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.create_unique_constraint('uq_apikey_id', ['id'])
-
- with op.batch_alter_table('flow', schema=None) as batch_op:
- batch_op.create_unique_constraint('uq_flow_id', ['id'])
+ if not any(
+ constraint["name"] == "uq_apikey_id" for constraint in api_key_constraints
+ ):
+ with op.batch_alter_table("apikey", schema=None) as batch_op:
 
- with op.batch_alter_table('user', schema=None) as batch_op:
- batch_op.create_unique_constraint('uq_user_id', ['id'])
+ batch_op.create_unique_constraint("uq_apikey_id", ["id"])
+ if not any(
+ constraint["name"] == "uq_flow_id" for constraint in flow_constraints
+ ):
+ with op.batch_alter_table("flow", schema=None) as batch_op:
+ batch_op.create_unique_constraint("uq_flow_id", ["id"])
+ if not any(
+ constraint["name"] == "uq_user_id" for constraint in user_constraints
+ ):
+ with op.batch_alter_table("user", schema=None) as batch_op:
+ batch_op.create_unique_constraint("uq_user_id", ["id"])
  except Exception as e:
  print(e)
  pass
@@ -36,15 +51,24 @@ def upgrade() -> None:
 
 def downgrade() -> None:
  # ### commands auto generated by Alembic - please adjust! ###
+ conn = op.get_bind()
+ inspector = Inspector.from_engine(conn) # type: ignore
+ api_key_constraints = inspector.get_unique_constraints("apikey")
+ flow_constraints = inspector.get_unique_constraints("flow")
+ user_constraints = inspector.get_unique_constraints("user")
  try:
- with op.batch_alter_table('user', schema=None) as batch_op:
- batch_op.drop_constraint('uq_user_id', type_='unique')
-
- with op.batch_alter_table('flow', schema=None) as batch_op:
- batch_op.drop_constraint('uq_flow_id', type_='unique')
+ if any(
+ constraint["name"] == "uq_apikey_id" for constraint in api_key_constraints
+ ):
+ with op.batch_alter_table("user", schema=None) as batch_op:
+ batch_op.drop_constraint("uq_user_id", type_="unique")
+ if any(constraint["name"] == "uq_flow_id" for constraint in flow_constraints):
+ with op.batch_alter_table("flow", schema=None) as batch_op:
+ batch_op.drop_constraint("uq_flow_id", type_="unique")
+ if any(constraint["name"] == "uq_user_id" for constraint in user_constraints):
 
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.drop_constraint('uq_apikey_id', type_='unique')
+  with op.batch_alter_table("apikey", schema=None) as batch_op:
+  batch_op.drop_constraint("uq_apikey_id", type_="unique")
  except Exception as e:
  print(e)
  pass

src/backend/langflow/alembic/versions/0b8757876a7c_.py

@@ -5,67 +5,25 @@
 Create Date: 2024-01-17 10:32:56.686287
 
 """
-from typing import Sequence, Union
 
-from alembic import op
+from typing import Sequence, Union
 
 # revision identifiers, used by Alembic.
-revision: str = '0b8757876a7c'
-down_revision: Union[str, None] = '006b3990db50'
+revision: str = "0b8757876a7c"
+down_revision: Union[str, None] = "006b3990db50"
 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! ###
- try:
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.create_index(batch_op.f('ix_apikey_api_key'), ['api_key'], unique=True)
- batch_op.create_index(batch_op.f('ix_apikey_name'), ['name'], unique=False)
- batch_op.create_index(batch_op.f('ix_apikey_user_id'), ['user_id'], unique=False)
- except Exception as e:
- print(e)
- pass
- try:
- with op.batch_alter_table('flow', schema=None) as batch_op:
- batch_op.create_index(batch_op.f('ix_flow_description'), ['description'], unique=False)
- batch_op.create_index(batch_op.f('ix_flow_name'), ['name'], unique=False)
- batch_op.create_index(batch_op.f('ix_flow_user_id'), ['user_id'], unique=False)
- except Exception as e:
- print(e)
- pass
+ pass
 
- try:
- with op.batch_alter_table('user', schema=None) as batch_op:
- batch_op.create_index(batch_op.f('ix_user_username'), ['username'], unique=True)
- except Exception as e:
- print(e)
- pass
  # ### end Alembic commands ###
 
 
 def downgrade() -> None:
  # ### commands auto generated by Alembic - please adjust! ###
- try:
- with op.batch_alter_table('user', schema=None) as batch_op:
- batch_op.drop_index(batch_op.f('ix_user_username'))
- except Exception as e:
- print(e)
- pass
- try:
- with op.batch_alter_table('flow', schema=None) as batch_op:
- batch_op.drop_index(batch_op.f('ix_flow_user_id'))
- batch_op.drop_index(batch_op.f('ix_flow_name'))
- batch_op.drop_index(batch_op.f('ix_flow_description'))
- except Exception as e:
- print(e)
- pass
- try:
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.drop_index(batch_op.f('ix_apikey_user_id'))
- batch_op.drop_index(batch_op.f('ix_apikey_name'))
- batch_op.drop_index(batch_op.f('ix_apikey_api_key'))
- except Exception as e:
- print(e)
- pass
- # ### end Alembic commands ###
+
+ pass
+ # ### end Alembic commands ###

src/backend/langflow/alembic/versions/1ef9c4f3765d_.py

@@ -6,26 +6,27 @@
 Create Date: 2023-12-04 15:00:27.968998
 
 """
+
 from typing import Sequence, Union
 
 import sqlalchemy as sa
 import sqlmodel
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = '1ef9c4f3765d'
-down_revision: Union[str, None] = 'fd531f8868b1'
+revision: str = "1ef9c4f3765d"
+down_revision: Union[str, None] = "fd531f8868b1"
 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! ###
  try:
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.alter_column('name',
- existing_type=sqlmodel.sql.sqltypes.AutoString(),
-  nullable=True)
+ with op.batch_alter_table("apikey", schema=None) as batch_op:
+ batch_op.alter_column(
+ "name", existing_type=sqlmodel.sql.sqltypes.AutoString(), nullable=True
+ )
  except Exception as e:
  pass
  # ### end Alembic commands ###
@@ -34,10 +35,8 @@ def upgrade() -> None:
 def downgrade() -> None:
  # ### commands auto generated by Alembic - please adjust! ###
  try:
- with op.batch_alter_table('apikey', schema=None) as batch_op:
- batch_op.alter_column('name',
- existing_type=sa.VARCHAR(),
- nullable=False)
+ with op.batch_alter_table("apikey", schema=None) as batch_op:
+ batch_op.alter_column("name", existing_type=sa.VARCHAR(), nullable=False)
  except Exception as e:
  pass
  # ### end Alembic commands ###

src/backend/langflow/alembic/versions/260dbcc8b680_adds_tables.py

@@ -5,6 +5,7 @@
 Create Date: 2023-08-27 19:49:02.681355
 
 """
+
 from typing import Sequence, Union
 
 import sqlalchemy as sa
@@ -33,7 +34,9 @@ def upgrade() -> None:
  if "ix_flowstyle_flow_id" in [
  index["name"] for index in inspector.get_indexes("flowstyle")
  ]:
- op.drop_index("ix_flowstyle_flow_id", table_name="flowstyle")
+ op.drop_index(
+ "ix_flowstyle_flow_id", table_name="flowstyle", if_exists=True
+ )
 
  existing_indices_flow = []
  existing_fks_flow = []
@@ -80,8 +83,7 @@ def upgrade() -> None:
  sa.Column("api_key", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
  sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False),
  sa.ForeignKeyConstraint(
- ["user_id"],
- ["user.id"],
+ ["user_id"], ["user.id"], name="fk_apikey_user_id_user"
  ),
  sa.PrimaryKeyConstraint("id", name="pk_apikey"),
  sa.UniqueConstraint("id", name="uq_apikey_id"),
@@ -103,8 +105,7 @@ def upgrade() -> None:
  sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False),
  sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False),
  sa.ForeignKeyConstraint(
- ["user_id"],
- ["user.id"],
+ ["user_id"], ["user.id"], name="fk_flow_user_id_user"
  ),
  sa.PrimaryKeyConstraint("id", name="pk_flow"),
  sa.UniqueConstraint("id", name="uq_flow_id"),
@@ -151,21 +152,21 @@ def downgrade() -> None:
  existing_tables = inspector.get_table_names()
  if "flow" in existing_tables:
  with op.batch_alter_table("flow", schema=None) as batch_op:
- batch_op.drop_index(batch_op.f("ix_flow_user_id"))
- batch_op.drop_index(batch_op.f("ix_flow_name"))
- batch_op.drop_index(batch_op.f("ix_flow_description"))
+ batch_op.drop_index(batch_op.f("ix_flow_user_id"), if_exists=True)
+ batch_op.drop_index(batch_op.f("ix_flow_name"), if_exists=True)
+ batch_op.drop_index(batch_op.f("ix_flow_description"), if_exists=True)
 
  op.drop_table("flow")
  if "apikey" in existing_tables:
  with op.batch_alter_table("apikey", schema=None) as batch_op:
- batch_op.drop_index(batch_op.f("ix_apikey_user_id"))
- batch_op.drop_index(batch_op.f("ix_apikey_name"))
- batch_op.drop_index(batch_op.f("ix_apikey_api_key"))
+ batch_op.drop_index(batch_op.f("ix_apikey_user_id"), if_exists=True)
+ batch_op.drop_index(batch_op.f("ix_apikey_name"), if_exists=True)
+ batch_op.drop_index(batch_op.f("ix_apikey_api_key"), if_exists=True)
 
  op.drop_table("apikey")
  if "user" in existing_tables:
  with op.batch_alter_table("user", schema=None) as batch_op:
- batch_op.drop_index(batch_op.f("ix_user_username"))
+ batch_op.drop_index(batch_op.f("ix_user_username"), if_exists=True)
 
  op.drop_table("user")