Model Runtime (#1858)

Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
Co-authored-by: Garfield Dai <dai.hai@foxmail.com>
Co-authored-by: chenhe <guchenhe@gmail.com>
Co-authored-by: jyong <jyong@dify.ai>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>

web/app/components/datasets/common/check-rerank-model.ts

@@ -1,5 +1,8 @@
-import type { BackendModel } from '../../header/account-setting/model-page/declarations'
 import { RETRIEVE_METHOD, type RetrievalConfig } from '@/types/app'
+import type {
+  DefaultModelResponse,
+  Model,
+} from '@/app/components/header/account-setting/model-provider-page/declarations'
 
 export const isReRankModelSelected = ({
   rerankDefaultModel,
@@ -8,15 +11,18 @@ export const isReRankModelSelected = ({
   rerankModelList,
   indexMethod,
 }: {
-  rerankDefaultModel?: BackendModel
+  rerankDefaultModel?: DefaultModelResponse
   isRerankDefaultModelVaild: boolean
   retrievalConfig: RetrievalConfig
-  rerankModelList: BackendModel[]
+  rerankModelList: Model[]
   indexMethod?: string
 }) => {
   const rerankModelSelected = (() => {
-    if (retrievalConfig.reranking_model?.reranking_model_name)
-      return !!rerankModelList.find(({ model_name }) => model_name === retrievalConfig.reranking_model?.reranking_model_name)
+    if (retrievalConfig.reranking_model?.reranking_model_name) {
+      const provider = rerankModelList.find(({ provider }) => provider === retrievalConfig.reranking_model?.reranking_provider_name)
+
+      return provider?.models.find(({ model }) => model === retrievalConfig.reranking_model?.reranking_model_name)
+    }
 
     if (isRerankDefaultModelVaild)
       return !!rerankDefaultModel
@@ -39,7 +45,7 @@ export const ensureRerankModelSelected = ({
   indexMethod,
   retrievalConfig,
 }: {
-  rerankDefaultModel: BackendModel
+  rerankDefaultModel: DefaultModelResponse
   retrievalConfig: RetrievalConfig
   indexMethod?: string
 }) => {
@@ -52,8 +58,8 @@ export const ensureRerankModelSelected = ({
     return {
       ...retrievalConfig,
       reranking_model: {
-        reranking_provider_name: rerankDefaultModel.model_provider.provider_name,
-        reranking_model_name: rerankDefaultModel.model_name,
+        reranking_provider_name: rerankDefaultModel.provider.provider,
+        reranking_model_name: rerankDefaultModel.model,
       },
     }
   }

web/app/components/datasets/common/retrieval-method-config/index.tsx

@@ -9,6 +9,7 @@ import RadioCard from '@/app/components/base/radio-card'
 import { PatternRecognition, Semantic } from '@/app/components/base/icons/src/vender/solid/development'
 import { FileSearch02 } from '@/app/components/base/icons/src/vender/solid/files'
 import { useProviderContext } from '@/context/provider-context'
+import { useDefaultModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 
 type Props = {
   value: RetrievalConfig
@@ -20,14 +21,15 @@ const RetrievalMethodConfig: FC<Props> = ({
   onChange,
 }) => {
   const { t } = useTranslation()
-  const { supportRetrievalMethods, rerankDefaultModel } = useProviderContext()
+  const { supportRetrievalMethods } = useProviderContext()
+  const { data: rerankDefaultModel } = useDefaultModel(3)
   const value = (() => {
     if (!passValue.reranking_model.reranking_model_name) {
       return {
         ...passValue,
         reranking_model: {
-          reranking_provider_name: rerankDefaultModel?.model_provider.provider_name || '',
-          reranking_model_name: rerankDefaultModel?.model_name || '',
+          reranking_provider_name: rerankDefaultModel?.provider.provider || '',
+          reranking_model_name: rerankDefaultModel?.model || '',
         },
       }
     }

web/app/components/datasets/common/retrieval-param-config/index.tsx

@@ -9,10 +9,9 @@ import { RETRIEVE_METHOD } from '@/types/app'
 import Switch from '@/app/components/base/switch'
 import Tooltip from '@/app/components/base/tooltip-plus'
 import { HelpCircle } from '@/app/components/base/icons/src/vender/line/general'
-import ModelSelector from '@/app/components/header/account-setting/model-page/model-selector'
-import { ModelType } from '@/app/components/header/account-setting/model-page/declarations'
 import type { RetrievalConfig } from '@/types/app'
-import { useProviderContext } from '@/context/provider-context'
+import ModelSelector from '@/app/components/header/account-setting/model-provider-page/model-selector'
+import { useModelListAndDefaultModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 
 type Props = {
   type: RETRIEVE_METHOD
@@ -29,8 +28,9 @@ const RetrievalParamConfig: FC<Props> = ({
   const canToggleRerankModalEnable = type !== RETRIEVE_METHOD.hybrid
   const isEconomical = type === RETRIEVE_METHOD.invertedIndex
   const {
-    rerankDefaultModel,
-  } = useProviderContext()
+    defaultModel: rerankDefaultModel,
+    modelList: rerankModelList,
+  } = useModelListAndDefaultModel(3)
 
   const rerankModel = (() => {
     if (value.reranking_model) {
@@ -41,8 +41,8 @@ const RetrievalParamConfig: FC<Props> = ({
     }
     else if (rerankDefaultModel) {
       return {
-        provider_name: rerankDefaultModel.model_provider.provider_name,
-        model_name: rerankDefaultModel.model_name,
+        provider_name: rerankDefaultModel.provider.provider,
+        model_name: rerankDefaultModel.model,
       }
     }
   })()
@@ -71,24 +71,21 @@ const RetrievalParamConfig: FC<Props> = ({
               </Tooltip>
             </div>
           </div>
-          <div>
-            <ModelSelector
-              whenEmptyGoToSetting
-              popClassName='!max-w-[100%] !w-full'
-              value={rerankModel && { providerName: rerankModel.provider_name, modelName: rerankModel.model_name } as any}
-              modelType={ModelType.reranking}
-              readonly={!value.reranking_enable && type !== RETRIEVE_METHOD.hybrid}
-              onChange={(v) => {
-                onChange({
-                  ...value,
-                  reranking_model: {
-                    reranking_provider_name: v.model_provider.provider_name,
-                    reranking_model_name: v.model_name,
-                  },
-                })
-              }}
-            />
-          </div>
+          <ModelSelector
+            triggerClassName={`${!value.reranking_enable && type !== RETRIEVE_METHOD.hybrid && '!opacity-60 !cursor-not-allowed'}`}
+            defaultModel={rerankModel && { provider: rerankModel.provider_name, model: rerankModel.model_name }}
+            modelList={rerankModelList}
+            readonly={!value.reranking_enable && type !== RETRIEVE_METHOD.hybrid}
+            onSelect={(v) => {
+              onChange({
+                ...value,
+                reranking_model: {
+                  reranking_provider_name: v.provider,
+                  reranking_model_name: v.model,
+                },
+              })
+            }}
+          />
         </div>
       )}