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

fix: not show rerank modal picker

Browse Source
This commit is contained in:
Joel
2024-02-29 19:39:27 +08:00
parent 257e795ca9
commit 045156985a
10 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
web/app/components/workflow/nodes/knowledge-retrieval/components/retrieval-config.tsx
View File

@ -11,6 +11,8 @@ import {
} from '@/app/components/base/portal-to-follow-elem'
import ConfigRetrievalContent from '@/app/components/app/configuration/dataset-config/params-config/config-content'
import { RETRIEVE_TYPE } from '@/types/app'
import { DATASET_DEFAULT } from '@/config'
import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
import type {
DatasetConfigs,
@ -35,6 +37,11 @@ const RetrievalConfig: FC<Props> = ({
const [open, setOpen] = useState(false)
const {
defaultModel: rerankDefaultModel,
currentModel: isRerankDefaultModelVaild,
} = useModelListAndDefaultModelAndCurrentProviderAndModel(3)
const { multiple_retrieval_config } = payload
const handleChange = useCallback((configs: DatasetConfigs, isRetrievalModeChange?: boolean) => {
if (isRetrievalModeChange) {
@ -43,11 +50,18 @@ const RetrievalConfig: FC<Props> = ({
}
onMultipleRetrievalConfigChange({
top_k: configs.top_k,
score_threshold: configs.score_threshold_enabled ? configs.score_threshold : null,
reranking_model: {
provider: configs.reranking_model?.reranking_provider_name,
model: configs.reranking_model?.reranking_model_name,
},
score_threshold: configs.score_threshold_enabled ? (configs.score_threshold || DATASET_DEFAULT.score_threshold) : null,
reranking_model: payload.retrieval_mode === RETRIEVE_TYPE.oneWay
? undefined
: (!configs.reranking_model?.reranking_provider_name
? {
provider: rerankDefaultModel?.provider?.provider || '',
model: rerankDefaultModel?.model || '',
}
: {
provider: configs.reranking_model?.reranking_provider_name,
model: configs.reranking_model?.reranking_model_name,
}),
})
}, [onRetrievalModeChange, onMultipleRetrievalConfigChange])
@ -75,13 +89,18 @@ const RetrievalConfig: FC<Props> = ({
datasetConfigs={
{
retrieval_model: payload.retrieval_mode,
reranking_model: {
reranking_provider_name: multiple_retrieval_config?.reranking_model?.provider || '',
reranking_model_name: multiple_retrieval_config?.reranking_model?.model || '',
},
top_k: multiple_retrieval_config?.top_k || 5,
reranking_model: !multiple_retrieval_config?.reranking_model?.provider
? {
reranking_provider_name: rerankDefaultModel?.provider?.provider || '',
reranking_model_name: rerankDefaultModel?.model || '',
}
: {
reranking_provider_name: multiple_retrieval_config?.reranking_model?.provider || '',
reranking_model_name: multiple_retrieval_config?.reranking_model?.model || '',
},
top_k: multiple_retrieval_config?.top_k || DATASET_DEFAULT.top_k,
score_threshold_enabled: !(multiple_retrieval_config?.score_threshold === undefined || multiple_retrieval_config?.score_threshold === null),
score_threshold: multiple_retrieval_config?.score_threshold || 0.5,
score_threshold: multiple_retrieval_config?.score_threshold,
datasets: {
datasets: [],
},

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

@ -11,7 +11,7 @@ export const mockData: KnowledgeRetrievalNodeType = {
retrieval_mode: RETRIEVE_TYPE.oneWay,
multiple_retrieval_config: {
top_k: 10,
score_threshold: 0.5,
score_threshold: null,
reranking_model: {
provider: '',
model: '',

21
web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx
View File

@ -67,21 +67,22 @@ const Panel: FC = () => {
type: 'string',
description: t(`${i18nPrefix}.outputVars.content`),
},
// url, title, link like bing search reference result: link, link page title, link page icon
{
name: 'title',
type: 'string',
description: t(`${i18nPrefix}.outputVars.title`),
},
// {
// name: 'url',
// type: 'string',
// description: t(`${i18nPrefix}.outputVars.url`)
// },
// {
// name: 'icon',
// type: 'string',
// description: t(`${i18nPrefix}.outputVars.icon`)
// },
{
name: 'url',
type: 'string',
description: t(`${i18nPrefix}.outputVars.url`),
},
{
name: 'icon',
type: 'string',
description: t(`${i18nPrefix}.outputVars.icon`),
},
{
name: 'metadata',
type: 'object',

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

@ -4,7 +4,7 @@ import type { RETRIEVE_TYPE } from '@/types/app'
export type MultipleRetrievalConfig = {
top_k: number
score_threshold: number | null | undefined
reranking_model: {
reranking_model?: {
provider: string
model: string
}