mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-13 17:19:01 +08:00
Fix/17466 cannot create a knowledge base by adding files (#17470)
This commit is contained in:
parent
dc9194ca00
commit
3e698074e7
@ -52,7 +52,6 @@ from core.rag.retrieval.template_prompts import (
|
|||||||
METADATA_FILTER_USER_PROMPT_2,
|
METADATA_FILTER_USER_PROMPT_2,
|
||||||
METADATA_FILTER_USER_PROMPT_3,
|
METADATA_FILTER_USER_PROMPT_3,
|
||||||
)
|
)
|
||||||
from core.tools.entities.common_entities import I18nObject
|
|
||||||
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
|
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
from libs.json_in_md_parser import parse_and_check_json_markdown
|
from libs.json_in_md_parser import parse_and_check_json_markdown
|
||||||
@ -295,10 +294,7 @@ class DatasetRetrieval:
|
|||||||
for dataset in available_datasets:
|
for dataset in available_datasets:
|
||||||
description = dataset.description
|
description = dataset.description
|
||||||
if not description:
|
if not description:
|
||||||
description = I18nObject(
|
description = "useful for when you want to answer queries about the " + dataset.name
|
||||||
en_US="useful for when you want to answer queries about the " + dataset.name,
|
|
||||||
zh_Hans="用于回答关于 " + dataset.name + " 的查询",
|
|
||||||
)
|
|
||||||
|
|
||||||
description = description.replace("\n", "").replace("\r", "")
|
description = description.replace("\n", "").replace("\r", "")
|
||||||
message_tool = PromptMessageTool(
|
message_tool = PromptMessageTool(
|
||||||
|
@ -6,7 +6,6 @@ from core.rag.datasource.retrieval_service import RetrievalService
|
|||||||
from core.rag.entities.context_entities import DocumentContext
|
from core.rag.entities.context_entities import DocumentContext
|
||||||
from core.rag.models.document import Document as RetrievalDocument
|
from core.rag.models.document import Document as RetrievalDocument
|
||||||
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
||||||
from core.tools.entities.common_entities import I18nObject
|
|
||||||
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
|
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
from models.dataset import Dataset
|
from models.dataset import Dataset
|
||||||
@ -39,10 +38,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
|
|||||||
def from_dataset(cls, dataset: Dataset, **kwargs):
|
def from_dataset(cls, dataset: Dataset, **kwargs):
|
||||||
description = dataset.description
|
description = dataset.description
|
||||||
if not description:
|
if not description:
|
||||||
description = I18nObject(
|
description = "useful for when you want to answer queries about the " + dataset.name
|
||||||
en_US="useful for when you want to answer queries about the " + dataset.name,
|
|
||||||
zh_Hans="用于回答关于 " + dataset.name + " 的查询",
|
|
||||||
)
|
|
||||||
|
|
||||||
description = description.replace("\n", "").replace("\r", "")
|
description = description.replace("\n", "").replace("\r", "")
|
||||||
return cls(
|
return cls(
|
||||||
|
@ -21,7 +21,6 @@ from core.plugin.entities.plugin import ModelProviderID
|
|||||||
from core.rag.index_processor.constant.built_in_field import BuiltInField
|
from core.rag.index_processor.constant.built_in_field import BuiltInField
|
||||||
from core.rag.index_processor.constant.index_type import IndexType
|
from core.rag.index_processor.constant.index_type import IndexType
|
||||||
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
||||||
from core.tools.entities.common_entities import I18nObject
|
|
||||||
from events.dataset_event import dataset_was_deleted
|
from events.dataset_event import dataset_was_deleted
|
||||||
from events.document_event import document_was_deleted
|
from events.document_event import document_was_deleted
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
@ -1379,10 +1378,7 @@ class DocumentService:
|
|||||||
cut_length = 18
|
cut_length = 18
|
||||||
cut_name = documents[0].name[:cut_length]
|
cut_name = documents[0].name[:cut_length]
|
||||||
dataset.name = cut_name + "..."
|
dataset.name = cut_name + "..."
|
||||||
dataset.description = I18nObject(
|
dataset.description = "useful for when you want to answer queries about the " + documents[0].name
|
||||||
en_US="useful for when you want to answer queries about the " + documents[0].name,
|
|
||||||
zh_Hans="用于回答关于 " + documents[0].name + " 的查询",
|
|
||||||
)
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
return dataset, documents, batch
|
return dataset, documents, batch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user