youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-05 09:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/attachments

Browse Source
This commit is contained in:
StyleZhang
2024-08-02 16:30:10 +08:00
parent 0480bb03c3 df530b53e5
commit a05d16375e
106 changed files with 4284 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/workflow/nodes/knowledge-retrieval/types.ts
View File

@ -2,7 +2,6 @@ import type { CommonNodeType, ModelConfig, ValueSelector } from '@/app/component
import type { RETRIEVE_TYPE } from '@/types/app'
import type {
RerankingModeEnum,
WeightedScoreEnum,
} from '@/models/datasets'
export type MultipleRetrievalConfig = {
@ -14,7 +13,6 @@ export type MultipleRetrievalConfig = {
}
reranking_mode?: RerankingModeEnum
weights?: {
weight_type: WeightedScoreEnum
vector_setting: {
vector_weight: number
embedding_provider_name: string

2
web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts
View File

@ -263,7 +263,7 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
handleMultipleRetrievalConfigChange,
handleModelChanged,
handleCompletionParamsChange,
selectedDatasets,
selectedDatasets: selectedDatasets.filter(d => d.name),
handleOnDatasetsChange,
isShowSingleRun,
hideSingleRun,

4
web/app/components/workflow/nodes/knowledge-retrieval/utils.ts
View File

@ -7,7 +7,6 @@ import type {
import {
DEFAULT_WEIGHTED_SCORE,
RerankingModeEnum,
WeightedScoreEnum,
} from '@/models/datasets'
import { RETRIEVE_METHOD } from '@/types/app'
import { DATASET_DEFAULT } from '@/config'
@ -89,7 +88,7 @@ export const getMultipleRetrievalConfig = (multipleRetrievalConfig: MultipleRetr
reranking_mode,
reranking_model,
weights,
reranking_enable,
reranking_enable: allEconomic ? reranking_enable : true,
}
if (allEconomic || mixtureHighQualityAndEconomic || inconsistentEmbeddingModel)
@ -100,7 +99,6 @@ export const getMultipleRetrievalConfig = (multipleRetrievalConfig: MultipleRetr
if (allHighQuality && !inconsistentEmbeddingModel && (reranking_mode === RerankingModeEnum.WeightedScore || reranking_mode === undefined) && !weights) {
result.weights = {
weight_type: WeightedScoreEnum.Customized,
vector_setting: {
vector_weight: allHighQualityVectorSearch
? DEFAULT_WEIGHTED_SCORE.allHighQualityVectorSearch.semantic