pull/22885/head
Asuka Minato 10 months ago
parent 3c1dc0be6a
commit bafdbf5c7c

@ -2,10 +2,11 @@ import enum
import json import json
from datetime import datetime from datetime import datetime
from typing import Optional, cast from typing import Optional, cast
from sqlalchemy.types import String
from flask_login import UserMixin # type: ignore from flask_login import UserMixin # type: ignore
from sqlalchemy import func, select from sqlalchemy import func, select
from sqlalchemy.orm import Mapped, mapped_column, reconstructor from sqlalchemy.orm import Mapped, mapped_column, reconstructor
from sqlalchemy.types import String
from models.base import Base from models.base import Base

@ -2,7 +2,8 @@ import enum
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.orm import mapped_column 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 .base import Base
from .engine import db from .engine import db
from .types import StringUUID from .types import StringUUID

@ -1,7 +1,7 @@
from typing import Annotated
from sqlalchemy.orm import DeclarativeBase from sqlalchemy.orm import DeclarativeBase
from sqlalchemy.types import String from sqlalchemy.types import String
from typing_extensions import Annotated
from models.engine import metadata from models.engine import metadata

@ -16,6 +16,7 @@ from sqlalchemy import func, select
from sqlalchemy.dialects.postgresql import JSONB from sqlalchemy.dialects.postgresql import JSONB
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from configs import dify_config from configs import dify_config
from core.rag.index_processor.constant.built_in_field import BuiltInField, MetadataDataSource from core.rag.index_processor.constant.built_in_field import BuiltInField, MetadataDataSource
from core.rag.retrieval.retrieval_methods import RetrievalMethod from core.rag.retrieval.retrieval_methods import RetrievalMethod

@ -20,6 +20,7 @@ from flask_login import UserMixin
from sqlalchemy import Float, Index, PrimaryKeyConstraint, func, text from sqlalchemy import Float, Index, PrimaryKeyConstraint, func, text
from sqlalchemy.orm import Mapped, Session, mapped_column from sqlalchemy.orm import Mapped, Session, mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from configs import dify_config from configs import dify_config
from constants import DEFAULT_FILE_NUMBER_LIMITS from constants import DEFAULT_FILE_NUMBER_LIMITS
from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType

@ -5,6 +5,7 @@ from typing import Optional
from sqlalchemy import func, text from sqlalchemy import func, text
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from .base import Base from .base import Base
from .engine import db from .engine import db
from .types import StringUUID from .types import StringUUID

@ -4,6 +4,7 @@ from sqlalchemy import func
from sqlalchemy.dialects.postgresql import JSONB from sqlalchemy.dialects.postgresql import JSONB
from sqlalchemy.orm import mapped_column from sqlalchemy.orm import mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from models.base import Base from models.base import Base
from .engine import db from .engine import db

@ -4,6 +4,7 @@ from typing import Optional
from celery import states # type: ignore from celery import states # type: ignore
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from libs.datetime_utils import naive_utc_now from libs.datetime_utils import naive_utc_now
from models.base import Base from models.base import Base

@ -2,12 +2,12 @@ import json
from datetime import datetime from datetime import datetime
from typing import Any, cast from typing import Any, cast
from urllib.parse import urlparse from urllib.parse import urlparse
from sqlalchemy.types import String
import sqlalchemy as sa import sqlalchemy as sa
from deprecated import deprecated from deprecated import deprecated
from sqlalchemy import ForeignKey, func from sqlalchemy import ForeignKey, func
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import String
from core.file import helpers as file_helpers from core.file import helpers as file_helpers
from core.helper import encrypter from core.helper import encrypter

@ -1,8 +1,8 @@
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import String
from models.base import Base from models.base import Base
from sqlalchemy.types import String
from .engine import db from .engine import db
from .model import Message from .model import Message

@ -28,6 +28,7 @@ import sqlalchemy as sa
from sqlalchemy import Index, PrimaryKeyConstraint, UniqueConstraint, func from sqlalchemy import Index, PrimaryKeyConstraint, UniqueConstraint, func
from sqlalchemy.orm import Mapped, declared_attr, mapped_column from sqlalchemy.orm import Mapped, declared_attr, mapped_column
from sqlalchemy.types import String from sqlalchemy.types import String
from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE
from core.helper import encrypter from core.helper import encrypter
from core.variables import SecretVariable, Segment, SegmentType, Variable from core.variables import SecretVariable, Segment, SegmentType, Variable

Loading…
Cancel
Save