Merge branch 'main' into feat/mcp

api/controllers/console/app/app_import.py

@@ -17,6 +17,8 @@ from libs.login import login_required
 from models import Account
 from models.model import App
 from services.app_dsl_service import AppDslService, ImportStatus
+from services.enterprise.enterprise_service import EnterpriseService
+from services.feature_service import FeatureService
 
 
 class AppImportApi(Resource):
@@ -60,7 +62,9 @@ class AppImportApi(Resource):
                 app_id=args.get("app_id"),
             )
             session.commit()
-
+        if result.app_id and FeatureService.get_system_features().webapp_auth.enabled:
+            # update web app setting as private
+            EnterpriseService.WebAppAuth.update_app_access_mode(result.app_id, "private")
         # Return appropriate status code based on result
         status = result.status
         if status == ImportStatus.FAILED.value:

api/core/repositories/sqlalchemy_workflow_execution_repository.py

@@ -6,7 +6,7 @@ import json
 import logging
 from typing import Optional, Union
 
-from sqlalchemy import func, select
+from sqlalchemy import select
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
@@ -146,20 +146,7 @@ class SQLAlchemyWorkflowExecutionRepository(WorkflowExecutionRepository):
         db_model.workflow_id = domain_model.workflow_id
         db_model.triggered_from = self._triggered_from
 
-        # Check if this is a new record
-        with self._session_factory() as session:
-            existing = session.scalar(select(WorkflowRun).where(WorkflowRun.id == domain_model.id_))
-            if not existing:
-                # For new records, get the next sequence number
-                stmt = select(func.max(WorkflowRun.sequence_number)).where(
-                    WorkflowRun.app_id == self._app_id,
-                    WorkflowRun.tenant_id == self._tenant_id,
-                )
-                max_sequence = session.scalar(stmt)
-                db_model.sequence_number = (max_sequence or 0) + 1
-            else:
-                # For updates, keep the existing sequence number
-                db_model.sequence_number = existing.sequence_number
+        # No sequence number generation needed anymore
 
         db_model.type = domain_model.workflow_type
         db_model.version = domain_model.workflow_version

api/fields/workflow_run_fields.py

@@ -19,7 +19,6 @@ workflow_run_for_log_fields = {
 
 workflow_run_for_list_fields = {
     "id": fields.String,
-    "sequence_number": fields.Integer,
     "version": fields.String,
     "status": fields.String,
     "elapsed_time": fields.Float,
@@ -36,7 +35,6 @@ advanced_chat_workflow_run_for_list_fields = {
     "id": fields.String,
     "conversation_id": fields.String,
     "message_id": fields.String,
-    "sequence_number": fields.Integer,
     "version": fields.String,
     "status": fields.String,
     "elapsed_time": fields.Float,
@@ -63,7 +61,6 @@ workflow_run_pagination_fields = {
 
 workflow_run_detail_fields = {
     "id": fields.String,
-    "sequence_number": fields.Integer,
     "version": fields.String,
     "graph": fields.Raw(attribute="graph_dict"),
     "inputs": fields.Raw(attribute="inputs_dict"),

api/libs/sendgrid.py

@@ -35,7 +35,10 @@ class SendGridClient:
             logging.exception("SendGridClient Timeout occurred while sending email")
             raise
         except (UnauthorizedError, ForbiddenError) as e:
-            logging.exception("SendGridClient Authentication failed. Verify that your credentials and the 'from")
+            logging.exception(
+                "SendGridClient Authentication failed. "
+                "Verify that your credentials and the 'from' email address are correct"
+            )
             raise
         except Exception as e:
             logging.exception(f"SendGridClient Unexpected error occurred while sending email to {_to}")

api/migrations/versions/2025_06_19_1633-0ab65e1cc7fa_remove_sequence_number_from_workflow_.py

@@ -0,0 +1,66 @@
+"""remove sequence_number from workflow_runs
+
+Revision ID: 0ab65e1cc7fa
+Revises: 4474872b0ee6
+Create Date: 2025-06-19 16:33:13.377215
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0ab65e1cc7fa'
+down_revision = '4474872b0ee6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('workflow_runs', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('workflow_run_tenant_app_sequence_idx'))
+        batch_op.drop_column('sequence_number')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # WARNING: This downgrade CANNOT recover the original sequence_number values!
+    # The original sequence numbers are permanently lost after the upgrade.
+    # This downgrade will regenerate sequence numbers based on created_at order,
+    # which may result in different values than the original sequence numbers.
+    #
+    # If you need to preserve original sequence numbers, use the alternative
+    # migration approach that creates a backup table before removal.
+
+    # Step 1: Add sequence_number column as nullable first
+    with op.batch_alter_table('workflow_runs', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('sequence_number', sa.INTEGER(), autoincrement=False, nullable=True))
+
+    # Step 2: Populate sequence_number values based on created_at order within each app
+    # NOTE: This recreates sequence numbering logic but values will be different
+    # from the original sequence numbers that were removed in the upgrade
+    connection = op.get_bind()
+    connection.execute(sa.text("""
+        UPDATE workflow_runs
+        SET sequence_number = subquery.row_num
+        FROM (
+            SELECT id, ROW_NUMBER() OVER (
+                PARTITION BY tenant_id, app_id
+                ORDER BY created_at, id
+            ) as row_num
+            FROM workflow_runs
+        ) subquery
+        WHERE workflow_runs.id = subquery.id
+    """))
+
+    # Step 3: Make the column NOT NULL and add the index
+    with op.batch_alter_table('workflow_runs', schema=None) as batch_op:
+        batch_op.alter_column('sequence_number', nullable=False)
+        batch_op.create_index(batch_op.f('workflow_run_tenant_app_sequence_idx'), ['tenant_id', 'app_id', 'sequence_number'], unique=False)
+
+    # ### end Alembic commands ###

api/models/workflow.py

@@ -386,7 +386,7 @@ class WorkflowRun(Base):
     - id (uuid) Run ID
     - tenant_id (uuid) Workspace ID
     - app_id (uuid) App ID
-    - sequence_number (int) Auto-increment sequence number, incremented within the App, starting from 1
+
     - workflow_id (uuid) Workflow ID
     - type (string) Workflow type
     - triggered_from (string) Trigger source
@@ -419,13 +419,12 @@ class WorkflowRun(Base):
     __table_args__ = (
         db.PrimaryKeyConstraint("id", name="workflow_run_pkey"),
         db.Index("workflow_run_triggerd_from_idx", "tenant_id", "app_id", "triggered_from"),
-        db.Index("workflow_run_tenant_app_sequence_idx", "tenant_id", "app_id", "sequence_number"),
     )
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID)
     app_id: Mapped[str] = mapped_column(StringUUID)
-    sequence_number: Mapped[int] = mapped_column()
+
     workflow_id: Mapped[str] = mapped_column(StringUUID)
     type: Mapped[str] = mapped_column(db.String(255))
     triggered_from: Mapped[str] = mapped_column(db.String(255))
@@ -485,7 +484,6 @@ class WorkflowRun(Base):
             "id": self.id,
             "tenant_id": self.tenant_id,
             "app_id": self.app_id,
-            "sequence_number": self.sequence_number,
             "workflow_id": self.workflow_id,
             "type": self.type,
             "triggered_from": self.triggered_from,
@@ -511,7 +509,6 @@ class WorkflowRun(Base):
             id=data.get("id"),
             tenant_id=data.get("tenant_id"),
             app_id=data.get("app_id"),
-            sequence_number=data.get("sequence_number"),
             workflow_id=data.get("workflow_id"),
             type=data.get("type"),
             triggered_from=data.get("triggered_from"),

api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py

@@ -163,7 +163,6 @@ def real_workflow_run():
     workflow_run.tenant_id = "test-tenant-id"
     workflow_run.app_id = "test-app-id"
     workflow_run.workflow_id = "test-workflow-id"
-    workflow_run.sequence_number = 1
     workflow_run.type = "chat"
     workflow_run.triggered_from = "app-run"
     workflow_run.version = "1.0"