Merge branch 'feat/support-knowledge-metadata' into deploy/dev

# Conflicts:
#	api/core/rag/retrieval/dataset_retrieval.py
#	api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
#	api/migrations/versions/2025_02_27_0917-d20049ed0af6_add_metadata_function.py
#	api/poetry.lock
This commit is contained in:
jyong 2025-03-14 18:57:30 +08:00
commit ecd6b300a3
3 changed files with 7 additions and 4 deletions

View File

@ -54,6 +54,7 @@ from core.rag.retrieval.template_prompts import (
)
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
from extensions.ext_database import db
from libs.json_in_md_parser import parse_and_check_json_markdown
from models.dataset import ChildChunk, Dataset, DatasetMetadata, DatasetQuery, DocumentSegment
from models.dataset import Document as DatasetDocument
from services.external_knowledge_service import ExternalDatasetService

View File

@ -1,7 +1,7 @@
import json
import logging
import time
from collections import defaultdict
import time
from collections.abc import Mapping, Sequence
from typing import Any, Optional, cast

View File

@ -1,3 +1,4 @@
import copy
import datetime
import json
import logging
@ -767,10 +768,11 @@ class DocumentService:
if dataset.built_in_field_enabled:
if document.doc_metadata:
document.doc_metadata[BuiltInField.document_name] = name
else:
document.name = name
doc_metadata = copy.deepcopy(document.doc_metadata)
doc_metadata[BuiltInField.document_name.value] = name
document.doc_metadata = doc_metadata
document.name = name
db.session.add(document)
db.session.commit()