fix: dashboard usage display datas for last 30 days
This commit is contained in:
@@ -97,6 +97,8 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
const [selectedModel, setSelectedModel] = useState<any>({});
|
||||
const [collapsed, setCollapsed] = useState<boolean>(false);
|
||||
const [isGGUF, setIsGGUF] = useState<boolean>(false);
|
||||
const [isEvaluatModel, setIsEvaluatModel] = useState<boolean>(false);
|
||||
const [isEvaluatModelFile, setIsEvaluatModelFile] = useState<boolean>(false);
|
||||
const modelFileRef = useRef<any>(null);
|
||||
|
||||
const getDefaultSpec = (item: any) => {
|
||||
@@ -114,7 +116,7 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
}
|
||||
return categories || null;
|
||||
};
|
||||
const handleSelectModelFile = (item: any) => {
|
||||
const handleSelectModelFile = (item: any, evaluate?: boolean) => {
|
||||
form.current?.form?.resetFields(resetFields);
|
||||
const modelInfo = onSelectModel(selectedModel, props.source);
|
||||
form.current?.setFieldsValue?.({
|
||||
@@ -129,7 +131,7 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
}
|
||||
};
|
||||
|
||||
const handleOnSelectModel = (item: any) => {
|
||||
const handleOnSelectModel = (item: any, evaluate?: boolean) => {
|
||||
setSelectedModel(item);
|
||||
if (!item.isGGUF) {
|
||||
setIsGGUF(false);
|
||||
@@ -209,7 +211,6 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
}, [onCancel]);
|
||||
|
||||
const handleOnOpen = () => {
|
||||
console.log('handleOnOpen----------', props.source, props.deploymentType);
|
||||
if (props.deploymentType === 'modelFiles') {
|
||||
form.current?.form?.setFieldsValue({
|
||||
...props.initialValues
|
||||
@@ -233,6 +234,27 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
return warningStatus.show && warningStatus.type !== 'success';
|
||||
}, [warningStatus.show, warningStatus.type]);
|
||||
|
||||
const displayEvaluateStatus = () => {
|
||||
console.log('displayEvaluateStatus===');
|
||||
setWarningStatus({
|
||||
show: true,
|
||||
title: '',
|
||||
type: 'transition',
|
||||
message: intl.formatMessage({ id: 'models.form.evaluating' })
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (isEvaluatModel || isEvaluatModelFile) {
|
||||
setWarningStatus({
|
||||
show: true,
|
||||
title: '',
|
||||
type: 'transition',
|
||||
message: intl.formatMessage({ id: 'models.form.evaluating' })
|
||||
});
|
||||
}
|
||||
}, [isEvaluatModel, isEvaluatModelFile]);
|
||||
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
handleOnOpen();
|
||||
@@ -289,6 +311,7 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
hasLinuxWorker={hasLinuxWorker}
|
||||
modelSource={props.source}
|
||||
onSelectModel={handleOnSelectModel}
|
||||
displayEvaluateStatus={displayEvaluateStatus}
|
||||
></SearchModel>
|
||||
</ColumnWrapper>
|
||||
<Separator></Separator>
|
||||
@@ -309,6 +332,7 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
modelSource={props.source}
|
||||
onSelectFile={handleSelectModelFile}
|
||||
collapsed={collapsed}
|
||||
displayEvaluateStatus={displayEvaluateStatus}
|
||||
></HFModelFile>
|
||||
)}
|
||||
</ColumnWrapper>
|
||||
|
||||
@@ -39,7 +39,8 @@ interface HFModelFileProps {
|
||||
loadingModel?: boolean;
|
||||
modelSource: string;
|
||||
ref: any;
|
||||
onSelectFile?: (file: any) => void;
|
||||
onSelectFile?: (file: any, evaluate?: boolean) => void;
|
||||
displayEvaluateStatus?: (show?: boolean) => void;
|
||||
}
|
||||
|
||||
const pattern = /^(.*)-(\d+)-of-(\d+)\.(.*)$/;
|
||||
@@ -49,7 +50,7 @@ const includeReg = /\.(safetensors|gguf)$/i;
|
||||
const filterRegGGUF = /\.(gguf)$/i;
|
||||
|
||||
const HFModelFile: React.FC<HFModelFileProps> = forwardRef((props, ref) => {
|
||||
const { collapsed, modelSource, isDownload } = props;
|
||||
const { collapsed, modelSource, isDownload, displayEvaluateStatus } = props;
|
||||
const intl = useIntl();
|
||||
const [isEvaluating, setIsEvaluating] = useState(false);
|
||||
const [dataSource, setDataSource] = useState<any>({
|
||||
@@ -73,8 +74,8 @@ const HFModelFile: React.FC<HFModelFileProps> = forwardRef((props, ref) => {
|
||||
const checkTokenRef = useRef<any>(null);
|
||||
const timer = useRef<any>(null);
|
||||
|
||||
const handleSelectModelFile = (item: any) => {
|
||||
props.onSelectFile?.(item);
|
||||
const handleSelectModelFile = (item: any, evaluate?: boolean) => {
|
||||
props.onSelectFile?.(item, evaluate);
|
||||
setCurrent(item.path);
|
||||
currentPathRef.current = item.path;
|
||||
};
|
||||
@@ -243,7 +244,7 @@ const HFModelFile: React.FC<HFModelFileProps> = forwardRef((props, ref) => {
|
||||
});
|
||||
|
||||
setIsEvaluating(true);
|
||||
|
||||
displayEvaluateStatus?.(true);
|
||||
const evaluationList = await getEvaluateResults(evaluateFileList);
|
||||
|
||||
const resultList = _.map(list, (item: any, index: number) => {
|
||||
@@ -257,7 +258,7 @@ const HFModelFile: React.FC<HFModelFileProps> = forwardRef((props, ref) => {
|
||||
(item: any) => item.path === currentPathRef.current
|
||||
);
|
||||
if (currentItem) {
|
||||
handleSelectModelFile(currentItem);
|
||||
handleSelectModelFile(currentItem, true);
|
||||
}
|
||||
setDataSource({ fileList: resultList, loading: false });
|
||||
setIsEvaluating(false);
|
||||
|
||||
@@ -41,7 +41,8 @@ interface SearchInputProps {
|
||||
isDownload?: boolean;
|
||||
setLoadingModel?: (flag: boolean) => void;
|
||||
onSourceChange?: (source: string) => void;
|
||||
onSelectModel: (model: any) => void;
|
||||
onSelectModel: (model: any, evaluate?: boolean) => void;
|
||||
displayEvaluateStatus?: (show?: boolean) => void;
|
||||
}
|
||||
|
||||
const SearchModel: React.FC<SearchInputProps> = (props) => {
|
||||
@@ -51,7 +52,8 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
|
||||
isDownload,
|
||||
hasLinuxWorker,
|
||||
setLoadingModel,
|
||||
onSelectModel
|
||||
onSelectModel,
|
||||
displayEvaluateStatus
|
||||
} = props;
|
||||
const [dataSource, setDataSource] = useState<{
|
||||
repoOptions: any[];
|
||||
@@ -108,8 +110,8 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
|
||||
return isGGUF || isGGUFFromMs;
|
||||
};
|
||||
|
||||
const handleOnSelectModel = (item: any) => {
|
||||
onSelectModel(item);
|
||||
const handleOnSelectModel = (item: any, evaluate?: boolean) => {
|
||||
onSelectModel(item, evaluate);
|
||||
setCurrent(item.id);
|
||||
currentRef.current = item.id;
|
||||
};
|
||||
@@ -232,6 +234,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
|
||||
};
|
||||
});
|
||||
setIsEvaluating(true);
|
||||
displayEvaluateStatus?.(true);
|
||||
const evaluations = await getEvaluateResults(repoList);
|
||||
const resultList = list.map((item, index) => {
|
||||
return {
|
||||
@@ -251,7 +254,7 @@ const SearchModel: React.FC<SearchInputProps> = (props) => {
|
||||
(item) => item.id === currentRef.current
|
||||
);
|
||||
if (currentItem) {
|
||||
handleOnSelectModel(currentItem);
|
||||
handleOnSelectModel(currentItem, true);
|
||||
}
|
||||
} catch (error) {
|
||||
setIsEvaluating(false);
|
||||
|
||||
Reference in New Issue
Block a user