From eeb06f6ab132ae0c2723d90f7bd041bca2574c36 Mon Sep 17 00:00:00 2001 From: ytqh Date: Fri, 2 May 2025 21:03:19 +0800 Subject: [PATCH] feat: change enum --- api/commands.py | 11 ++++++----- api/services/account_service.py | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/commands.py b/api/commands.py index 9056632b12..123a61c5e9 100644 --- a/api/commands.py +++ b/api/commands.py @@ -8,6 +8,9 @@ from pathlib import Path from typing import Optional import click +from flask import current_app +from werkzeug.exceptions import NotFound + from configs import dify_config from constants.languages import languages from core.rag.datasource.vdb.vector_factory import Vector @@ -18,22 +21,19 @@ from events.app_event import app_was_created from extensions.ext_database import db from extensions.ext_redis import redis_client from extensions.ext_storage import storage -from flask import current_app from libs.helper import email as email_validate from libs.password import hash_password, password_pattern, valid_password from libs.rsa import generate_key_pair from models import Account, Tenant, TenantAccountJoin from models.account import TenantAccountJoinRole -from models.dataset import Dataset, DatasetCollectionBinding, DatasetMetadata, DatasetMetadataBinding +from models.dataset import Dataset, DatasetCollectionBinding, DatasetMetadata, DatasetMetadataBinding, DocumentSegment from models.dataset import Document as DatasetDocument -from models.dataset import DocumentSegment from models.model import App, AppAnnotationSetting, AppMode, Conversation, MessageAnnotation, UploadFile from models.provider import Provider, ProviderModel from services.account_service import RegisterService, TenantService from services.clear_free_plan_tenant_expired_logs import ClearFreePlanTenantExpiredLogs from services.plugin.data_migration import PluginDataMigration from services.plugin.plugin_migration import PluginMigration -from werkzeug.exceptions import NotFound @click.command("reset-password", help="Reset the account password.") @@ -505,10 +505,11 @@ def add_qdrant_index(field: str): click.echo(click.style("No dataset collection bindings found.", fg="red")) return import qdrant_client - from core.rag.datasource.vdb.qdrant.qdrant_vector import QdrantConfig from qdrant_client.http.exceptions import UnexpectedResponse from qdrant_client.http.models import PayloadSchemaType + from core.rag.datasource.vdb.qdrant.qdrant_vector import QdrantConfig + for binding in bindings: if dify_config.QDRANT_URL is None: raise ValueError("Qdrant URL is required.") diff --git a/api/services/account_service.py b/api/services/account_service.py index 31e8e04e63..e1c0aac9c6 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -8,6 +8,11 @@ from datetime import UTC, datetime, timedelta from hashlib import sha256 from typing import Any, Optional, cast +from pydantic import BaseModel # type: ignore +from sqlalchemy import func # type: ignore +from sqlalchemy.orm import Session +from werkzeug.exceptions import Unauthorized + from configs import dify_config from constants.languages import language_timezone_mapping, languages from events.tenant_event import tenant_was_created @@ -28,7 +33,6 @@ from models.account import ( TenantStatus, ) from models.model import DifySetup -from pydantic import BaseModel # type: ignore from services.billing_service import BillingService from services.errors.account import ( AccountAlreadyInTenantError, @@ -48,15 +52,12 @@ from services.errors.account import ( ) from services.errors.workspace import WorkSpaceNotAllowedCreateError from services.feature_service import FeatureService -from sqlalchemy import func # type: ignore -from sqlalchemy.orm import Session from tasks.delete_account_task import delete_account_task from tasks.mail_account_deletion_task import send_account_deletion_verification_code from tasks.mail_email_code_login import send_email_code_login_mail_task from tasks.mail_invite_member_task import send_invite_member_mail_task from tasks.mail_reset_password_task import send_reset_password_mail_task from tasks.phone_sms_code_login import send_phone_sms_code_login_task -from werkzeug.exceptions import Unauthorized class TokenPair(BaseModel):