diff --git a/api/models/account.py b/api/models/account.py index a634726924..d26a68a74e 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -2,10 +2,11 @@ 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 +from sqlalchemy.types import String from models.base import Base diff --git a/api/models/api_based_extension.py b/api/models/api_based_extension.py index 50e8dd6b3f..fa2f2df0b5 100644 --- a/api/models/api_based_extension.py +++ b/api/models/api_based_extension.py @@ -2,7 +2,8 @@ import enum from sqlalchemy import func from sqlalchemy.orm import mapped_column -from sqlalchemy.types import String, Text, DateTime +from sqlalchemy.types import DateTime, String, Text + from .base import Base from .engine import db from .types import StringUUID diff --git a/api/models/base.py b/api/models/base.py index 3a1f6b36e2..fa7e16d066 100644 --- a/api/models/base.py +++ b/api/models/base.py @@ -1,7 +1,7 @@ +from typing import Annotated + from sqlalchemy.orm import DeclarativeBase from sqlalchemy.types import String -from typing_extensions import Annotated - from models.engine import metadata diff --git a/api/models/dataset.py b/api/models/dataset.py index 58a742031b..6d653c71f2 100644 --- a/api/models/dataset.py +++ b/api/models/dataset.py @@ -16,6 +16,7 @@ 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 diff --git a/api/models/model.py b/api/models/model.py index 2f663cf3c7..523ee1dbfa 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -20,6 +20,7 @@ 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 diff --git a/api/models/provider.py b/api/models/provider.py index b75575be58..1b842517e9 100644 --- a/api/models/provider.py +++ b/api/models/provider.py @@ -5,6 +5,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 diff --git a/api/models/source.py b/api/models/source.py index defa3fb5f1..2e9e765ff0 100644 --- a/api/models/source.py +++ b/api/models/source.py @@ -4,6 +4,7 @@ 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 diff --git a/api/models/task.py b/api/models/task.py index 5d5727a604..1f0faf8b63 100644 --- a/api/models/task.py +++ b/api/models/task.py @@ -4,6 +4,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 diff --git a/api/models/tools.py b/api/models/tools.py index e20b1367ae..0ecc3da07b 100644 --- a/api/models/tools.py +++ b/api/models/tools.py @@ -2,12 +2,12 @@ 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 from sqlalchemy import ForeignKey, func from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.types import String from core.file import helpers as file_helpers from core.helper import encrypter diff --git a/api/models/web.py b/api/models/web.py index 2c3ca006c0..adf2685fca 100644 --- a/api/models/web.py +++ b/api/models/web.py @@ -1,8 +1,8 @@ from sqlalchemy import func from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.types import String from models.base import Base -from sqlalchemy.types import String from .engine import db from .model import Message diff --git a/api/models/workflow.py b/api/models/workflow.py index 65f3bec1cb..0577a3dd55 100644 --- a/api/models/workflow.py +++ b/api/models/workflow.py @@ -28,6 +28,7 @@ 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