db.String -> from sqlalchemy.types import String

api/models/account.py

@@ -2,7 +2,7 @@ import enum
 import json
 from datetime import datetime
 from typing import Optional, cast
-
+from sqlalchemy.types import String
 from flask_login import UserMixin  # type: ignore
 from sqlalchemy import func, select
 from sqlalchemy.orm import Mapped, mapped_column, reconstructor
@@ -86,20 +86,20 @@ class Account(UserMixin, Base):
     __table_args__ = (db.PrimaryKeyConstraint("id", name="account_pkey"), db.Index("account_email_idx", "email"))
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
-    name: Mapped[str] = mapped_column(db.String(255))
-    email: Mapped[str] = mapped_column(db.String(255))
-    password: Mapped[Optional[str]] = mapped_column(db.String(255))
-    password_salt: Mapped[Optional[str]] = mapped_column(db.String(255))
-    avatar: Mapped[Optional[str]] = mapped_column(db.String(255), nullable=True)
-    interface_language: Mapped[Optional[str]] = mapped_column(db.String(255))
-    interface_theme: Mapped[Optional[str]] = mapped_column(db.String(255), nullable=True)
-    timezone: Mapped[Optional[str]] = mapped_column(db.String(255))
+    name: Mapped[str] = mapped_column(String(255))
+    email: Mapped[str] = mapped_column(String(255))
+    password: Mapped[Optional[str]] = mapped_column(String(255))
+    password_salt: Mapped[Optional[str]] = mapped_column(String(255))
+    avatar: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
+    interface_language: Mapped[Optional[str]] = mapped_column(String(255))
+    interface_theme: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
+    timezone: Mapped[Optional[str]] = mapped_column(String(255))
     last_login_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime, nullable=True)
-    last_login_ip: Mapped[Optional[str]] = mapped_column(db.String(255), nullable=True)
+    last_login_ip: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
     last_active_at: Mapped[datetime] = mapped_column(
         db.DateTime, server_default=func.current_timestamp(), nullable=False
     )
-    status: Mapped[str] = mapped_column(db.String(16), server_default=db.text("'active'::character varying"))
+    status: Mapped[str] = mapped_column(String(16), server_default=db.text("'active'::character varying"))
     initialized_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime, nullable=True)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp(), nullable=False)
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp(), nullable=False)
@@ -200,10 +200,10 @@ class Tenant(Base):
     __table_args__ = (db.PrimaryKeyConstraint("id", name="tenant_pkey"),)
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
-    name: Mapped[str] = mapped_column(db.String(255))
+    name: Mapped[str] = mapped_column(String(255))
     encrypt_public_key = db.Column(db.Text)
-    plan: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'basic'::character varying"))
-    status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'normal'::character varying"))
+    plan: Mapped[str] = mapped_column(String(255), server_default=db.text("'basic'::character varying"))
+    status: Mapped[str] = mapped_column(String(255), server_default=db.text("'normal'::character varying"))
     custom_config: Mapped[Optional[str]] = mapped_column(db.Text)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp(), nullable=False)
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
@@ -237,7 +237,7 @@ class TenantAccountJoin(Base):
     tenant_id: Mapped[str] = mapped_column(StringUUID)
     account_id: Mapped[str] = mapped_column(StringUUID)
     current: Mapped[bool] = mapped_column(db.Boolean, server_default=db.text("false"))
-    role: Mapped[str] = mapped_column(db.String(16), server_default="normal")
+    role: Mapped[str] = mapped_column(String(16), server_default="normal")
     invited_by: Mapped[Optional[str]] = mapped_column(StringUUID)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
@@ -253,9 +253,9 @@ class AccountIntegrate(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     account_id: Mapped[str] = mapped_column(StringUUID)
-    provider: Mapped[str] = mapped_column(db.String(16))
-    open_id: Mapped[str] = mapped_column(db.String(255))
-    encrypted_token: Mapped[str] = mapped_column(db.String(255))
+    provider: Mapped[str] = mapped_column(String(16))
+    open_id: Mapped[str] = mapped_column(String(255))
+    encrypted_token: Mapped[str] = mapped_column(String(255))
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
 
@@ -269,9 +269,9 @@ class InvitationCode(Base):
     )
 
     id: Mapped[int] = mapped_column(db.Integer)
-    batch: Mapped[str] = mapped_column(db.String(255))
-    code: Mapped[str] = mapped_column(db.String(32))
-    status: Mapped[str] = mapped_column(db.String(16), server_default=db.text("'unused'::character varying"))
+    batch: Mapped[str] = mapped_column(String(255))
+    code: Mapped[str] = mapped_column(String(32))
+    status: Mapped[str] = mapped_column(String(16), server_default=db.text("'unused'::character varying"))
     used_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
     used_by_tenant_id: Mapped[Optional[str]] = mapped_column(StringUUID)
     used_by_account_id: Mapped[Optional[str]] = mapped_column(StringUUID)
@@ -298,10 +298,8 @@ class TenantPluginPermission(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    install_permission: Mapped[InstallPermission] = mapped_column(
-        db.String(16), nullable=False, server_default="everyone"
-    )
-    debug_permission: Mapped[DebugPermission] = mapped_column(db.String(16), nullable=False, server_default="noone")
+    install_permission: Mapped[InstallPermission] = mapped_column(String(16), nullable=False, server_default="everyone")
+    debug_permission: Mapped[DebugPermission] = mapped_column(String(16), nullable=False, server_default="noone")
 
 
 class TenantPluginAutoUpgradeStrategy(Base):
@@ -323,14 +321,10 @@ class TenantPluginAutoUpgradeStrategy(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    strategy_setting: Mapped[StrategySetting] = mapped_column(db.String(16), nullable=False, server_default="fix_only")
+    strategy_setting: Mapped[StrategySetting] = mapped_column(String(16), nullable=False, server_default="fix_only")
     upgrade_time_of_day: Mapped[int] = mapped_column(db.Integer, nullable=False, default=0)  # seconds of the day
-    upgrade_mode: Mapped[UpgradeMode] = mapped_column(db.String(16), nullable=False, server_default="exclude")
-    exclude_plugins: Mapped[list[str]] = mapped_column(
-        db.ARRAY(db.String(255)), nullable=False
-    )  # plugin_id (author/name)
-    include_plugins: Mapped[list[str]] = mapped_column(
-        db.ARRAY(db.String(255)), nullable=False
-    )  # plugin_id (author/name)
+    upgrade_mode: Mapped[UpgradeMode] = mapped_column(String(16), nullable=False, server_default="exclude")
+    exclude_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(String(255)), nullable=False)  # plugin_id (author/name)
+    include_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(String(255)), nullable=False)  # plugin_id (author/name)
     created_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())

api/models/api_based_extension.py

@@ -2,7 +2,7 @@ import enum
 
 from sqlalchemy import func
 from sqlalchemy.orm import mapped_column
-
+from sqlalchemy.types import String, Text, DateTime
 from .base import Base
 from .engine import db
 from .types import StringUUID
@@ -24,7 +24,7 @@ class APIBasedExtension(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
-    name = mapped_column(db.String(255), nullable=False)
-    api_endpoint = mapped_column(db.String(255), nullable=False)
-    api_key = mapped_column(db.Text, nullable=False)
-    created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
+    name = mapped_column(String(255), nullable=False)
+    api_endpoint = mapped_column(String(255), nullable=False)
+    api_key = mapped_column(Text, nullable=False)
+    created_at = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())

api/models/base.py

@@ -1,7 +1,15 @@
 from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.types import String
+from typing_extensions import Annotated
+
 
 from models.engine import metadata
 
+str50 = Annotated[str, 50]
+
 
 class Base(DeclarativeBase):
     metadata = metadata
+    type_annotation_map = {
+        str50: String(50),
+    }

api/models/dataset.py

@@ -15,7 +15,7 @@ from typing import Any, Optional, cast
 from sqlalchemy import func, select
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import Mapped, mapped_column
-
+from sqlalchemy.types import String
 from configs import dify_config
 from core.rag.index_processor.constant.built_in_field import BuiltInField, MetadataDataSource
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
@@ -48,19 +48,19 @@ class Dataset(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID)
-    name: Mapped[str] = mapped_column(db.String(255))
+    name: Mapped[str] = mapped_column(String(255))
     description = mapped_column(db.Text, nullable=True)
-    provider: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'vendor'::character varying"))
-    permission: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'only_me'::character varying"))
-    data_source_type = mapped_column(db.String(255))
-    indexing_technique: Mapped[Optional[str]] = mapped_column(db.String(255))
+    provider: Mapped[str] = mapped_column(String(255), server_default=db.text("'vendor'::character varying"))
+    permission: Mapped[str] = mapped_column(String(255), server_default=db.text("'only_me'::character varying"))
+    data_source_type = mapped_column(String(255))
+    indexing_technique: Mapped[Optional[str]] = mapped_column(String(255))
     index_struct = mapped_column(db.Text, nullable=True)
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_by = mapped_column(StringUUID, nullable=True)
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    embedding_model = db.Column(db.String(255), nullable=True)  # TODO: mapped_column
-    embedding_model_provider = db.Column(db.String(255), nullable=True)  # TODO: mapped_column
+    embedding_model = db.Column(String(255), nullable=True)  # TODO: mapped_column
+    embedding_model_provider = db.Column(String(255), nullable=True)  # TODO: mapped_column
     collection_binding_id = mapped_column(StringUUID, nullable=True)
     retrieval_model = mapped_column(JSONB, nullable=True)
     built_in_field_enabled = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
@@ -268,7 +268,7 @@ class DatasetProcessRule(Base):
 
     id = mapped_column(StringUUID, nullable=False, server_default=db.text("uuid_generate_v4()"))
     dataset_id = mapped_column(StringUUID, nullable=False)
-    mode = mapped_column(db.String(255), nullable=False, server_default=db.text("'automatic'::character varying"))
+    mode = mapped_column(String(255), nullable=False, server_default=db.text("'automatic'::character varying"))
     rules = mapped_column(db.Text, nullable=True)
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -314,12 +314,12 @@ class Document(Base):
     tenant_id = mapped_column(StringUUID, nullable=False)
     dataset_id = mapped_column(StringUUID, nullable=False)
     position = mapped_column(db.Integer, nullable=False)
-    data_source_type = mapped_column(db.String(255), nullable=False)
+    data_source_type = mapped_column(String(255), nullable=False)
     data_source_info = mapped_column(db.Text, nullable=True)
     dataset_process_rule_id = mapped_column(StringUUID, nullable=True)
-    batch = mapped_column(db.String(255), nullable=False)
-    name = mapped_column(db.String(255), nullable=False)
-    created_from = mapped_column(db.String(255), nullable=False)
+    batch = mapped_column(String(255), nullable=False)
+    name = mapped_column(String(255), nullable=False)
+    created_from = mapped_column(String(255), nullable=False)
     created_by = mapped_column(StringUUID, nullable=False)
     created_api_request_id = mapped_column(StringUUID, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -353,21 +353,19 @@ class Document(Base):
     stopped_at = mapped_column(db.DateTime, nullable=True)
 
     # basic fields
-    indexing_status = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'waiting'::character varying")
-    )
+    indexing_status = mapped_column(String(255), nullable=False, server_default=db.text("'waiting'::character varying"))
     enabled = mapped_column(db.Boolean, nullable=False, server_default=db.text("true"))
     disabled_at = mapped_column(db.DateTime, nullable=True)
     disabled_by = mapped_column(StringUUID, nullable=True)
     archived = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
-    archived_reason = mapped_column(db.String(255), nullable=True)
+    archived_reason = mapped_column(String(255), nullable=True)
     archived_by = mapped_column(StringUUID, nullable=True)
     archived_at = mapped_column(db.DateTime, nullable=True)
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    doc_type = mapped_column(db.String(40), nullable=True)
+    doc_type = mapped_column(String(40), nullable=True)
     doc_metadata = mapped_column(JSONB, nullable=True)
-    doc_form = mapped_column(db.String(255), nullable=False, server_default=db.text("'text_model'::character varying"))
-    doc_language = mapped_column(db.String(255), nullable=True)
+    doc_form = mapped_column(String(255), nullable=False, server_default=db.text("'text_model'::character varying"))
+    doc_language = mapped_column(String(255), nullable=True)
 
     DATA_SOURCES = ["upload_file", "notion_import", "website_crawl"]
 
@@ -667,15 +665,15 @@ class DocumentSegment(Base):
 
     # indexing fields
     keywords = mapped_column(db.JSON, nullable=True)
-    index_node_id = mapped_column(db.String(255), nullable=True)
-    index_node_hash = mapped_column(db.String(255), nullable=True)
+    index_node_id = mapped_column(String(255), nullable=True)
+    index_node_hash = mapped_column(String(255), nullable=True)
 
     # basic fields
     hit_count = mapped_column(db.Integer, nullable=False, default=0)
     enabled = mapped_column(db.Boolean, nullable=False, server_default=db.text("true"))
     disabled_at = mapped_column(db.DateTime, nullable=True)
     disabled_by = mapped_column(StringUUID, nullable=True)
-    status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'waiting'::character varying"))
+    status: Mapped[str] = mapped_column(String(255), server_default=db.text("'waiting'::character varying"))
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_by = mapped_column(StringUUID, nullable=True)
@@ -812,9 +810,9 @@ class ChildChunk(Base):
     content = mapped_column(db.Text, nullable=False)
     word_count = mapped_column(db.Integer, nullable=False)
     # indexing fields
-    index_node_id = mapped_column(db.String(255), nullable=True)
-    index_node_hash = mapped_column(db.String(255), nullable=True)
-    type = mapped_column(db.String(255), nullable=False, server_default=db.text("'automatic'::character varying"))
+    index_node_id = mapped_column(String(255), nullable=True)
+    index_node_hash = mapped_column(String(255), nullable=True)
+    type = mapped_column(String(255), nullable=False, server_default=db.text("'automatic'::character varying"))
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
     updated_by = mapped_column(StringUUID, nullable=True)
@@ -863,9 +861,9 @@ class DatasetQuery(Base):
     id = mapped_column(StringUUID, primary_key=True, nullable=False, server_default=db.text("uuid_generate_v4()"))
     dataset_id = mapped_column(StringUUID, nullable=False)
     content = mapped_column(db.Text, nullable=False)
-    source = mapped_column(db.String(255), nullable=False)
+    source = mapped_column(String(255), nullable=False)
     source_app_id = mapped_column(StringUUID, nullable=True)
-    created_by_role = mapped_column(db.String, nullable=False)
+    created_by_role = mapped_column(String, nullable=False)
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.func.current_timestamp())
 
@@ -881,7 +879,7 @@ class DatasetKeywordTable(Base):
     dataset_id = mapped_column(StringUUID, nullable=False, unique=True)
     keyword_table = mapped_column(db.Text, nullable=False)
     data_source_type = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'database'::character varying")
+        String(255), nullable=False, server_default=db.text("'database'::character varying")
     )
 
     @property
@@ -925,12 +923,12 @@ class Embedding(Base):
 
     id = mapped_column(StringUUID, primary_key=True, server_default=db.text("uuid_generate_v4()"))
     model_name = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'text-embedding-ada-002'::character varying")
+        String(255), nullable=False, server_default=db.text("'text-embedding-ada-002'::character varying")
     )
-    hash = mapped_column(db.String(64), nullable=False)
+    hash = mapped_column(String(64), nullable=False)
     embedding = mapped_column(db.LargeBinary, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    provider_name = mapped_column(db.String(255), nullable=False, server_default=db.text("''::character varying"))
+    provider_name = mapped_column(String(255), nullable=False, server_default=db.text("''::character varying"))
 
     def set_embedding(self, embedding_data: list[float]):
         self.embedding = pickle.dumps(embedding_data, protocol=pickle.HIGHEST_PROTOCOL)
@@ -947,10 +945,10 @@ class DatasetCollectionBinding(Base):
     )
 
     id = mapped_column(StringUUID, primary_key=True, server_default=db.text("uuid_generate_v4()"))
-    provider_name = mapped_column(db.String(255), nullable=False)
-    model_name = mapped_column(db.String(255), nullable=False)
-    type = mapped_column(db.String(40), server_default=db.text("'dataset'::character varying"), nullable=False)
-    collection_name = mapped_column(db.String(64), nullable=False)
+    provider_name = mapped_column(String(255), nullable=False)
+    model_name = mapped_column(String(255), nullable=False)
+    type = mapped_column(String(40), server_default=db.text("'dataset'::character varying"), nullable=False)
+    collection_name = mapped_column(String(64), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -965,12 +963,12 @@ class TidbAuthBinding(Base):
     )
     id = mapped_column(StringUUID, primary_key=True, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=True)
-    cluster_id = mapped_column(db.String(255), nullable=False)
-    cluster_name = mapped_column(db.String(255), nullable=False)
+    cluster_id = mapped_column(String(255), nullable=False)
+    cluster_name = mapped_column(String(255), nullable=False)
     active = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
-    status = mapped_column(db.String(255), nullable=False, server_default=db.text("CREATING"))
-    account = mapped_column(db.String(255), nullable=False)
-    password = mapped_column(db.String(255), nullable=False)
+    status = mapped_column(String(255), nullable=False, server_default=db.text("CREATING"))
+    account = mapped_column(String(255), nullable=False)
+    password = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -982,7 +980,7 @@ class Whitelist(Base):
     )
     id = mapped_column(StringUUID, primary_key=True, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=True)
-    category = mapped_column(db.String(255), nullable=False)
+    category = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -1012,8 +1010,8 @@ class ExternalKnowledgeApis(Base):
     )
 
     id = mapped_column(StringUUID, nullable=False, server_default=db.text("uuid_generate_v4()"))
-    name = mapped_column(db.String(255), nullable=False)
-    description = mapped_column(db.String(255), nullable=False)
+    name = mapped_column(String(255), nullable=False)
+    description = mapped_column(String(255), nullable=False)
     tenant_id = mapped_column(StringUUID, nullable=False)
     settings = mapped_column(db.Text, nullable=True)
     created_by = mapped_column(StringUUID, nullable=False)
@@ -1104,8 +1102,8 @@ class RateLimitLog(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
-    subscription_plan = mapped_column(db.String(255), nullable=False)
-    operation = mapped_column(db.String(255), nullable=False)
+    subscription_plan = mapped_column(String(255), nullable=False)
+    operation = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
 
 
@@ -1120,8 +1118,8 @@ class DatasetMetadata(Base):
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
     dataset_id = mapped_column(StringUUID, nullable=False)
-    type = mapped_column(db.String(255), nullable=False)
-    name = mapped_column(db.String(255), nullable=False)
+    type = mapped_column(String(255), nullable=False)
+    name = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
     created_by = mapped_column(StringUUID, nullable=False)

api/models/model.py

@@ -19,7 +19,7 @@ from flask import request
 from flask_login import UserMixin
 from sqlalchemy import Float, Index, PrimaryKeyConstraint, func, text
 from sqlalchemy.orm import Mapped, Session, mapped_column
-
+from sqlalchemy.types import String
 from configs import dify_config
 from constants import DEFAULT_FILE_NUMBER_LIMITS
 from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
@@ -40,7 +40,7 @@ class DifySetup(Base):
     __tablename__ = "dify_setups"
     __table_args__ = (db.PrimaryKeyConstraint("version", name="dify_setup_pkey"),)
 
-    version = mapped_column(db.String(255), nullable=False)
+    version = mapped_column(String(255), nullable=False)
     setup_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -76,15 +76,15 @@ class App(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID)
-    name: Mapped[str] = mapped_column(db.String(255))
+    name: Mapped[str] = mapped_column(String(255))
     description: Mapped[str] = mapped_column(db.Text, server_default=db.text("''::character varying"))
-    mode: Mapped[str] = mapped_column(db.String(255))
-    icon_type: Mapped[Optional[str]] = mapped_column(db.String(255))  # image, emoji
-    icon = db.Column(db.String(255))
-    icon_background: Mapped[Optional[str]] = mapped_column(db.String(255))
+    mode: Mapped[str] = mapped_column(String(255))
+    icon_type: Mapped[Optional[str]] = mapped_column(String(255))  # image, emoji
+    icon = db.Column(String(255))
+    icon_background: Mapped[Optional[str]] = mapped_column(String(255))
     app_model_config_id = mapped_column(StringUUID, nullable=True)
     workflow_id = mapped_column(StringUUID, nullable=True)
-    status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'normal'::character varying"))
+    status: Mapped[str] = mapped_column(String(255), server_default=db.text("'normal'::character varying"))
     enable_site: Mapped[bool] = mapped_column(db.Boolean)
     enable_api: Mapped[bool] = mapped_column(db.Boolean)
     api_rpm: Mapped[int] = mapped_column(db.Integer, server_default=db.text("0"))
@@ -309,8 +309,8 @@ class AppModelConfig(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
-    provider = mapped_column(db.String(255), nullable=True)
-    model_id = mapped_column(db.String(255), nullable=True)
+    provider = mapped_column(String(255), nullable=True)
+    model_id = mapped_column(String(255), nullable=True)
     configs = mapped_column(db.JSON, nullable=True)
     created_by = mapped_column(StringUUID, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -324,12 +324,12 @@ class AppModelConfig(Base):
     more_like_this = mapped_column(db.Text)
     model = mapped_column(db.Text)
     user_input_form = mapped_column(db.Text)
-    dataset_query_variable = mapped_column(db.String(255))
+    dataset_query_variable = mapped_column(String(255))
     pre_prompt = mapped_column(db.Text)
     agent_mode = mapped_column(db.Text)
     sensitive_word_avoidance = mapped_column(db.Text)
     retriever_resource = mapped_column(db.Text)
-    prompt_type = mapped_column(db.String(255), nullable=False, server_default=db.text("'simple'::character varying"))
+    prompt_type = mapped_column(String(255), nullable=False, server_default=db.text("'simple'::character varying"))
     chat_prompt_config = mapped_column(db.Text)
     completion_prompt_config = mapped_column(db.Text)
     dataset_configs = mapped_column(db.Text)
@@ -564,14 +564,14 @@ class RecommendedApp(Base):
     id = mapped_column(StringUUID, primary_key=True, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
     description = mapped_column(db.JSON, nullable=False)
-    copyright = mapped_column(db.String(255), nullable=False)
-    privacy_policy = mapped_column(db.String(255), nullable=False)
+    copyright = mapped_column(String(255), nullable=False)
+    privacy_policy = mapped_column(String(255), nullable=False)
     custom_disclaimer: Mapped[str] = mapped_column(sa.TEXT, default="")
-    category = mapped_column(db.String(255), nullable=False)
+    category = mapped_column(String(255), nullable=False)
     position = mapped_column(db.Integer, nullable=False, default=0)
     is_listed = mapped_column(db.Boolean, nullable=False, default=True)
     install_count = mapped_column(db.Integer, nullable=False, default=0)
-    language = mapped_column(db.String(255), nullable=False, server_default=db.text("'en-US'::character varying"))
+    language = mapped_column(String(255), nullable=False, server_default=db.text("'en-US'::character varying"))
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -620,26 +620,26 @@ class Conversation(Base):
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
     app_model_config_id = mapped_column(StringUUID, nullable=True)
-    model_provider = mapped_column(db.String(255), nullable=True)
+    model_provider = mapped_column(String(255), nullable=True)
     override_model_configs = mapped_column(db.Text)
-    model_id = mapped_column(db.String(255), nullable=True)
-    mode: Mapped[str] = mapped_column(db.String(255))
-    name = mapped_column(db.String(255), nullable=False)
+    model_id = mapped_column(String(255), nullable=True)
+    mode: Mapped[str] = mapped_column(String(255))
+    name = mapped_column(String(255), nullable=False)
     summary = mapped_column(db.Text)
     _inputs: Mapped[dict] = mapped_column("inputs", db.JSON)
     introduction = mapped_column(db.Text)
     system_instruction = mapped_column(db.Text)
     system_instruction_tokens = mapped_column(db.Integer, nullable=False, server_default=db.text("0"))
-    status = mapped_column(db.String(255), nullable=False)
+    status = mapped_column(String(255), nullable=False)
 
     # The `invoke_from` records how the conversation is created.
     #
     # Its value corresponds to the members of `InvokeFrom`.
     # (api/core/app/entities/app_invoke_entities.py)
-    invoke_from = mapped_column(db.String(255), nullable=True)
+    invoke_from = mapped_column(String(255), nullable=True)
 
     # ref: ConversationSource.
-    from_source = mapped_column(db.String(255), nullable=False)
+    from_source = mapped_column(String(255), nullable=False)
     from_end_user_id = mapped_column(StringUUID)
     from_account_id = mapped_column(StringUUID)
     read_at = mapped_column(db.DateTime)
@@ -897,8 +897,8 @@ class Message(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
-    model_provider = mapped_column(db.String(255), nullable=True)
-    model_id = mapped_column(db.String(255), nullable=True)
+    model_provider = mapped_column(String(255), nullable=True)
+    model_id = mapped_column(String(255), nullable=True)
     override_model_configs = mapped_column(db.Text)
     conversation_id = mapped_column(StringUUID, db.ForeignKey("conversations.id"), nullable=False)
     _inputs: Mapped[dict] = mapped_column("inputs", db.JSON)
@@ -914,12 +914,12 @@ class Message(Base):
     parent_message_id = mapped_column(StringUUID, nullable=True)
     provider_response_latency = mapped_column(db.Float, nullable=False, server_default=db.text("0"))
     total_price = mapped_column(db.Numeric(10, 7))
-    currency = mapped_column(db.String(255), nullable=False)
-    status = mapped_column(db.String(255), nullable=False, server_default=db.text("'normal'::character varying"))
+    currency = mapped_column(String(255), nullable=False)
+    status = mapped_column(String(255), nullable=False, server_default=db.text("'normal'::character varying"))
     error = mapped_column(db.Text)
     message_metadata = mapped_column(db.Text)
-    invoke_from: Mapped[Optional[str]] = mapped_column(db.String(255), nullable=True)
-    from_source = mapped_column(db.String(255), nullable=False)
+    invoke_from: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
+    from_source = mapped_column(String(255), nullable=False)
     from_end_user_id: Mapped[Optional[str]] = mapped_column(StringUUID)
     from_account_id: Mapped[Optional[str]] = mapped_column(StringUUID)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
@@ -1241,9 +1241,9 @@ class MessageFeedback(Base):
     app_id = mapped_column(StringUUID, nullable=False)
     conversation_id = mapped_column(StringUUID, nullable=False)
     message_id = mapped_column(StringUUID, nullable=False)
-    rating = mapped_column(db.String(255), nullable=False)
+    rating = mapped_column(String(255), nullable=False)
     content = mapped_column(db.Text)
-    from_source = mapped_column(db.String(255), nullable=False)
+    from_source = mapped_column(String(255), nullable=False)
     from_end_user_id = mapped_column(StringUUID)
     from_account_id = mapped_column(StringUUID)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -1301,12 +1301,12 @@ class MessageFile(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     message_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    type: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    transfer_method: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    type: Mapped[str] = mapped_column(String(255), nullable=False)
+    transfer_method: Mapped[str] = mapped_column(String(255), nullable=False)
     url: Mapped[Optional[str]] = mapped_column(db.Text, nullable=True)
-    belongs_to: Mapped[Optional[str]] = mapped_column(db.String(255), nullable=True)
+    belongs_to: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
     upload_file_id: Mapped[Optional[str]] = mapped_column(StringUUID, nullable=True)
-    created_by_role: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    created_by_role: Mapped[str] = mapped_column(String(255), nullable=False)
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -1418,10 +1418,10 @@ class OperationLog(Base):
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
     account_id = mapped_column(StringUUID, nullable=False)
-    action = mapped_column(db.String(255), nullable=False)
+    action = mapped_column(String(255), nullable=False)
     content = mapped_column(db.JSON)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    created_ip = mapped_column(db.String(255), nullable=False)
+    created_ip = mapped_column(String(255), nullable=False)
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -1436,9 +1436,9 @@ class EndUser(Base, UserMixin):
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     app_id = mapped_column(StringUUID, nullable=True)
-    type = mapped_column(db.String(255), nullable=False)
-    external_user_id = mapped_column(db.String(255), nullable=True)
-    name = mapped_column(db.String(255))
+    type = mapped_column(String(255), nullable=False)
+    external_user_id = mapped_column(String(255), nullable=True)
+    name = mapped_column(String(255))
     is_anonymous = mapped_column(db.Boolean, nullable=False, server_default=db.text("true"))
     session_id: Mapped[str] = mapped_column()
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -1455,10 +1455,10 @@ class AppMCPServer(Base):
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
     app_id = mapped_column(StringUUID, nullable=False)
-    name = mapped_column(db.String(255), nullable=False)
-    description = mapped_column(db.String(255), nullable=False)
-    server_code = mapped_column(db.String(255), nullable=False)
-    status = mapped_column(db.String(255), nullable=False, server_default=db.text("'normal'::character varying"))
+    name = mapped_column(String(255), nullable=False)
+    description = mapped_column(String(255), nullable=False)
+    server_code = mapped_column(String(255), nullable=False)
+    status = mapped_column(String(255), nullable=False, server_default=db.text("'normal'::character varying"))
     parameters = mapped_column(db.Text, nullable=False)
 
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -1488,28 +1488,28 @@ class Site(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
-    title = mapped_column(db.String(255), nullable=False)
-    icon_type = mapped_column(db.String(255), nullable=True)
-    icon = mapped_column(db.String(255))
-    icon_background = mapped_column(db.String(255))
+    title = mapped_column(String(255), nullable=False)
+    icon_type = mapped_column(String(255), nullable=True)
+    icon = mapped_column(String(255))
+    icon_background = mapped_column(String(255))
     description = mapped_column(db.Text)
-    default_language = mapped_column(db.String(255), nullable=False)
-    chat_color_theme = mapped_column(db.String(255))
+    default_language = mapped_column(String(255), nullable=False)
+    chat_color_theme = mapped_column(String(255))
     chat_color_theme_inverted = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
-    copyright = mapped_column(db.String(255))
-    privacy_policy = mapped_column(db.String(255))
+    copyright = mapped_column(String(255))
+    privacy_policy = mapped_column(String(255))
     show_workflow_steps = mapped_column(db.Boolean, nullable=False, server_default=db.text("true"))
     use_icon_as_answer_icon = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
     _custom_disclaimer: Mapped[str] = mapped_column("custom_disclaimer", sa.TEXT, default="")
-    customize_domain = mapped_column(db.String(255))
-    customize_token_strategy = mapped_column(db.String(255), nullable=False)
+    customize_domain = mapped_column(String(255))
+    customize_token_strategy = mapped_column(String(255), nullable=False)
     prompt_public = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
-    status = mapped_column(db.String(255), nullable=False, server_default=db.text("'normal'::character varying"))
+    status = mapped_column(String(255), nullable=False, server_default=db.text("'normal'::character varying"))
     created_by = mapped_column(StringUUID, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_by = mapped_column(StringUUID, nullable=True)
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    code = mapped_column(db.String(255))
+    code = mapped_column(String(255))
 
     @property
     def custom_disclaimer(self):
@@ -1547,8 +1547,8 @@ class ApiToken(Base):
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=True)
     tenant_id = mapped_column(StringUUID, nullable=True)
-    type = mapped_column(db.String(16), nullable=False)
-    token = mapped_column(db.String(255), nullable=False)
+    type = mapped_column(String(16), nullable=False)
+    token = mapped_column(String(255), nullable=False)
     last_used_at = mapped_column(db.DateTime, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -1570,21 +1570,21 @@ class UploadFile(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    storage_type: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    key: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    name: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    storage_type: Mapped[str] = mapped_column(String(255), nullable=False)
+    key: Mapped[str] = mapped_column(String(255), nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
     size: Mapped[int] = mapped_column(db.Integer, nullable=False)
-    extension: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    mime_type: Mapped[str] = mapped_column(db.String(255), nullable=True)
+    extension: Mapped[str] = mapped_column(String(255), nullable=False)
+    mime_type: Mapped[str] = mapped_column(String(255), nullable=True)
     created_by_role: Mapped[str] = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'account'::character varying")
+        String(255), nullable=False, server_default=db.text("'account'::character varying")
     )
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     used: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
     used_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
     used_at: Mapped[datetime | None] = mapped_column(db.DateTime, nullable=True)
-    hash: Mapped[str | None] = mapped_column(db.String(255), nullable=True)
+    hash: Mapped[str | None] = mapped_column(String(255), nullable=True)
     source_url: Mapped[str] = mapped_column(sa.TEXT, default="")
 
     def __init__(
@@ -1633,10 +1633,10 @@ class ApiRequest(Base):
     id = mapped_column(StringUUID, nullable=False, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
     api_token_id = mapped_column(StringUUID, nullable=False)
-    path = mapped_column(db.String(255), nullable=False)
+    path = mapped_column(String(255), nullable=False)
     request = mapped_column(db.Text, nullable=True)
     response = mapped_column(db.Text, nullable=True)
-    ip = mapped_column(db.String(255), nullable=False)
+    ip = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
@@ -1649,7 +1649,7 @@ class MessageChain(Base):
 
     id = mapped_column(StringUUID, nullable=False, server_default=db.text("uuid_generate_v4()"))
     message_id = mapped_column(StringUUID, nullable=False)
-    type = mapped_column(db.String(255), nullable=False)
+    type = mapped_column(String(255), nullable=False)
     input = mapped_column(db.Text, nullable=True)
     output = mapped_column(db.Text, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.func.current_timestamp())
@@ -1686,9 +1686,9 @@ class MessageAgentThought(Base):
     answer_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
     tokens = mapped_column(db.Integer, nullable=True)
     total_price = mapped_column(db.Numeric, nullable=True)
-    currency = mapped_column(db.String, nullable=True)
+    currency = mapped_column(String, nullable=True)
     latency = mapped_column(db.Float, nullable=True)
-    created_by_role = mapped_column(db.String, nullable=False)
+    created_by_role = mapped_column(String, nullable=False)
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.func.current_timestamp())
 
@@ -1808,8 +1808,8 @@ class Tag(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=True)
-    type = mapped_column(db.String(16), nullable=False)
-    name = mapped_column(db.String(255), nullable=False)
+    type = mapped_column(String(16), nullable=False)
+    name = mapped_column(String(255), nullable=False)
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -1839,7 +1839,7 @@ class TraceAppConfig(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     app_id = mapped_column(StringUUID, nullable=False)
-    tracing_provider = mapped_column(db.String(255), nullable=True)
+    tracing_provider = mapped_column(String(255), nullable=True)
     tracing_config = mapped_column(db.JSON, nullable=True)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = mapped_column(

api/models/provider.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from sqlalchemy import func, text
 from sqlalchemy.orm import Mapped, mapped_column
-
+from sqlalchemy.types import String
 from .base import Base
 from .engine import db
 from .types import StringUUID
@@ -56,16 +56,16 @@ class Provider(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
     provider_type: Mapped[str] = mapped_column(
-        db.String(40), nullable=False, server_default=text("'custom'::character varying")
+        String(40), nullable=False, server_default=text("'custom'::character varying")
     )
     encrypted_config: Mapped[Optional[str]] = mapped_column(db.Text, nullable=True)
     is_valid: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=text("false"))
     last_used: Mapped[Optional[datetime]] = mapped_column(db.DateTime, nullable=True)
 
     quota_type: Mapped[Optional[str]] = mapped_column(
-        db.String(40), nullable=True, server_default=text("''::character varying")
+        String(40), nullable=True, server_default=text("''::character varying")
     )
     quota_limit: Mapped[Optional[int]] = mapped_column(db.BigInteger, nullable=True)
     quota_used: Mapped[Optional[int]] = mapped_column(db.BigInteger, default=0)
@@ -113,9 +113,9 @@ class ProviderModel(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_type: Mapped[str] = mapped_column(String(40), nullable=False)
     encrypted_config: Mapped[Optional[str]] = mapped_column(db.Text, nullable=True)
     is_valid: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=text("false"))
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -131,9 +131,9 @@ class TenantDefaultModel(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_type: Mapped[str] = mapped_column(String(40), nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -147,8 +147,8 @@ class TenantPreferredModelProvider(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    preferred_provider_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    preferred_provider_type: Mapped[str] = mapped_column(String(40), nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -162,16 +162,16 @@ class ProviderOrder(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
     account_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    payment_product_id: Mapped[str] = mapped_column(db.String(191), nullable=False)
-    payment_id: Mapped[Optional[str]] = mapped_column(db.String(191))
-    transaction_id: Mapped[Optional[str]] = mapped_column(db.String(191))
+    payment_product_id: Mapped[str] = mapped_column(String(191), nullable=False)
+    payment_id: Mapped[Optional[str]] = mapped_column(String(191))
+    transaction_id: Mapped[Optional[str]] = mapped_column(String(191))
     quantity: Mapped[int] = mapped_column(db.Integer, nullable=False, server_default=text("1"))
-    currency: Mapped[Optional[str]] = mapped_column(db.String(40))
+    currency: Mapped[Optional[str]] = mapped_column(String(40))
     total_amount: Mapped[Optional[int]] = mapped_column(db.Integer)
     payment_status: Mapped[str] = mapped_column(
-        db.String(40), nullable=False, server_default=text("'wait_pay'::character varying")
+        String(40), nullable=False, server_default=text("'wait_pay'::character varying")
     )
     paid_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
     pay_failed_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
@@ -193,9 +193,9 @@ class ProviderModelSetting(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_type: Mapped[str] = mapped_column(String(40), nullable=False)
     enabled: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=text("true"))
     load_balancing_enabled: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=text("false"))
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -215,10 +215,10 @@ class LoadBalancingModelConfig(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    provider_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_name: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    model_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
-    name: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    model_type: Mapped[str] = mapped_column(String(40), nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
     encrypted_config: Mapped[Optional[str]] = mapped_column(db.Text, nullable=True)
     enabled: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=text("true"))
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())

api/models/source.py

@@ -3,7 +3,7 @@ import json
 from sqlalchemy import func
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import mapped_column
-
+from sqlalchemy.types import String
 from models.base import Base
 
 from .engine import db
@@ -20,8 +20,8 @@ class DataSourceOauthBinding(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
-    access_token = mapped_column(db.String(255), nullable=False)
-    provider = mapped_column(db.String(255), nullable=False)
+    access_token = mapped_column(String(255), nullable=False)
+    provider = mapped_column(String(255), nullable=False)
     source_info = mapped_column(JSONB, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -38,8 +38,8 @@ class DataSourceApiKeyAuthBinding(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id = mapped_column(StringUUID, nullable=False)
-    category = mapped_column(db.String(255), nullable=False)
-    provider = mapped_column(db.String(255), nullable=False)
+    category = mapped_column(String(255), nullable=False)
+    provider = mapped_column(String(255), nullable=False)
     credentials = mapped_column(db.Text, nullable=True)  # JSON
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())

api/models/task.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 from celery import states  # type: ignore
 from sqlalchemy.orm import Mapped, mapped_column
-
+from sqlalchemy.types import String
 from libs.datetime_utils import naive_utc_now
 from models.base import Base
 
@@ -16,8 +16,8 @@ class CeleryTask(Base):
     __tablename__ = "celery_taskmeta"
 
     id = mapped_column(db.Integer, db.Sequence("task_id_sequence"), primary_key=True, autoincrement=True)
-    task_id = mapped_column(db.String(155), unique=True)
-    status = mapped_column(db.String(50), default=states.PENDING)
+    task_id = mapped_column(String(155), unique=True)
+    status = mapped_column(String(50), default=states.PENDING)
     result = mapped_column(db.PickleType, nullable=True)
     date_done = mapped_column(
         db.DateTime,
@@ -26,12 +26,12 @@ class CeleryTask(Base):
         nullable=True,
     )
     traceback = mapped_column(db.Text, nullable=True)
-    name = mapped_column(db.String(155), nullable=True)
+    name = mapped_column(String(155), nullable=True)
     args = mapped_column(db.LargeBinary, nullable=True)
     kwargs = mapped_column(db.LargeBinary, nullable=True)
-    worker = mapped_column(db.String(155), nullable=True)
+    worker = mapped_column(String(155), nullable=True)
     retries = mapped_column(db.Integer, nullable=True)
-    queue = mapped_column(db.String(155), nullable=True)
+    queue = mapped_column(String(155), nullable=True)
 
 
 class CeleryTaskSet(Base):
@@ -42,6 +42,6 @@ class CeleryTaskSet(Base):
     id: Mapped[int] = mapped_column(
         db.Integer, db.Sequence("taskset_id_sequence"), autoincrement=True, primary_key=True
     )
-    taskset_id = mapped_column(db.String(155), unique=True)
+    taskset_id = mapped_column(String(155), unique=True)
     result = mapped_column(db.PickleType, nullable=True)
     date_done: Mapped[Optional[datetime]] = mapped_column(db.DateTime, default=lambda: naive_utc_now(), nullable=True)

api/models/tools.py

@@ -2,6 +2,7 @@ import json
 from datetime import datetime
 from typing import Any, cast
 from urllib.parse import urlparse
+from sqlalchemy.types import String
 
 import sqlalchemy as sa
 from deprecated import deprecated
@@ -30,8 +31,8 @@ class ToolOAuthSystemClient(Base):
     )
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
-    plugin_id: Mapped[str] = mapped_column(db.String(512), nullable=False)
-    provider: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    plugin_id = mapped_column(String(512), nullable=False)
+    provider: Mapped[str] = mapped_column(String(255), nullable=False)
     # oauth params of the tool provider
     encrypted_oauth_params: Mapped[str] = mapped_column(db.Text, nullable=False)
 
@@ -47,8 +48,8 @@ class ToolOAuthTenantClient(Base):
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     # tenant id
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    plugin_id: Mapped[str] = mapped_column(db.String(512), nullable=False)
-    provider: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    plugin_id: Mapped[str] = mapped_column(String(512), nullable=False)
+    provider: Mapped[str] = mapped_column(String(255), nullable=False)
     enabled: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=db.text("true"))
     # oauth params of the tool provider
     encrypted_oauth_params: Mapped[str] = mapped_column(db.Text, nullable=False)
@@ -72,14 +73,14 @@ class BuiltinToolProvider(Base):
     # id of the tool provider
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     name: Mapped[str] = mapped_column(
-        db.String(256), nullable=False, server_default=db.text("'API KEY 1'::character varying")
+        String(256), nullable=False, server_default=db.text("'API KEY 1'::character varying")
     )
     # id of the tenant
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=True)
     # who created this tool provider
     user_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     # name of the tool provider
-    provider: Mapped[str] = mapped_column(db.String(256), nullable=False)
+    provider: Mapped[str] = mapped_column(String(256), nullable=False)
     # credential of the tool provider
     encrypted_credentials: Mapped[str] = mapped_column(db.Text, nullable=True)
     created_at: Mapped[datetime] = mapped_column(
@@ -91,7 +92,7 @@ class BuiltinToolProvider(Base):
     is_default: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
     # credential type, e.g., "api-key", "oauth2"
     credential_type: Mapped[str] = mapped_column(
-        db.String(32), nullable=False, server_default=db.text("'api-key'::character varying")
+        String(32), nullable=False, server_default=db.text("'api-key'::character varying")
     )
     expires_at: Mapped[int] = mapped_column(db.BigInteger, nullable=False, server_default=db.text("-1"))
 
@@ -113,12 +114,12 @@ class ApiToolProvider(Base):
 
     id = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     # name of the api provider
-    name = mapped_column(db.String(255), nullable=False, server_default=db.text("'API KEY 1'::character varying"))
+    name = mapped_column(String(255), nullable=False, server_default=db.text("'API KEY 1'::character varying"))
     # icon
-    icon = mapped_column(db.String(255), nullable=False)
+    icon = mapped_column(String(255), nullable=False)
     # original schema
     schema = mapped_column(db.Text, nullable=False)
-    schema_type_str: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    schema_type_str: Mapped[str] = mapped_column(String(40), nullable=False)
     # who created this tool
     user_id = mapped_column(StringUUID, nullable=False)
     # tenant id
@@ -130,7 +131,7 @@ class ApiToolProvider(Base):
     # json format credentials
     credentials_str = mapped_column(db.Text, nullable=False)
     # privacy policy
-    privacy_policy = mapped_column(db.String(255), nullable=True)
+    privacy_policy = mapped_column(String(255), nullable=True)
     # custom_disclaimer
     custom_disclaimer: Mapped[str] = mapped_column(sa.TEXT, default="")
 
@@ -173,11 +174,11 @@ class ToolLabelBinding(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     # tool id
-    tool_id: Mapped[str] = mapped_column(db.String(64), nullable=False)
+    tool_id: Mapped[str] = mapped_column(String(64), nullable=False)
     # tool type
-    tool_type: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    tool_type: Mapped[str] = mapped_column(String(40), nullable=False)
     # label name
-    label_name: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    label_name: Mapped[str] = mapped_column(String(40), nullable=False)
 
 
 class WorkflowToolProvider(Base):
@@ -194,15 +195,15 @@ class WorkflowToolProvider(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     # name of the workflow provider
-    name: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
     # label of the workflow provider
-    label: Mapped[str] = mapped_column(db.String(255), nullable=False, server_default="")
+    label: Mapped[str] = mapped_column(String(255), nullable=False, server_default="")
     # icon
-    icon: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    icon: Mapped[str] = mapped_column(String(255), nullable=False)
     # app id of the workflow provider
     app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     # version of the workflow provider
-    version: Mapped[str] = mapped_column(db.String(255), nullable=False, server_default="")
+    version: Mapped[str] = mapped_column(String(255), nullable=False, server_default="")
     # who created this tool
     user_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     # tenant id
@@ -212,7 +213,7 @@ class WorkflowToolProvider(Base):
     # parameter configuration
     parameter_configuration: Mapped[str] = mapped_column(db.Text, nullable=False, server_default="[]")
     # privacy policy
-    privacy_policy: Mapped[str] = mapped_column(db.String(255), nullable=True, server_default="")
+    privacy_policy: Mapped[str] = mapped_column(String(255), nullable=True, server_default="")
 
     created_at: Mapped[datetime] = mapped_column(
         db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)")
@@ -253,15 +254,15 @@ class MCPToolProvider(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     # name of the mcp provider
-    name: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    name: Mapped[str] = mapped_column(String(40), nullable=False)
     # server identifier of the mcp provider
-    server_identifier: Mapped[str] = mapped_column(db.String(64), nullable=False)
+    server_identifier: Mapped[str] = mapped_column(String(64), nullable=False)
     # encrypted url of the mcp provider
     server_url: Mapped[str] = mapped_column(db.Text, nullable=False)
     # hash of server_url for uniqueness check
-    server_url_hash: Mapped[str] = mapped_column(db.String(64), nullable=False)
+    server_url_hash: Mapped[str] = mapped_column(String(64), nullable=False)
     # icon of the mcp provider
-    icon: Mapped[str] = mapped_column(db.String(255), nullable=True)
+    icon: Mapped[str] = mapped_column(String(255), nullable=True)
     # tenant id
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     # who created this tool
@@ -355,11 +356,11 @@ class ToolModelInvoke(Base):
     # tenant id
     tenant_id = mapped_column(StringUUID, nullable=False)
     # provider
-    provider = mapped_column(db.String(255), nullable=False)
+    provider = mapped_column(String(255), nullable=False)
     # type
-    tool_type = mapped_column(db.String(40), nullable=False)
+    tool_type = mapped_column(String(40), nullable=False)
     # tool name
-    tool_name = mapped_column(db.String(128), nullable=False)
+    tool_name = mapped_column(String(128), nullable=False)
     # invoke parameters
     model_parameters = mapped_column(db.Text, nullable=False)
     # prompt messages
@@ -373,7 +374,7 @@ class ToolModelInvoke(Base):
     answer_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
     provider_response_latency = mapped_column(db.Float, nullable=False, server_default=db.text("0"))
     total_price = mapped_column(db.Numeric(10, 7))
-    currency = mapped_column(db.String(255), nullable=False)
+    currency = mapped_column(String(255), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
@@ -429,11 +430,11 @@ class ToolFile(Base):
     # conversation id
     conversation_id: Mapped[str] = mapped_column(StringUUID, nullable=True)
     # file key
-    file_key: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    file_key: Mapped[str] = mapped_column(String(255), nullable=False)
     # mime type
-    mimetype: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    mimetype: Mapped[str] = mapped_column(String(255), nullable=False)
     # original url
-    original_url: Mapped[str] = mapped_column(db.String(2048), nullable=True)
+    original_url: Mapped[str] = mapped_column(String(2048), nullable=True)
     # name
     name: Mapped[str] = mapped_column(default="")
     # size
@@ -465,11 +466,11 @@ class DeprecatedPublishedAppTool(Base):
     # to describe this parameter to llm, we need this field
     query_description = mapped_column(db.Text, nullable=False)
     # query name, the name of the query parameter
-    query_name = mapped_column(db.String(40), nullable=False)
+    query_name = mapped_column(String(40), nullable=False)
     # name of the tool provider
-    tool_name = mapped_column(db.String(40), nullable=False)
+    tool_name = mapped_column(String(40), nullable=False)
     # author
-    author = mapped_column(db.String(40), nullable=False)
+    author = mapped_column(String(40), nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
 

api/models/web.py

@@ -2,6 +2,7 @@ from sqlalchemy import func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from models.base import Base
+from sqlalchemy.types import String
 
 from .engine import db
 from .model import Message
@@ -19,7 +20,7 @@ class SavedMessage(Base):
     app_id = mapped_column(StringUUID, nullable=False)
     message_id = mapped_column(StringUUID, nullable=False)
     created_by_role = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'end_user'::character varying")
+        String(255), nullable=False, server_default=db.text("'end_user'::character varying")
     )
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
@@ -40,7 +41,7 @@ class PinnedConversation(Base):
     app_id = mapped_column(StringUUID, nullable=False)
     conversation_id: Mapped[str] = mapped_column(StringUUID)
     created_by_role = mapped_column(
-        db.String(255), nullable=False, server_default=db.text("'end_user'::character varying")
+        String(255), nullable=False, server_default=db.text("'end_user'::character varying")
     )
     created_by = mapped_column(StringUUID, nullable=False)
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())

api/models/workflow.py

@@ -27,7 +27,7 @@ if TYPE_CHECKING:
 import sqlalchemy as sa
 from sqlalchemy import Index, PrimaryKeyConstraint, UniqueConstraint, func
 from sqlalchemy.orm import Mapped, declared_attr, mapped_column
-
+from sqlalchemy.types import String
 from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE
 from core.helper import encrypter
 from core.variables import SecretVariable, Segment, SegmentType, Variable
@@ -127,8 +127,8 @@ class Workflow(Base):
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    type: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    version: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    type: Mapped[str] = mapped_column(String(255), nullable=False)
+    version: Mapped[str] = mapped_column(String(255), nullable=False)
     marked_name: Mapped[str] = mapped_column(default="", server_default="")
     marked_comment: Mapped[str] = mapped_column(default="", server_default="")
     graph: Mapped[str] = mapped_column(sa.Text)
@@ -503,18 +503,18 @@ class WorkflowRun(Base):
     app_id: Mapped[str] = mapped_column(StringUUID)
 
     workflow_id: Mapped[str] = mapped_column(StringUUID)
-    type: Mapped[str] = mapped_column(db.String(255))
-    triggered_from: Mapped[str] = mapped_column(db.String(255))
-    version: Mapped[str] = mapped_column(db.String(255))
+    type: Mapped[str] = mapped_column(String(255))
+    triggered_from: Mapped[str] = mapped_column(String(255))
+    version: Mapped[str] = mapped_column(String(255))
     graph: Mapped[Optional[str]] = mapped_column(db.Text)
     inputs: Mapped[Optional[str]] = mapped_column(db.Text)
-    status: Mapped[str] = mapped_column(db.String(255))  # running, succeeded, failed, stopped, partial-succeeded
+    status: Mapped[str] = mapped_column(String(255))  # running, succeeded, failed, stopped, partial-succeeded
     outputs: Mapped[Optional[str]] = mapped_column(sa.Text, default="{}")
     error: Mapped[Optional[str]] = mapped_column(db.Text)
     elapsed_time: Mapped[float] = mapped_column(db.Float, nullable=False, server_default=sa.text("0"))
     total_tokens: Mapped[int] = mapped_column(sa.BigInteger, server_default=sa.text("0"))
     total_steps: Mapped[int] = mapped_column(db.Integer, server_default=db.text("0"), nullable=True)
-    created_by_role: Mapped[str] = mapped_column(db.String(255))  # account, end_user
+    created_by_role: Mapped[str] = mapped_column(String(255))  # account, end_user
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     finished_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
@@ -711,23 +711,23 @@ class WorkflowNodeExecutionModel(Base):
     tenant_id: Mapped[str] = mapped_column(StringUUID)
     app_id: Mapped[str] = mapped_column(StringUUID)
     workflow_id: Mapped[str] = mapped_column(StringUUID)
-    triggered_from: Mapped[str] = mapped_column(db.String(255))
+    triggered_from: Mapped[str] = mapped_column(String(255))
     workflow_run_id: Mapped[Optional[str]] = mapped_column(StringUUID)
     index: Mapped[int] = mapped_column(db.Integer)
-    predecessor_node_id: Mapped[Optional[str]] = mapped_column(db.String(255))
-    node_execution_id: Mapped[Optional[str]] = mapped_column(db.String(255))
-    node_id: Mapped[str] = mapped_column(db.String(255))
-    node_type: Mapped[str] = mapped_column(db.String(255))
-    title: Mapped[str] = mapped_column(db.String(255))
+    predecessor_node_id: Mapped[Optional[str]] = mapped_column(String(255))
+    node_execution_id: Mapped[Optional[str]] = mapped_column(String(255))
+    node_id: Mapped[str] = mapped_column(String(255))
+    node_type: Mapped[str] = mapped_column(String(255))
+    title: Mapped[str] = mapped_column(String(255))
     inputs: Mapped[Optional[str]] = mapped_column(db.Text)
     process_data: Mapped[Optional[str]] = mapped_column(db.Text)
     outputs: Mapped[Optional[str]] = mapped_column(db.Text)
-    status: Mapped[str] = mapped_column(db.String(255))
+    status: Mapped[str] = mapped_column(String(255))
     error: Mapped[Optional[str]] = mapped_column(db.Text)
     elapsed_time: Mapped[float] = mapped_column(db.Float, server_default=db.text("0"))
     execution_metadata: Mapped[Optional[str]] = mapped_column(db.Text)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp())
-    created_by_role: Mapped[str] = mapped_column(db.String(255))
+    created_by_role: Mapped[str] = mapped_column(String(255))
     created_by: Mapped[str] = mapped_column(StringUUID)
     finished_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
 
@@ -846,8 +846,8 @@ class WorkflowAppLog(Base):
     app_id: Mapped[str] = mapped_column(StringUUID)
     workflow_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     workflow_run_id: Mapped[str] = mapped_column(StringUUID)
-    created_from: Mapped[str] = mapped_column(db.String(255), nullable=False)
-    created_by_role: Mapped[str] = mapped_column(db.String(255), nullable=False)
+    created_from: Mapped[str] = mapped_column(String(255), nullable=False)
+    created_by_role: Mapped[str] = mapped_column(String(255), nullable=False)
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
     created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())