Move some constants to common (#11004)

### What problem does this PR solve?

As title.

### Type of change

- [x] Refactoring

---------

Signed-off-by: Jin Hai <haijin.chn@gmail.com>

api/apps/__init__.py

@@ -24,7 +24,7 @@ from flask_cors import CORS
 from flasgger import Swagger
 from itsdangerous.url_safe import URLSafeTimedSerializer as Serializer
 
-from api.db import StatusEnum
+from common.constants import StatusEnum
 from api.db.db_models import close_connection
 from api.db.services import UserService
 from api.utils.json_encode import CustomJSONEncoder

api/apps/api_app.py

@@ -21,7 +21,7 @@ from flask import request, Response
 from api.db.services.llm_service import LLMBundle
 from flask_login import login_required, current_user
 
-from api.db import VALID_FILE_TYPES, VALID_TASK_STATUS, FileType, LLMType, ParserType, FileSource
+from api.db import VALID_FILE_TYPES, FileType
 from api.db.db_models import APIToken, Task, File
 from api.db.services import duplicate_name
 from api.db.services.api_service import APITokenService, API4ConversationService
@@ -34,7 +34,7 @@ from api.db.services.task_service import queue_tasks, TaskService
 from api.db.services.user_service import UserTenantService
 from api import settings
 from common.misc_utils import get_uuid
-from common.constants import RetCode
+from common.constants import RetCode, VALID_TASK_STATUS, LLMType, ParserType, FileSource
 from api.utils.api_utils import server_error_response, get_data_error_result, get_json_result, validate_request, \
     generate_confirmation_token
 

api/apps/chunk_app.py

@@ -22,7 +22,6 @@ from flask import request
 from flask_login import current_user, login_required
 
 from api import settings
-from api.db import LLMType, ParserType
 from api.db.services.dialog_service import meta_filter
 from api.db.services.document_service import DocumentService
 from api.db.services.knowledgebase_service import KnowledgebaseService
@@ -36,7 +35,7 @@ from rag.nlp import rag_tokenizer, search
 from rag.prompts.generator import gen_meta_filter, cross_languages, keyword_extraction
 from rag.settings import PAGERANK_FLD
 from common.string_utils import remove_redundant_spaces
-from common.constants import RetCode
+from common.constants import RetCode, LLMType, ParserType
 
 
 @manager.route('/list', methods=['POST'])  # noqa: F821

api/apps/connector_app.py

@@ -18,11 +18,11 @@ import time
 from flask import request
 from flask_login import login_required, current_user
 
-from api.db import TaskStatus, InputType
+from api.db import InputType
 from api.db.services.connector_service import ConnectorService, Connector2KbService, SyncLogsService
 from api.utils.api_utils import get_json_result, validate_request, get_data_error_result
 from common.misc_utils import get_uuid
-from common.constants import RetCode
+from common.constants import RetCode, TaskStatus
 
 @manager.route("/set", methods=["POST"])  # noqa: F821
 @login_required

api/apps/conversation_app.py

@@ -19,7 +19,6 @@ import logging
 from copy import deepcopy
 from flask import Response, request
 from flask_login import current_user, login_required
-from api.db import LLMType
 from api.db.db_models import APIToken
 from api.db.services.conversation_service import ConversationService, structure_answer
 from api.db.services.dialog_service import DialogService, ask, chat, gen_mindmap
@@ -30,7 +29,7 @@ from api.db.services.user_service import TenantService, UserTenantService
 from api.utils.api_utils import get_data_error_result, get_json_result, server_error_response, validate_request
 from rag.prompts.template import load_prompt
 from rag.prompts.generator import chunks_format
-from common.constants import RetCode
+from common.constants import RetCode, LLMType
 
 
 @manager.route("/set", methods=["POST"])  # noqa: F821

api/apps/dialog_app.py

@@ -18,7 +18,7 @@ from flask import request
 from flask_login import login_required, current_user
 from api.db.services import duplicate_name
 from api.db.services.dialog_service import DialogService
-from api.db import StatusEnum
+from common.constants import StatusEnum
 from api.db.services.tenant_llm_service import TenantLLMService
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.services.user_service import TenantService, UserTenantService

api/apps/document_app.py

@@ -26,7 +26,7 @@ from flask_login import current_user, login_required
 from api import settings
 from api.common.check_team_permission import check_kb_team_permission
 from api.constants import FILE_NAME_LEN_LIMIT, IMG_BASE64_PREFIX
-from api.db import VALID_FILE_TYPES, VALID_TASK_STATUS, FileType, ParserType, TaskStatus
+from api.db import VALID_FILE_TYPES, FileType
 from api.db.db_models import Task
 from api.db.services import duplicate_name
 from api.db.services.document_service import DocumentService, doc_upload_and_parse
@@ -44,7 +44,7 @@ from api.utils.api_utils import (
 )
 from api.utils.file_utils import filename_type, thumbnail
 from common.file_utils import get_project_base_directory
-from common.constants import RetCode
+from common.constants import RetCode, VALID_TASK_STATUS, ParserType, TaskStatus
 from api.utils.web_utils import CONTENT_TYPE_MAP, html2pdf, is_valid_url
 from deepdoc.parser.html_parser import RAGFlowHtmlParser
 from rag.nlp import search, rag_tokenizer

api/apps/file_app.py

@@ -27,8 +27,8 @@ from api.db.services.document_service import DocumentService
 from api.db.services.file2document_service import File2DocumentService
 from api.utils.api_utils import server_error_response, get_data_error_result, validate_request
 from common.misc_utils import get_uuid
-from common.constants import RetCode
-from api.db import FileType, FileSource
+from common.constants import RetCode, FileSource
+from api.db import FileType
 from api.db.services import duplicate_name
 from api.db.services.file_service import FileService
 from api.utils.api_utils import get_json_result

api/apps/kb_app.py

@@ -21,7 +21,7 @@ from flask import request
 from flask_login import login_required, current_user
 import numpy as np
 
-from api.db import LLMType
+
 from api.db.services.connector_service import Connector2KbService
 from api.db.services.llm_service import LLMBundle
 from api.db.services.document_service import DocumentService, queue_raptor_o_graphrag_tasks
@@ -31,7 +31,7 @@ from api.db.services.pipeline_operation_log_service import PipelineOperationLogS
 from api.db.services.task_service import TaskService, GRAPH_RAPTOR_FAKE_DOC_ID
 from api.db.services.user_service import TenantService, UserTenantService
 from api.utils.api_utils import get_error_data_result, server_error_response, get_data_error_result, validate_request, not_allowed_parameters
-from api.db import PipelineTaskType, StatusEnum, FileSource, VALID_FILE_TYPES, VALID_TASK_STATUS
+from api.db import VALID_FILE_TYPES
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.db_models import File
 from api.utils.api_utils import get_json_result
@@ -42,7 +42,7 @@ from rag.settings import PAGERANK_FLD
 from rag.utils.redis_conn import REDIS_CONN
 from rag.utils.storage_factory import STORAGE_IMPL
 from rag.utils.doc_store_conn import OrderByExpr  
-from common.constants import RetCode
+from common.constants import RetCode, PipelineTaskType, StatusEnum, VALID_TASK_STATUS, FileSource, LLMType
 
 
 @manager.route('/create', methods=['post'])  # noqa: F821
@@ -748,7 +748,6 @@ def delete_kb_task():
             return get_error_data_result(message="Internal Error: Invalid task type")
 
 
-
     ok = KnowledgebaseService.update_by_id(kb_id, {kb_task_id_field: "", kb_task_finish_at: None})
     if not ok:
         return server_error_response(f"Internal error: cannot delete task {pipeline_task_type}")
@@ -891,7 +890,7 @@ def check_embedding():
     }
     if summary["avg_cos_sim"] > 0.99:
         return get_json_result(data={"summary": summary, "results": results})
-    return get_json_result(code=settings.RetCode.NOT_EFFECTIVE, message="failed", data={"summary": summary, "results": results})
+    return get_json_result(code=RetCode.NOT_EFFECTIVE, message="failed", data={"summary": summary, "results": results})
 
 
 @manager.route("/<kb_id>/link", methods=["POST"])  # noqa: F821
@@ -901,6 +900,6 @@ def link_connector(kb_id):
     req = request.json
     errors = Connector2KbService.link_connectors(kb_id, req["connector_ids"], current_user.id)
     if errors:
-        return get_json_result(data=False, message=errors, code=settings.RetCode.SERVER_ERROR)
+        return get_json_result(data=False, message=errors, code=RetCode.SERVER_ERROR)
     return get_json_result(data=True)
 

api/apps/llm_app.py

@@ -21,7 +21,7 @@ from flask_login import login_required, current_user
 from api.db.services.tenant_llm_service import LLMFactoriesService, TenantLLMService
 from api.db.services.llm_service import LLMService
 from api.utils.api_utils import server_error_response, get_data_error_result, validate_request
-from api.db import StatusEnum, LLMType
+from common.constants import StatusEnum, LLMType
 from api.db.db_models import TenantLLM
 from api.utils.api_utils import get_json_result
 from common.base64_image import test_image

api/apps/mcp_server_app.py

@@ -16,11 +16,10 @@
 from flask import Response, request
 from flask_login import current_user, login_required
 
-from api.db import VALID_MCP_SERVER_TYPES
 from api.db.db_models import MCPServer
 from api.db.services.mcp_server_service import MCPServerService
 from api.db.services.user_service import TenantService
-from common.constants import RetCode
+from common.constants import RetCode, VALID_MCP_SERVER_TYPES
 
 from common.misc_utils import get_uuid
 from api.utils.api_utils import get_data_error_result, get_json_result, server_error_response, validate_request, \

api/apps/sdk/chat.py

@@ -17,13 +17,12 @@ import logging
 
 from flask import request
 
-from api.db import StatusEnum
 from api.db.services.dialog_service import DialogService
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.services.tenant_llm_service import TenantLLMService
 from api.db.services.user_service import TenantService
 from common.misc_utils import get_uuid
-from common.constants import RetCode
+from common.constants import RetCode, StatusEnum
 from api.utils.api_utils import check_duplicate_ids, get_error_data_result, get_result, token_required
 
 

api/apps/sdk/dataset.py

@@ -21,14 +21,13 @@ import json
 from flask import request
 from peewee import OperationalError
 from api import settings
-from api.db import FileSource, StatusEnum
 from api.db.db_models import File
 from api.db.services.document_service import DocumentService
 from api.db.services.file2document_service import File2DocumentService
 from api.db.services.file_service import FileService
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.services.user_service import TenantService
-from common.constants import RetCode
+from common.constants import RetCode, FileSource, StatusEnum
 from api.utils.api_utils import (
     deep_merge,
     get_error_argument_result,

api/apps/sdk/dify_retrieval.py

@@ -17,7 +17,6 @@ import logging
 
 from flask import request, jsonify
 
-from api.db import LLMType
 from api.db.services.document_service import DocumentService
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.services.llm_service import LLMBundle
@@ -25,7 +24,7 @@ from api import settings
 from api.utils.api_utils import validate_request, build_error_result, apikey_required
 from rag.app.tag import label_question
 from api.db.services.dialog_service import meta_filter, convert_conditions
-from common.constants import RetCode
+from common.constants import RetCode, LLMType
 
 @manager.route('/dify/retrieval', methods=['POST'])  # noqa: F821
 @apikey_required

api/apps/sdk/doc.py

@@ -26,7 +26,7 @@ from pydantic import BaseModel, Field, validator
 
 from api import settings
 from api.constants import FILE_NAME_LEN_LIMIT
-from api.db import FileSource, FileType, LLMType, ParserType, TaskStatus
+from api.db import FileType
 from api.db.db_models import File, Task
 from api.db.services.document_service import DocumentService
 from api.db.services.file2document_service import File2DocumentService
@@ -43,7 +43,7 @@ from rag.nlp import rag_tokenizer, search
 from rag.prompts.generator import cross_languages, keyword_extraction
 from rag.utils.storage_factory import STORAGE_IMPL
 from common.string_utils import remove_redundant_spaces
-from common.constants import RetCode
+from common.constants import RetCode, LLMType, ParserType, TaskStatus, FileSource
 
 MAXIMUM_OF_UPLOADING_FILES = 256
 

api/apps/sdk/session.py

@@ -22,7 +22,6 @@ from flask import Response, jsonify, request
 
 from agent.canvas import Canvas
 from api import settings
-from api.db import LLMType, StatusEnum
 from api.db.db_models import APIToken
 from api.db.services.api_service import API4ConversationService
 from api.db.services.canvas_service import UserCanvasService, completion_openai
@@ -41,7 +40,7 @@ from api.utils.api_utils import check_duplicate_ids, get_data_openai, get_error_
 from rag.app.tag import label_question
 from rag.prompts.template import load_prompt
 from rag.prompts.generator import cross_languages, gen_meta_filter, keyword_extraction, chunks_format
-from common.constants import RetCode
+from common.constants import RetCode, LLMType, StatusEnum
 
 @manager.route("/chats/<chat_id>/sessions", methods=["POST"])  # noqa: F821
 @token_required

api/apps/search_app.py

@@ -18,13 +18,12 @@ from flask import request
 from flask_login import current_user, login_required
 
 from api.constants import DATASET_NAME_LIMIT
-from api.db import StatusEnum
 from api.db.db_models import DB
 from api.db.services import duplicate_name
 from api.db.services.search_service import SearchService
 from api.db.services.user_service import TenantService, UserTenantService
 from common.misc_utils import get_uuid
-from common.constants import RetCode
+from common.constants import RetCode, StatusEnum
 from api.utils.api_utils import get_data_error_result, get_json_result, not_allowed_parameters, server_error_response, validate_request
 
 

api/apps/tenant_app.py

@@ -19,11 +19,11 @@ from flask_login import login_required, current_user
 
 from api import settings
 from api.apps import smtp_mail_server
-from api.db import UserTenantRole, StatusEnum
+from api.db import UserTenantRole
 from api.db.db_models import UserTenant
 from api.db.services.user_service import UserTenantService, UserService
 
-from common.constants import RetCode
+from common.constants import RetCode, StatusEnum
 from common.misc_utils import get_uuid
 from common.time_utils import delta_seconds
 from api.utils.api_utils import get_json_result, validate_request, server_error_response, get_data_error_result

api/db/__init__.py

@@ -13,21 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from enum import Enum
+
 from enum import IntEnum
 from strenum import StrEnum
 
 
-class StatusEnum(Enum):
-    VALID = "1"
-    INVALID = "0"
-
-
-class ActiveEnum(Enum):
-    ACTIVE = "1"
-    INACTIVE = "0"
-
-
 class UserTenantRole(StrEnum):
     OWNER = 'owner'
     ADMIN = 'admin'
@@ -56,59 +46,6 @@ class FileType(StrEnum):
 
 VALID_FILE_TYPES = {FileType.PDF, FileType.DOC, FileType.VISUAL, FileType.AURAL, FileType.VIRTUAL, FileType.FOLDER, FileType.OTHER}
 
-class LLMType(StrEnum):
-    CHAT = 'chat'
-    EMBEDDING = 'embedding'
-    SPEECH2TEXT = 'speech2text'
-    IMAGE2TEXT = 'image2text'
-    RERANK = 'rerank'
-    TTS    = 'tts'
-
-
-class TaskStatus(StrEnum):
-    UNSTART = "0"
-    RUNNING = "1"
-    CANCEL = "2"
-    DONE = "3"
-    FAIL = "4"
-    SCHEDULE = "5"
-
-
-VALID_TASK_STATUS     = {TaskStatus.UNSTART, TaskStatus.RUNNING, TaskStatus.CANCEL, TaskStatus.DONE, TaskStatus.FAIL, TaskStatus.SCHEDULE}
-
-
-class ParserType(StrEnum):
-    PRESENTATION = "presentation"
-    LAWS = "laws"
-    MANUAL = "manual"
-    PAPER = "paper"
-    RESUME = "resume"
-    BOOK = "book"
-    QA = "qa"
-    TABLE = "table"
-    NAIVE = "naive"
-    PICTURE = "picture"
-    ONE = "one"
-    AUDIO = "audio"
-    EMAIL = "email"
-    KG = "knowledge_graph"
-    TAG = "tag"
-
-
-class FileSource(StrEnum):
-    LOCAL = ""
-    KNOWLEDGEBASE = "knowledgebase"
-    S3 = "s3"
-    NOTION = "notion"
-    DISCORD = "discord"
-    CONFLUENCE = "confluence"
-    GMAIL = "gmail"
-    GOOGLE_DRIVER = "google_driver"
-    JIRA = "jira"
-    SHAREPOINT = "sharepoint"
-    SLACK = "slack"
-    TEAMS = "teams"
-
 
 class InputType(StrEnum):
     LOAD_STATE = "load_state"  # e.g. loading a current full state or a save state, such as from a file
@@ -122,14 +59,6 @@ class CanvasCategory(StrEnum):
     DataFlow = "dataflow_canvas"
 
 
-class MCPServerType(StrEnum):
-    SSE = "sse"
-    STREAMABLE_HTTP = "streamable-http"
-
-
-VALID_MCP_SERVER_TYPES = {MCPServerType.SSE, MCPServerType.STREAMABLE_HTTP}
-
-
 class PipelineTaskType(StrEnum):
     PARSE = "Parse"
     DOWNLOAD = "Download"

api/db/db_models.py

@@ -32,12 +32,13 @@ from playhouse.migrate import MySQLMigrator, PostgresqlMigrator, migrate
 from playhouse.pool import PooledMySQLDatabase, PooledPostgresqlDatabase
 
 from api import settings, utils
-from api.db import ParserType, SerializedType
+from api.db import SerializedType
 from api.utils.json_encode import json_dumps, json_loads
 from api.utils.configs import deserialize_b64, serialize_b64
 
 from common.time_utils import current_timestamp, timestamp_to_date, date_string_to_timestamp
 from common.decorator import singleton
+from common.constants import ParserType
 
 
 CONTINUOUS_FIELD_TYPE = {IntegerField, FloatField, DateTimeField}

api/db/init_data.py

@@ -20,7 +20,7 @@ import time
 import uuid
 from copy import deepcopy
 
-from api.db import LLMType, UserTenantRole
+from api.db import UserTenantRole
 from api.db.db_models import init_database_tables as init_web_db, LLMFactories, LLM, TenantLLM
 from api.db.services import UserService
 from api.db.services.canvas_service import CanvasTemplateService
@@ -30,6 +30,7 @@ from api.db.services.tenant_llm_service import LLMFactoriesService, TenantLLMSer
 from api.db.services.llm_service import LLMService, LLMBundle, get_init_tenant_llm
 from api.db.services.user_service import TenantService, UserTenantService
 from api import settings
+from common.constants import LLMType
 from common.file_utils import get_project_base_directory
 from api.common.base64 import encode_to_base64
 

api/db/joint_services/user_account_service.py

@@ -18,7 +18,7 @@ import uuid
 
 from api import settings
 from api.utils.api_utils import group_by
-from api.db import FileType, UserTenantRole, ActiveEnum
+from api.db import FileType, UserTenantRole
 from api.db.services.api_service import APITokenService, API4ConversationService
 from api.db.services.canvas_service import UserCanvasService
 from api.db.services.conversation_service import ConversationService
@@ -37,7 +37,7 @@ from api.db.services.user_canvas_version import UserCanvasVersionService
 from api.db.services.user_service import TenantService, UserService, UserTenantService
 from rag.utils.storage_factory import STORAGE_IMPL
 from rag.nlp import search
-
+from common.constants import ActiveEnum
 
 def create_new_user(user_info: dict) -> dict:
     """

api/db/services/connector_service.py

@@ -19,12 +19,13 @@ from datetime import datetime
 from anthropic import BaseModel
 from peewee import SQL, fn
 
-from api.db import InputType, TaskStatus
+from api.db import InputType
 from api.db.db_models import Connector, SyncLogs, Connector2Kb, Knowledgebase
 from api.db.services.common_service import CommonService
 from api.db.services.document_service import DocumentService
 from api.db.services.file_service import FileService
 from common.misc_utils import get_uuid
+from common.constants import TaskStatus
 from common.time_utils import current_timestamp, timestamp_to_date
 
 

api/db/services/conversation_service.py

@@ -15,7 +15,7 @@
 #
 import time
 from uuid import uuid4
-from api.db import StatusEnum
+from common.constants import StatusEnum
 from api.db.db_models import Conversation, DB
 from api.db.services.api_service import API4ConversationService
 from api.db.services.common_service import CommonService

api/db/services/dialog_service.py

@@ -26,7 +26,7 @@ from langfuse import Langfuse
 from peewee import fn
 from agentic_reasoning import DeepResearcher
 from api import settings
-from api.db import LLMType, ParserType, StatusEnum
+from common.constants import LLMType, ParserType, StatusEnum
 from api.db.db_models import DB, Dialog
 from api.db.services.common_service import CommonService
 from api.db.services.document_service import DocumentService

api/db/services/document_service.py

@@ -28,7 +28,7 @@ from peewee import fn, Case, JOIN
 
 from api import settings
 from api.constants import IMG_BASE64_PREFIX, FILE_NAME_LEN_LIMIT
-from api.db import FileType, LLMType, ParserType, StatusEnum, TaskStatus, UserTenantRole, CanvasCategory
+from api.db import FileType, UserTenantRole, CanvasCategory
 from api.db.db_models import DB, Document, Knowledgebase, Task, Tenant, UserTenant, File2Document, File, UserCanvas, \
     User
 from api.db.db_utils import bulk_insert_into_db
@@ -36,6 +36,7 @@ from api.db.services.common_service import CommonService
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from common.misc_utils import get_uuid
 from common.time_utils import current_timestamp, get_format_time
+from common.constants import LLMType, ParserType, StatusEnum, TaskStatus
 from rag.nlp import rag_tokenizer, search
 from rag.settings import get_svr_queue_name, SVR_CONSUMER_GROUP_NAME
 from rag.utils.redis_conn import REDIS_CONN

api/db/services/file2document_service.py

@@ -15,7 +15,7 @@
 #
 from datetime import datetime
 
-from api.db import FileSource
+from common.constants import FileSource
 from api.db.db_models import DB
 from api.db.db_models import File, File2Document
 from api.db.services.common_service import CommonService

api/db/services/file_service.py

@@ -21,13 +21,14 @@ from pathlib import Path
 from flask_login import current_user
 from peewee import fn
 
-from api.db import KNOWLEDGEBASE_FOLDER_NAME, FileSource, FileType, ParserType, TaskStatus
+from api.db import KNOWLEDGEBASE_FOLDER_NAME, FileType
 from api.db.db_models import DB, Document, File, File2Document, Knowledgebase, Task
 from api.db.services import duplicate_name
 from api.db.services.common_service import CommonService
 from api.db.services.document_service import DocumentService
 from api.db.services.file2document_service import File2DocumentService
 from common.misc_utils import get_uuid
+from common.constants import TaskStatus, FileSource, ParserType
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.services.task_service import TaskService
 from api.utils.file_utils import filename_type, read_potential_broken_pdf, thumbnail_img

api/db/services/knowledgebase_service.py

@@ -17,13 +17,14 @@ from datetime import datetime
 
 from peewee import fn, JOIN
 
-from api.db import StatusEnum, TenantPermission
+from api.db import TenantPermission
 from api.db.db_models import DB, Document, Knowledgebase, User, UserTenant, UserCanvas
 from api.db.services.common_service import CommonService
 from common.time_utils import current_timestamp, datetime_format
 from api.db.services import duplicate_name
 from api.db.services.user_service import TenantService
 from common.misc_utils import get_uuid
+from common.constants import StatusEnum
 from api.constants import DATASET_NAME_LIMIT
 from api.utils.api_utils import get_parser_config, get_data_error_result
 
@@ -91,7 +92,7 @@ class KnowledgebaseService(CommonService):
         # Returns:
         #     If all documents are parsed successfully, returns (True, None)
         #     If any document is not fully parsed, returns (False, error_message)
-        from api.db import TaskStatus
+        from common.constants import TaskStatus
         from api.db.services.document_service import DocumentService
 
         # Get knowledge base information

api/db/services/search_service.py

@@ -17,7 +17,7 @@ from datetime import datetime
 
 from peewee import fn
 
-from api.db import StatusEnum
+from common.constants import StatusEnum
 from api.db.db_models import DB, Search, User
 from api.db.services.common_service import CommonService
 from common.time_utils import current_timestamp, datetime_format

api/db/services/task_service.py

@@ -23,12 +23,13 @@ from api.db.db_utils import bulk_insert_into_db
 from deepdoc.parser import PdfParser
 from peewee import JOIN
 from api.db.db_models import DB, File2Document, File
-from api.db import StatusEnum, FileType, TaskStatus
+from api.db import FileType
 from api.db.db_models import Task, Document, Knowledgebase, Tenant
 from api.db.services.common_service import CommonService
 from api.db.services.document_service import DocumentService
 from common.misc_utils import get_uuid
 from common.time_utils import current_timestamp
+from common.constants import StatusEnum, TaskStatus
 from deepdoc.parser.excel_parser import RAGFlowExcelParser
 from rag.settings import get_svr_queue_name
 from rag.utils.storage_factory import STORAGE_IMPL

api/db/services/tenant_llm_service.py

@@ -17,7 +17,7 @@ import os
 import logging
 from langfuse import Langfuse
 from api import settings
-from api.db import LLMType
+from common.constants import LLMType
 from api.db.db_models import DB, LLMFactories, TenantLLM
 from api.db.services.common_service import CommonService
 from api.db.services.langfuse_service import TenantLangfuseService

api/db/services/user_service.py

@@ -26,7 +26,7 @@ from api.db.db_models import User, Tenant
 from api.db.services.common_service import CommonService
 from common.misc_utils import get_uuid
 from common.time_utils import current_timestamp, datetime_format
-from api.db import StatusEnum
+from common.constants import StatusEnum
 from rag.settings import MINIO
 
 

api/utils/api_utils.py

@@ -35,7 +35,7 @@ from flask import (
 from peewee import OperationalError
 
 from api import settings
-from api.db import ActiveEnum
+from common.constants import ActiveEnum
 from api.db.db_models import APIToken
 from api.utils.json_encode import CustomJSONEncoder
 from rag.utils.mcp_tool_call_conn import MCPToolCallSession, close_multiple_mcp_toolcall_sessions