fix:ci test (#47)

longbingljw · web-flow · commit 24e84c7b567a · 2025-09-17T15:10:13.000+08:00
* fix

* fix

* fix

* fix

* fix

* fix
diff --git a/.github/workflows/vdb-tests.yml b/.github/workflows/vdb-tests.yml
@@ -84,7 +84,7 @@ jobs:
             chroma
             elasticsearch
             oceanbase
-
+          compose-flags: "--profile oceanbase --profile weaviate --profile qdrant --profile couchbase --profile milvus --profile pgvector --profile pgvecto-rs --profile chroma --profile elasticsearch"
       - name: setup test config
         run: |
           echo $(pwd)
diff --git a/api/controllers/console/app/wraps.py b/api/controllers/console/app/wraps.py
@@ -11,6 +11,8 @@
 
 def _load_app_model(app_id: str) -> Optional[App]:
     assert isinstance(current_user, Account)
+    if current_user is None:
+        return None
     app_model = (
         db.session.query(App)
         .where(App.id == app_id, App.tenant_id == current_user.current_tenant_id, App.status == "normal")
@@ -19,15 +21,6 @@ def _load_app_model(app_id: str) -> Optional[App]:
     return app_model
 
 
-def _load_app_model(app_id: str) -> Optional[App]:
-    app_model = (
-        db.session.query(App)
-        .filter(App.id == app_id, App.tenant_id == current_user.current_tenant_id, App.status == "normal")
-        .first()
-    )
-    return app_model
-
-
 def get_app_model(view: Optional[Callable] = None, *, mode: Union[AppMode, list[AppMode], None] = None):
     def decorator(view_func):
         @wraps(view_func)
diff --git a/api/core/entities/model_entities.py b/api/core/entities/model_entities.py
@@ -76,25 +76,6 @@ def raise_for_status(self) -> None:
         if self.status in error_messages:
             raise ValueError(error_messages[self.status])
 
-    def raise_for_status(self) -> None:
-        """
-        Check model status and raise ValueError if not active.
-
-        :raises ValueError: When model status is not active, with a descriptive message
-        """
-        if self.status == ModelStatus.ACTIVE:
-            return
-
-        error_messages = {
-            ModelStatus.NO_CONFIGURE: "Model is not configured",
-            ModelStatus.QUOTA_EXCEEDED: "Model quota has been exceeded",
-            ModelStatus.NO_PERMISSION: "No permission to use this model",
-            ModelStatus.DISABLED: "Model is disabled",
-        }
-
-        if self.status in error_messages:
-            raise ValueError(error_messages[self.status])
-
 
 class ModelWithProviderEntity(ProviderModelWithStatusEntity):
     """
diff --git a/api/core/rag/datasource/vdb/pgvector/pgvector.py b/api/core/rag/datasource/vdb/pgvector/pgvector.py
@@ -3,7 +3,7 @@
 import logging
 import uuid
 from contextlib import contextmanager
-from typing import Any
+from typing import Any, Optional
 
 import psycopg2.errors
 import psycopg2.extras  # type: ignore
@@ -68,6 +68,8 @@ def validate_config(cls, values: dict) -> dict:
 USING hnsw (embedding vector_cosine_ops) WITH (m = 16, ef_construction = 64);
 """
 
+SQL_CREATE_INDEX_PG_BIGM: Optional[str]
+
 if dify_config.SQLALCHEMY_DATABASE_URI_SCHEME == "postgresql":
     SQL_CREATE_INDEX_PG_BIGM = """
     CREATE INDEX IF NOT EXISTS bigm_idx_{index_hash} ON {table_name}
@@ -264,7 +266,7 @@ def _create_collection(self, dimension: int):
                 # ref: https://github.com/pgvector/pgvector?tab=readme-ov-file#indexing
                 if dimension <= 2000:
                     cur.execute(SQL_CREATE_INDEX.format(table_name=self.table_name, index_hash=self.index_hash))
-                if self.pg_bigm:
+                if self.pg_bigm and SQL_CREATE_INDEX_PG_BIGM is not None:
                     cur.execute(SQL_CREATE_INDEX_PG_BIGM.format(table_name=self.table_name, index_hash=self.index_hash))
             redis_client.set(collection_exist_cache_key, 1, ex=3600)
 
diff --git a/api/extensions/ext_migrate.py b/api/extensions/ext_migrate.py
@@ -10,6 +10,8 @@ def init_app(app: DifyApp):
     # Migration directory has to be mannually specified since mergeing 1.8.0, 
     # haven't found why yet
     if "mysql" in dify_config.SQLALCHEMY_DATABASE_URI_SCHEME:
-        directory="migrations-mysql"
+        directory = "migrations-mysql"
+    else:
+        directory = "migrations"
 
     flask_migrate.Migrate(app, db, directory=directory)
diff --git a/api/extensions/ext_redis.py b/api/extensions/ext_redis.py
@@ -43,12 +43,12 @@ class RedisClientWrapper:
                            if the client is not initialized.
     """
 
-    _client: Union[redis.Redis, RedisCluster, None]
+    _client: Union[redis.Redis, RedisCluster, Any, None]
 
     def __init__(self) -> None:
         self._client = None
 
-    def initialize(self, client: Union[redis.Redis, RedisCluster]) -> None:
+    def initialize(self, client: Union[redis.Redis, RedisCluster, Any]) -> None:
         if self._client is None:
             self._client = client
 
@@ -253,25 +253,6 @@ def _create_standalone_client(redis_params: dict[str, Any]) -> Union[redis.Redis
     return client
 
 
-def init_app(app: DifyApp):
-    """Initialize Redis client and attach it to the app."""
-    global redis_client
-
-    # Determine Redis mode and create appropriate client
-    if dify_config.REDIS_USE_SENTINEL:
-        redis_params = _get_base_redis_params()
-        client = _create_sentinel_client(redis_params)
-    elif dify_config.REDIS_USE_CLUSTERS:
-        client = _create_cluster_client()
-    else:
-        redis_params = _get_base_redis_params()
-        client = _create_standalone_client(redis_params)
-
-    # Initialize the wrapper and attach to app
-    redis_client.initialize(client)
-    app.extensions["redis"] = redis_client
-
-
 def redis_fallback(default_return: Optional[Any] = None):
     """
     decorator to handle Redis operation exceptions and return a default value when Redis is unavailable.
diff --git a/api/migrations-mysql/env.py b/api/migrations-mysql/env.py
@@ -10,7 +10,8 @@
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
-fileConfig(config.config_file_name)
+if config.config_file_name:
+    fileConfig(config.config_file_name)
 logger = logging.getLogger('alembic.env')
 
 
diff --git a/api/migrations-mysql/versions/15d91fcf3eb9_fix_table.py b/api/migrations-mysql/versions/15d91fcf3eb9_fix_table.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '15d91fcf3eb9'
-down_revision = '4ce39f688dc4'
-branch_labels = None
-depends_on = None
+down_revision: str | None = '4ce39f688dc4'
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
diff --git a/api/migrations-mysql/versions/37c2bb41f84a_update_mcp_servers_and_tools.py b/api/migrations-mysql/versions/37c2bb41f84a_update_mcp_servers_and_tools.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '37c2bb41f84a'
-down_revision = 'e0e5dc8aa037'
-branch_labels = None
-depends_on = None
+down_revision: str | None = 'e0e5dc8aa037'
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
@@ -73,7 +73,7 @@ def upgrade():
     sa.UniqueConstraint('app_id', 'node_id', 'name', name=op.f('workflow_draft_variables_app_id_key'))
     )
     with op.batch_alter_table('workflow_node_executions', schema=None) as batch_op:
-        batch_op.create_index(batch_op.f('workflow_node_executions_tenant_id_idx'), ['tenant_id', 'workflow_id', 'node_id', sa.literal_column('created_at DESC')], unique=False)
+        batch_op.create_index(batch_op.f('workflow_node_executions_tenant_id_idx'), ['tenant_id', 'workflow_id', 'node_id', 'created_at'], unique=False)
 
     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'))
diff --git a/api/migrations-mysql/versions/4ce39f688dc4_1_8_0.py b/api/migrations-mysql/versions/4ce39f688dc4_1_8_0.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '4ce39f688dc4'
-down_revision = '7aefe33a8deb'
-branch_labels = None
-depends_on = None
+down_revision: str | None = '7aefe33a8deb'
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
diff --git a/api/migrations-mysql/versions/7aefe33a8deb_upgrade_to_1_7_0.py b/api/migrations-mysql/versions/7aefe33a8deb_upgrade_to_1_7_0.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '7aefe33a8deb'
-down_revision = '37c2bb41f84a'
-branch_labels = None
-depends_on = None
+down_revision: str | None = '37c2bb41f84a'
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
diff --git a/api/migrations-mysql/versions/9adccf7ca328_init_mysql_versions.py b/api/migrations-mysql/versions/9adccf7ca328_init_mysql_versions.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '9adccf7ca328'
-down_revision = None
-branch_labels = None
-depends_on = None
+down_revision: str | None = None
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
diff --git a/api/migrations-mysql/versions/e0e5dc8aa037_update_more_text_fields_for_mysql_.py b/api/migrations-mysql/versions/e0e5dc8aa037_update_more_text_fields_for_mysql_.py
@@ -12,9 +12,9 @@
 
 # revision identifiers, used by Alembic.
 revision = 'e0e5dc8aa037'
-down_revision = '9adccf7ca328'
-branch_labels = None
-depends_on = None
+down_revision: str | None = '9adccf7ca328'
+branch_labels: str | None = None
+depends_on: str | None = None
 
 
 def upgrade():
diff --git a/api/models/model.py b/api/models/model.py
@@ -1677,7 +1677,7 @@ class MessageAgentThought(Base):
     message_unit_price = mapped_column(sa.Numeric, nullable=True)
     message_price_unit = mapped_column(sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001"))
     message_files = mapped_column(adjusted_text(), nullable=True)
-    answer = sa.Column(adjusted_text(), nullable=True)
+    answer: Mapped[str] = mapped_column(adjusted_text(), nullable=True)
     answer_token = mapped_column(sa.Integer, nullable=True)
     answer_unit_price = mapped_column(sa.Numeric, nullable=True)
     answer_price_unit = mapped_column(sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001"))
diff --git a/api/services/workflow_draft_variable_service.py b/api/services/workflow_draft_variable_service.py
@@ -4,11 +4,12 @@
 from enum import StrEnum
 from typing import Any, ClassVar
 
-from sqlalchemy import Engine, orm
+from sqlalchemy import Engine, func, orm
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.dialects.mysql import insert as mysql_insert
 from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy.sql.expression import and_, or_
+from typing import Union
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -443,6 +444,9 @@ def _batch_upsert_draft_variable(
 ) -> None:
     if not draft_vars:
         return None
+
+    # Declare stmt variable with Union type to handle both PostgreSQL and MySQL inserts
+    stmt: Union[insert, mysql_insert] = None  # type: ignore
     # Although we could use SQLAlchemy ORM operations here, we choose not to for several reasons:
     #
     # 1. The variable saving process involves writing multiple rows to the
@@ -486,27 +490,28 @@ def _batch_upsert_draft_variable(
         else:
             raise Exception("Invalid value for update policy.")
     elif dify_config.SQLALCHEMY_DATABASE_URI_SCHEME == "mysql+pymysql":
-        stmt = mysql_insert(WorkflowDraftVariable).values([_model_to_insertion_dict(v) for v in draft_vars])
+        mysql_stmt = mysql_insert(WorkflowDraftVariable).values([_model_to_insertion_dict(v) for v in draft_vars])
         if policy == _UpsertPolicy.OVERWRITE:
-            # Index_elements needn't to be specified in mysql dialect. Conflict was determined 
+            # Index_elements needn't to be specified in mysql dialect. Conflict was determined
             # by unique_key.
-            stmt = stmt.on_duplicate_key_update(
-                # 更新字段为“要插入的新值”
-                created_at=stmt.inserted.created_at,
-                updated_at=stmt.inserted.updated_at,
-                last_edited_at=stmt.inserted.last_edited_at,
-                description=stmt.inserted.description,
-                value_type=stmt.inserted.value_type,
-                value=stmt.inserted.value,
-                visible=stmt.inserted.visible,
-                editable=stmt.inserted.editable,
-                node_execution_id=stmt.inserted.node_execution_id,
+            mysql_stmt = mysql_stmt.on_duplicate_key_update(
+                # 更新字段为"要插入的新值"
+                created_at=func.now(),
+                updated_at=func.now(),
+                last_edited_at=func.now(),
+                description=func.values(WorkflowDraftVariable.__table__.c.description),
+                value_type=func.values(WorkflowDraftVariable.__table__.c.value_type),
+                value=func.values(WorkflowDraftVariable.__table__.c.value),
+                visible=func.values(WorkflowDraftVariable.__table__.c.visible),
+                editable=func.values(WorkflowDraftVariable.__table__.c.editable),
+                node_execution_id=func.values(WorkflowDraftVariable.__table__.c.node_execution_id),
             )
         elif policy == _UpsertPolicy.IGNORE:
             # MySQL: INSERT IGNORE（忽略冲突，不报错）
-            stmt = stmt.prefix_with("IGNORE")
+            mysql_stmt = mysql_stmt.prefix_with("IGNORE")
         else:
             raise Exception("Invalid value for update policy.")
+        stmt = mysql_stmt
     else:
         raise Exception(f"Invalid SQLALCHEMY_DATABASE_URI_SCHEME: {dify_config.SQLALCHEMY_DATABASE_URI_SCHEME}")
     session.execute(stmt)
diff --git a/api/tests/unit_tests/test_mysql_migration.py b/api/tests/unit_tests/test_mysql_migration.py
diff --git a/docker/docker-compose-redis.yaml b/docker/docker-compose-redis.yaml
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
