Merge branch 'main' into feat/mcp

api/migrations/versions/2024_10_10_0516-bbadea11becb_add_name_and_size_to_tool_files.py

@@ -5,45 +5,61 @@ Revises: 33f5fac87f29
 Create Date: 2024-10-10 05:16:14.764268
 
 """
-from alembic import op
-import models as models
+
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
+from alembic import op, context
 
 # revision identifiers, used by Alembic.
-revision = 'bbadea11becb'
-down_revision = 'd8e744d88ed6'
+revision = "bbadea11becb"
+down_revision = "d8e744d88ed6"
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
+    def _has_name_or_size_column() -> bool:
+        # We cannot access the database in offline mode, so assume
+        # the "name" and "size" columns do not exist.
+        if context.is_offline_mode():
+            # Log a warning message to inform the user that the database schema cannot be inspected
+            # in offline mode, and the generated SQL may not accurately reflect the actual execution.
+            op.execute(
+                "-- Executing in offline mode, assuming the name and size columns do not exist.\n"
+                "-- The generated SQL may differ from what will actually be executed.\n"
+                "-- Please review the migration script carefully!"
+            )
+
+            return False
+        # Use SQLAlchemy inspector to get the columns of the 'tool_files' table
+        inspector = sa.inspect(conn)
+        columns = [col["name"] for col in inspector.get_columns("tool_files")]
+
+        # If 'name' or 'size' columns already exist, exit the upgrade function
+        if "name" in columns or "size" in columns:
+            return True
+        return False
+
     # ### commands auto generated by Alembic - please adjust! ###
     # Get the database connection
     conn = op.get_bind()
 
-    # Use SQLAlchemy inspector to get the columns of the 'tool_files' table
-    inspector = sa.inspect(conn)
-    columns = [col['name'] for col in inspector.get_columns('tool_files')]
-
-    # If 'name' or 'size' columns already exist, exit the upgrade function
-    if 'name' in columns or 'size' in columns:
+    if _has_name_or_size_column():
         return
 
-    with op.batch_alter_table('tool_files', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('name', sa.String(), nullable=True))
-        batch_op.add_column(sa.Column('size', sa.Integer(), nullable=True))
+    with op.batch_alter_table("tool_files", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("name", sa.String(), nullable=True))
+        batch_op.add_column(sa.Column("size", sa.Integer(), nullable=True))
     op.execute("UPDATE tool_files SET name = '' WHERE name IS NULL")
     op.execute("UPDATE tool_files SET size = -1 WHERE size IS NULL")
-    with op.batch_alter_table('tool_files', schema=None) as batch_op:
-        batch_op.alter_column('name', existing_type=sa.String(), nullable=False)
-        batch_op.alter_column('size', existing_type=sa.Integer(), nullable=False)
+    with op.batch_alter_table("tool_files", schema=None) as batch_op:
+        batch_op.alter_column("name", existing_type=sa.String(), nullable=False)
+        batch_op.alter_column("size", existing_type=sa.Integer(), nullable=False)
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('tool_files', schema=None) as batch_op:
-        batch_op.drop_column('size')
-        batch_op.drop_column('name')
+    with op.batch_alter_table("tool_files", schema=None) as batch_op:
+        batch_op.drop_column("size")
+        batch_op.drop_column("name")
     # ### end Alembic commands ###

api/migrations/versions/2024_12_23_1154-d7999dfa4aae_remove_workflow_node_executions_retry_.py

@@ -5,28 +5,38 @@ Revises: e1944c35e15e
 Create Date: 2024-12-23 11:54:15.344543
 
 """
-from alembic import op
-import models as models
-import sqlalchemy as sa
+
+from alembic import op, context
 from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
-revision = 'd7999dfa4aae'
-down_revision = 'e1944c35e15e'
+revision = "d7999dfa4aae"
+down_revision = "e1944c35e15e"
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
-    # Check if column exists before attempting to remove it
-    conn = op.get_bind()
-    inspector = inspect(conn)
-    has_column = 'retry_index' in [col['name'] for col in inspector.get_columns('workflow_node_executions')]
+    def _has_retry_index_column() -> bool:
+        if context.is_offline_mode():
+            # Log a warning message to inform the user that the database schema cannot be inspected
+            # in offline mode, and the generated SQL may not accurately reflect the actual execution.
+            op.execute(
+                '-- Executing in offline mode: assuming the "retry_index" column does not exist.\n'
+                "-- The generated SQL may differ from what will actually be executed.\n"
+                "-- Please review the migration script carefully!"
+            )
+            return False
+        conn = op.get_bind()
+        inspector = inspect(conn)
+        return "retry_index" in [col["name"] for col in inspector.get_columns("workflow_node_executions")]
+
+    has_column = _has_retry_index_column()
 
     if has_column:
-        with op.batch_alter_table('workflow_node_executions', schema=None) as batch_op:
-            batch_op.drop_column('retry_index')
+        with op.batch_alter_table("workflow_node_executions", schema=None) as batch_op:
+            batch_op.drop_column("retry_index")
 
 
 def downgrade():

api/migrations/versions/2025_05_14_1403-d28f2004b072_add_index_for_workflow_conversation_.py

@@ -0,0 +1,33 @@
+"""add index for workflow_conversation_variables.conversation_id
+
+Revision ID: d28f2004b072
+Revises: 6a9f914f656c
+Create Date: 2025-05-14 14:03:36.713828
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd28f2004b072'
+down_revision = '6a9f914f656c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('workflow_conversation_variables', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('workflow_conversation_variables_conversation_id_idx'), ['conversation_id'], unique=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('workflow_conversation_variables', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('workflow_conversation_variables_conversation_id_idx'))
+
+    # ### end Alembic commands ###

api/migrations/versions/2025_05_15_1531-2adcbe1f5dfb_add_workflowdraftvariable_model.py

@@ -0,0 +1,51 @@
+"""add WorkflowDraftVariable model
+
+Revision ID: 2adcbe1f5dfb
+Revises: d28f2004b072
+Create Date: 2025-05-15 15:31:03.128680
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+import models as models
+
+# revision identifiers, used by Alembic.
+revision = "2adcbe1f5dfb"
+down_revision = "d28f2004b072"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "workflow_draft_variables",
+        sa.Column("id", models.types.StringUUID(), server_default=sa.text("uuid_generate_v4()"), nullable=False),
+        sa.Column("created_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("app_id", models.types.StringUUID(), nullable=False),
+        sa.Column("last_edited_at", sa.DateTime(), nullable=True),
+        sa.Column("node_id", sa.String(length=255), nullable=False),
+        sa.Column("name", sa.String(length=255), nullable=False),
+        sa.Column("description", sa.String(length=255), nullable=False),
+        sa.Column("selector", sa.String(length=255), nullable=False),
+        sa.Column("value_type", sa.String(length=20), nullable=False),
+        sa.Column("value", sa.Text(), nullable=False),
+        sa.Column("visible", sa.Boolean(), nullable=False),
+        sa.Column("editable", sa.Boolean(), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("workflow_draft_variables_pkey")),
+        sa.UniqueConstraint("app_id", "node_id", "name", name=op.f("workflow_draft_variables_app_id_key")),
+    )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # Dropping `workflow_draft_variables` also drops any index associated with it.
+    op.drop_table("workflow_draft_variables")
+
+    # ### end Alembic commands ###