ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong using of RetrievalMethod Enum (#6345)

Browse Source
pull/6349/head
Jyong 2 years ago committed by GitHub
parent ed9e692263
commit 0de224b153
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

16
api/controllers/console/datasets/datasets.py
Unescape Escape View File

@ -545,15 +545,15 @@ class DatasetRetrievalSettingApi(Resource):
case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE: case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE:
return { return {
'retrieval_method': [ 'retrieval_method': [
RetrievalMethod.SEMANTIC_SEARCH RetrievalMethod.SEMANTIC_SEARCH.value
] ]
} }
case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH | VectorType.ANALYTICDB | VectorType.MYSCALE: case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH | VectorType.ANALYTICDB | VectorType.MYSCALE:
return { return {
'retrieval_method': [ 'retrieval_method': [
RetrievalMethod.SEMANTIC_SEARCH, RetrievalMethod.SEMANTIC_SEARCH.value,
RetrievalMethod.FULL_TEXT_SEARCH, RetrievalMethod.FULL_TEXT_SEARCH.value,
RetrievalMethod.HYBRID_SEARCH, RetrievalMethod.HYBRID_SEARCH.value,
] ]
} }
case _: case _:
@ -569,15 +569,15 @@ class DatasetRetrievalSettingMockApi(Resource):
case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE: case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE:
return { return {
'retrieval_method': [ 'retrieval_method': [
RetrievalMethod.SEMANTIC_SEARCH RetrievalMethod.SEMANTIC_SEARCH.value
] ]
} }
case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH| VectorType.ANALYTICDB | VectorType.MYSCALE: case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH| VectorType.ANALYTICDB | VectorType.MYSCALE:
return { return {
'retrieval_method': [ 'retrieval_method': [
RetrievalMethod.SEMANTIC_SEARCH, RetrievalMethod.SEMANTIC_SEARCH.value,
RetrievalMethod.FULL_TEXT_SEARCH, RetrievalMethod.FULL_TEXT_SEARCH.value,
RetrievalMethod.HYBRID_SEARCH, RetrievalMethod.HYBRID_SEARCH.value,
] ]
} }
case _: case _:

8
api/core/rag/datasource/retrieval_service.py
Unescape Escape View File

@ -11,7 +11,7 @@ from extensions.ext_database import db
from models.dataset import Dataset from models.dataset import Dataset
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',
@ -86,7 +86,7 @@ class RetrievalService:
exception_message = ';\n'.join(exceptions) exception_message = ';\n'.join(exceptions)
raise Exception(exception_message) raise Exception(exception_message)
if retrival_method == RetrievalMethod.HYBRID_SEARCH: if retrival_method == RetrievalMethod.HYBRID_SEARCH.value:
data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False) data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False)
all_documents = data_post_processor.invoke( all_documents = data_post_processor.invoke(
query=query, query=query,
@ -142,7 +142,7 @@ class RetrievalService:
) )
if documents: if documents:
if reranking_model and retrival_method == RetrievalMethod.SEMANTIC_SEARCH: if reranking_model and retrival_method == RetrievalMethod.SEMANTIC_SEARCH.value:
data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False) data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False)
all_documents.extend(data_post_processor.invoke( all_documents.extend(data_post_processor.invoke(
query=query, query=query,
@ -174,7 +174,7 @@ class RetrievalService:
top_k=top_k top_k=top_k
) )
if documents: if documents:
if reranking_model and retrival_method == RetrievalMethod.FULL_TEXT_SEARCH: if reranking_model and retrival_method == RetrievalMethod.FULL_TEXT_SEARCH.value:
data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False) data_post_processor = DataPostProcessor(str(dataset.tenant_id), reranking_model, False)
all_documents.extend(data_post_processor.invoke( all_documents.extend(data_post_processor.invoke(
query=query, query=query,

4
api/core/rag/retrieval/dataset_retrieval.py
Unescape Escape View File

@ -28,7 +28,7 @@ from models.dataset import Dataset, DatasetQuery, DocumentSegment
from models.dataset import Document as DatasetDocument from models.dataset import Document as DatasetDocument
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',
@ -464,7 +464,7 @@ class DatasetRetrieval:
if retrieve_config.retrieve_strategy == DatasetRetrieveConfigEntity.RetrieveStrategy.SINGLE: if retrieve_config.retrieve_strategy == DatasetRetrieveConfigEntity.RetrieveStrategy.SINGLE:
# get retrieval model config # get retrieval model config
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

6
api/core/rag/retrieval/retrival_methods.py
Unescape Escape View File

@ -1,15 +1,15 @@
from enum import Enum from enum import Enum
class RetrievalMethod(str, Enum): class RetrievalMethod(Enum):
SEMANTIC_SEARCH = 'semantic_search' SEMANTIC_SEARCH = 'semantic_search'
FULL_TEXT_SEARCH = 'full_text_search' FULL_TEXT_SEARCH = 'full_text_search'
HYBRID_SEARCH = 'hybrid_search' HYBRID_SEARCH = 'hybrid_search'
@staticmethod @staticmethod
def is_support_semantic_search(retrieval_method: str) -> bool: def is_support_semantic_search(retrieval_method: str) -> bool:
return retrieval_method in {RetrievalMethod.SEMANTIC_SEARCH, RetrievalMethod.HYBRID_SEARCH} return retrieval_method in {RetrievalMethod.SEMANTIC_SEARCH.value, RetrievalMethod.HYBRID_SEARCH.value}
@staticmethod @staticmethod
def is_support_fulltext_search(retrieval_method: str) -> bool: def is_support_fulltext_search(retrieval_method: str) -> bool:
return retrieval_method in {RetrievalMethod.FULL_TEXT_SEARCH, RetrievalMethod.HYBRID_SEARCH} return retrieval_method in {RetrievalMethod.FULL_TEXT_SEARCH.value, RetrievalMethod.HYBRID_SEARCH.value}

2
api/core/tools/tool/dataset_retriever/dataset_multi_retriever_tool.py
Unescape Escape View File

@ -14,7 +14,7 @@ from extensions.ext_database import db
from models.dataset import Dataset, Document, DocumentSegment from models.dataset import Dataset, Document, DocumentSegment
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

2
api/core/tools/tool/dataset_retriever/dataset_retriever_tool.py
Unescape Escape View File

@ -8,7 +8,7 @@ from extensions.ext_database import db
from models.dataset import Dataset, Document, DocumentSegment from models.dataset import Dataset, Document, DocumentSegment
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

2
api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
Unescape Escape View File

@ -22,7 +22,7 @@ from models.dataset import Dataset, Document, DocumentSegment
from models.workflow import WorkflowNodeExecutionStatus from models.workflow import WorkflowNodeExecutionStatus
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

2
api/models/dataset.py
Unescape Escape View File

@ -117,7 +117,7 @@ class Dataset(db.Model):
@property @property
def retrieval_model_dict(self): def retrieval_model_dict(self):
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

4
api/services/dataset_service.py
Unescape Escape View File

@ -688,7 +688,7 @@ class DocumentService:
dataset.collection_binding_id = dataset_collection_binding.id dataset.collection_binding_id = dataset_collection_binding.id
if not dataset.retrieval_model: if not dataset.retrieval_model:
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',
@ -1059,7 +1059,7 @@ class DocumentService:
retrieval_model = document_data['retrieval_model'] retrieval_model = document_data['retrieval_model']
else: else:
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

2
api/services/hit_testing_service.py
Unescape Escape View File

@ -9,7 +9,7 @@ from models.account import Account
from models.dataset import Dataset, DatasetQuery, DocumentSegment from models.dataset import Dataset, DatasetQuery, DocumentSegment
default_retrieval_model = { default_retrieval_model = {
'search_method': RetrievalMethod.SEMANTIC_SEARCH, 'search_method': RetrievalMethod.SEMANTIC_SEARCH.value,
'reranking_enable': False, 'reranking_enable': False,
'reranking_model': { 'reranking_model': {
'reranking_provider_name': '', 'reranking_provider_name': '',

Write Preview
Loading…
Cancel
Save