Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 11:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'fix/rerank-validation-issue' into deploy/dev
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Details
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Details
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Details
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Details
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Details
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
StyleZhang 2024-10-31 20:09:22 +08:00
commit 71f2b5779a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/components/app/configuration/dataset-config/index.tsx
View File

@ -59,7 +59,6 @@ const DatasetConfig: FC = () => {
})
const {
allExternal,
allEconomic,
allInternal,
mixtureInternalAndExternal,
mixtureHighQualityAndEconomic,
@ -67,7 +66,7 @@ const DatasetConfig: FC = () => {
} = getSelectedDatasetsMode(filteredDataSets)
if (
(allInternal && (allEconomic || mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
(allInternal && (mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
|| mixtureInternalAndExternal
|| allExternal
)

3
web/app/components/app/configuration/index.tsx
View File

@ -254,7 +254,6 @@ const Configuration: FC = () => {
hideSelectDataSet()
const {
allExternal,
allEconomic,
allInternal,
mixtureInternalAndExternal,
mixtureHighQualityAndEconomic,
@ -262,7 +261,7 @@ const Configuration: FC = () => {
} = getSelectedDatasetsMode(newDatasets)
if (
(allInternal && (allEconomic || mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
(allInternal && (mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
|| mixtureInternalAndExternal
|| allExternal
)