|
|
|
|
@ -4,9 +4,9 @@ from pydantic import BaseModel, Field
|
|
|
|
|
|
|
|
|
|
from core.rag.datasource.retrieval_service import RetrievalService
|
|
|
|
|
from core.rag.entities.context_entities import DocumentContext
|
|
|
|
|
from core.rag.entities.metadata_entities import MetadataCondition
|
|
|
|
|
from core.rag.models.document import Document as RetrievalDocument
|
|
|
|
|
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
|
|
|
|
from core.rag.entities.metadata_entities import MetadataCondition
|
|
|
|
|
from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
|
|
|
|
|
from extensions.ext_database import db
|
|
|
|
|
from models.dataset import Dataset
|
|
|
|
|
@ -48,7 +48,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
|
|
|
|
|
tenant_id=dataset.tenant_id,
|
|
|
|
|
dataset_id=dataset.id,
|
|
|
|
|
description=description,
|
|
|
|
|
metadata_filtering_conditions= MetadataCondition(),
|
|
|
|
|
metadata_filtering_conditions=MetadataCondition(),
|
|
|
|
|
**kwargs,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@ -68,7 +68,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
|
|
|
|
|
dataset_id=dataset.id,
|
|
|
|
|
query=query,
|
|
|
|
|
external_retrieval_parameters=dataset.retrieval_model,
|
|
|
|
|
metadata_condition=self.metadata_filtering_conditions
|
|
|
|
|
metadata_condition=self.metadata_filtering_conditions,
|
|
|
|
|
)
|
|
|
|
|
for external_document in external_documents:
|
|
|
|
|
document = RetrievalDocument(
|
|
|
|
|
|