Merge branch 'main' into feat/support-knowledge-metadata

# Conflicts:
#	api/core/rag/datasource/retrieval_service.py
#	api/core/workflow/nodes/code/code_node.py
#	api/services/dataset_service.py
This commit is contained in:
jyong
2025-02-26 19:59:14 +08:00
3498 changed files with 74030 additions and 293893 deletions

View File

@ -149,6 +149,12 @@ site_fields = {
"updated_at": TimestampField,
}
deleted_tool_fields = {
"type": fields.String,
"tool_name": fields.String,
"provider_id": fields.String,
}
app_detail_fields_with_site = {
"id": fields.String,
"name": fields.String,
@ -169,9 +175,10 @@ app_detail_fields_with_site = {
"created_at": TimestampField,
"updated_by": fields.String,
"updated_at": TimestampField,
"deleted_tools": fields.List(fields.String),
"deleted_tools": fields.List(fields.Nested(deleted_tool_fields)),
}
app_site_fields = {
"app_id": fields.String,
"access_token": fields.String(attribute="code"),
@ -191,6 +198,8 @@ app_site_fields = {
"use_icon_as_answer_icon": fields.Boolean,
}
leaked_dependency_fields = {"type": fields.String, "value": fields.Raw, "current_identifier": fields.String}
app_import_fields = {
"id": fields.String,
"status": fields.String,
@ -199,3 +208,7 @@ app_import_fields = {
"imported_dsl_version": fields.String,
"error": fields.String,
}
app_import_check_dependencies_fields = {
"leaked_dependencies": fields.List(fields.Nested(leaked_dependency_fields)),
}

View File

@ -14,6 +14,7 @@ segment_fields = {
"position": fields.Integer,
"document_id": fields.String,
"content": fields.String,
"sign_content": fields.String,
"answer": fields.String,
"word_count": fields.Integer,
"tokens": fields.Integer,

View File

@ -18,6 +18,7 @@ segment_fields = {
"position": fields.Integer,
"document_id": fields.String,
"content": fields.String,
"sign_content": fields.String,
"answer": fields.String,
"word_count": fields.Integer,
"tokens": fields.Integer,