fix: parse download progress
This commit is contained in:
jialin
@@ -2,7 +2,6 @@ import useSetChunkRequest from '@/hooks/use-chunk-request';
|
||||
import useContainerScroll from '@/hooks/use-container-scorll';
|
||||
import Convert from 'ansi-to-html';
|
||||
import classNames from 'classnames';
|
||||
import _ from 'lodash';
|
||||
import { memo, useCallback, useEffect, useRef, useState } from 'react';
|
||||
import './index.less';
|
||||
|
||||
@@ -26,47 +25,59 @@ const LogsViewer: React.FC<LogsViewerProps> = (props) => {
|
||||
|
||||
const convert = new Convert({
|
||||
newline: true,
|
||||
escapeXML: true
|
||||
escapeXML: true,
|
||||
stream: false
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
updateScrollerPosition();
|
||||
}, [logsContent]);
|
||||
|
||||
const getTrailingACount = useCallback((str: string) => {
|
||||
const match = str.match(/A+$/);
|
||||
return match ? match[0].length : 0;
|
||||
const endsWithAnsiEscapeSequence = useCallback((str: string) => {
|
||||
const ansiEscapeRegex = /\x1B\[[0-9;]*[A-Za-z]$/;
|
||||
return ansiEscapeRegex.test(str);
|
||||
}, []);
|
||||
const parseHtmlStr = useCallback((htmlStr: string) => {
|
||||
const result: string[] = [];
|
||||
const htmlStrArr = _.filter(
|
||||
htmlStr?.split?.('<br/>'),
|
||||
(item: string) => item
|
||||
);
|
||||
const getCursorUpLines = useCallback((str: string) => {
|
||||
const match = str.match(/\x1B\[(\d*)A$/);
|
||||
|
||||
htmlStrArr.forEach((item: string, index: number) => {
|
||||
const aCount = getTrailingACount(item);
|
||||
if (aCount > 0) {
|
||||
console.log('aCount========', {
|
||||
htmlStrArr,
|
||||
aCount,
|
||||
item,
|
||||
length: result.length,
|
||||
result: [...result]
|
||||
});
|
||||
const placeIndex = result.length - aCount;
|
||||
result[placeIndex] = item.slice(0, -aCount);
|
||||
if (match) {
|
||||
return match[1] === '' ? 1 : parseInt(match[1], 10);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const parseHtmlStr = useCallback((logStr: string) => {
|
||||
const result: string[] = [];
|
||||
const lines = logStr?.split?.('\n');
|
||||
|
||||
lines.forEach((line: string, index: number) => {
|
||||
const upCount = getCursorUpLines(line);
|
||||
if (endsWithAnsiEscapeSequence(line)) {
|
||||
if (upCount) {
|
||||
const placeIndex = result.length - upCount;
|
||||
result[placeIndex] = line;
|
||||
} else {
|
||||
result.push(line);
|
||||
}
|
||||
} else {
|
||||
result.push(item);
|
||||
if (line.includes('\r')) {
|
||||
const parts = line.split('\r');
|
||||
const lastLine = parts[parts.length - 1];
|
||||
result.push(lastLine);
|
||||
} else {
|
||||
result.push(line);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
return result.map((item) => {
|
||||
return convert.toHtml(item);
|
||||
});
|
||||
}, []);
|
||||
|
||||
const updateContent = (newVal: string) => {
|
||||
const htmlStr = `${convert.toHtml(newVal)}`;
|
||||
const list = parseHtmlStr(htmlStr);
|
||||
const list = parseHtmlStr(newVal);
|
||||
setLogsContent(list);
|
||||
};
|
||||
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
export const text = `reflection-llama-3.1-70b
|
||||
Hugging Face / Reflection-Llama-3.1-70B.Q6_K*.gguf
|
||||
0 / 1
|
||||
2024-09-10 17:42:25
|
||||
reflection-llama-3.1-70b-2cDWS
|
||||
0.42%
|
||||
2024-09-10 17:42:25
|
||||
|
||||
gemma2-27b
|
||||
Ollama Library / gemma2:27b
|
||||
0 / 1
|
||||
2024-09-10 16:54:13
|
||||
gemma2-27b-m37dz
|
||||
58.98%
|
||||
2024-09-10 16:54:13
|
||||
|
||||
查看日志
|
||||
2024-09-10T17:42:27+08:00 - gpustack.worker.downloaders - INFO - Downloading model leafspark/Reflection-Llama-3.1-70B-GGUF/Reflection-Llama-3.1-70B.Q6_K*.gguf
|
||||
|
||||
Fetching 2 files: 0%| | 0/2 [00:00<?, ?it/s]
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.0G/39.9G [00:00<?, ?B/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.0G/39.9G [00:05<2:30:05, 1.98MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.0G/39.9G [00:10<2:26:57, 2.02MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.0G/39.9G [00:15<2:27:42, 2.01MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:20<2:23:48, 2.06MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:25<2:22:41, 2.08MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:30<2:22:08, 2.09MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:35<2:22:43, 2.08MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:40<2:22:49, 2.07MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:45<2:21:54, 2.09MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 55%|█████▌ | 22.1G/39.9G [00:50<2:21:42, 2.09MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.1G/39.9G [00:55<2:23:39, 2.06MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.1G/39.9G [01:01<2:25:09, 2.04MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.1G/39.9G [01:06<2:23:30, 2.06MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.2G/39.9G [01:11<2:26:31, 2.01MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.2G/39.9G [01:16<2:26:04, 2.02MB/s]A
|
||||
|
||||
(…)n-Llama-3.1-70B.Q6_K-00001-of-00002.gguf: 56%|█████▌ | 22.2G/39.9G [01:21<2:25:13, 2.03MB/s]A`;
|
||||
|
||||
export default text;
|
||||
Reference in New Issue
Block a user