Compare commits

..
72 Commits
Author SHA1 Message Date
jialin 9d654bcd66 fix: show upgrade check 2024-10-31 11:06:58 +08:00
jialin 5f8e72c6ae chore: update vllm arguments 2024-10-31 11:06:58 +08:00
jialin 5dde5cae50 fix: filter gguf files in modelscope 2024-10-29 17:55:40 +08:00
jialin f730548c8f fix(style): tooltip shown when no content 2024-10-25 22:36:26 +08:00
jialin a185bd9463 style: viewcode scrollbar color 2024-10-25 20:52:15 +08:00
jialin abdc78e123 fix(style): text overflow 2024-10-25 18:36:18 +08:00
jialin ba49fa6c88 chore: completion payload format 2024-10-25 12:15:26 +08:00
jialin 870ffa9dc1 chore: add button for copy logs 2024-10-24 23:23:47 +08:00
jialin 8afaf1a60e chore: update playground payload format 2024-10-24 22:40:38 +08:00
jialin 6974ac8e14 chore: parse bibtex 2024-10-24 22:40:38 +08:00
jialin 9f274ee17e chore: remove metadata of readme 2024-10-24 17:25:31 +08:00
jialin 673bcde719 fix: playground error message field 2024-10-24 14:52:57 +08:00
jialin 6eaf5bb463 style: comparsion model card title 2024-10-24 11:54:21 +08:00
jialin b463eedb3f fix: remove invalid parameter 2024-10-24 10:25:18 +08:00
jialin 90350f99ad style: table column size 2024-10-23 19:36:29 +08:00
jialin 8576015633 fix: chart resize 2024-10-23 18:04:34 +08:00
jialin f5edf39027 chore: worker ip 2024-10-23 14:47:55 +08:00
jialin 751781e3e5 fix: distributed across workers 2024-10-23 14:27:49 +08:00
jialin bc9129bcbe fix(style): body scroll 2024-10-22 18:37:45 +08:00
jialin c442a33d5e fix: stream_options spelling 2024-10-22 15:46:35 +08:00
jialin 902bb06353 fix: logs viewer do not scroll after opened 2024-10-22 15:36:53 +08:00
jialin a0a1b8b3e8 chore: openai api error message 2024-10-22 10:17:29 +08:00
jialin eb5cf9da8d fix: logs scrollbar ux 2024-10-22 09:29:03 +08:00
jialin 57386eeb55 style: body and side menu scrollbar style 2024-10-21 11:36:54 +08:00
jialin 33a21f2aaa fix: scrollbar ux 2024-10-20 12:47:14 +08:00
jialin d6fd498489 chore: logs style 2024-10-20 10:40:17 +08:00
jialin 386f2969eb chore: upgrade check 2024-10-18 19:35:47 +08:00
jialin 2fea3a4b40 chore: parse ansi 2024-10-18 15:20:55 +08:00
jialin b9c9fe7a97 fix: model instances limit 2024-10-18 12:09:09 +08:00
jialin 594c4cd670 fix: select same model will clear filename 2024-10-18 10:59:01 +08:00
jialin e10c5e28b5 fix: upload a image can clear other message 2024-10-17 16:06:38 +08:00
jialin fbefb2014d fix: do not clear system message, on clear button 2024-10-17 15:49:41 +08:00
jialin 909da7edb5 style: model tag style 2024-10-17 14:59:42 +08:00
jialin 349676d908 fix: adjust image size when paste 2024-10-17 13:32:38 +08:00
jialin a47f7cc0ce fix: no request, search model 2024-10-15 17:52:02 +08:00
jialin 8fbdb884c7 chore: hide rerank tab 2024-10-14 10:46:32 +08:00
jialin ec68ce082e fix(style): document list 2024-10-14 10:40:13 +08:00
jialin 2b61e3dfd3 fix(style): input text hover 2024-10-14 10:33:00 +08:00
jialin 4c3dddc486 feat: playground rerank 2024-10-14 10:27:46 +08:00
jialin ecc683a6bd fix: cpu_offload is not shown when editting model 2024-10-09 19:23:29 +08:00
jialin 7b2098cf33 fix: playground params do not update after being changed 2024-10-09 15:07:12 +08:00
jialin 3784d86344 chore: update antd 2024-10-09 14:08:27 +08:00
jialin 2b22481443 style: change select to radio group 2024-10-09 14:08:27 +08:00
jialin c041d768b2 style: model readme.md table cell align left 2024-09-30 20:12:01 +08:00
jialin 5df6154abe fix: system message can not sync to others 2024-09-30 19:51:01 +08:00
jialin 1fed02d23f fix: modal title does not upate after change language 2024-09-30 19:10:13 +08:00
jialin 2d34d07da4 fix: language does not refresh after toggling 2024-09-30 18:54:48 +08:00
jialin ea25291d75 fix(style): model readme img render 2024-09-30 16:33:38 +08:00
jialin 5f77a0082c fix: models compare system message sync to all 2024-09-30 11:45:42 +08:00
jialin 3978ec683d style: no available models tips 2024-09-29 20:34:11 +08:00
jialin 458f467985 chore: modelscope downloading state 2024-09-29 18:58:12 +08:00
jialin 69ffdd4604 fix(style): markdown viewer text-intent 2024-09-29 16:54:00 +08:00
jialin 5c2503b2a8 chore: add no available models notes 2024-09-29 11:52:50 +08:00
jialin bc921ff835 fix(style): hide table cell content if too long 2024-09-28 19:23:56 +08:00
jialin 197488bff6 fix: chat error message 2024-09-27 19:19:56 +08:00
jialin e48d21c8cb fix: overlayscrollbars.css 2024-09-27 17:13:53 +08:00
jialin 7e992fad99 fix: update lock.yaml 2024-09-27 17:00:22 +08:00
jialin 49c0467428 fix: query modelscope files by recursive 2024-09-27 16:50:09 +08:00
jialin 7e985991cd fix(style): compare sroll 2024-09-26 19:52:54 +08:00
jialin cc7d2ded6c fix: update model backend not show 2024-09-26 14:04:19 +08:00
jialin f813f56c1f chore: vllm params 2024-09-26 10:30:40 +08:00
jialin a698c65a07 fix: playground edit message 2024-09-25 16:17:25 +08:00
jialin 3cd96ba2e8 feat: vllm support 2024-09-25 16:17:25 +08:00
jialin 0652f850d6 fix: modelscope model name 2024-09-25 16:17:25 +08:00
jialin 3ab29f9e01 feat: modelscope model 2024-09-22 14:55:23 +08:00
jialin b041cdc766 style: playground style 2024-09-22 14:55:23 +08:00
jialin c04b9342b8 refactor: playground add comparsion 2024-09-22 14:55:23 +08:00
jialin 1abaa164f5 refactor: playground chat 2024-09-22 14:55:23 +08:00
jialin 4f4f00f0c8 feat: add models compare 2024-09-22 14:55:23 +08:00
jialin 2e5f0d9210 fix: submit message 2024-09-22 14:55:23 +08:00
jialin af077c4706 style: upload image in message input 2024-09-22 14:55:23 +08:00
Arne Sundandjialin a5cebb88ef Fix typos in Resources table headings 2024-09-22 12:10:25 +08:00
180 changed files with 10927 additions and 2923 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ const isProduction = env === 'production';
const t = Date.now();
export default defineConfig({
proxy: {
...proxy('http://192.168.50.166:8080')
...proxy()
},
history: {
type: 'hash'
+9 -1
View File
@@ -1,4 +1,12 @@
const proxyTableList = ['cli', 'v1', 'auth', 'v1-openai', 'version'];
const proxyTableList = [
'cli',
'v1',
'auth',
'v1-openai',
'version',
'proxy',
'update'
];
// @ts-ingore
export default function createProxyTable(target?: string) {
-7
View File
@@ -31,13 +31,6 @@ export default [
access: 'canSeeAdmin',
component: './resources'
},
// {
// name: 'usage',
// path: '/usage',
// key: 'usage',
// icon: 'BarChartOutlined',
// component: './usage'
// },
{
name: 'apikeys',
path: '/api-keys',
+7 -1
View File
@@ -28,6 +28,10 @@ export default {
Message: {
contentPadding: '12px 16px'
},
Tooltip: {
colorBgSpotlight: 'rgba(110,110,110,1)'
// sizePopupArrow: 0
},
Slider: {
handleSize: 8,
handleSizeHover: 8,
@@ -42,7 +46,9 @@ export default {
},
token: {
colorPrimary: '#007BFF',
borderRadius: 8,
colorSuccess: '#54cc98',
borderRadius: 4,
borderRadiusSM: 2,
fontSize: 12,
motion: true
}
+15 -5
View File
@@ -1,29 +1,34 @@
{
"private": true,
"author": "jialin <jialinkuang@126.com>",
"author": "jialin",
"scripts": {
"build": "max build",
"dev": "max dev",
"format": "prettier --cache --write .",
"postinstall": "max setup",
"prepare": "husky",
"preview": "max preview",
"setup": "max setup",
"start": "npm run dev"
},
"resolutions": {
"immer": "^9.0.6"
},
"dependencies": {
"@ant-design/icons": "^5.3.7",
"@ant-design/pro-components": "^2.7.1",
"@ant-design/icons": "^5.5.1",
"@ant-design/pro-components": "^2.7.18",
"@huggingface/gguf": "^0.1.7",
"@huggingface/hub": "^0.15.1",
"@huggingface/tasks": "^0.11.6",
"@monaco-editor/react": "^4.6.0",
"@orcid/bibtex-parse-js": "^0.0.25",
"@react-hook/resize-observer": "^2.0.2",
"@types/lodash": "^4.17.4",
"@umijs/max": "^4.2.11",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"ansi-to-html": "^0.7.2",
"antd": "^5.18.3",
"antd": "^5.20.6",
"antd-style": "^3.6.2",
"axios": "^1.7.2",
"classnames": "^2.5.1",
@@ -36,14 +41,19 @@
"jotai": "^2.8.4",
"localforage": "^1.10.0",
"lodash": "^4.17.21",
"mammoth": "^1.8.0",
"marked": "^14.1.0",
"numeral": "^2.0.6",
"overlayscrollbars": "^2.10.0",
"overlayscrollbars-react": "^0.5.6",
"query-string": "^9.0.0",
"rc-virtual-list": "^3.14.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hotkeys-hook": "^4.5.0",
"simplebar-react": "^3.2.6",
"umi-presets-pro": "^2.0.3"
"umi-presets-pro": "^2.0.3",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
},
"devDependencies": {
"@types/marked": "^6.0.0",
+4 -3
View File
@@ -4,11 +4,12 @@ export default (api: IApi) => {
api.modifyHTML(($) => {
const info = JSON.parse(process.env.VERSION || '{}');
const env = process.env.NODE_ENV;
$('html').attr('data-env', env);
$('html').attr(
'data-version',
env === 'production'
? info.version || info.commitId
: `dev-${info.commitId}`
env === 'production' ? info.version || info.commitId : `${info.commitId}`
);
if (env === 'production') {
$('script[src^="/js/umi"]').first?.().remove?.();
+1609 -1031
View File
File diff suppressed because it is too large Load Diff
+16 -2
View File
@@ -1,9 +1,10 @@
import { GPUStackVersionAtom } from '@/atoms/user';
import { GPUStackVersionAtom, UpdateCheckAtom } from '@/atoms/user';
import { setAtomStorage } from '@/atoms/utils';
import { requestConfig } from '@/request-config';
import {
queryCurrentUserState,
queryVersionInfo
queryVersionInfo,
updateCheck
} from '@/services/profile/apis';
import { RequestConfig, history } from '@umijs/max';
@@ -16,11 +17,24 @@ export async function getInitialState(): Promise<{
}> {
const { location } = history;
const getUpdateCheck = async () => {
try {
const data = await updateCheck();
setAtomStorage(UpdateCheckAtom, data);
return data;
} catch (error) {
console.error('updateCheck error', error);
}
};
const fetchUserInfo = async (): Promise<Global.UserInfo> => {
try {
const data = await queryCurrentUserState({
skipErrorHandler: true
});
if (data.is_admin) {
getUpdateCheck();
}
return data;
} catch (error) {
history.push(loginPath);
+25
View File
@@ -38,6 +38,10 @@
margin-left: 20px;
}
.m-l-40 {
margin-left: 40px;
}
.m-r-10 {
margin-right: 10px;
}
@@ -66,6 +70,10 @@
padding-left: 6px;
}
.p-l-8 {
padding-left: 8px;
}
.flex {
display: flex;
}
@@ -85,6 +93,10 @@
align-items: center;
}
.flex-wrap {
flex-wrap: wrap;
}
.flex-gap-2 {
display: flex;
gap: 2px;
@@ -98,6 +110,11 @@
opacity: 0.8;
}
.flex-end {
display: flex;
justify-content: flex-end;
}
.flex-column {
display: flex;
flex-direction: column;
@@ -119,6 +136,10 @@
position: relative;
}
.font-size-0 {
font-size: 0;
}
.font-size-12 {
font-size: var(--font-size-base);
}
@@ -131,6 +152,10 @@
font-size: var(--font-size-large);
}
.font-size-20 {
font-size: 20px;
}
.font-400 {
font-weight: var(--font-weight-normal);
}
+6
View File
@@ -11,6 +11,12 @@ export const GPUStackVersionAtom = atom<{
git_commit: ''
});
export const UpdateCheckAtom = atom<{
latest_version: string;
}>({
latest_version: ''
});
export const initialPasswordAtom = atomWithStorage<string>(
'initialPassword',
''
+34
View File
@@ -0,0 +1,34 @@
import { Image as AntImage, ImageProps } from 'antd';
import { round } from 'lodash';
import React, { useCallback, useEffect, useState } from 'react';
const AutoImage: React.FC<ImageProps & { height: number }> = (props) => {
const { height = 100, ...rest } = props;
const [width, setWidth] = useState(0);
const getImgRatio = useCallback((url: string): Promise<{ ratio: number }> => {
return new Promise((resolve) => {
const img = new Image();
img.onload = () => {
resolve({ ratio: round(img.width / img.height, 2) });
};
img.onerror = () => {
resolve({ ratio: 1 });
};
img.src = url;
});
}, []);
const handleOnLoad = useCallback(async () => {
const { ratio } = await getImgRatio(props.src || '');
setWidth(height * ratio);
}, [getImgRatio, height, props.src]);
useEffect(() => {
handleOnLoad();
}, [handleOnLoad]);
return <AntImage {...rest} height={height} width={width} />;
};
export default AutoImage;
+35 -12
View File
@@ -1,5 +1,5 @@
import { Tag, Tooltip } from 'antd';
import debounce from 'lodash/debounce';
import { Tag, Tooltip, type TagProps } from 'antd';
import { throttle } from 'lodash';
import React, {
useCallback,
useEffect,
@@ -7,46 +7,51 @@ import React, {
useRef,
useState
} from 'react';
import TitleTip from './title-tip';
interface AutoTooltipProps extends React.ComponentProps<typeof Tag> {
// type TagProps = React.ComponentProps<typeof Tag>;
interface AutoTooltipProps extends Omit<TagProps, 'title'> {
children: React.ReactNode;
maxWidth?: number | string;
minWidth?: number | string;
color?: string;
style?: React.CSSProperties;
ghost?: boolean;
title?: React.ReactNode;
showTitle?: boolean;
tooltipProps?: React.ComponentProps<typeof Tooltip>;
}
const AutoTooltip: React.FC<AutoTooltipProps> = ({
children,
maxWidth = '100%',
minWidth,
ghost = false,
title,
showTitle = false,
tooltipProps,
...tagProps
}) => {
const contentRef = useRef<HTMLDivElement>(null);
const [isOverflowing, setIsOverflowing] = useState(false);
const resizeObserver = useRef<ResizeObserver>();
const checkOverflow = useCallback(() => {
if (contentRef.current) {
const { scrollWidth, clientWidth } = contentRef.current;
setIsOverflowing(scrollWidth > clientWidth);
}
}, []);
const debouncedCheckOverflow = useMemo(
() => debounce(checkOverflow, 200),
[checkOverflow]
);
}, [contentRef.current]);
useEffect(() => {
checkOverflow();
const debouncedCheckOverflow = throttle(checkOverflow, 200);
window.addEventListener('resize', debouncedCheckOverflow);
return () => {
window.removeEventListener('resize', debouncedCheckOverflow);
debouncedCheckOverflow.cancel();
};
}, [checkOverflow, debouncedCheckOverflow]);
}, [checkOverflow]);
useEffect(() => {
checkOverflow();
@@ -55,6 +60,7 @@ const AutoTooltip: React.FC<AutoTooltipProps> = ({
const tagStyle = useMemo(
() => ({
maxWidth,
minWidth,
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap' as const,
@@ -64,7 +70,24 @@ const AutoTooltip: React.FC<AutoTooltipProps> = ({
);
return (
<Tooltip title={isOverflowing || showTitle ? children : ''}>
<Tooltip
overlayInnerStyle={{ paddingInline: 0 }}
destroyTooltipOnHide={false}
title={
isOverflowing || showTitle ? (
<TitleTip
isOverflowing={isOverflowing}
title={title}
showTitle={showTitle}
>
{children}
</TitleTip>
) : (
''
)
}
{...tooltipProps}
>
{ghost ? (
<div ref={contentRef} style={tagStyle}>
{children}
+31
View File
@@ -0,0 +1,31 @@
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import React from 'react';
interface TitleTipProps {
isOverflowing: boolean;
showTitle: boolean;
title: React.ReactNode;
children: React.ReactNode;
}
const TitleTip: React.FC<TitleTipProps> = (props) => {
const { isOverflowing, showTitle, title, children } = props;
const { initialize } = useOverlayScroller();
const scrollRef = React.useRef<any>(null);
React.useEffect(() => {
if (scrollRef.current) {
initialize(scrollRef.current);
}
}, [initialize, scrollRef.current]);
return (
<div style={{ maxHeight: 200, overflowY: 'auto' }} ref={scrollRef}>
<div style={{ width: 'max-content', maxWidth: 250, paddingInline: 10 }}>
{isOverflowing || showTitle ? title || children : ''}
</div>
</div>
);
};
export default React.memo(TitleTip);
+47
View File
@@ -0,0 +1,47 @@
import bibtexParse from '@orcid/bibtex-parse-js';
import { Typography } from 'antd';
import React from 'react';
/*
@inproceedings{Lysenko:2010:GMC:1839778.1839781,\
author = {Lysenko, Mikola and Nelaturi, Saigopal and Shapiro, Vadim},\
title = {Group morphology with convolution algebras},\
booktitle = {Proceedings of the 14th ACM Symposium on Solid and Physical Modeling},\
series = {SPM '10},\
year = {2010},\
isbn = {978-1-60558-984-8},\
location = {Haifa, Israel},\
pages = {11--22},\
numpages = {12},\
url = {http://doi.acm.org/10.1145/1839778.1839781},\
doi = {10.1145/1839778.1839781},\
acmid = {1839781},\
publisher = {ACM},\
address = {New York, NY, USA},\
}
*/
const BibTeXViewer: React.FC<{ data: string }> = ({ data }) => {
if (!data) {
return null;
}
const dataList = bibtexParse.toJSON(data);
return (
<ol>
{dataList.map((item: any, index: number) => (
<li key={index} style={{ lineHeight: 2 }}>
<Typography.Link href={item.entryTags?.url} target="_blank">
{item.entryTags?.title}.{' '}
</Typography.Link>
<Typography.Text>{item.entryTags?.author}. </Typography.Text>
<Typography.Text>[{item.entryTags?.year}] </Typography.Text>
{item.entryTags?.journal && (
<Typography.Text>.({item.entryTags?.journal})</Typography.Text>
)}
</li>
))}
</ol>
);
};
export default BibTeXViewer;
+1 -1
View File
@@ -18,7 +18,7 @@ const CopyButton: React.FC<CopyButtonProps> = ({
text,
disabled,
type = 'text',
shape = 'circle',
shape = 'default',
fontSize = '14px',
style,
size = 'middle'
+30 -7
View File
@@ -1,4 +1,4 @@
import { throttle } from 'echarts/core';
import { throttle } from 'lodash';
import { useCallback, useEffect, useRef } from 'react';
import echarts, { ECOption } from '.';
@@ -9,6 +9,8 @@ const Chart: React.FC<{
}> = ({ options, width, height }) => {
const container = useRef<HTMLDivElement>(null);
const chart = useRef<echarts.EChartsType>();
const resizeable = useRef(false);
const resizeObserver = useRef<ResizeObserver>();
const init = useCallback(() => {
if (container.current) {
@@ -30,27 +32,48 @@ const Chart: React.FC<{
}, []);
useEffect(() => {
init();
if (container.current) {
init();
}
return () => {
chart.current?.dispose();
};
}, [init]);
useEffect(() => {
resizeable.current = false;
resize();
setOption(options);
}, [options]);
// resize on window resize
useEffect(() => {
let timer: any = null;
timer = setTimeout(() => {
resizeable.current = true;
}, 300);
return () => {
clearTimeout(timer);
};
}, []);
useEffect(() => {
const handleResize = throttle(() => {
resize();
if (resizeable.current) {
chart.current?.resize();
}
}, 100);
window.addEventListener('resize', handleResize);
if (container.current) {
resizeObserver.current = new ResizeObserver(handleResize);
resizeObserver.current.observe(container.current);
}
return () => {
window.removeEventListener('resize', handleResize);
if (container.current) {
resizeObserver.current?.unobserve(container.current);
}
};
}, [resize]);
}, []);
return <div ref={container} style={{ width: width, height }}></div>;
};
+2 -6
View File
@@ -1,5 +1,4 @@
import type {
// 系列类型的定义后缀都为 SeriesOption
BarSeriesOption,
GaugeSeriesOption,
LineSeriesOption
@@ -8,18 +7,16 @@ import { BarChart, GaugeChart, LineChart } from 'echarts/charts';
import type {
DatasetComponentOption,
GridComponentOption,
// 组件类型的定义后缀都为 ComponentOption
TitleComponentOption,
TooltipComponentOption
} from 'echarts/components';
import {
// 数据集组件
DatasetComponent,
GridComponent,
LegendComponent,
TitleComponent,
TooltipComponent,
// 内置数据转换器组件 (filter, sort)
// (filter, sort)
TransformComponent
} from 'echarts/components';
import type { ComposeOption } from 'echarts/core';
@@ -27,7 +24,6 @@ import * as echarts from 'echarts/core';
import { LabelLayout, UniversalTransition } from 'echarts/features';
import { CanvasRenderer } from 'echarts/renderers';
// 通过 ComposeOption 来组合出一个只有必须组件和图表的 Option 类型
type ECOption = ComposeOption<
| BarSeriesOption
| LineSeriesOption
@@ -38,7 +34,7 @@ type ECOption = ComposeOption<
| GaugeSeriesOption
>;
// 注册必须的组件
// register components and charts
echarts.use([
LegendComponent,
TitleComponent,
+8 -1
View File
@@ -1,10 +1,16 @@
.editor-wrap {
border-radius: var(--border-radius-mini);
overflow: hidden;
font-size: 0;
.code-pre {
margin-bottom: 0;
}
.editor-header {
display: flex;
padding: 6px 10px;
height: 40px;
padding: 0 10px;
justify-content: space-between;
align-items: center;
background-color: rgb(56, 56, 56);
@@ -12,6 +18,7 @@
.ant-select-selector {
background-color: rgba(255, 255, 255, 9%) !important;
color: rgba(255, 255, 255, 70%);
border-radius: var(--border-radius-2px);
.ant-select-selection-item {
color: rgba(255, 255, 255, 70%);
+7 -1
View File
@@ -10,6 +10,11 @@ interface EditorwrapProps {
copyText: string;
defaultValue?: string;
langOptions?: { label: string; value: string }[];
styles?: {
wrapper?: React.CSSProperties;
header?: React.CSSProperties;
content?: React.CSSProperties;
};
onChangeLang?: (value: string) => void;
}
const EditorWrap: React.FC<EditorwrapProps> = ({
@@ -19,6 +24,7 @@ const EditorWrap: React.FC<EditorwrapProps> = ({
langOptions,
onChangeLang,
defaultValue,
styles = {},
showHeader = true
}) => {
const handleChangeLang = (value: string) => {
@@ -52,7 +58,7 @@ const EditorWrap: React.FC<EditorwrapProps> = ({
return null;
};
return (
<div className="editor-wrap">
<div className="editor-wrap" style={{ ...styles.wrapper }}>
{renderHeader()}
<div className="editor-content">{children}</div>
</div>
+89
View File
@@ -0,0 +1,89 @@
import Editor from '@monaco-editor/react';
import React, { useEffect, useRef, useState } from 'react';
import EditorWrap from '../editor-wrap';
interface ViewerProps {
lang: string;
defaultLang?: string;
langOptions?: Global.BaseOption<string>[];
config?: any;
value: string;
height?: string | number;
theme?: string;
showHeader?: boolean;
}
const ViewerEditor: React.FC<ViewerProps> = (props) => {
const editorRef = useRef<any>(null);
const {
lang,
value,
config,
langOptions,
defaultLang,
height = 380,
showHeader
} = props;
const [langType, setLangType] = useState(defaultLang);
const handleBeforeMount = (monaco: any) => {
monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
noSemanticValidation: false,
noSyntaxValidation: false,
diagnosticCodesToIgnore: [80001]
});
};
const handleEditorDidMount = (editor: any, monaco: any) => {
editorRef.current = editor;
console.log('loaded====', editor, monaco);
};
const handleOnChangeLang = (value: string) => {
setLangType(value);
};
const formatCode = () => {
if (editorRef.current) {
setTimeout(() => {
editorRef.current
?.getAction?.('editor.action.formatDocument')
?.run()
.then(() => {
console.log('format success');
});
}, 100);
}
};
useEffect(() => {
formatCode();
setTimeout(() => {
const lineCount = editorRef.current?.getModel().getLineCount(); // 获取总行数
editorRef.current?.revealLine(lineCount); // 滚动到最后一行
}, 100); // 可以调整延时,确保编辑器完全加载
}, [value]);
return (
<EditorWrap
copyText={value}
langOptions={langOptions}
defaultValue={lang}
showHeader={showHeader}
onChangeLang={handleOnChangeLang}
>
<Editor
height={height}
theme="vs-dark"
className="monaco-editor"
defaultLanguage={defaultLang}
language={langType}
value={value}
options={config}
beforeMount={handleBeforeMount}
onMount={handleEditorDidMount}
/>
</EditorWrap>
);
};
export default React.memo(ViewerEditor);
+1
View File
@@ -12,6 +12,7 @@ const Footer: React.FC = () => {
const showVersion = () => {
Modal.info({
...modalConfig,
width: 460,
content: <VersionInfo intl={intl} />
});
};
@@ -8,12 +8,21 @@ interface CodeViewerProps {
autodetect?: boolean;
ignoreIllegals?: boolean;
copyable?: boolean;
height?: string | number;
}
const DarkViewer: React.FC<CodeViewerProps> = (props) => {
const { code, lang, autodetect, ignoreIllegals, copyable } = props || {};
const {
code,
lang,
autodetect,
ignoreIllegals,
copyable,
height = 'auto'
} = props || {};
return (
<CodeViewer
height={height}
code={code}
lang={lang}
theme="dark"
@@ -8,12 +8,21 @@ interface CodeViewerProps {
autodetect?: boolean;
ignoreIllegals?: boolean;
copyable?: boolean;
height?: string | number;
}
const LightViewer: React.FC<CodeViewerProps> = (props) => {
const { code, lang, autodetect, ignoreIllegals, copyable } = props || {};
const {
code,
lang,
autodetect,
ignoreIllegals,
copyable,
height = 'auto'
} = props || {};
return (
<CodeViewer
height={height}
code={code}
lang={lang}
theme="light"
+19 -7
View File
@@ -10,6 +10,7 @@ interface CodeViewerProps {
autodetect?: boolean;
ignoreIllegals?: boolean;
copyable?: boolean;
height?: string | number;
theme?: 'light' | 'dark';
}
const CodeViewer: React.FC<CodeViewerProps> = (props) => {
@@ -18,7 +19,8 @@ const CodeViewer: React.FC<CodeViewerProps> = (props) => {
lang,
autodetect = true,
ignoreIllegals = true,
copyable = true
copyable = true,
height = 'auto'
} = props || {};
const highlightedCode = useMemo(() => {
@@ -58,14 +60,24 @@ const CodeViewer: React.FC<CodeViewerProps> = (props) => {
return (
<pre
className={classNames('code-pre', {
dark: props.theme === 'dark',
light: props.theme === 'light',
copyable: copyable
})}
className={classNames(
'code-pre custome-scrollbar custom-scrollbar-horizontal ',
{
dark: props.theme === 'dark',
light: props.theme === 'light',
copyable: copyable
}
)}
style={{
height: height
}}
>
<code
className={highlightedCode.className}
style={{ minHeight: height }}
className={classNames(highlightedCode.className, {
dark: props.theme === 'dark',
light: props.theme === 'light'
})}
dangerouslySetInnerHTML={{
__html: highlightedCode.value
}}
+23 -5
View File
@@ -1,3 +1,4 @@
import React from 'react';
import CodeViewerDark from './code-viewer-dark';
import CodeViewerLight from './code-viewer-light';
import './styles/index.less';
@@ -7,18 +8,35 @@ const HighlightCode: React.FC<{
lang?: string;
copyable?: boolean;
theme?: 'light' | 'dark';
height?: string | number;
}> = (props) => {
const { code, lang = 'bash', copyable = true, theme = 'dark' } = props;
const {
code,
lang = 'bash',
copyable = true,
theme = 'dark',
height = 'auto'
} = props;
return (
<div className="high-light-wrapper">
<div className="high-light-wrapper hj-wrapper">
{theme === 'dark' ? (
<CodeViewerDark lang={lang} code={code} copyable={copyable} />
<CodeViewerDark
lang={lang}
code={code}
copyable={copyable}
height={height}
/>
) : (
<CodeViewerLight lang={lang} code={code} copyable={copyable} />
<CodeViewerLight
lang={lang}
code={code}
copyable={copyable}
height={height}
/>
)}
</div>
);
};
export default HighlightCode;
export default React.memo(HighlightCode);
@@ -1,5 +1,6 @@
.high-light-wrapper {
text-align: left;
font-size: var(--font-size-base);
.hljs {
font-weight: var(--font-weight-normal);
@@ -7,21 +8,35 @@
padding-block: 1.2em;
&::-webkit-scrollbar {
height: 8px;
height: var(--scrollbar-size);
}
&::-webkit-scrollbar-thumb {
background-color: rgba(211, 211, 220, 50%);
border-radius: 6px;
&:hover {
background-color: rgba(190, 190, 190, 100%);
}
background-color: transparent;
border-radius: 4px;
}
&::-webkit-scrollbar-track {
background-color: transparent;
}
&.light {
&:hover {
&::-webkit-scrollbar-thumb {
background-color: var(--color-scrollbar-thumb);
border-radius: 4px;
}
}
}
&.dark {
&:hover {
&::-webkit-scrollbar-thumb {
background-color: var(--scrollbar-handle-light-bg);
border-radius: 4px;
}
}
}
}
.code-pre {
@@ -29,6 +44,10 @@
position: relative;
border-radius: var(--border-radius-mini);
code {
line-height: 1.5;
}
&.copyable {
padding-inline: 12px 32px;
}
+1 -1
View File
@@ -1,7 +1,7 @@
import { createFromIconfontCN } from '@ant-design/icons';
const IconFont = createFromIconfontCN({
scriptUrl: '//at.alicdn.com/t/c/font_4613488_3n3aubqzylv.js'
scriptUrl: '//at.alicdn.com/t/c/font_4613488_l9554igzbh.js'
});
export default IconFont;
+5 -3
View File
@@ -52,7 +52,7 @@ const LabelItem: React.FC<LabelItemProps> = ({
// has duplicate key
const duplicates = _.filter(
labelList,
(item: Global.BaseListItem) => val && val === item.key
(item: Global.BaseListItem<string>) => val && val === item.key
);
if (duplicates.length > 1) {
setOpen(true);
@@ -77,7 +77,8 @@ const LabelItem: React.FC<LabelItemProps> = ({
title={intl.formatMessage({ id: 'resources.table.key.tips' })}
>
<SealInput.Input
label="Key"
checkStatus="success"
label={intl.formatMessage({ id: 'common.input.key' })}
value={label.key}
onChange={handleOnKeyChange}
onBlur={handleKeyOnBlur}
@@ -89,7 +90,8 @@ const LabelItem: React.FC<LabelItemProps> = ({
<div className="label-value">
{valueAddon ?? (
<SealInput.Input
label="Value"
checkStatus={label.value ? 'success' : ''}
label={intl.formatMessage({ id: 'common.input.value' })}
value={label.value}
onChange={handleOnValueChange}
></SealInput.Input>
@@ -5,6 +5,7 @@
border: 1px solid var(--ant-color-border);
border-radius: var(--border-radius-base);
display: flex;
width: 100%;
flex-direction: column;
:global {
+4 -2
View File
@@ -6,7 +6,7 @@ const Wrapper: React.FC<{
label?: string;
description?: React.ReactNode;
children: React.ReactNode;
}> = ({ children, label, description }) => {
}> = ({ children, label, description, ...rest }) => {
return (
<div className={styles['wrapper']}>
{label && (
@@ -14,7 +14,9 @@ const Wrapper: React.FC<{
<LabelInfo label={label} description={description}></LabelInfo>
</span>
)}
{children}
{React.isValidElement(children)
? React.cloneElement(children, { ...rest })
: children}
</div>
);
};
+99
View File
@@ -0,0 +1,99 @@
import AutoComplete from '@/components/seal-form/auto-complete';
import _ from 'lodash';
import React from 'react';
interface HintInputProps {
value: string;
label?: string;
onChange: (value: string) => void;
placeholder?: string;
sourceOptions?: Global.HintOptions[];
}
const matchReg = /[^=]+=[^=]*$/;
const HintInput: React.FC<HintInputProps> = (props) => {
const { value, label, onChange, sourceOptions } = props;
const cursorPosRef = React.useRef(0);
const contextBeforeCursorRef = React.useRef('');
const [options, setOptions] = React.useState<
Array<Global.BaseOption<string>>
>([]);
const generateOptions = (context: string) => {
if (!context) {
setOptions(sourceOptions || []);
return;
}
const match = context.match(matchReg);
if (!match) {
const list = _.filter(sourceOptions, (item: Global.HintOptions) =>
item.label.includes(context)
);
setOptions(list);
return;
}
const [key, value] = _.split(match[0], '=');
const data = _.find(
sourceOptions,
(item: Global.HintOptions) => item.label === key
);
if (!data) {
setOptions([]);
return;
}
const list = _.filter(data.opts, (item: Global.BaseOption<string>) =>
item.label.includes(value)
);
setOptions(list);
};
const replaceLastEqual = (value: string) => {
const matchStr = contextBeforeCursorRef.current.match(matchReg);
if (matchStr) {
const arr = _.split(matchStr[0], '=');
onChange(`${arr[0]}=${value}`);
} else {
onChange(value?.trim());
}
};
const getContextBeforeCursor = _.debounce((e: any) => {
cursorPosRef.current = e.target.selectionStart;
contextBeforeCursorRef.current = e.target.value.slice(
0,
cursorPosRef.current
);
generateOptions(contextBeforeCursorRef.current);
}, 100);
const handleInput = (e: any) => {
getContextBeforeCursor(e);
onChange(e.target.value?.trim());
};
const handleOnChange = (value: string) => {
onChange(value?.trim());
};
const handleOnSelect = (value: string) => {
replaceLastEqual(value);
setOptions([]);
};
return (
<AutoComplete
placeholder={props.placeholder}
defaultActiveFirstOption={true}
value={value}
onInput={handleInput}
onSelect={handleOnSelect}
onFocus={getContextBeforeCursor}
label={label}
options={options}
style={{ width: '100%' }}
/>
);
};
export default React.memo(HintInput);
+110
View File
@@ -0,0 +1,110 @@
import { PlusOutlined } from '@ant-design/icons';
import { useIntl } from '@umijs/max';
import { Button } from 'antd';
import _ from 'lodash';
import React from 'react';
import Wrapper from '../label-selector/wrapper';
import ListItem from './list-item';
interface ListInputProps {
dataList: string[];
label: string;
description?: React.ReactNode;
btnText?: string;
options?: Global.HintOptions[];
placeholder?: string;
onChange: (data: string[]) => void;
}
const ListInput: React.FC<ListInputProps> = (props) => {
const intl = useIntl();
const { dataList, label, description, onChange, btnText, options } = props;
const [list, setList] = React.useState<{ value: string; uid: number }[]>([]);
const countRef = React.useRef(0);
const buttonRef = React.useRef<HTMLButtonElement>(null);
const updateCountRef = () => {
countRef.current = countRef.current + 1;
};
const handleOnRemove = (index: number) => {
const values = _.cloneDeep(list);
values.splice(index, 1);
const valueList = _.map(values, 'value').filter((val: string) => !!val);
setList(values);
onChange(valueList);
};
const handleOnChange = (value: string, index: number) => {
const values = _.cloneDeep(list);
values[index].value = value;
const valueList = _.map(values, 'value').filter((val: string) => !!val);
setList(values);
onChange(valueList);
};
const handleOnAdd = () => {
updateCountRef();
const values = _.cloneDeep(list);
values.push({
value: '',
uid: countRef.current
});
setList(values);
setTimeout(() => {
buttonRef.current?.scrollIntoView?.({ behavior: 'smooth' });
}, 100);
};
React.useEffect(() => {
const valueList = _.map(list, 'value').filter((val: string) => !!val);
if (!_.isEqual(valueList, dataList)) {
const values = _.map(dataList, (value: string) => {
updateCountRef();
return {
value,
uid: countRef.current
};
});
setList(values);
}
}, [dataList]);
return (
<Wrapper label={label} description={description}>
<>
{_.map(list, (item: any, index: number) => {
return (
<ListItem
placeholder={props.placeholder}
options={options}
key={item.uid}
value={item.value}
onRemove={() => handleOnRemove(index)}
onChange={(val) => handleOnChange(val, index)}
/>
);
})}
<div className="flex justify-center">
<Button
ref={buttonRef}
type="text"
block
style={{
marginTop: 16,
backgroundColor: 'var(--ant-color-fill-secondary)'
}}
onClick={handleOnAdd}
>
<PlusOutlined className="font-size-14" />{' '}
{intl.formatMessage({
id: btnText
})}
</Button>
</div>
</>
</Wrapper>
);
};
export default React.memo(ListInput);
+45
View File
@@ -0,0 +1,45 @@
// import AutoComplete from '@/components/seal-form/auto-complete';
import { MinusOutlined } from '@ant-design/icons';
import { Button } from 'antd';
import React from 'react';
import HintInput from './hint-input';
import './styles/list-item.less';
interface LabelItemProps {
onRemove: () => void;
onChange: (value: string) => void;
value: string;
label?: string;
placeholder?: string;
options?: Global.HintOptions[];
}
const ListItem: React.FC<LabelItemProps> = (props) => {
const { onRemove, onChange, label, value, options } = props;
const handleOnChange = (value: any) => {
onChange(value);
};
return (
<div className="list-item">
<HintInput
value={value}
onChange={handleOnChange}
label={label}
sourceOptions={options}
placeholder={props.placeholder}
/>
<Button
size="small"
className="btn"
type="default"
shape="circle"
icon={<MinusOutlined />}
onClick={onRemove}
/>
</div>
);
};
export default React.memo(ListItem);
@@ -0,0 +1,15 @@
.list-item {
display: flex;
align-items: center;
justify-content: flex-start;
width: 100%;
margin-bottom: 12px;
.field-wrapper {
flex: 1;
}
.btn {
margin-left: 10px;
}
}
@@ -0,0 +1,15 @@
.list-item {
display: flex;
align-items: center;
justify-content: flex-start;
width: 100%;
margin-bottom: 12px;
.field-wrapper {
flex: 1;
}
.btn {
margin-left: 10px;
}
}
+26 -7
View File
@@ -1,9 +1,30 @@
.logs-viewer-wrap-w2 {
position: relative;
.copy {
position: absolute;
top: 10px;
right: 10px;
z-index: 100;
button {
color: rgba(255, 255, 255, 70%);
background-color: rgba(71, 71, 71, 100%);
&:hover {
color: rgba(255, 255, 255, 90%) !important;
background-color: rgba(71, 71, 71, 100%) !important;
}
}
}
.wrap {
padding: 5px 0 5px 10px;
background-color: var(--color-logs-bg);
border-radius: var(--border-radius-mini);
overflow: hidden;
overflow: auto;
font-family: monospace, Menlo, Courier, 'Courier New', Consolas, Monaco,
'Liberation Mono' !important;
.content {
word-wrap: break-word;
@@ -14,7 +35,7 @@
}
.text {
height: 100%;
min-height: 22px;
}
color: var(--color-logs-text);
@@ -26,14 +47,12 @@
}
.xterm {
height: 100% !important;
.xterm-viewport {
overflow-y: auto !important;
// custom scrollbar
&::-webkit-scrollbar {
width: 8px;
height: 6px;
width: var(--scrollbar-size);
height: var(--scrollbar-size);
}
&::-webkit-scrollbar-thumb {
+98 -71
View File
@@ -1,12 +1,11 @@
import useSetChunkRequest from '@/hooks/use-chunk-request';
import { FitAddon } from '@xterm/addon-fit';
import { Terminal } from '@xterm/xterm';
import useSetChunkFetch from '@/hooks/use-chunk-fetch';
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import '@xterm/xterm/css/xterm.css';
import classNames from 'classnames';
import _ from 'lodash';
import { memo, useCallback, useEffect, useRef, useState } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import './index.less';
import useSize from './use-size';
import useParseAnsi from './parse-ansi';
interface LogsViewerProps {
height: number;
@@ -15,38 +14,47 @@ interface LogsViewerProps {
params?: object;
}
const LogsViewer: React.FC<LogsViewerProps> = (props) => {
const { height, content, url } = props;
const { setChunkRequest } = useSetChunkRequest();
const { height, url } = props;
const {
initialize,
updateScrollerPosition,
generateInstance,
scrollEventElement,
instance,
initialized
} = useOverlayScroller({
theme: 'os-theme-light'
});
const { isClean, parseAnsi } = useParseAnsi();
const { setChunkFetch } = useSetChunkFetch();
const chunkRequedtRef = useRef<any>(null);
const scroller = useRef<any>({});
const termRef = useRef<any>({});
const termwrapRef = useRef<any>({});
const fitAddonRef = useRef<any>({});
const cacheDataRef = useRef<any>(null);
const [logs, setLogs] = useState('');
const size = useSize(scroller);
const cacheDataRef = useRef<any>('');
const uidRef = useRef<any>(0);
const [logs, setLogs] = useState<any[]>([]);
const stopScroll = useRef(false);
const throttleScroll = _.debounce(() => {
termRef.current?.scrollToBottom?.();
}, 100);
const updateContent = useCallback(
_.throttle((data: string) => {
cacheDataRef.current = '';
termRef.current?.clear?.();
cacheDataRef.current = data;
termRef.current?.write?.(data);
}, 100),
[]
);
const fitTerm = () => {
fitAddonRef.current?.fit?.();
const setId = () => {
uidRef.current += 1;
return uidRef.current;
};
const updateContent = useCallback(
(data: string) => {
if (isClean(data)) {
cacheDataRef.current = data;
} else {
cacheDataRef.current += data;
}
const res = parseAnsi(cacheDataRef.current, setId);
setLogs(res);
},
[setLogs, setId]
);
const createChunkConnection = async () => {
chunkRequedtRef.current?.current?.cancel?.();
chunkRequedtRef.current = setChunkRequest({
chunkRequedtRef.current?.current?.abort?.();
chunkRequedtRef.current = setChunkFetch({
url,
params: {
...props.params,
@@ -57,65 +65,84 @@ const LogsViewer: React.FC<LogsViewerProps> = (props) => {
});
};
const initTerm = () => {
termRef.current?.dispose?.();
termRef.current = new Terminal({
lineHeight: 1.2,
fontSize: 13,
fontFamily:
"monospace,Menlo,Courier,'Courier New',Consolas,Monaco, 'Liberation Mono'",
disableStdin: true,
convertEol: true,
theme: {
background: '#1e1e1e',
foreground: 'rgba(255,255,255,0.8)'
},
cursorInactiveStyle: 'none',
smoothScrollDuration: 0
});
fitAddonRef.current = new FitAddon();
termRef.current.loadAddon(fitAddonRef.current);
termRef.current.open(termwrapRef.current);
const debounceResetStopScroll = _.debounce(() => {
stopScroll.current = false;
}, 30000);
// add event
termRef.current.onLineFeed((e: any) => {
if (cacheDataRef.current) {
throttleScroll();
const handleOnWheel = useCallback(
(e: any) => {
const scrollTop = scrollEventElement?.scrollTop;
const scrollHeight = scrollEventElement?.scrollHeight;
const clientHeight = scrollEventElement?.clientHeight;
if (scrollTop + clientHeight >= scrollHeight) {
stopScroll.current = false;
} else {
stopScroll.current = true;
}
});
};
debounceResetStopScroll();
},
[debounceResetStopScroll, scrollEventElement]
);
const handleResize = _.throttle(() => {
fitTerm();
}, 100);
const debounceUpdateScrollerPosition = _.debounce(() => {
generateInstance();
updateScrollerPosition(0);
}, 200);
const copyText = useMemo(() => {
if (!logs.length) {
return '';
}
return logs?.map((item) => item.content).join('\n');
}, [logs]);
useEffect(() => {
createChunkConnection();
return () => {
chunkRequedtRef.current?.current?.cancel?.();
chunkRequedtRef.current?.current?.abort?.();
};
}, [url, props.params]);
useEffect(() => {
if (termwrapRef.current) {
initTerm();
if (scroller.current) {
initialize(scroller.current);
}
return () => {
termRef.current?.dispose?.();
};
}, [termwrapRef.current]);
}, [scroller.current, initialize]);
useEffect(() => {
if (size) {
handleResize();
if (logs.length && !stopScroll.current && instance) {
updateScrollerPosition(0);
} else if (logs.length && !stopScroll.current && scroller.current) {
if (!initialized) {
initialize(scroller.current);
}
if (!instance) {
debounceUpdateScrollerPosition();
} else {
updateScrollerPosition(0);
}
}
}, [size]);
}, [logs, stopScroll.current, instance, scroller.current]);
return (
<div className="logs-viewer-wrap-w2">
<div className="wrap" style={{ height: height }} ref={scroller}>
{/* <span className="copy">
<CopyButton text={copyText} type="text" size="small"></CopyButton>
</span> */}
<div
className="wrap"
style={{ height: height }}
ref={scroller}
onWheel={handleOnWheel}
>
<div className={classNames('content')}>
<div className="text" ref={termwrapRef}></div>
{_.map(logs, (item: any, index: number) => {
return (
<div key={item.uid} className="text">
{item.content}
</div>
);
})}
</div>
</div>
</div>
+153
View File
@@ -0,0 +1,153 @@
import { useCallback, useRef } from 'react';
const controlSeqRegex = /\x1b\[(\d*);?(\d*)?([A-DJKHfm])/g;
const useParseAnsi = () => {
const lastIndex = useRef(0);
const removeBrackets = useCallback((str: string) => {
return str?.replace?.(/^\(…\)/, '');
}, []);
const isClean = useCallback((ansiStr: string) => {
let input = ansiStr.replace(/\r\n/g, '\n');
let match = controlSeqRegex.exec(input) || [];
const command = match?.[3];
const n = parseInt(match?.[1], 10) || 1;
return command === 'J' && n === 2;
}, []);
const parseAnsi = useCallback((inputStr: string, setId: () => number) => {
let cursorRow = 0; // current row
let cursorCol = 0; // current column
// screen content array
let screen = [['']];
// replace carriage return and newline characters in the text
let input = inputStr.replace(/\r\n/g, '\n');
lastIndex.current = 0;
// handle the \r and \n characters in the text
const handleText = (text: string) => {
let processed = '';
for (let char of text) {
if (char === '\r') {
cursorCol = 0; // move to the beginning of the line
} else if (char === '\n') {
cursorRow++; // move to the next line
cursorCol = 0; // move to the beginning of the line
screen[cursorRow] = screen[cursorRow] || ['']; // create a new line if it does not exist
} else {
// add the character to the screen content array
screen[cursorRow][cursorCol] = char;
cursorCol++;
}
}
return processed;
};
let output = ''; // output text
let match;
// ANSI color map
const colorMap: Record<string, string> = {
'30': 'black',
'31': 'red',
'32': 'green',
'33': 'yellow',
'34': 'blue',
'35': 'magenta',
'36': 'cyan',
'37': 'white'
};
let currentStyle = ''; // current text style
// match ANSI control characters
while ((match = controlSeqRegex.exec(input)) !== null) {
// handle text before the control character
let textBeforeControl = input.slice(lastIndex.current, match.index);
output += handleText(textBeforeControl); // add the processed text to the output
lastIndex.current = controlSeqRegex.lastIndex; // update the last index
const n = parseInt(match[1], 10) || 1;
const m = parseInt(match[2], 10) || 1;
const command = match[3];
console.log('command', {
command,
cursorRow,
n
});
// handle ANSI control characters
switch (command) {
case 'A': // up
cursorRow = Math.max(0, cursorRow - n);
if (cursorRow === 0) {
// screen = [['']];
// cursorCol = 0;
}
break;
case 'B': // down
cursorRow += n;
break;
case 'C': // right
cursorCol += n;
break;
case 'D': // left
cursorCol = Math.max(0, cursorCol - n);
break;
case 'H': // move the cursor to the specified position (n, m)
cursorRow = Math.max(0, n - 1);
cursorCol = Math.max(0, m - 1);
break;
case 'J': // clear the screen
if (n === 2) {
console.log('clear====');
screen = [['']];
cursorRow = 0;
cursorCol = 0;
}
break;
case 'm': // color
if (match[1] === '0') {
currentStyle = '';
} else if (colorMap[match[1]]) {
currentStyle = `color: ${colorMap[match[1]]};`;
}
break;
}
// check if the row and column are within the screen content array
while (screen.length <= cursorRow) {
screen.push(['']);
}
while (screen[cursorRow].length <= cursorCol) {
screen[cursorRow].push('');
}
}
// handle the remaining text
output += handleText(input.slice(lastIndex.current));
let result = [];
for (let row = 0; row < screen.length; row++) {
let rowContent = screen[row].join('');
result.push({
content: removeBrackets(rowContent),
uid: setId()
});
}
result.push({
content: output,
uid: setId()
});
return result;
}, []);
return { parseAnsi, isClean };
};
export default useParseAnsi;
@@ -0,0 +1,139 @@
import { useRef, useState } from 'react';
const usePaseByLine = () => {
const [result, setResult] = useState<any[]>([]);
const uidRef = useRef(0);
const cursorRow = useRef(0); // current row
const cursorCol = useRef(0); // current column
// screen.current content array
const screen = useRef([['']]);
// replace carriage return and newline characters in the text
// let input = inputStr.replace(/\r\n/g, '\n')
const removeBrackets = (str: string) => {
return str?.replace?.(/^\(\.*?\)/, '');
};
const setId = () => {
uidRef.current += 1;
return uidRef.current;
};
// handle the \r and \n characters in the text
const handleText = (text: string) => {
for (let char of text) {
if (char === '\r') {
cursorCol.current = 0; // move to the beginning of the line
} else if (char === '\n') {
cursorRow.current += 1; // move to the next line
cursorCol.current = 0; // move to the beginning of the line
screen.current[cursorRow.current] = screen.current[
cursorRow.current
] || ['']; // create a new line if it does not exist
} else {
// add the character to the screen.current content array
screen.current[cursorRow.current][cursorCol.current] = char;
cursorCol.current += 1;
}
}
};
// ANSI
const controlSeqRegex = /\x1b\[(\d*);?(\d*)?([A-DJKHfm])/g;
// ANSI color map
const colorMap: Record<string, string> = {
'30': 'black',
'31': 'red',
'32': 'green',
'33': 'yellow',
'34': 'blue',
'35': 'magenta',
'36': 'cyan',
'37': 'white'
};
const updateResult = () => {
let res = [];
for (let row = 0; row < screen.current.length; row++) {
console.log('screen.current[row]', screen.current[row]);
let rowContent = screen.current[row].join('');
res.push({
content: removeBrackets(rowContent),
uid: setId()
});
}
console.log('res', res);
setResult(res);
};
const handleLine = (line: string) => {
let match;
let lastIndex = 0;
let currentStyle = ''; // current text style
// match ANSI control characters
while ((match = controlSeqRegex.exec(line)) !== null) {
// handle text before the control character
let textBeforeControl = line.slice(lastIndex, match.index);
handleText(textBeforeControl); // add the processed text to the output
lastIndex = controlSeqRegex.lastIndex; // update the last index
const n = parseInt(match[1], 10) || 1;
const m = parseInt(match[2], 10) || 1;
const command = match[3];
// handle ANSI control characters
switch (command) {
case 'A': // up
cursorRow.current = Math.max(0, cursorRow.current - n);
break;
case 'B': // down
cursorRow.current += n;
break;
case 'C': // right
cursorCol.current += n;
break;
case 'D': // left
cursorCol.current = Math.max(0, cursorCol.current - n);
break;
case 'H': // move the cursor to the specified position (n, m)
cursorRow.current = Math.max(0, n - 1);
cursorCol.current = Math.max(0, m - 1);
break;
case 'J': // clear the screen.current
if (n === 2) {
screen.current = [['']];
cursorRow.current = 0;
cursorCol.current = 0;
}
break;
case 'm': // color
if (match[1] === '0') {
currentStyle = '';
} else if (colorMap[match[1]]) {
currentStyle = `color: ${colorMap[match[1]]};`;
}
break;
}
// check if the row and column are within the screen.current content array
while (screen.current.length <= cursorRow.current) {
screen.current.push(['']);
}
while (screen.current[cursorRow.current].length <= cursorCol.current) {
screen.current[cursorRow.current].push('');
}
}
handleText(line.slice(lastIndex));
updateResult();
};
return {
handleLine,
result
};
};
export default usePaseByLine;
+101
View File
@@ -0,0 +1,101 @@
.markdown-viewer {
font-family: var(--font-family) !important;
.hr {
border: none;
height: 1px;
background-color: var(--ant-color-split);
}
p {
margin-bottom: 0;
}
h1,
h2,
h3,
h4 {
font-weight: 700;
font-weight: var(--font-weight-bold);
font-size: var(--font-size-small);
}
.hj-wrapper {
margin-top: 16px;
}
strong {
font-weight: var(--font-weight-bold);
}
ul {
margin-bottom: 0;
padding-left: 20px;
line-height: 2;
}
ol {
margin-bottom: 0;
padding-left: 20px;
line-height: 2;
}
a * {
color: inherit;
}
table {
width: 100%;
margin-bottom: 1.2em;
th {
font-weight: var(--font-weight-bold);
line-height: 1.5;
padding-inline: 6px;
border-bottom: 1px solid var(--ant-color-split);
word-break: break-word;
text-align: left !important;
}
td {
line-height: 1.5;
padding-inline: 6px;
border-bottom: 1px solid var(--ant-color-split);
word-break: break-word;
text-align: left !important;
}
div {
display: inline;
}
}
a {
div {
display: inline;
}
}
img {
max-width: 100%;
height: auto;
}
video {
max-width: 100%;
height: auto;
border-radius: var(--border-radius-base);
}
audio {
max-width: 100%;
height: auto;
border-radius: var(--border-radius-base);
}
.item-token {
color: inherit;
font-size: inherit;
font-weight: inherit;
}
}
+191 -9
View File
@@ -1,26 +1,208 @@
import { marked, Tokens } from 'marked';
import React from 'react';
import { EyeOutlined } from '@ant-design/icons';
import { Checkbox, Image, Typography } from 'antd';
import { unescape } from 'lodash';
import { TokensList, marked } from 'marked';
import React, { Fragment, useCallback, useEffect } from 'react';
import HighlightCode from '../highlight-code';
import './index.less';
const { Text, Link, Paragraph } = Typography;
interface MarkdownViewerProps {
content: string;
height?: string;
theme?: 'light' | 'dark';
generateImgLink?: (src: string) => string;
}
const MarkdownViewer: React.FC<MarkdownViewerProps> = ({
content,
height = 'auto'
generateImgLink,
height = 'auto',
theme = 'light'
}) => {
const renderer = new marked.Renderer();
const tokens = marked.lexer(content);
const reDefineTypes = [
'code',
'link',
'hr',
'heading',
'paragraph',
'codespan',
'strong',
'text',
'image',
'em',
'list',
'list_item',
'br',
'html',
'escape',
'del',
'blockquote',
'checkbox'
// 'bibtex'
];
renderer.link = ({ href, title, text }: Tokens.Link) => {
return `<a href="${href}" title="${title || ''}" target="_blank" rel="noopener noreferrer">${text}</a>`;
// renderer.link = ({ href, title, text }) => {
// return `<a href="${href}" title="${title || ''}" target="_blank" rel="noopener noreferrer">${text}</a>`;
// };
const isValidURL = useCallback((url: string) => {
const pattern = /^(https?:\/\/|\/\/)([^\s/$.?#].[^\s]*)$/;
return pattern.test(url);
}, []);
const generateImgSrc = useCallback(
(src: string | null) => {
if (!src) {
return '';
}
if (generateImgLink) {
return isValidURL(src) ? src : generateImgLink(src);
}
return src;
},
[generateImgLink]
);
const renderItem = useCallback(
(token: any, render: any) => {
console.log('token====', token);
if (!reDefineTypes.includes(token.type)) {
return (
<span
dangerouslySetInnerHTML={{
__html: marked.parser([token], { renderer })
}}
></span>
);
}
let htmlstr: any = null;
let child: any = null;
if (token.tokens?.length) {
child = render?.(token.tokens as TokensList, render);
}
const text = child ? child : unescape(token.text);
if (token.type === 'escape') {
htmlstr = text;
}
if (token.type === 'html') {
htmlstr = <div dangerouslySetInnerHTML={{ __html: token.text }} />;
}
if (token.type === 'list') {
htmlstr = token.order ? (
<ol>{render?.(token.items, render)}</ol>
) : (
<ul>{render?.(token.items, render)}</ul>
);
}
if (token.type === 'list_item') {
htmlstr = <li>{text}</li>;
}
if (token.type === 'del') {
htmlstr = <del>{text}</del>;
}
if (token.type === 'blockquote') {
htmlstr = <blockquote>{text}</blockquote>;
}
if (token.type === 'checkbox') {
htmlstr = <Checkbox value={token.checked} />;
}
if (token.type === 'br') {
htmlstr = <br />;
}
if (token.type === 'em') {
htmlstr = <em>{text}</em>;
}
if (token.type === 'image') {
let href = generateImgSrc(token.href);
htmlstr = (
<Image
src={href}
alt={token.text}
preview={{
mask: <EyeOutlined />
}}
/>
);
}
if (token.type === 'text') {
htmlstr = text;
}
if (token.type === 'codespan') {
htmlstr = <Text code>{text}</Text>;
}
if (token.type === 'strong') {
htmlstr = <Text strong>{text}</Text>;
}
if (token.type === 'heading') {
htmlstr = <Typography.Title level={4}>{text}</Typography.Title>;
}
if (token.type === 'paragraph') {
htmlstr = <Paragraph> {text}</Paragraph>;
}
if (token.type === 'code') {
htmlstr = (
<HighlightCode theme={theme} code={token.text} lang={token.lang} />
);
}
if (token.type === 'link') {
htmlstr = (
<Link
href={token.href}
title={token.title || ''}
target="_blank"
rel="noopener noreferrer"
>
{text}
</Link>
);
}
if (token.type === 'hr') {
htmlstr = <hr className="hr" />;
}
return htmlstr;
},
[generateImgSrc]
);
const renderTokens = (tokens: TokensList): any => {
return tokens?.map((token: any, index: number) => {
return <Fragment key={index}>{renderItem(token, renderTokens)}</Fragment>;
});
};
useEffect(() => {
if (!content) {
return;
}
const imgs = document.querySelectorAll('.markdown-viewer img');
imgs.forEach((img) => {
const src = img.getAttribute('src');
img.setAttribute('src', generateImgSrc(src));
});
}, [content, generateImgSrc]);
return (
<div style={{ height, overflow: 'auto' }}>
<div
dangerouslySetInnerHTML={{ __html: marked(content, { renderer }) }}
/>
<div
style={{ height }}
className="markdown-viewer custom-scrollbar-horizontal"
>
{renderTokens(tokens)}
</div>
);
};
@@ -0,0 +1 @@
export default {};
+16
View File
@@ -0,0 +1,16 @@
const htmlUnescapes: Record<string, string> = {
'&amp;': '&',
'&lt;': '<',
'&gt;': '>',
'&quot;': '"',
'&#39;': "'"
};
const reEscapedHtml = /&(?:amp|lt|gt|quot|#(?:0+)?39);/g;
const reHasEscapedHtml = RegExp(reEscapedHtml.source);
export const unescape = (str = '') => {
return reHasEscapedHtml.test(str)
? str.replace(reEscapedHtml, (entity) => htmlUnescapes[entity] || "'")
: str;
};
+5 -5
View File
@@ -4,9 +4,9 @@ import { useEffect, useRef, useState } from 'react';
import Wrapper from './components/wrapper';
import { SealFormItemProps } from './types';
const SealAutoComplete: React.FC<AutoCompleteProps & SealFormItemProps> = (
props
) => {
const SealAutoComplete: React.FC<
AutoCompleteProps & SealFormItemProps & { onInput?: (e: Event) => void }
> = (props) => {
const {
label,
placeholder,
@@ -75,7 +75,7 @@ const SealAutoComplete: React.FC<AutoCompleteProps & SealFormItemProps> = (
<Wrapper
status={status}
extra={extra}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
@@ -87,7 +87,7 @@ const SealAutoComplete: React.FC<AutoCompleteProps & SealFormItemProps> = (
{...rest}
ref={inputRef}
placeholder={
isFocus ? (
isFocus || !label ? (
<span style={{ paddingLeft: '12px' }}>{placeholder}</span>
) : (
''
@@ -1,5 +1,5 @@
:local(.wrapper-box) {
@borderRadius: 8px;
@borderRadius: var(--border-radius-base);
position: relative;
display: flex;
@@ -95,6 +95,7 @@
align-items: flex-start;
flex: 1;
padding-block: 20px 0;
max-width: 100%;
&.no-wrapper-style {
padding-block: 0;
+7 -3
View File
@@ -9,7 +9,7 @@ interface WrapperProps {
className?: string;
disabled?: boolean;
required?: boolean;
description?: string;
description?: React.ReactNode;
variant?: string;
style?: React.CSSProperties;
onClick?: () => void;
@@ -28,7 +28,11 @@ const Wrapper: React.FC<WrapperProps> = ({
}) => {
return (
<div
style={{ ...style }}
style={{
padding: '0 calc(var(--ant-padding-sm) - 5px)',
width: '100%',
...style
}}
className={classNames(
wrapperStyle.wrapper,
wrapperStyle[`validate-status-${status}`],
@@ -51,8 +55,8 @@ const Wrapper: React.FC<WrapperProps> = ({
></LabelInfo>
</label>
<div
className="child-inner"
style={{
padding: '0 calc(var(--ant-padding-sm) - 5px)',
width: '100%'
}}
>
+1 -1
View File
@@ -62,7 +62,7 @@ const SealInputNumber: React.FC<InputNumberProps & SealFormItemProps> = (
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
+1 -1
View File
@@ -68,7 +68,7 @@ const SealInputSearch: React.FC<SearchProps & SealFormItemProps> = (props) => {
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
+1 -1
View File
@@ -57,7 +57,7 @@ const SealPassword: React.FC<InputProps & SealFormItemProps> = (props) => {
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
+115
View File
@@ -0,0 +1,115 @@
import { CloseOutlined } from '@ant-design/icons';
import { useIntl } from '@umijs/max';
import { Button, Input, Tooltip } from 'antd';
import classNames from 'classnames';
import React, { useState } from 'react';
import './styles/row-textarea.less';
interface SystemMessageProps {
style?: React.CSSProperties;
value: string;
placeholder?: string;
label?: React.ReactNode;
onChange: (e: any) => void;
}
const RowTextarea: React.FC<SystemMessageProps> = (props) => {
const { value, onChange, style, label, placeholder } = props;
const intl = useIntl();
const rowTextAreaRef = React.useRef<any>(null);
const [autoSize, setAutoSize] = useState<{
minRows: number;
maxRows: number;
focus: boolean;
}>({ minRows: 1, maxRows: 1, focus: false });
const handleFocus = () => {
setAutoSize({
minRows: 3,
maxRows: 3,
focus: true
});
setTimeout(() => {
rowTextAreaRef.current?.focus?.({
cursor: 'end'
});
}, 50);
};
const handleBlur = (e: any) => {
setAutoSize({
minRows: 2,
maxRows: 2,
focus: false
});
};
const handleOnChange = (e: any) => {
onChange?.(e);
};
const handleClear = () => {
onChange?.({ target: { value: '' } });
};
return (
<div
className={classNames('row-textarea', {
focus: autoSize.focus
})}
style={{ ...style }}
>
{
<div
style={{ display: autoSize.focus ? 'block' : 'none' }}
className="textarea-wrapper"
>
<span className="textarea-label">{label}</span>
<Input.TextArea
className="custome-scrollbar"
ref={rowTextAreaRef}
placeholder={placeholder}
style={{
borderRadius: '0',
border: 'none'
}}
value={value}
autoSize={{
minRows: autoSize.minRows,
maxRows: autoSize.maxRows
}}
onFocus={handleFocus}
onBlur={handleBlur}
allowClear={false}
onChange={handleOnChange}
></Input.TextArea>
</div>
}
{!autoSize.focus && (
<div className="content-wrap" onClick={handleFocus}>
<div className="content">
<span className="title">{label}</span>
{value || (
<span style={{ color: 'var(--ant-color-text-tertiary)' }}>
{placeholder}
</span>
)}
</div>
{value && (
<Tooltip title={intl.formatMessage({ id: 'common.button.clear' })}>
<Button
className="clear-btn"
type="text"
icon={<CloseOutlined />}
size="small"
onClick={handleClear}
></Button>
</Tooltip>
)}
</div>
)}
</div>
);
};
export default React.memo(RowTextarea);
+4 -3
View File
@@ -17,6 +17,7 @@ const SealInput: React.FC<InputProps & SealFormItemProps> = (props) => {
isInFormItems = true,
variant,
addAfter,
checkStatus,
trim = true,
...rest
} = props;
@@ -70,8 +71,8 @@ const SealInput: React.FC<InputProps & SealFormItemProps> = (props) => {
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
status={checkStatus || status}
label={label}
isFocus={isFocus}
required={required}
description={description}
@@ -82,7 +83,7 @@ const SealInput: React.FC<InputProps & SealFormItemProps> = (props) => {
>
<Input
{...rest}
placeholder={isFocus ? placeholder : ''}
placeholder={isFocus || !label ? placeholder : ''}
ref={inputRef}
autoComplete="off"
onInput={handleInput}
+1 -1
View File
@@ -60,7 +60,7 @@ const SealSelect: React.FC<SelectProps & SealFormItemProps> = (props) => {
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
+1 -1
View File
@@ -79,7 +79,7 @@ const SealTextArea: React.FC<TextAreaProps & SealFormItemProps> = (props) => {
return (
<Wrapper
status={status}
label={label || (placeholder as string)}
label={label}
isFocus={isFocus}
required={required}
description={description}
@@ -0,0 +1,60 @@
.row-textarea {
position: relative;
&.focus {
padding-top: 9px;
}
.content-wrap {
position: relative;
display: flex;
align-items: center;
justify-content: space-between;
padding-right: 20px;
cursor: pointer;
&:hover {
.clear-btn {
display: block;
}
}
}
textarea.ant-input {
background-color: transparent;
box-shadow: none;
}
.clear-btn {
display: none;
position: absolute;
right: 6px;
top: 6px;
}
.textarea-label {
position: relative;
top: 1px;
font-weight: var(--font-weight-bold);
padding-left: 14px;
}
.content {
flex: 1;
width: 100px;
height: 40px;
line-height: 24px;
padding: 8px 14px;
padding-right: 4px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
color: var(--ant-color-text-secondary);
.title {
font-weight: var(--font-weight-normal);
padding-right: 10px;
color: var(--ant-color-text);
}
}
}
+1
View File
@@ -9,4 +9,5 @@ export interface SealFormItemProps {
addAfter?: React.ReactNode;
loading?: React.ReactNode;
trim?: boolean;
checkStatus?: 'success' | 'error' | 'warning' | '';
}
@@ -46,6 +46,7 @@ const TableRow: React.FC<
const { updateChunkedList, cacheDataListRef } = useUpdateChunkedList({
dataList: childrenData,
limit: 100,
setDataList: setChildrenData
// callback: (list) => renderChildren?.(list)
});
@@ -79,7 +80,7 @@ const TableRow: React.FC<
}, []);
const renderChildrenData = () => {
return renderChildren?.(childrenData);
return renderChildren?.(childrenData, record);
};
const handlePolling = async () => {
@@ -118,7 +119,7 @@ const TableRow: React.FC<
const updateChildrenHandler = (list: any) => {
_.each(list, (data: any) => {
updateChunkedList(data, childrenDataRef.current);
updateChunkedList(data);
});
};
+5 -2
View File
@@ -46,7 +46,10 @@ const SealTable: React.FC<SealTableProps & { pagination: PaginationProps }> = (
if (selectedRowKeys?.length === 0) {
setSelectAll(false);
setIndeterminate(false);
} else if (selectedRowKeys?.length === props.dataSource.length) {
} else if (
selectedRowKeys?.length === props.dataSource.length &&
selectedRowKeys.length > 0
) {
setSelectAll(true);
setIndeterminate(false);
} else {
@@ -54,7 +57,7 @@ const SealTable: React.FC<SealTableProps & { pagination: PaginationProps }> = (
setIndeterminate(true);
}
}
}, [rowSelection]);
}, [rowSelection, props.dataSource]);
const handleSelectAllChange = (e: any) => {
if (e.target.checked) {
+9 -1
View File
@@ -4,7 +4,15 @@
display: flex;
align-items: center;
justify-content: flex-start;
height: 68px;
min-height: 68px;
word-break: break-word;
min-width: 20px;
overflow: hidden;
.cell-content {
max-width: 100%;
line-height: 18px;
}
&-left {
justify-content: flex-start;
@@ -63,6 +63,8 @@
}
.row-prefix-wrapper {
display: flex;
align-items: center;
padding-left: var(--ant-table-cell-padding-inline);
}
}
+1 -1
View File
@@ -52,7 +52,7 @@ export interface SealTableProps {
onCell?: (record: any, dataIndex: string) => void;
onSort?: (dataIndex: string, order: 'ascend' | 'descend') => void;
onExpand?: (expanded: boolean, record: any, rowKey: any) => void;
renderChildren?: (data: any) => React.ReactNode;
renderChildren?: (data: any, parent?: any) => React.ReactNode;
loadChildren?: (record: any) => Promise<any[]>;
loadChildrenAPI?: (record: any) => string;
contentRendered?: () => void;
+1 -1
View File
@@ -52,7 +52,7 @@ const StatusTag: React.FC<StatusTagProps> = ({
const renderContent = () => {
const percent = download?.percent || 0;
if (download && percent > 0 && percent < 100) {
if (download && percent > 0 && percent <= 100) {
return (
<>
<span className="progress">{download?.percent || 0}%</span>
-1
View File
@@ -37,7 +37,6 @@
}
.ant-input {
/* 只隐藏垂直滚动条轨道 */
&::-webkit-scrollbar-track {
width: 0 !important;
color: transparent;
+26 -5
View File
@@ -1,6 +1,5 @@
.version-box {
display: flex;
margin-bottom: 40px;
flex-direction: column;
align-items: center;
@@ -23,20 +22,42 @@
}
.ver {
margin-bottom: 20px;
line-height: 32px;
display: flex;
justify-content: center;
font-size: var(--font-size-middle);
color: var(--ant-color-text-secondary);
gap: 10px;
.label {
display: flex;
justify-content: flex-start;
width: 60px;
font-size: var(--font-size-middle);
font-weight: var(--font-weight-medium);
}
.val {
color: var(--ant-color-text-secondary);
.dev.val {
display: flex;
flex-direction: column;
.item {
display: flex;
}
.tl {
display: flex;
justify-content: flex-start;
width: 60px;
}
}
}
.upgrade {
display: flex;
justify-content: space-between;
padding-block: 20px 4px;
align-items: center;
width: 100%;
border-top: 1px solid var(--ant-color-split);
}
}
+58 -12
View File
@@ -1,34 +1,80 @@
import Logo from '@/assets/images/gpustack-logo.png';
import { GPUStackVersionAtom } from '@/atoms/user';
import { GPUStackVersionAtom, UpdateCheckAtom, userAtom } from '@/atoms/user';
import { getAtomStorage } from '@/atoms/utils';
import externalLinks from '@/constants/external-links';
import { Button } from 'antd';
import React from 'react';
import './index.less';
const VersionInfo: React.FC<{ intl: any }> = ({ intl }) => {
// get the data attr from html
const version = document.documentElement.getAttribute('data-version');
const latestVersion = getAtomStorage(UpdateCheckAtom).latest_version;
const currentVersion = getAtomStorage(GPUStackVersionAtom)?.version;
const isProd =
currentVersion !== '0.0.0' && currentVersion?.indexOf('rc') === -1;
const uiVersion = document.documentElement.getAttribute('data-version');
return (
<div className="version-box">
<div className="img">
<img src={Logo} alt="logo" />
</div>
<div>
<div className="ver">
<div className="ver">
{isProd && (
<span className="label">
{' '}
{intl.formatMessage({ id: 'common.footer.version.server' })}
{intl.formatMessage({ id: 'common.footer.version' })}
</span>
)}
{isProd ? (
<span className="val">
{getAtomStorage(GPUStackVersionAtom)?.version ||
getAtomStorage(GPUStackVersionAtom)?.git_commit}
</span>
</div>
<div className="ver">
<span className="label">UI </span>
<span className="val"> {version}</span>
</div>
) : (
<span className="val dev">
<span className="item">
<span className="tl">
{' '}
{intl.formatMessage({ id: 'common.footer.version.server' })}
</span>
{currentVersion === '0.0.0'
? getAtomStorage(GPUStackVersionAtom)?.git_commit
: getAtomStorage(GPUStackVersionAtom)?.version}
</span>
<span className="item">
<span className="tl">UI</span>
{uiVersion}
</span>
</span>
)}
</div>
{getAtomStorage(userAtom)?.is_admin && isProd && (
<div className="upgrade">
<span className="m-l-5">
{latestVersion &&
latestVersion !== currentVersion &&
latestVersion !== '0.0.0'
? intl.formatMessage(
{ id: 'users.version.update' },
{ version: latestVersion }
)
: intl.formatMessage(
{ id: 'users.version.islatest' },
{ version: currentVersion }
)}
</span>
<Button
type="link"
href={externalLinks.release}
target="_blank"
style={{ paddingInline: 0 }}
>
{intl.formatMessage({ id: 'common.text.changelog' })}
</Button>
</div>
)}
</div>
);
};
+10 -4
View File
@@ -22,14 +22,20 @@ declare namespace Global {
id: number;
}
interface BaseListItem {
interface BaseListItem<T> {
key: string;
value: string | number;
value: T;
}
interface BaseOption {
interface BaseOption<T> {
label: string;
value: string | number;
value: T;
}
interface HintOptions {
label: string;
value: string;
opts?: Array<BaseOption<string>>;
}
type SearchParams = Pagination & { search?: string };
+24 -20
View File
@@ -1,23 +1,27 @@
import { platformCall } from '@/utils';
const platform = platformCall();
const KeybindingsMap = {
CREATE: ['alt+ctrl+N', 'alt+meta+N'],
CLEAR: ['alt+ctrl+W', 'alt+meta+W'],
RIGHT: ['ctrl+RIGHT', 'meta+RIGHT'],
SAVE: ['ctrl+S', 'meta+S'],
SUBMIT: ['ctrl+enter', 'meta+enter'],
SAVEAS: ['alt+ctrl+S', 'alt+meta+S'],
OPEN: ['alt+ctrl+O', 'alt+meta+O'],
CANCEL: ['ctrl+W', 'meta+W'],
CREATE: ['Alt+Ctrl+N', 'Alt+Meta+N'],
CLEAR: ['Alt+Ctrl+K', 'Alt+Meta+K'],
RIGHT: ['Ctrl+RIGHT', 'Meta+RIGHT'],
SAVE: ['Ctrl+S', 'Meta+S'],
SUBMIT: ['Ctrl+Enter', 'Meta+Enter'],
SAVEAS: ['Alt+Ctrl+S', 'Alt+Meta+S'],
OPEN: ['Alt+Ctrl+O', 'Alt+Meta+O'],
CANCEL: ['Ctrl+W', 'Meta+W'],
DELETE: ['delete'],
COPY: ['ctrl+C', 'meta+C'],
REFRESH: ['ctrl+R', 'meta+R'],
EDIT: ['ctrl+E', 'meta+E'],
SEARCH: ['ctrl+K', 'meta+K'],
RESET: ['alt+ctrl+R', 'alt+meta+R'],
INPUT: ['ctrl+K', 'meta+K'],
NEW1: ['ctrl+1', 'meta+1'],
NEW2: ['ctrl+2', 'meta+2']
COPY: ['Ctrl+C', 'Meta+C'],
REFRESH: ['Ctrl+R', 'Meta+R'],
EDIT: ['Ctrl+E', 'Meta+E'],
SEARCH: ['Ctrl+K', 'Meta+K'],
RESET: ['Alt+Ctrl+R', 'Alt+Meta+R'],
INPUT: ['Ctrl+K', 'Meta+K'],
NEW1: ['Ctrl+1', 'Meta+1'],
NEW2: ['Ctrl+2', 'Meta+2'],
NEW3: ['Ctrl+3', 'Meta+3'],
FOCUS: ['/', '/'],
ADD: ['Alt+Ctrl+Enter', 'Alt+Meta+Enter']
};
type KeyBindingType = keyof typeof KeybindingsMap;
@@ -36,11 +40,11 @@ const KeybiningList: KeybindingValue[] = Object.entries(KeybindingsMap).map(
keybinding: keybinding,
command: key,
textKeybinding: platform.isMac
? keybinding.replace('meta', 'Command').replace('alt', 'Option')
: keybinding.replace('ctrl', 'Ctrl'),
? keybinding.replace('Meta', 'Cmd').replace('Alt', 'Option')
: keybinding.replace('Ctrl', 'Ctrl'),
iconKeybinding: platform.isMac
? keybinding.replace('meta', '⌘').replace('alt', '⌥')
: keybinding.replace('ctrl', 'Ctrl')
? keybinding.replace('Meta', '⌘').replace('Alt', '⌥')
: keybinding.replace('Ctrl', 'Ctrl')
} as KeybindingValue;
}
);
+2 -1
View File
@@ -2,5 +2,6 @@ export default {
documentation: 'https://docs.gpustack.ai/',
github: 'https://github.com/gpustack/gpustack',
discord: 'https://discord.gg/VXYJzuaqwD',
site: 'https://gpustack.ai/'
site: 'https://gpustack.ai/',
release: 'https://github.com/gpustack/gpustack/releases'
};
+201 -15
View File
@@ -2,15 +2,23 @@
@import url('src/assets/styles/menu.less');
html {
--font-family: 'noto sans', sans-serif;
--ant-color-text-secondary: rgba(0, 0, 0, 65%);
--ant-color-text-tertiary: rgba(0, 0, 0, 45%);
--ant-color-text-quaternary: rgba(0, 0, 0, 25%);
--ant-color-fill: rgba(0, 0, 0, 15%);
--ant-color-fill: rgba(223, 168, 168, 15%);
--ant-color-fill-secondary: rgba(0, 0, 0, 6%);
--ant-color-fill-tertiary: rgba(0, 0, 0, 4%);
--ant-color-fill-quaternary: rgba(0, 0, 0, 2%);
--color-text-light-1: rgba(255, 255, 255, 90%);
--color-fill-1: var(--ant-color-fill-tertiary);
--color-scrollbar-thumb: rgba(193, 193, 193, 80%);
--scrollbar-size: 6px;
--scrollbar-handle-bg: rgba(0, 0, 0, 44%);
--scrollbar-handle-light-bg: rgba(255, 255, 255, 44%);
--scrollbar-handle-hover-bg: rgba(0, 0, 0, 55%);
--color-editor-dark: #282c34;
--color-editor-light: #fafafa;
--color-scrollbar-track: var(--ant-color-fill-tertiary);
// --color-fill-1: #fff;
--ant-color-text: #000;
@@ -21,12 +29,14 @@ html {
--color-logs-text: #d4d4d4;
--layout-content-blockpadding: 32px;
--layout-content-inlinepadding: 32px;
--menu-border-radius-base: 8px;
--border-radius-base: 8px;
--border-radius-modal: 6px;
--menu-border-radius-base: 4px;
--border-radius-base: 4px;
--border-radius-middle: 20px;
--border-radius-small: 8px;
--border-radius-mdium: 6px;
--border-radius-small: 4px;
--border-radius-mdium: 4px;
--border-radius-mini: 4px;
--border-radius-2px: 2px;
--color-white-1: rgba(255, 255, 255, 100%);
--color-fill-sider: #f4f5f4;
--font-weight-normal: 500;
@@ -36,14 +46,15 @@ html {
--color-text-3: rgba(0, 0, 0, 45%);
--color-text-2: rgba(0, 0, 0, 65%);
--color-bg-light-1: #e6f6ff;
--font-size-small: 13px;
--font-size-base: 12px;
--font-size-large: 16px;
--font-size-middle: 14px;
--table-td-radius: 8px;
--checkbox-border-radius: 4px;
--table-td-radius: 4px;
--checkbox-border-radius: 2px;
--ant-table-cell-padding-inline: 16px;
--ant-table-cell-padding-block: 8px;
--ant-table-header-border-radius: 8px;
--ant-table-cell-padding-block: 6px;
--ant-table-header-border-radius: 4px;
--ant-table-header-split-color: #f0f0f0;
--ant-table-row-selected-bg: #e6f6ff;
--ant-table-row-selected-hover-bg: #e6f6ff;
@@ -54,12 +65,14 @@ html {
--seal-transition-func: cubic-bezier(0, 0, 1, 1);
--color-progress-green: rgba(84, 204, 152, 100%);
--color-border-1: rgba(217, 217, 217, 100%);
--ant-rate-star-color: #fadb14;
--color-fill-mask: rgba(255, 255, 255, 60%);
// ======== input ============
--ant-input-active-shadow: 0 0 0 2px rgba(5, 255, 105, 6%);
--ant-input-active-border-color: #007bff;
--ant-input-hover-border-color: #2997ff;
--box-shadow-base: 0 4px 6px rgba(227, 232, 240, 70%);
--ant-border-radius-lg: 8px;
--ant-border-radius-lg: 4px;
--ant-menu-item-color: var(--color-text-1);
--color-selected-bg: rgba(230, 230, 230, 88%);
// --box-shadow-base: none;
@@ -75,7 +88,7 @@ html {
&.ant-menu-css-var {
// --ant-menu-item-selected-bg: var(--color-white-1);
--ant-menu-item-border-radius: 8px;
--ant-menu-item-border-radius: 4px;
--ant-menu-item-selected-color: var(--ant-color-primary);
--ant-menu-item-color: var(--color-text-1);
}
@@ -92,7 +105,7 @@ html {
--ant-font-size-xl: 20px;
--ant-font-size: var(--font-size-base);
--ant-padding-sm: 14px;
--ant-border-radius-lg: 8px;
--ant-border-radius-lg: 4px;
--ant-color-text: #000;
--ant-color-error: #ff4d4f;
--ant-color-bg-mask: rgba(0, 0, 0, 35%);
@@ -113,6 +126,10 @@ html {
--ant-table-row-hover-bg: #e6e6e6;
}
&.ant-progress {
--ant-progress-line-border-radius: 2px;
}
&.ant-modal-css-var {
--ant-modal-title-font-size: 14px;
--ant-modal-header-margin-bottom: 20px;
@@ -126,7 +143,7 @@ html {
.css-var-ri.ant-menu-css-var,
.css-var-rh.ant-menu-css-var {
--ant-menu-item-height: 46px;
--ant-menu-item-border-radius: 8px;
--ant-menu-item-border-radius: 4px;
--ant-menu-item-selected-color: var(--ant-color-primary);
--ant-menu-item-color: var(--color-text-1);
--ant-menu-item-active-bg: rgba(0, 0, 0, 4%);
@@ -155,6 +172,10 @@ body {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
&::-webkit-scrollbar {
width: 0;
}
.ant-modal-confirm-title {
display: none;
}
@@ -269,7 +290,7 @@ body {
// form item help
.ant-form-item-with-help .ant-form-item-explain {
padding-left: 24px;
padding-left: 16px;
}
// icon
@@ -293,12 +314,26 @@ body {
}
.ant-pro-sider-logo {
position: relative;
padding-left: 18px;
padding-block: 12px;
border-block-end: none;
}
.ant-pro-sider-logo-collapsed {
padding-left: 12px;
.collapse-wrap {
display: none;
position: absolute;
top: 12px;
}
&:hover {
.collapse-wrap {
display: block;
}
}
}
.ant-pro-sider .ant-layout-sider-children {
@@ -353,6 +388,7 @@ body {
}
.ant-pro-layout-container {
overflow-x: auto;
min-height: 100vh;
// background-color: var(--color-fill-2);
}
@@ -404,6 +440,26 @@ body {
font-size: var(--font-size-middle);
}
}
.new-icon {
position: relative;
bottom: 3px;
display: flex;
color: #fff;
width: 36px;
height: 15px;
margin-left: 5px;
justify-content: center;
align-items: center;
background-color: var(--ant-orange-5);
border-radius: 8px 8px 8px 0;
transform: scale(0.9);
.text {
transform: scale(0.8);
line-height: 1em;
}
}
}
}
@@ -416,6 +472,16 @@ body {
}
&.user-menu-collapsed {
.ant-menu-submenu-title {
display: flex;
justify-content: center;
align-items: center;
color: var(--color-text-1) !important;
padding-inline: unset !important;
width: 100%;
margin-inline: 0 !important;
}
.user-avatar.ant-menu-submenu {
.ant-menu-submenu-title {
padding: 0 !important;
@@ -427,6 +493,10 @@ body {
}
}
}
.sub-title {
display: none !important;
}
}
.ant-menu-submenu-title {
@@ -442,7 +512,105 @@ body {
}
// ======== monaco editor style ============
.monaco-editor {
border-radius: 16px;
border-radius: 8px;
}
.ant-modal-centered.ant-modal-wrap {
&::-webkit-scrollbar {
width: var(--scrollbar-size);
}
&::-webkit-scrollbar-thumb {
background-color: transparent;
border-radius: 4px;
}
&::-webkit-scrollbar-track {
background-color: transparent;
}
&:hover {
&::-webkit-scrollbar-thumb {
background-color: var(--scrollbar-handle-bg);
border-radius: 4px;
}
}
}
.custome-scrollbar {
&::-webkit-scrollbar {
width: var(--scrollbar-size);
}
&::-webkit-scrollbar-thumb {
background-color: transparent;
border-radius: 4px;
}
&::-webkit-scrollbar-track {
background-color: transparent;
}
&:hover {
&::-webkit-scrollbar-thumb {
background-color: var(--color-scrollbar-thumb);
border-radius: 4px;
}
}
}
.custom-scrollbar-horizontal {
&::-webkit-scrollbar {
height: var(--scrollbar-size);
}
&::-webkit-scrollbar-thumb {
background-color: transparent;
border-radius: 4px;
}
&::-webkit-scrollbar-track {
background-color: transparent;
}
&:hover {
&::-webkit-scrollbar-thumb {
background-color: var(--color-scrollbar-thumb);
border-radius: 4px;
}
}
}
.simplebar-scrollbar.simplebar-visible::before {
opacity: 1;
}
.simplebar-scrollbar::before {
background: var(--scrollbar-handle-bg);
width: var(--scrollbar-size);
}
.simplebar-scrollbar.simplebar-visible.simplebar-hover {
&::before {
background: var(--scrollbar-handle-hover-bg);
}
}
.rc-virtual-list-scrollbar {
width: var(--scrollbar-size) !important;
}
.ant-dropdown-menu
.ant-dropdown-menu-item.ant-dropdown-menu-item-danger:not(
.ant-dropdown-menu-item-disabled
):hover {
background-color: var(--ant-color-error-bg) !important;
color: var(--ant-color-error) !important;
}
.ant-image {
border-radius: var(--border-radius-base);
overflow: hidden;
}
.ant-message-notice-wrapper {
@@ -500,6 +668,12 @@ body {
}
}
// =============== segment start==============
.ant-segmented .ant-segmented-item::after {
border-radius: var(--border-radius-mini);
}
// =============== segment end ===============
.background {
position: fixed;
top: 0;
@@ -535,6 +709,10 @@ body {
.ant-pro-page-container {
background: transparent;
.ant-page-header-heading {
min-width: max-content;
}
}
@keyframes skeleton-loading {
@@ -560,6 +738,14 @@ body {
.ant-modal {
max-width: 100vw;
.ant-modal-title {
font-weight: var(--font-weight-bold);
}
}
.ant-drawer .ant-drawer-title {
font-weight: var(--font-weight-bold);
}
.tooltip-wrapper {
+137
View File
@@ -0,0 +1,137 @@
import { split } from 'lodash';
import qs from 'query-string';
import { useEffect, useRef } from 'react';
interface RequestConfig {
url: string;
handler: (data: any) => any;
beforeReconnect?: () => void;
params?: object;
byLine?: boolean;
contentType?: 'json' | 'text';
}
const useSetChunkFetch = () => {
const axiosToken = useRef<any>(null);
const requestConfig = useRef<any>({});
const chunkDataRef = useRef<any>([]);
const bufferCacheRef = useRef<any>('');
const readTextEventStreamData = async (
reader: ReadableStreamDefaultReader<Uint8Array>,
decoder: TextDecoder,
callback: (data: any) => void
) => {
const { done, value } = await reader.read();
if (done) {
return;
}
const chunk = decoder.decode(value, { stream: true });
callback(chunk);
// console.log('chunkDataRef.current===2', chunkDataRef.current);
await readTextEventStreamData(reader, decoder, callback);
};
const readTextEventStreamDataByLine = async (
reader: ReadableStreamDefaultReader<Uint8Array>,
decoder: TextDecoder,
callback: (data: any) => void
) => {
const { done, value } = await reader.read();
if (done) {
return;
}
bufferCacheRef.current += decoder.decode(value, { stream: true });
const lines = split(bufferCacheRef.current, /\r?\n/);
bufferCacheRef.current = lines.pop();
for (const line of lines) {
callback(line);
}
await readTextEventStreamDataByLine(reader, decoder, callback);
};
const readTextEventStreamDataByLineWithBuffer = async (
reader: ReadableStreamDefaultReader<Uint8Array>,
decoder: TextDecoder,
callback: (data: any) => void
) => {
await readTextEventStreamDataByLine(reader, decoder, callback);
if (bufferCacheRef.current.length > 0) {
callback(bufferCacheRef.current);
}
};
const fetchChunkRequest = async ({
url,
handler,
byLine = false,
params = {}
}: RequestConfig) => {
axiosToken.current?.abort?.();
axiosToken.current = new AbortController();
try {
const response = await fetch(
`v1${url}?${qs.stringify({
...params,
watch: true
})}`,
{
method: 'GET',
body: null,
headers: {
'Content-Type': 'application/octet-stream'
},
signal: axiosToken.current.signal
}
);
if (!response.ok) {
return;
}
const reader =
response?.body?.getReader() as ReadableStreamDefaultReader<Uint8Array>;
const decoder = new TextDecoder('utf-8');
await readTextEventStreamData(reader, decoder, handler);
console.log('chunkDataRef.current===1', chunkDataRef.current);
} catch (error) {
// handle error
console.log('error============', error);
}
return axiosToken.current;
};
const setChunkFetch = (config: RequestConfig) => {
requestConfig.current = { ...config };
fetchChunkRequest(requestConfig.current);
return axiosToken;
};
useEffect(() => {
const handleUnload = () => {
axiosToken.current?.abort?.();
};
window.addEventListener('beforeunload', handleUnload);
return () => {
axiosToken.current?.abort?.();
window.removeEventListener('beforeunload', handleUnload);
};
}, []);
return {
setChunkFetch
};
};
export default useSetChunkFetch;
+1 -2
View File
@@ -172,7 +172,7 @@ const useSetChunkRequest = () => {
let result = response;
let cres = '';
console.log('chunkrequest============e==', e);
console.log('chunkrequest============e==', result);
if (contentType === 'json') {
const currentRes = sliceData(response, e.loaded, loadedSize);
result = parseData(currentRes);
@@ -194,7 +194,6 @@ const useSetChunkRequest = () => {
retryCount.current -= 1;
}
} catch (error) {
console.log('error=============', error);
if (!axios.isCancel(error)) {
setRequestReadyState(4);
if (retryCount.current > 0) {
+119
View File
@@ -0,0 +1,119 @@
import { throttle } from 'lodash';
import {
UseOverlayScrollbarsParams,
useOverlayScrollbars
} from 'overlayscrollbars-react';
import React from 'react';
export const overlaySollerOptions: UseOverlayScrollbarsParams = {
options: {
update: {
debounce: 0
},
overflow: {
x: 'hidden'
},
scrollbars: {
theme: 'os-theme-light',
autoHide: 'scroll',
autoHideDelay: 600,
clickScroll: 'instant'
}
},
defer: true
};
export default function useOverlayScroller(options?: any) {
const scrollEventElement = React.useRef<any>(null);
const instanceRef = React.useRef<any>(null);
const initialized = React.useRef(false);
const [initialize, instance] = useOverlayScrollbars({
options: {
update: {
debounce: 0
},
overflow: {
x: 'hidden'
},
scrollbars: {
theme: options?.theme || 'os-theme-dark',
autoHide: 'scroll',
autoHideDelay: 600,
clickScroll: 'instant'
}
},
defer: true
});
instanceRef.current = instance?.();
scrollEventElement.current =
instanceRef.current?.elements()?.scrollEventElement;
const throttledScroll = React.useCallback(
throttle(() => {
scrollEventElement.current?.scrollTo?.({
top: scrollEventElement.current.scrollHeight,
behavior: 'smooth'
});
instanceRef.current?.update?.();
}, 100),
[(scrollEventElement.current, instanceRef.current)]
);
const scrollauto = React.useCallback(() => {
scrollEventElement.current?.scrollTo?.({
top: scrollEventElement.current.scrollHeight,
behavior: 'auto'
});
instanceRef.current?.update?.();
}, [scrollEventElement.current, instanceRef.current]);
const throttledUpdateScrollerPosition = React.useCallback(
(delay?: number) => {
if (delay === 0) {
scrollauto();
} else {
throttledScroll();
}
},
[throttledScroll, scrollauto]
);
const generateInstance = () => {
instanceRef.current = instance?.();
scrollEventElement.current =
instanceRef.current?.elements()?.scrollEventElement;
};
const createInstance = React.useCallback(
(el: any) => {
if (instanceRef.current) {
return;
}
if (el) {
initialize(el);
initialized.current = true;
console.log(
'createInstance===2',
initialized.current,
instanceRef.current,
instance?.(),
instance
);
instanceRef.current = instance?.();
scrollEventElement.current =
instanceRef.current?.elements()?.scrollEventElement;
}
},
[initialize, instance]
);
return {
initialize: createInstance,
instance: instanceRef.current,
scrollEventElement: scrollEventElement.current,
initialized: initialized.current,
generateInstance,
updateScrollerPosition: throttledUpdateScrollerPosition
};
}
+6 -1
View File
@@ -11,10 +11,15 @@ export default function useTableRowSelection() {
setSelectedRowKeys([]);
};
const removeSelectedKey = (rowKey: React.Key) => {
setSelectedRowKeys((keys) => keys.filter((key) => key !== rowKey));
};
const rowSelection = {
selectedRowKeys,
clearSelections,
onChange: onSelectChange
onChange: onSelectChange,
removeSelectedKey
};
return rowSelection;
+30 -31
View File
@@ -1,5 +1,4 @@
import { WatchEventType } from '@/config';
import _ from 'lodash';
import { useEffect, useRef } from 'react';
interface ChunkedCollection {
@@ -11,6 +10,7 @@ interface ChunkedCollection {
// Only used to update lists without nested state
export function useUpdateChunkedList(options: {
dataList?: any[];
limit?: number;
setDataList: (args: any) => void;
callback?: (args: any) => void;
filterFun?: (args: any) => boolean;
@@ -19,6 +19,8 @@ export function useUpdateChunkedList(options: {
}) {
const cacheDataListRef = useRef<any[]>(options.dataList || []);
const timerRef = useRef<any>(null);
const countRef = useRef<number>(0);
const limit = options.limit || 10;
useEffect(() => {
cacheDataListRef.current = [...(options.dataList || [])];
@@ -30,74 +32,71 @@ export function useUpdateChunkedList(options: {
options.setDataList?.([...cacheDataListRef.current]);
}, 80);
};
const updateChunkedList = (
data: ChunkedCollection,
dataList?: { id: string | number }[]
) => {
const updateChunkedList = (data: ChunkedCollection) => {
console.log('updateChunkedList=====', {
ids: data?.ids,
type: data?.type,
collection: data?.collection.length,
dataList: _.map(dataList, (o: any) => o.id)
collection: data?.collection
});
let collections = data?.collection || [];
if (options?.computedID) {
collections = _.map(collections, (item: any) => {
collections = collections?.map((item: any) => {
item.id = options?.computedID?.(item);
return item;
});
}
if (options?.filterFun) {
collections = _.filter(data?.collection, options?.filterFun);
collections = data?.collection?.filter(options?.filterFun);
}
if (options?.mapFun) {
collections = _.map(data?.collection, options?.mapFun);
collections = data?.collection?.map(options?.mapFun);
}
const ids = data?.ids || [];
// CREATE
if (data?.type === WatchEventType.CREATE) {
const newDataList: any[] = [];
_.each(collections, (item: any) => {
const updateIndex = _.findIndex(
cacheDataListRef.current,
const newDataList = collections.reduce((acc: any[], item: any) => {
const updateIndex = cacheDataListRef.current?.findIndex(
(sItem: any) => sItem.id === item.id
);
const updateItem = { ...item };
if (updateIndex === -1) {
const updateItem = _.cloneDeep(item);
newDataList.push(updateItem);
acc.push(updateItem);
} else {
cacheDataListRef.current[updateIndex] = updateItem;
}
console.log('create=========', updateIndex, collections);
});
cacheDataListRef.current = [...newDataList, ...cacheDataListRef.current];
// options.setDataList?.([...cacheDataListRef.current]);
return acc;
}, []);
cacheDataListRef.current = [
...newDataList,
...cacheDataListRef.current
].slice(0, limit);
}
// DELETE
if (data?.type === WatchEventType.DELETE) {
cacheDataListRef.current = _.filter(
cacheDataListRef.current,
cacheDataListRef.current = cacheDataListRef.current?.filter(
(item: any) => {
return !_.includes(ids, item.id);
return !ids?.includes(item.id);
}
);
options.setDataList?.([...cacheDataListRef.current]);
}
// UPDATE
if (data?.type === WatchEventType.UPDATE) {
_.each(collections, (item: any) => {
const updateIndex = _.findIndex(
cacheDataListRef.current,
collections?.forEach((item: any) => {
const updateIndex = cacheDataListRef.current?.findIndex(
(sItem: any) => sItem.id === item.id
);
const updateItem = { ...item };
if (updateIndex > -1) {
const updateItem = _.cloneDeep(item);
cacheDataListRef.current[updateIndex] = updateItem;
} else if (updateIndex === -1) {
const updateItem = _.cloneDeep(item);
cacheDataListRef.current.push(updateItem);
cacheDataListRef.current = [
updateItem,
...cacheDataListRef.current.slice(0, limit - 1)
];
}
});
console.log('updateChunkedList=====update', cacheDataListRef.current);
// options.setDataList?.([...cacheDataListRef.current]);
}
debounceUpdateChunckedList();
+96 -23
View File
@@ -1,13 +1,15 @@
// @ts-nocheck
import { userAtom } from '@/atoms/user';
import { GPUStackVersionAtom, UpdateCheckAtom, userAtom } from '@/atoms/user';
import ShortCuts, {
modalConfig as ShortCutsConfig
} from '@/components/short-cuts';
import VersionInfo, { modalConfig } from '@/components/version-info';
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import { logout } from '@/pages/login/apis';
import { useAccessMarkedRoutes } from '@@/plugin-access';
import { useModel } from '@@/plugin-model';
import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
import { ProLayout } from '@ant-design/pro-components';
import {
Link,
@@ -20,14 +22,16 @@ import {
useNavigate,
type IRoute
} from '@umijs/max';
import { Modal } from 'antd';
import { Button, Modal } from 'antd';
import { useAtom } from 'jotai';
import { useMemo, useState } from 'react';
import 'overlayscrollbars/overlayscrollbars.css';
import { useCallback, useEffect, useMemo, useState } from 'react';
import Exception from './Exception';
import './Layout.css';
import { LogoIcon, SLogoIcon } from './Logo';
import { getRightRenderContent } from './rightRender';
import { patchRoutes } from './runtime';
const loginPath = '/login';
type InitialStateType = {
@@ -86,12 +90,17 @@ const mapRoutes = (routes: IRoute[], role: string) => {
};
export default (props: any) => {
const { initialize: initialize } = useOverlayScroller();
const { initialize: initializeMenu } = useOverlayScroller();
const [userInfo] = useAtom(userAtom);
const [version] = useAtom(GPUStackVersionAtom);
const [updateCheck] = useAtom(UpdateCheckAtom);
const location = useLocation();
const navigate = useNavigate();
const intl = useIntl();
const { clientRoutes, pluginManager } = useAppData();
const [collapsed, setCollapsed] = useState(false);
const [collapseValue, setCollapseValue] = useState(false);
const initialInfo = (useModel && useModel('@@initialState')) || {
initialState: undefined,
@@ -113,6 +122,7 @@ export default (props: any) => {
const showVersion = () => {
Modal.info({
...modalConfig,
width: 460,
content: <VersionInfo intl={intl} />
});
};
@@ -139,6 +149,11 @@ export default (props: any) => {
notFound: <span>404 not found</span>
};
const handleToggleCollapse = (e: any) => {
e.stopPropagation();
setCollapsed(!collapsed);
};
const newRoutes = filterRoutes(
clientRoutes.filter((route) => route.id === '@@/global-layout'),
(route) => {
@@ -151,7 +166,6 @@ export default (props: any) => {
const role = initialState?.currentUser?.is_admin ? 'admin' : 'user';
const [route] = useAccessMarkedRoutes(mapRoutes(newRoutes, role));
console.log('clientRoutes===========', route, clientRoutes, newRoutes);
patchRoutes({
routes: route.children,
@@ -162,7 +176,79 @@ export default (props: any) => {
() => matchRoutes(route?.children || [], location.pathname)?.pop?.()?.route,
[location.pathname]
);
console.log('route===========', matchedRoute, route);
const showUpgrade = useMemo(() => {
return (
initialState?.currentUser?.is_admin &&
updateCheck.latest_version &&
updateCheck.latest_version !== version?.version &&
updateCheck.latest_version !== '0.0.0' &&
updateCheck.latest_version?.indexOf('rc') === -1
);
}, [updateCheck, version, initialState]);
useEffect(() => {
const body = document.querySelector('body');
if (body) {
initialize(body);
}
}, [initialize]);
useEffect(() => {
const menuWrap = document.querySelector(
'.ant-menu.ant-menu-root'
)?.parentElement;
if (menuWrap) {
initializeMenu(menuWrap);
}
}, [initializeMenu]);
const renderMenuHeader = useCallback(
(logo, title) => {
return (
<>
{logo}
<div className="collapse-wrap">
<Button
style={{ marginRight: collapsed ? 0 : -14 }}
size="small"
type={collapsed ? 'default' : 'text'}
onClick={handleToggleCollapse}
>
<>
<MenuUnfoldOutlined
style={{ display: collapsed ? 'block' : 'none' }}
/>
<MenuFoldOutlined
style={{ display: !collapsed ? 'block' : 'none' }}
/>
</>
</Button>
</div>
</>
);
},
[collapsed]
);
const actionRender = useCallback(
(layoutProps) => {
const dom = getRightRenderContent({
runtimeConfig,
loading,
initialState,
setInitialState,
intl,
siderWidth: layoutProps.siderWidth,
collapsed: layoutProps.collapsed,
showUpgrade
});
return dom;
},
[intl, version, updateCheck]
);
return (
<div>
<div className="background"></div>
@@ -174,20 +260,19 @@ export default (props: any) => {
layout="side"
disableMobile={true}
siderWidth={220}
onCollapse={(collapsed) => {
setCollapsed(collapsed);
}}
onMenuHeaderClick={(e) => {
e.stopPropagation();
e.preventDefault();
navigate('/');
}}
menuHeaderRender={renderMenuHeader}
collapsed={collapsed}
onCollapse={(collapsed) => {
setCollapsed(collapsed);
}}
onPageChange={(route) => {
const { location } = history;
console.log('onPageChange', userInfo, initialState);
// if user is not change password, redirect to change password page
if (
location.pathname !== loginPath &&
@@ -242,19 +327,7 @@ export default (props: any) => {
fixSiderbar
fixedHeader
{...runtimeConfig}
actionsRender={(layoutProps) => {
const dom = getRightRenderContent({
runtimeConfig,
loading,
initialState,
setInitialState,
intl,
siderWidth: layoutProps.siderWidth,
collapsed: layoutProps.collapsed
});
return dom;
}}
actionsRender={actionRender}
>
<Exception
route={matchedRoute}
+38 -19
View File
@@ -1,5 +1,4 @@
// @ts-nocheck
import avatarImg from '@/assets/images/avatar.png';
import externalLinks from '@/constants/external-links';
import langConfigMap from '@/locales/lang-config-map';
@@ -18,7 +17,7 @@ import { getAllLocales, history, setLocale } from '@umijs/max';
import { Avatar, Menu, Spin } from 'antd';
import _ from 'lodash';
export function getRightRenderContent(opts: {
export const getRightRenderContent = (opts: {
runtimeConfig: any;
loading: boolean;
initialState: any;
@@ -26,8 +25,8 @@ export function getRightRenderContent(opts: {
setInitialState: any;
siderWidth: number;
intl: any;
}) {
const { intl, collapsed, siderWidth } = opts;
}) => {
const { intl, collapsed, siderWidth, showUpgrade } = opts;
const allLocals = getAllLocales();
if (opts.runtimeConfig.rightRender) {
@@ -100,11 +99,6 @@ export function getRightRenderContent(opts: {
icon: <InfoCircleOutlined />,
label: intl.formatMessage({ id: 'common.button.version' })
}
// {
// key: 'shortcuts',
// icon: <IconFont type="icon-keyboard"></IconFont>,
// label: intl.formatMessage({ id: 'common.button.shortcut' })
// }
];
const helpMenu = {
@@ -114,14 +108,30 @@ export function getRightRenderContent(opts: {
: 'user-menu-container',
mode: 'vertical',
expandIcon: false,
inlineCollapsed: collapsed,
// inlineCollapsed: collapsed,
triggerSubMenuAction: 'hover',
items: [
{
key: 'help',
icon: <QuestionCircleOutlined />,
label: (
<span>{intl?.formatMessage?.({ id: 'common.button.help' })}</span>
<span className="sub-title ">
<span className="flex-center">
<span>{intl?.formatMessage?.({ id: 'common.button.help' })}</span>
{showUpgrade && (
<span
className="m-l-5"
style={{
display: 'flex',
width: 8,
height: 8,
borderRadius: 4,
backgroundColor: 'var(--ant-orange-5)'
}}
></span>
)}
</span>
</span>
),
children: helpList.map((item) => ({
key: item.key,
@@ -129,7 +139,16 @@ export function getRightRenderContent(opts: {
<span className="flex flex-center">
{item.icon}
{item.key === 'version' ? (
<a className="m-l-8">{item.label}</a>
<>
<a className="m-l-8">{item.label}</a>
{showUpgrade && (
<span className="new-icon">
<span className="text">
{intl.formatMessage({ id: 'common.text.new' })}
</span>
</span>
)}
</>
) : (
<a
className="m-l-8"
@@ -162,14 +181,14 @@ export function getRightRenderContent(opts: {
: 'user-menu-container',
mode: 'vertical',
expandIcon: false,
inlineCollapsed: collapsed,
// inlineCollapsed: collapsed,
triggerSubMenuAction: 'hover',
items: [
{
key: 'lang',
icon: <GlobalOutlined />,
label: (
<span>
<span className="sub-title">
{intl?.formatMessage?.({ id: 'common.settings.language' })}
</span>
),
@@ -195,7 +214,7 @@ export function getRightRenderContent(opts: {
: 'user-menu-container',
mode: 'vertical',
expandIcon: false,
inlineCollapsed: collapsed,
// inlineCollapsed: collapsed,
triggerSubMenuAction: 'hover',
items: [
{
@@ -262,22 +281,22 @@ export function getRightRenderContent(opts: {
<Menu
{...helpMenu}
style={{
width: collapsed ? 64 : `calc(${siderWidth}px - 16px)`
width: collapsed ? 40 : `calc(${siderWidth}px - 16px)`
}}
></Menu>
<Menu
{...langMenu}
style={{
width: collapsed ? 64 : `calc(${siderWidth}px - 16px)`
width: collapsed ? 40 : `calc(${siderWidth}px - 16px)`
}}
></Menu>
<Menu
{...userMenu}
style={{
width: collapsed ? 64 : `calc(${siderWidth}px - 16px)`,
width: collapsed ? 40 : `calc(${siderWidth}px - 16px)`,
marginTop: 20
}}
></Menu>
</div>
);
}
};
+17 -22
View File
@@ -1,23 +1,18 @@
import apikeys from './en-US/apikeys';
import common from './en-US/common';
import dashboard from './en-US/dashboard';
import menu from './en-US/menu';
import models from './en-US/models';
import playground from './en-US/playground';
import resources from './en-US/resources';
import shortcuts from './en-US/shortcuts';
import usage from './en-US/usage';
import users from './en-US/users';
/**
* @description The directory name used in require.context must match the language configuration names defined in lang-config-map.ts.
* @example Directories like 'en-US' or 'zh-CN' should correspond exactly to the configuration names in lang-config-map.ts.
*/
export default {
...common,
...menu,
...models,
...playground,
...resources,
...apikeys,
...users,
...dashboard,
...usage,
...shortcuts
};
const requireContext = require.context(`./en-US`, false, /\.ts$/);
let languageConfig: Record<string, string> = {};
requireContext.keys().forEach((fileName: any) => {
const moduleConfig = requireContext(fileName).default;
languageConfig = {
...languageConfig,
...moduleConfig
};
});
export default languageConfig;
+10 -5
View File
@@ -88,7 +88,7 @@ export default {
'common.tips.title': 'Tips:',
'common.input.range.start': 'start value',
'common.input.range.end': 'end value',
'common.footer.version': 'Versions',
'common.footer.version': 'Version',
'common.footer.version.title': 'Version Information',
'common.footer.version.web': 'UI',
'common.footer.version.server': 'Server',
@@ -113,9 +113,9 @@ export default {
'common.button.logs': 'Logs',
'common.ws.close': 'The connection was lost, do you want to reconnect?',
'common.ws.reconnect': 'Reconnect',
'common.input.key': 'key',
'common.input.value': 'value',
'common.input.type': 'type',
'common.input.key': 'Key',
'common.input.value': 'Value',
'common.input.type': 'Type',
'common.input.visible': 'visibility',
'common.input.description': 'description',
'common.time.day': 'day',
@@ -205,5 +205,10 @@ export default {
'common.button.version': 'Version',
'common.title.delete.confirm': 'Confirm delete',
'common.button.addLabel': 'Add Labels',
'common.button.addSelector': 'Add Selectors'
'common.button.addSelector': 'Add Selectors',
'common.button.addParams': 'Add Parameter',
'common.text.here': 'here',
'common.text.latest': 'Latest',
'common.text.new': 'New',
'common.text.changelog': 'Release Notes'
};
+2
View File
@@ -1,6 +1,8 @@
export default {
'menu.dashboard': 'Dashboard',
'menu.playground': 'Playground',
'menu.chat': 'Chat',
'menu.compare': 'Compare',
'menu.models': 'Models',
'menu.resources': 'Resources',
'menu.apikeys': 'API Keys',
+14 -3
View File
@@ -22,7 +22,7 @@ export default {
'model.form.ollama.model': 'Ollama Model',
'model.form.ollamaholder': 'Please select or input model name',
'model.deploy.sort': 'Sort',
'model.deploy.search.placeholder': 'Search models from Hugging Face',
'model.deploy.search.placeholder': 'Search models from {source}',
'model.form.ollamatips':
'Tip: The following are the preconfigured Ollama models in GPUStack. Please select the model you want, or directly enter the model you wish to deploy in the 【{name}】 input box on the right.',
'models.sort.name': 'Name',
@@ -35,6 +35,7 @@ export default {
'models.data.card': 'Model Card',
'models.available.files': 'Available Files',
'models.viewin.hf': 'View in Hugging Face',
'models.viewin.modelscope': 'View in ModelScope',
'models.architecture': 'Architecture',
'models.search.noresult': 'No related models found',
'models.search.nofiles': 'No available files',
@@ -52,7 +53,17 @@ export default {
'models.form.manual.schedule': 'Manual Schedule',
'models.table.gpuindex': 'GPU Index',
'models.table.backend': 'Backends',
'models.table.acrossworker': 'Distribution Across Workers',
'models.table.acrossworker': 'Distributed Across Workers',
'models.table.cpuoffload': 'CPU Offload',
'models.table.layers': 'Layers'
'models.table.layers': 'Layers',
'models.form.backend': 'Backend',
'models.form.backend_parameters': 'Backend Parameters',
'models.search.gguf.tips': '1. GGUF model backend is llama-box(llama.cpp).',
'models.search.vllm.tips': '2. Non-GGUF model backend is vLLM.',
'models.form.ollamalink': 'Find More in Ollama Library',
'models.form.backend_parameters.llamabox.placeholder':
'e.g., --ctx-size=8192',
'models.form.backend_parameters.vllm.placeholder':
'e.g., --max-model-len=8192',
'models.form.backend_parameters.vllm.tips': 'More {backend} parameter details'
};
+20 -2
View File
@@ -1,7 +1,8 @@
export default {
'playground.system.tips': 'Enter system message here',
'playground.system.tips': 'Type system instructions here',
'playground.title': 'Playground',
'playground.system': 'System',
'playground.systemMessage': 'System instructions',
'playground.user': 'User',
'playground.assistant': 'Assistant',
'playground.newMessage': 'New Message',
@@ -29,5 +30,22 @@ export default {
'A stop sequence is a predefined or user-specified text string that signals the AI to stop generating further tokens when these sequences appear.',
'playground.viewcode.tips':
'Your API Key can be found {here}.You should use environment variables or a secret management tool to expose your key to your applications.',
'playground.viewcode.here': 'here'
'playground.viewcode.here': 'here',
'playground.delete.img': 'Delete Image',
'playground.img.upload': 'Upload Image',
'playground.img.upload.success': 'Upload Success',
'playground.img.upload.error': 'Upload Error',
'playground.toolbar.clearmsg': 'Clear Messages',
'playground.toolbar.prompts': 'Prompts',
'playground.toolbar.compare2Model': '2-Model Comparison',
'playground.toolbar.compare3Model': '3-Model Comparison',
'playground.toolbar.compare4Model': '4-Model Comparison',
'playground.toolbar.compare6Model': '6-Model Comparison',
'playground.input.holder': 'Type <kbd>/</kbd> to input message',
'playground.input.keyword.holder': 'Type <kbd>/</kbd> to input your query',
'playground.compare.apply': 'Apply',
'playground.compare.applytoall': 'Apply to all models',
'playground.model.noavailable': 'No available models',
'playground.model.noavailable.tips':
'Please deploy a model first, and it should not be an embedding-only model.'
};
+3 -2
View File
@@ -29,14 +29,15 @@ export default {
'resources.table.vram': 'VRAM',
'resources.table.index': 'Index',
'resources.table.workername': 'Worker Name',
'resources.table.vender': 'Vender',
'resources.table.vender': 'Vendor',
'resources.table.temperature': 'Temperature',
'resources.table.core': 'Core',
'resources.table.core': 'Cores',
'resources.table.utilization': 'Utilization',
'resources.table.gpuutilization': 'GPU Utilization',
'resources.table.vramutilization': 'VRAM Utilization',
'resources.table.total': 'Total',
'resources.table.used': 'Used',
'resources.table.allocated': 'Allocated',
'resources.table.wokers': 'workers',
'resources.worker.linuxormaxos': 'Linux or MacOS',
'resources.table.unified': 'Unified Memory',
+3 -1
View File
@@ -25,5 +25,7 @@ export default {
'users.password.confirm': 'Confirm New Password',
'users.password.confirm.empty': 'Please confirm the new password.',
'users.password.confirm.error': 'The two passwords entered do not match.',
'users.login.title': 'Log in to {name}'
'users.login.title': 'Log in to {name}',
'users.version.islatest': 'GPUStack {version} is the latest version',
'users.version.update': 'GPUStack {version} is available'
};
+6
View File
@@ -1,5 +1,11 @@
import IconFont from '@/components/icon-font';
/**
* Language configuration map
* Warning: The key of the map must be the same as the directory name in the locales directory
* Do not modify the key of the map
*
*/
const langConfigMap = {
'ar-EG': {
lang: 'ar-EG',
+17 -22
View File
@@ -1,23 +1,18 @@
import apikeys from './zh-CN/apikeys';
import common from './zh-CN/common';
import dashboard from './zh-CN/dashboard';
import menu from './zh-CN/menu';
import models from './zh-CN/models';
import playground from './zh-CN/playground';
import resources from './zh-CN/resources';
import shortcuts from './zh-CN/shortcuts';
import usage from './zh-CN/usage';
import users from './zh-CN/users';
/**
* @description The directory name used in require.context must match the language configuration names defined in lang-config-map.ts.
* @example Directories like 'en-US' or 'zh-CN' should correspond exactly to the configuration names in lang-config-map.ts.
*/
export default {
...common,
...menu,
...models,
...playground,
...resources,
...apikeys,
...users,
...dashboard,
...usage,
...shortcuts
};
const requireContext = require.context(`./zh-CN`, false, /\.ts$/);
let languageConfig: Record<string, string> = {};
requireContext.keys().forEach((fileName: any) => {
const moduleConfig = requireContext(fileName).default;
languageConfig = {
...languageConfig,
...moduleConfig
};
});
export default languageConfig;
+6 -1
View File
@@ -198,5 +198,10 @@ export default {
'common.button.version': '版本',
'common.title.delete.confirm': '确认删除',
'common.button.addLabel': '添加标签',
'common.button.addSelector': '添加选择器'
'common.button.addSelector': '添加选择器',
'common.button.addParams': '添加参数',
'common.text.here': '这里',
'common.text.latest': '最新',
'common.text.new': '新',
'common.text.changelog': '更新日志'
};
+2
View File
@@ -1,6 +1,8 @@
export default {
'menu.dashboard': '概览',
'menu.playground': '试验场',
'menu.chat': '聊天',
'menu.compare': '多模型对比',
'menu.models': '模型',
'menu.resources': '资源',
'menu.apikeys': 'API 密钥',
+13 -2
View File
@@ -22,7 +22,7 @@ export default {
'model.form.ollama.model': 'Ollama 模型',
'model.form.ollamaholder': '请选择或输入模型名称',
'model.deploy.sort': '排序',
'model.deploy.search.placeholder': '从 Hugging Face 搜索模型',
'model.deploy.search.placeholder': '从 {source} 搜索模型',
'model.form.ollamatips':
'提示:以下为 GPUStack 预设的 Ollama 模型,请选择你想要的模型或者直接在右侧表单 【{name}】 输入框中输入你要部署的模型。',
'models.sort.name': '名称',
@@ -35,6 +35,7 @@ export default {
'models.data.card': '模型简介',
'models.available.files': '可用文件',
'models.viewin.hf': '在 Hugging Face 中查看',
'models.viewin.modelscope': '在 ModelScope 中查看',
'models.architecture': '架构',
'models.search.noresult': '未找到相关模型',
'models.search.nofiles': '无可用文件',
@@ -53,5 +54,15 @@ export default {
'models.table.backend': '后端',
'models.table.acrossworker': '跨 worker 推理',
'models.table.cpuoffload': 'CPU 卸载',
'models.table.layers': '层'
'models.table.layers': '层',
'models.form.backend': '后端',
'models.form.backend_parameters': '后端参数',
'models.search.gguf.tips': '1. GGUF 模型后端为 llama-box(llama.cpp)',
'models.search.vllm.tips': '2. 非 GGUF 模型后端为 vLLM',
'models.form.ollamalink': '在 Ollama Library 中查找',
'models.form.backend_parameters.llamabox.placeholder':
'例如,--ctx-size=8192',
'models.form.backend_parameters.vllm.placeholder':
'例如,--max-model-len=8192',
'models.form.backend_parameters.vllm.tips': '更多 {backend} 参数说明查看'
};
+19 -1
View File
@@ -2,6 +2,7 @@ export default {
'playground.system.tips': '在这里输入系统消息',
'playground.title': '试验场',
'playground.system': '系统',
'playground.systemMessage': '系统消息',
'playground.user': '用户',
'playground.assistant': '小助手',
'playground.newMessage': '新消息',
@@ -29,5 +30,22 @@ export default {
'停止序列是一个预定义或用户指定的文本字符串,当这些序列出现时,它会提示 AI 停止生成后续的 token。',
'playground.viewcode.tips':
'{here} 查看 API 密钥。您应该使用环境变量或密钥管理工具将您的密钥暴露给您的应用程序。',
'playground.viewcode.here': '这里'
'playground.viewcode.here': '这里',
'playground.delete.img': '删除图片',
'playground.img.upload': '上传图片',
'playground.img.upload.success': '上传成功',
'playground.img.upload.error': '上传失败',
'playground.toolbar.clearmsg': '清空消息',
'playground.toolbar.prompts': '提示词',
'playground.toolbar.compare2Model': '2 模型对比',
'playground.toolbar.compare3Model': '3 模型对比',
'playground.toolbar.compare4Model': '4 模型对比',
'playground.toolbar.compare6Model': '6 模型对比',
'playground.input.holder': '按 <kbd>/</kbd> 开始输入',
'playground.input.keyword.holder': '按 <kbd>/</kbd> 输入你的查询',
'playground.compare.apply': '应用',
'playground.compare.applytoall': '应用到所有模型',
'playground.model.noavailable': '无可用模型',
'playground.model.noavailable.tips':
'请先部署模型,且不是 Embedding Only 的模型'
};
+1
View File
@@ -37,6 +37,7 @@ export default {
'resources.table.utilization': '利用率',
'resources.table.total': '总量',
'resources.table.used': '已用',
'resources.table.allocated': '已分配',
'resources.table.wokers': 'workers',
'resources.table.unified': '统一内存',
'resources.worker.linuxormaxos': 'Linux 或 MacOS',
+3 -1
View File
@@ -24,5 +24,7 @@ export default {
'users.password.confirm': '确认新密码',
'users.password.confirm.empty': '请确认新密码',
'users.password.confirm.error': '两次输入的密码不一致',
'users.login.title': '登录 {name}'
'users.login.title': '登录 {name}',
'users.version.islatest': 'GPUStack {version} 已是最新版本',
'users.version.update': 'GPUStack {version} 版本可供更新'
};
@@ -185,6 +185,7 @@ const AddModal: React.FC<AddModalProps> = ({
<Form.Item>
<div>
<Tag
bordered={false}
color="error"
style={{ padding: '6px 8px', marginBottom: 16 }}
>
+36 -7
View File
@@ -1,3 +1,4 @@
import AutoTooltip from '@/components/auto-tooltip';
import DeleteModal from '@/components/delete-modal';
import PageTools from '@/components/page-tools';
import { PageAction } from '@/config';
@@ -218,9 +219,15 @@ const APIKeys: React.FC = () => {
title={intl.formatMessage({ id: 'common.table.name' })}
dataIndex="name"
key="name"
width={400}
ellipsis={{
showTitle: true
showTitle: false
}}
render={(text, record) => {
return (
<AutoTooltip ghost style={{ maxWidth: 400 }}>
{text}
</AutoTooltip>
);
}}
/>
@@ -228,10 +235,19 @@ const APIKeys: React.FC = () => {
title={intl.formatMessage({ id: 'apikeys.form.expiretime' })}
dataIndex="expires_at"
key="expiration"
ellipsis={{
showTitle: false
}}
render={(text, record) => {
return text
? dayjs(text).format('YYYY-MM-DD HH:mm:ss')
: intl.formatMessage({ id: 'apikeys.form.expiration.never' });
return (
<AutoTooltip ghost>
{text
? dayjs(text).format('YYYY-MM-DD HH:mm:ss')
: intl.formatMessage({
id: 'apikeys.form.expiration.never'
})}
</AutoTooltip>
);
}}
/>
<Column
@@ -239,7 +255,10 @@ const APIKeys: React.FC = () => {
dataIndex="description"
key="description"
ellipsis={{
showTitle: true
showTitle: false
}}
render={(text, record) => {
return <AutoTooltip ghost>{text}</AutoTooltip>;
}}
/>
<Column
@@ -250,13 +269,23 @@ const APIKeys: React.FC = () => {
sortOrder={sortOrder}
showSorterTooltip={false}
sorter={false}
ellipsis={{
showTitle: false
}}
render={(text, record) => {
return dayjs(text).format('YYYY-MM-DD HH:mm:ss');
return (
<AutoTooltip ghost>
{dayjs(text).format('YYYY-MM-DD HH:mm:ss')}
</AutoTooltip>
);
}}
/>
<Column
title={intl.formatMessage({ id: 'common.table.operation' })}
key="operation"
ellipsis={{
showTitle: false
}}
render={(text, record: ListItem) => {
return (
<Space size={20}>
+24 -76
View File
@@ -1,72 +1,11 @@
import AutoTooltip from '@/components/auto-tooltip';
import PageTools from '@/components/page-tools';
import { convertFileSize } from '@/utils';
import { useIntl } from '@umijs/max';
import { Col, Row, Table } from 'antd';
import { useContext } from 'react';
import { memo, useContext } from 'react';
import { DashboardContext } from '../config/dashboard-context';
const projectColumns = [
{
title: 'Name',
dataIndex: 'name',
key: 'name'
},
{
title: 'Token Quota',
dataIndex: 'quota',
key: 'quota',
render: (text: any, record: any) => <span>{record.quota}k</span>
},
{
title: 'Token Utilization',
dataIndex: 'utilization',
key: 'utilization',
render: (text: any, record: any) => <span>{record.utilization}%</span>
},
{
title: 'Members',
dataIndex: 'members',
key: 'members'
}
];
const projectData = [
{
id: 1,
name: 'copilot-dev',
quota: 100,
utilization: 50,
members: 4
},
{
id: 2,
name: 'rag-wiki',
quota: 200,
utilization: 70,
members: 3
},
{
id: 3,
name: 'smart-auto-agent',
quota: 100,
utilization: 20,
members: 5
},
{
id: 4,
name: 'office-auto-docs',
quota: 100,
utilization: 25,
members: 1
},
{
id: 5,
name: 'smart-customer-service',
quota: 100,
utilization: 46,
members: 2
}
];
const ActiveTable = () => {
const intl = useIntl();
const data = useContext(DashboardContext).active_models || [];
@@ -74,26 +13,27 @@ const ActiveTable = () => {
{
title: intl.formatMessage({ id: 'common.table.name' }),
dataIndex: 'name',
key: 'name'
key: 'name',
ellipsis: true,
render: (text: any, record: any) => {
return (
<AutoTooltip ghost>
<span>{text}</span>
</AutoTooltip>
);
}
},
// {
// title: intl.formatMessage({ id: 'dashboard.gpuutilization' }),
// dataIndex: 'gpu_utilization',
// key: 'gpu_utilization',
// render: (text: any, record: any) => (
// <ProgressBar percent={_.round(text, 0)}></ProgressBar>
// )
// },
{
title: intl.formatMessage({ id: 'dashboard.allocatevram' }),
dataIndex: 'resource_claim.memory',
key: 'vram',
ellipsis: true,
render: (text: any, record: any) => {
return (
<span>
<AutoTooltip ghost>
{convertFileSize(record.resource_claim?.vram || 0)} /{' '}
{convertFileSize(record.resource_claim?.ram || 0)}
</span>
</AutoTooltip>
);
}
},
@@ -105,7 +45,15 @@ const ActiveTable = () => {
{
title: intl.formatMessage({ id: 'dashboard.tokens' }),
dataIndex: 'token_count',
key: 'token_count'
key: 'token_count',
ellipsis: true,
render: (text: any, record: any) => {
return (
<AutoTooltip ghost>
<span>{text}</span>
</AutoTooltip>
);
}
}
];
return (
@@ -133,4 +81,4 @@ const ActiveTable = () => {
);
};
export default ActiveTable;
export default memo(ActiveTable);
+2 -2
View File
@@ -29,7 +29,7 @@ const renderCardItem = (data: {
const Overview: React.FC = () => {
const intl = useIntl();
const data = useContext(DashboardContext).resource_counts || {};
console.log('overview===');
const renderValue = (
value:
| number
@@ -74,4 +74,4 @@ const Overview: React.FC = () => {
);
};
export default Overview;
export default React.memo(Overview);
@@ -5,11 +5,6 @@ import _ from 'lodash';
import { memo, useContext, useMemo } from 'react';
import { DashboardContext } from '../config/dashboard-context';
const chartColorMap = {
tickLineColor: 'rgba(217,217,217,0.5)',
axislabelColor: 'rgba(0, 0, 0, 0.4)'
};
const TypeKeyMap = {
cpu: {
label: 'CPU',
@@ -37,80 +32,7 @@ const TypeKeyMap = {
}
};
const option = {
title: {
text: ''
},
legend: {
itemWidth: 8,
itemHeight: 8,
data: []
},
grid: {
left: 0,
right: 20,
bottom: 20,
containLabel: true
},
tooltip: {
trigger: 'axis',
formatter(params: any) {
let result = `<span class="tooltip-x-name">${params[0].axisValue}</span>`;
params.forEach((item: any) => {
result += `<span class="tooltip-item">
<span class="tooltip-item-name">
<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:${item.color};"></span>
<span class="tooltip-title">${item.seriesName}</span>:
</span>
<span class="tooltip-value">${item.data.value}</span>
</span>`;
});
return `<div class="tooltip-wrapper">${result}</div>`;
}
},
xAxis: {
type: 'category',
boundaryGap: true,
axisTick: {
show: true,
lineStyle: {
color: chartColorMap.tickLineColor
}
},
axisLabel: {
color: chartColorMap.axislabelColor,
// fontFamily: 'unset',
fontSize: 12
},
axisLine: {
show: false
},
data: []
},
yAxis: {
max: 100,
min: 0,
splitLine: {
show: true,
lineStyle: {
type: 'dashed'
}
},
axisLabel: {
color: chartColorMap.axislabelColor,
// fontFamily: 'unset',
fontSize: 12
},
axisTick: {
show: false
},
type: 'value'
},
series: []
};
const UtilizationOvertime: React.FC = () => {
console.log('systemload=====================');
const intl = useIntl();
const data = useContext(DashboardContext)?.system_load?.history || {};
@@ -147,7 +69,7 @@ const UtilizationOvertime: React.FC = () => {
legendData,
xAxisData: _.uniq(xAxisData)
};
}, [data]);
}, [data, intl]);
return (
<>
+32 -15
View File
@@ -5,9 +5,8 @@ import breakpoints from '@/config/breakpoints';
import useWindowResize from '@/hooks/use-window-resize';
import { useIntl } from '@umijs/max';
import { Col, Row } from 'antd';
import dayjs from 'dayjs';
import _ from 'lodash';
import { useContext, useEffect, useState } from 'react';
import { memo, useContext, useEffect, useMemo, useState } from 'react';
import { DashboardContext } from '../config/dashboard-context';
import ResourceUtilization from './resource-utilization';
@@ -28,11 +27,29 @@ const SystemLoad = () => {
const [paddingRight, setPaddingRight] = useState<string>('20px');
const [smallChartHeight, setSmallChartHeight] = useState<number>(190);
const [largeChartHeight, setLargeChartHeight] = useState<number>(400);
const thresholds = [0.5, 0.7, 1];
const height = 400;
const currentDate = dayjs().format('YYYY-MM-DD');
const handleSelectDate = (date: any) => {};
const height = 400;
const chartData = useMemo(() => {
return {
gpu: {
data: _.round(data.gpu || 0, 1),
color: strokeColorFunc(data.gpu)
},
vram: {
data: _.round(data.vram || 0, 1),
color: strokeColorFunc(data.vram)
},
cpu: {
data: _.round(data.cpu || 0, 1),
color: strokeColorFunc(data.cpu)
},
ram: {
data: _.round(data.ram || 0, 1),
color: strokeColorFunc(data.ram)
}
};
}, [data]);
useEffect(() => {
if (size.width < breakpoints.xl) {
@@ -70,8 +87,8 @@ const SystemLoad = () => {
<Col span={12} style={{ height: smallChartHeight }}>
<GaugeChart
height={smallChartHeight}
value={_.round(data.gpu || 0, 1)}
color={strokeColorFunc(data.gpu)}
value={chartData.gpu.data}
color={chartData.gpu.color}
title={intl.formatMessage({
id: 'dashboard.gpuutilization'
})}
@@ -83,8 +100,8 @@ const SystemLoad = () => {
id: 'dashboard.vramutilization'
})}
height={smallChartHeight}
color={strokeColorFunc(data.vram)}
value={_.round(data.vram || 0, 1)}
color={chartData.vram.color}
value={chartData.vram.data}
></GaugeChart>
</Col>
<Col span={12} style={{ height: smallChartHeight }}>
@@ -93,8 +110,8 @@ const SystemLoad = () => {
id: 'dashboard.cpuutilization'
})}
height={smallChartHeight}
color={strokeColorFunc(data.cpu)}
value={_.round(data.cpu || 0, 1)}
color={chartData.cpu.color}
value={chartData.cpu.data}
></GaugeChart>
</Col>
<Col span={12} style={{ height: smallChartHeight }}>
@@ -103,8 +120,8 @@ const SystemLoad = () => {
id: 'dashboard.memoryutilization'
})}
height={smallChartHeight}
color={strokeColorFunc(data.ram)}
value={_.round(data.ram || 0, 1)}
color={chartData.ram.color}
value={chartData.ram.data}
></GaugeChart>
</Col>
</Row>
@@ -116,4 +133,4 @@ const SystemLoad = () => {
);
};
export default SystemLoad;
export default memo(SystemLoad);
@@ -4,7 +4,7 @@ import { useIntl } from '@umijs/max';
import { Col, Row } from 'antd';
import dayjs from 'dayjs';
import _ from 'lodash';
import { memo, useCallback, useContext } from 'react';
import { memo, useCallback, useContext, useEffect, useState } from 'react';
import { DashboardContext } from '../../config/dashboard-context';
import RequestTokenInner from './request-token-inner';
import TopUser from './top-user';
@@ -33,18 +33,29 @@ const getCurrentMonthDays = () => {
const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
const intl = useIntl();
const currentDate = dayjs();
const currentMonthDays = getCurrentMonthDays();
let requestData: {
name: string;
color: string;
areaStyle: any;
data: { time: string; value: number }[];
}[] = [];
let tokenData: { time: string; value: number }[] = [];
let userData: { name: string; value: number }[] = [];
const xAxisData: string[] = currentMonthDays;
let topUserList: string[] = [];
const [topUserData, setTopUserData] = useState<{
userData: { name: string; value: number }[];
topUserList: string[];
}>({
userData: [],
topUserList: []
});
const [requestTokenData, setRequestTokenData] = useState<{
requestData: {
name: string;
color: string;
areaStyle: any;
data: { time: string; value: number }[];
}[];
tokenData: { time: string; value: number }[];
xAxisData: string[];
}>({
requestData: [],
tokenData: [],
xAxisData: []
});
const { model_usage } = useContext(DashboardContext);
const data = model_usage || {};
@@ -54,6 +65,7 @@ const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
};
const generateData = useCallback(() => {
const currentMonthDays = getCurrentMonthDays();
const requestList: {
name: string;
color: string;
@@ -88,7 +100,7 @@ const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
data: []
};
_.each(xAxisData, (date: string) => {
_.each(currentMonthDays, (date: string) => {
// tokens data
const item = _.find(data.completion_token_history, (item: any) => {
return dayjs(item.timestamp * 1000).format('YYYY-MM-DD') === date;
@@ -140,8 +152,10 @@ const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
// ========== top users ============
if (!data.top_users?.length) {
userData = [];
topUserList = [];
setTopUserData({
userData: [],
topUserList: []
});
} else {
const users: string[] = [];
_.each(data.top_users, (item: any) => {
@@ -155,15 +169,23 @@ const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
value: item.completion_token_count
});
});
topUserList = _.uniq(users);
userData = [topUserCompletion, topUserPrompt];
setTopUserData({
userData: [topUserCompletion, topUserPrompt],
topUserList: _.uniq(users)
});
}
requestData = [requestList];
tokenData = [completionData, prompData];
}, [data, xAxisData]);
setRequestTokenData({
requestData: [requestList],
tokenData: [completionData, prompData],
xAxisData: currentMonthDays
});
}, [data]);
generateData();
useEffect(() => {
generateData();
}, [generateData]);
return (
<>
@@ -181,13 +203,16 @@ const UsageInner: React.FC<{ paddingRight: string }> = ({ paddingRight }) => {
style={{ paddingRight: paddingRight }}
>
<RequestTokenInner
requestData={requestData}
xAxisData={xAxisData}
tokenData={tokenData}
requestData={requestTokenData.requestData}
xAxisData={requestTokenData.xAxisData}
tokenData={requestTokenData.tokenData}
></RequestTokenInner>
</Col>
<Col xs={24} sm={24} md={24} lg={24} xl={8}>
<TopUser userData={userData} topUserList={topUserList}></TopUser>
<TopUser
userData={topUserData.userData}
topUserList={topUserData.topUserList}
></TopUser>
</Col>
</Row>
</>
@@ -17,7 +17,6 @@ interface RequestTokenInnerProps {
xAxisData: string[];
}
const RequestTokenInner: React.FC<RequestTokenInnerProps> = (props) => {
console.log('request token inner=====================');
const { requestData, tokenData, xAxisData } = props;
const intl = useIntl();
const labelFormatter = (v: any) => {
@@ -8,7 +8,6 @@ interface TopUserProps {
topUserList: string[];
}
const TopUser: React.FC<TopUserProps> = (props) => {
console.log('TopUser=====================');
const { userData, topUserList } = props;
const intl = useIntl();
+86 -1
View File
@@ -1,6 +1,7 @@
import { downloadFile, listFiles, listModels } from '@huggingface/hub';
import { PipelineType } from '@huggingface/tasks';
import { request } from '@umijs/max';
import qs from 'query-string';
import {
FormData,
GPUListItem,
@@ -126,6 +127,15 @@ export async function callHuggingfaceQuickSearch(params: any) {
const HUGGINGFACE_API = 'https://huggingface.co/api/models';
const MODEL_SCOPE_LIST_MODEL_API =
'/proxy?url=https://www.modelscope.cn/api/v1/dolphin/models';
const MODEL_SCOPE_DETAIL_MODEL_API =
'/proxy?url=https://www.modelscope.cn/api/v1/dolphin/models/';
const MODE_SCOPE_MODEL_FIELS_API =
'/proxy?url=https://modelscope.cn/api/v1/models/';
export async function queryHuggingfaceModelDetail(
params: { repo: string },
options?: any
@@ -136,6 +146,81 @@ export async function queryHuggingfaceModelDetail(
});
}
export async function queryModelScopeModels(
params: {
PageSize?: number;
PageNumber?: number;
SortBy?: string;
Target?: string;
SingleCriterion?: any[];
Name: string;
filterGGUF?: boolean;
},
config?: any
) {
const Criterion = params.filterGGUF
? {
Criterion: [
{ category: 'tags', predicate: 'contains', values: ['gguf'] }
]
}
: {};
const res = await fetch(`${MODEL_SCOPE_LIST_MODEL_API}`, {
method: 'PUT',
signal: config?.signal,
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
...params,
...Criterion,
Name: `${params.Name}`,
PageSize: 100,
PageNumber: 1
})
});
if (!res.ok) {
throw new Error('Network response was not ok');
return null;
}
return res.json();
}
export async function queryModelScopeModelDetail(
params: { name: string },
options?: any
) {
return request(`${MODE_SCOPE_MODEL_FIELS_API}${params.name}`, {
method: 'GET',
cancelToken: options?.token
});
}
export async function queryModelScopeModelFiles(
params: { name: string; revision: string },
options?: any
) {
const res = await fetch(
`${MODE_SCOPE_MODEL_FIELS_API}${params.name}/repo/files?${qs.stringify({
Revision: params.revision,
Recursive: true,
Root: ''
})}`,
{
method: 'GET',
signal: options?.signal,
body: null
}
);
if (!res.ok) {
throw new Error('Network response was not ok');
return null;
}
return res.json();
}
export async function queryHuggingfaceModels(
params: {
search: {
@@ -152,7 +237,7 @@ export async function queryHuggingfaceModels(
...params,
...options,
limit: 100,
additionalFields: ['sha'],
additionalFields: ['sha', 'tags'],
fetch(url: string, config: any) {
try {
const newUrl = params.search.sort

Some files were not shown because too many files have changed in this diff Show More