Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Refactor: drop model IDs from tenant info in favor of default model dictionary (#966) (#18209)

Wang Qid2ee236354a5
diff --git a/web/src/hooks/use-user-setting-request.tsx b/web/src/hooks/use-user-setting-request.tsx
index 66ffd61fe9..0ef33c7f1f 100644
--- a/web/src/hooks/use-user-setting-request.tsx
+++ b/web/src/hooks/use-user-setting-request.tsx
@@ -41,8 +41,7 @@ import {
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { useCallback, useMemo, useState, useSyncExternalStore } from 'react';
import { useTranslation } from 'react-i18next';
-
-import { useWarnEmptyModel } from './use-warn-empty-model';
+import { useFetchDefaultModelDictionary } from './use-llm-request';
export const enum UserSettingApiAction {
UserInfo = 'userInfo',
@@ -88,40 +87,30 @@ export const useFetchUserInfo = (): ResponseGetType<IUserInfo> => {
return { data, loading };
};
-// Stop using this interface to retrieve the default model; instead, directly call `useFetchDefaultModelDictionary`.
-export const useFetchTenantInfo = (
- showEmptyModelWarn = false,
-): ResponseGetType<ITenantInfo> => {
+export const useFetchTenantData = (): ResponseGetType<ITenantInfo> => {
const { data, isFetching: loading } = useQuery({
- queryKey: [UserSettingApiAction.TenantInfo, showEmptyModelWarn],
+ queryKey: [UserSettingApiAction.TenantInfo],
initialData: {},
gcTime: 0,
queryFn: async () => {
const { data: res } = await userService.getTenantInfo();
if (res.code === 0) {
- // llm_id is chat_id
- // asr_id is speech2txt
- const { data } = res;
- data.chat_id = data.llm_id;
- data.speech2text_id = data.asr_id;
-
- return data;
+ return res.data ?? {};
}
return res;
},
});
-
- useWarnEmptyModel(showEmptyModelWarn, data?.embd_id, data?.llm_id, loading);
-
return { data, loading };
};
+export const useFetchTenantInfo = useFetchTenantData;
+
export const useSelectParserList = (): Array<{
value: string;
label: string;
}> => {
- const { data: tenantInfo } = useFetchTenantInfo(true);
+ const { data: tenantInfo } = useFetchTenantInfo();
const { t } = useTranslation();
// Detect backend runtime language (Go vs Python) so we can choose
@@ -144,6 +133,7 @@ export const useSelectParserList = (): Array<{
staleTime: Infinity,
enabled: backendLang === 'go',
});
+ useFetchDefaultModelDictionary(true);
const defaultParsers = useMemo(
() => [
diff --git a/web/src/interfaces/database/dataset.ts b/web/src/interfaces/database/dataset.ts
index 369bda2cc2..1bae6b028d 100644
--- a/web/src/interfaces/database/dataset.ts
+++ b/web/src/interfaces/database/dataset.ts
@@ -147,25 +147,10 @@ export interface IKnowledgeFile {
}
export interface ITenantInfo {
- asr_id: string;
- embd_id: string;
- img2txt_id: string;
- llm_id: string;
name: string;
parser_ids: string;
role: string;
tenant_id: string;
- chat_id: string;
- speech2text_id: string;
- rerank_id?: string;
- tts_id: string;
- // Tenant model IDs
- tenant_asr_id?: string;
- tenant_embd_id?: string;
- tenant_img2txt_id?: string;
- tenant_llm_id?: string;
- tenant_rerank_id?: string;
- tenant_tts_id?: string;
}
export type ChunkDocType = 'image' | 'table' | 'text';