fix: debounce for page change in search models

This commit is contained in:
jialin
2025-06-17 11:50:33 +08:00
parent 2c5100b2ed
commit 0133524f09
6 changed files with 71 additions and 9 deletions
@@ -248,6 +248,7 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
<FormInnerContext.Provider <FormInnerContext.Provider
value={{ value={{
onBackendChange: handleBackendChange, onBackendChange: handleBackendChange,
onValuesChange: onValuesChange,
gpuOptions: gpuOptions gpuOptions: gpuOptions
}} }}
> >
+1 -2
View File
@@ -49,8 +49,7 @@ const MarkDownTitle: React.FC<{
return ( return (
<MkdTitle onClick={onCollapse}> <MkdTitle onClick={onCollapse}>
<span> <span>
<FileTextOutlined className="m-r-2 text-tertiary" />{' '} <FileTextOutlined className="m-r-2 text-tertiary" /> README.md
{intl.formatMessage({ id: 'models.readme' })}
</span> </span>
<span> <span>
{collapsed ? ( {collapsed ? (
+50 -3
View File
@@ -33,6 +33,12 @@ const UL = styled.ul`
margin: 0; margin: 0;
`; `;
const PaginationMain = styled(Pagination)`
.ant-pagination-slash {
margin-inline: 5px;
}
`;
interface SearchInputProps { interface SearchInputProps {
hasLinuxWorker?: boolean; hasLinuxWorker?: boolean;
modelSource: string; modelSource: string;
@@ -87,6 +93,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
const filterTaskRef = useRef<string>(''); const filterTaskRef = useRef<string>('');
const timer = useRef<any>(null); const timer = useRef<any>(null);
const requestIdRef = useRef<number>(0); const requestIdRef = useRef<number>(0);
const searchIdRef = useRef<number>(0);
const [query, setQuery] = useState({ const [query, setQuery] = useState({
page: 1, page: 1,
perPage: 10, perPage: 10,
@@ -111,6 +118,11 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
} }
]); ]);
const updateSearchId = () => {
searchIdRef.current += 1;
return searchIdRef.current;
};
const updateRequestId = () => { const updateRequestId = () => {
requestIdRef.current += 1; requestIdRef.current += 1;
return requestIdRef.current; return requestIdRef.current;
@@ -135,6 +147,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
// huggeface // huggeface
const getModelsFromHuggingface = async (sort: string) => { const getModelsFromHuggingface = async (sort: string) => {
const currentSearchId = updateSearchId();
try { try {
const task: any = searchInputRef.current ? '' : 'text-generation'; const task: any = searchInputRef.current ? '' : 'text-generation';
const params = { const params = {
@@ -148,6 +161,11 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
const data = await queryHuggingfaceModels(params, { const data = await queryHuggingfaceModels(params, {
signal: axiosTokenRef.current.signal signal: axiosTokenRef.current.signal
}); });
if (searchIdRef.current !== currentSearchId) {
return {
notSameRequest: true
};
}
let list = _.map(data || [], (item: any) => { let list = _.map(data || [], (item: any) => {
return { return {
...item, ...item,
@@ -159,6 +177,11 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
}); });
return list; return list;
} catch (error) { } catch (error) {
if (searchIdRef.current !== currentSearchId) {
return {
notSameRequest: true
};
}
return []; return [];
} }
}; };
@@ -169,6 +192,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
page: number; page: number;
perPage?: number; perPage?: number;
}) => { }) => {
const currentSearchId = updateSearchId();
try { try {
const params = { const params = {
Name: `${searchInputRef.current}`, Name: `${searchInputRef.current}`,
@@ -183,6 +207,11 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
const data = await queryModelScopeModels(params, { const data = await queryModelScopeModels(params, {
signal: axiosTokenRef.current.signal signal: axiosTokenRef.current.signal
}); });
if (searchIdRef.current !== currentSearchId) {
return {
notSameRequest: true
};
}
let list = _.map(_.get(data, 'Data.Model.Models') || [], (item: any) => { let list = _.map(_.get(data, 'Data.Model.Models') || [], (item: any) => {
return { return {
path: item.Path, path: item.Path,
@@ -214,6 +243,11 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
}); });
return list; return list;
} catch (error) { } catch (error) {
if (searchIdRef.current !== currentSearchId) {
return {
notSameRequest: true
};
}
setQuery((prev) => { setQuery((prev) => {
return { return {
...prev, ...prev,
@@ -343,6 +377,9 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
let list: any[] = []; let list: any[] = [];
if (modelSource === modelSourceMap.huggingface_value) { if (modelSource === modelSourceMap.huggingface_value) {
const resultList = await getModelsFromHuggingface(sort); const resultList = await getModelsFromHuggingface(sort);
if (resultList?.notSameRequest) {
return;
}
cacheRepoOptions.current = resultList; cacheRepoOptions.current = resultList;
// hf has no page and perPage, so we need to slice the resultList // hf has no page and perPage, so we need to slice the resultList
@@ -356,6 +393,9 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
}); });
} else if (modelSource === modelSourceMap.modelscope_value) { } else if (modelSource === modelSourceMap.modelscope_value) {
list = await getModelsFromModelscope(params); list = await getModelsFromModelscope(params);
if (list?.notSameRequest) {
return;
}
cacheRepoOptions.current = list; cacheRepoOptions.current = list;
} }
@@ -370,7 +410,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
unlockWarningStatus?.(); unlockWarningStatus?.();
displayEvaluateStatus?.( displayEvaluateStatus?.(
{ {
show: list.length > 0, show: list?.length > 0,
message: '' message: ''
}, },
{ {
@@ -389,6 +429,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
sortType: sort, sortType: sort,
networkError: error?.message === 'Failed to fetch' networkError: error?.message === 'Failed to fetch'
}); });
setLoadingModel?.(false); setLoadingModel?.(false);
displayEvaluateStatus?.({ displayEvaluateStatus?.({
show: false, show: false,
@@ -472,6 +513,12 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
handleOnSelectModel(currentList[0]); handleOnSelectModel(currentList[0]);
handleEvaluate(currentList); handleEvaluate(currentList);
} else if (modelSource === modelSourceMap.modelscope_value) { } else if (modelSource === modelSourceMap.modelscope_value) {
setQuery((prev) => {
return {
...prev,
page: page
};
});
handleOnSearchRepo({ handleOnSearchRepo({
sortType: dataSource.sortType, sortType: dataSource.sortType,
page: page, page: page,
@@ -539,7 +586,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
{renderGGUFTips} {renderGGUFTips}
</Checkbox> </Checkbox>
</span> </span>
<Pagination <PaginationMain
simple={{ readOnly: true }} simple={{ readOnly: true }}
total={query.total} total={query.total}
current={query.page} current={query.page}
@@ -547,7 +594,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
onChange={handleOnPageChange} onChange={handleOnPageChange}
showSizeChanger={false} showSizeChanger={false}
hideOnSinglePage={query.total <= query.perPage} hideOnSinglePage={query.total <= query.perPage}
></Pagination> ></PaginationMain>
</div> </div>
</> </>
); );
@@ -15,6 +15,7 @@ interface FormContextProps {
interface FormInnerContextProps { interface FormInnerContextProps {
onBackendChange?: (backend: string) => void; onBackendChange?: (backend: string) => void;
onValuesChange?: (changedValues: any, allValues: any) => void;
gpuOptions?: any[]; gpuOptions?: any[];
} }
+14 -3
View File
@@ -19,7 +19,7 @@ const LocalPathForm: React.FC = () => {
const formCtx = useFormContext(); const formCtx = useFormContext();
const formInnerCtx = useFormInnerContext(); const formInnerCtx = useFormInnerContext();
const source = Form.useWatch('source', form); const source = Form.useWatch('source', form);
const { onBackendChange, gpuOptions } = formInnerCtx; const { onBackendChange, onValuesChange, gpuOptions } = formInnerCtx;
const { byBuiltIn } = formCtx; const { byBuiltIn } = formCtx;
const { getRuleMessage } = useAppUtils(); const { getRuleMessage } = useAppUtils();
const intl = useIntl(); const intl = useIntl();
@@ -29,7 +29,7 @@ const LocalPathForm: React.FC = () => {
return null; return null;
} }
const handleLocalPathBlur = (e: any) => { const handleLocalPathBlur = async (e: any) => {
const value = e.target.value; const value = e.target.value;
if (value === localPathCache.current || !value) { if (value === localPathCache.current || !value) {
return; return;
@@ -37,6 +37,7 @@ const LocalPathForm: React.FC = () => {
const isEndwithGGUF = _.endsWith(value, '.gguf'); const isEndwithGGUF = _.endsWith(value, '.gguf');
const isBlobFile = value.split('/').pop().includes('sha256'); const isBlobFile = value.split('/').pop().includes('sha256');
let backend = form.getFieldValue('backend'); let backend = form.getFieldValue('backend');
const oldBackend = backend;
if (isEndwithGGUF || isBlobFile) { if (isEndwithGGUF || isBlobFile) {
backend = backendOptionsMap.llamaBox; backend = backendOptionsMap.llamaBox;
@@ -51,7 +52,17 @@ const LocalPathForm: React.FC = () => {
} }
form.setFieldValue('backend', backend); form.setFieldValue('backend', backend);
onBackendChange?.(backend); await new Promise((resolve) => {
setTimeout(() => {
resolve(true);
}, 0);
});
if (oldBackend !== backend) {
onBackendChange?.(backend);
} else {
onValuesChange?.({ local_path: value }, form.getFieldsValue());
}
}; };
const handleOnFocus = () => { const handleOnFocus = () => {
@@ -164,7 +164,10 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
const isDisabled = useMemo(() => { const isDisabled = useMemo(() => {
return disabled return disabled
? true ? true
: !message.content && isEmpty && !message.imgs?.length; : !message.content &&
isEmpty &&
!message.imgs?.length &&
!message.audio?.length;
}, [disabled, message, isEmpty]); }, [disabled, message, isEmpty]);
const resetMessage = () => { const resetMessage = () => {