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

Merge remote-tracking branch 'origin/main' into feat/trigger

Browse Source
This commit is contained in:
lyzno1
2025-10-23 11:54:35 +08:00
parent 949ac9d930 95ce224df0
commit 863b4f8fe9
366 changed files with 5222 additions and 3901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/components/workflow/nodes/knowledge-base/components/embedding-model.tsx
View File

@ -57,6 +57,7 @@ const EmbeddingModel = ({
modelList={embeddingModelList}
onSelect={handleEmbeddingModelChange}
readonly={readonly}
showDeprecatedWarnIcon
/>
</Field>
)

1
web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.tsx
View File

@ -44,6 +44,7 @@ const RerankingModelSelector = ({
modelList={rerankModelList}
onSelect={handleRerankingModelChange}
readonly={readonly}
showDeprecatedWarnIcon
/>
)
}

40
web/app/components/workflow/nodes/knowledge-base/default.ts
View File

@ -31,6 +31,8 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
embedding_model,
embedding_model_provider,
index_chunk_variable_selector,
_embeddingModelList,
_rerankModelList,
} = payload
const {
@ -39,6 +41,12 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
reranking_model,
} = retrieval_model || {}
const currentEmbeddingModelProvider = _embeddingModelList?.find(provider => provider.provider === embedding_model_provider)
const currentEmbeddingModel = currentEmbeddingModelProvider?.models.find(model => model.model === embedding_model)
const currentRerankingModelProvider = _rerankModelList?.find(provider => provider.provider === reranking_model?.reranking_provider_name)
const currentRerankingModel = currentRerankingModelProvider?.models.find(model => model.model === reranking_model?.reranking_model_name)
if (!chunk_structure) {
return {
isValid: false,
@ -60,10 +68,18 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
}
}
if (indexing_technique === IndexingType.QUALIFIED && (!embedding_model || !embedding_model_provider)) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsRequired'),
if (indexing_technique === IndexingType.QUALIFIED) {
if (!embedding_model || !embedding_model_provider) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsRequired'),
}
}
else if (!currentEmbeddingModel) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsInvalid'),
}
}
}
@ -74,10 +90,18 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
}
}
if (reranking_enable && (!reranking_model || !reranking_model.reranking_provider_name || !reranking_model.reranking_model_name)) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsRequired'),
if (reranking_enable) {
if (!reranking_model || !reranking_model.reranking_provider_name || !reranking_model.reranking_model_name) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsRequired'),
}
}
else if (!currentRerankingModel) {
return {
isValid: false,
errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsInvalid'),
}
}
}

3
web/app/components/workflow/nodes/knowledge-base/types.ts
View File

@ -3,6 +3,7 @@ import type { IndexingType } from '@/app/components/datasets/create/step-two'
import type { RETRIEVE_METHOD } from '@/types/app'
import type { WeightedScoreEnum } from '@/models/datasets'
import type { RerankingModeEnum } from '@/models/datasets'
import type { Model } from '@/app/components/header/account-setting/model-provider-page/declarations'
export { WeightedScoreEnum } from '@/models/datasets'
export { IndexingType as IndexMethodEnum } from '@/app/components/datasets/create/step-two'
export { RETRIEVE_METHOD as RetrievalSearchMethodEnum } from '@/types/app'
@ -49,4 +50,6 @@ export type KnowledgeBaseNodeType = CommonNodeType & {
embedding_model_provider?: string
keyword_number: number
retrieval_model: RetrievalSetting
_embeddingModelList?: Model[]
_rerankModelList?: Model[]
}