fix: logs scrollbar ux
This commit is contained in:
@@ -39,11 +39,7 @@ import {
|
||||
queryModelInstancesList,
|
||||
updateModel
|
||||
} from '../apis';
|
||||
import {
|
||||
InstanceStatusMap,
|
||||
getSourceRepoConfigValue,
|
||||
modelSourceMap
|
||||
} from '../config';
|
||||
import { getSourceRepoConfigValue, modelSourceMap } from '../config';
|
||||
import { FormData, ListItem, ModelInstanceListItem } from '../config/types';
|
||||
import DeployModal from './deploy-modal';
|
||||
import InstanceItem from './instance-item';
|
||||
@@ -657,7 +653,6 @@ const Models: React.FC<ModelsProps> = ({
|
||||
></DeployModal>
|
||||
<ViewLogsModal
|
||||
url={currentInstance.url}
|
||||
autoScroll={currentInstance.status !== InstanceStatusMap.Downloading}
|
||||
open={openLogModal}
|
||||
onCancel={handleLogModalCancel}
|
||||
></ViewLogsModal>
|
||||
|
||||
@@ -66,7 +66,6 @@ const ViewCodeModal: React.FC<ViewModalProps> = (props) => {
|
||||
<LogsViewer
|
||||
height={modalSize.height}
|
||||
url={url}
|
||||
autoScroll={props.autoScroll}
|
||||
params={{
|
||||
follow: true
|
||||
}}
|
||||
|
||||
@@ -173,7 +173,10 @@ const GroundLeft: React.FC<MessageProps> = forwardRef((props, ref) => {
|
||||
]
|
||||
: [...formatMessages],
|
||||
...parameters,
|
||||
stream: true
|
||||
stream: true,
|
||||
stream_otpions: {
|
||||
include_usage: true
|
||||
}
|
||||
};
|
||||
const result: any = await fetchChunkedData({
|
||||
data: chatParams,
|
||||
|
||||
@@ -173,7 +173,10 @@ const ModelItem: React.FC<ModelItemProps> = forwardRef(
|
||||
]
|
||||
: [...formatMessages],
|
||||
...params,
|
||||
stream: true
|
||||
stream: true,
|
||||
stream_otpions: {
|
||||
include_usage: true
|
||||
}
|
||||
};
|
||||
// ============== payload end ================
|
||||
const result: any = await fetchChunkedData({
|
||||
|
||||
@@ -4,7 +4,7 @@ import { BulbOutlined } from '@ant-design/icons';
|
||||
import { useIntl } from '@umijs/max';
|
||||
import { Button, Modal } from 'antd';
|
||||
import _ from 'lodash';
|
||||
import React, { useEffect, useRef, useState } from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
|
||||
type ViewModalProps = {
|
||||
systemMessage?: string;
|
||||
@@ -40,8 +40,6 @@ const ViewCodeModal: React.FC<ViewModalProps> = (props) => {
|
||||
} = props || {};
|
||||
|
||||
const intl = useIntl();
|
||||
const editorRef = useRef(null);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [codeValue, setCodeValue] = useState('');
|
||||
const [lang, setLang] = useState(langMap.shell);
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import AutoTooltip from '@/components/auto-tooltip';
|
||||
import PageTools from '@/components/page-tools';
|
||||
import ProgressBar from '@/components/progress-bar';
|
||||
import useTableSort from '@/hooks/use-table-sort';
|
||||
@@ -140,6 +141,16 @@ const GPUList: React.FC = () => {
|
||||
title={intl.formatMessage({ id: 'resources.table.workername' })}
|
||||
dataIndex="worker_name"
|
||||
key="worker_name"
|
||||
width={200}
|
||||
render={(text, record: GPUDeviceItem) => {
|
||||
return (
|
||||
<span style={{ display: 'flex', width: '100%' }}>
|
||||
<AutoTooltip ghost maxWidth={340}>
|
||||
{text}
|
||||
</AutoTooltip>
|
||||
</span>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<Column
|
||||
title={intl.formatMessage({ id: 'resources.table.vender' })}
|
||||
@@ -160,7 +171,7 @@ const GPUList: React.FC = () => {
|
||||
dataIndex="core"
|
||||
key="Core"
|
||||
render={(text, record: GPUDeviceItem) => {
|
||||
return <span>{record.core?.total}</span>;
|
||||
return <>{record.core ? <span>{record.core?.total}</span> : '-'}</>;
|
||||
}}
|
||||
/> */}
|
||||
<Column
|
||||
@@ -169,9 +180,15 @@ const GPUList: React.FC = () => {
|
||||
key="gpuUtil"
|
||||
render={(text, record: GPUDeviceItem) => {
|
||||
return (
|
||||
<ProgressBar
|
||||
percent={_.round(record.core?.utilization_rate, 2)}
|
||||
></ProgressBar>
|
||||
<>
|
||||
{record.core ? (
|
||||
<ProgressBar
|
||||
percent={_.round(record.core?.utilization_rate, 2)}
|
||||
></ProgressBar>
|
||||
) : (
|
||||
'-'
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
@@ -192,7 +209,10 @@ const GPUList: React.FC = () => {
|
||||
</span>
|
||||
<span>
|
||||
{intl.formatMessage({ id: 'resources.table.used' })}:{' '}
|
||||
{convertFileSize(record.memory?.used, 0)}
|
||||
{convertFileSize(
|
||||
record.memory?.used || record.memory?.allocated,
|
||||
0
|
||||
)}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
|
||||
@@ -307,6 +307,14 @@ const Resources: React.FC = () => {
|
||||
title={intl.formatMessage({ id: 'common.table.name' })}
|
||||
dataIndex="name"
|
||||
key="name"
|
||||
width={100}
|
||||
render={(text, record: ListItem) => {
|
||||
return (
|
||||
<AutoTooltip ghost maxWidth={240}>
|
||||
<span>{record.name}</span>
|
||||
</AutoTooltip>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<Column
|
||||
title={intl.formatMessage({ id: 'resources.table.labels' })}
|
||||
@@ -408,10 +416,14 @@ const Resources: React.FC = () => {
|
||||
>
|
||||
[{item.index}]
|
||||
</span>
|
||||
<ProgressBar
|
||||
key={index}
|
||||
percent={_.round(item.core?.utilization_rate, 0)}
|
||||
></ProgressBar>
|
||||
{item.core ? (
|
||||
<ProgressBar
|
||||
key={index}
|
||||
percent={_.round(item.core?.utilization_rate, 0)}
|
||||
></ProgressBar>
|
||||
) : (
|
||||
'-'
|
||||
)}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
@@ -455,7 +467,11 @@ const Resources: React.FC = () => {
|
||||
{intl.formatMessage({
|
||||
id: 'resources.table.used'
|
||||
})}
|
||||
: {convertFileSize(item.memory?.used, 0)}
|
||||
:{' '}
|
||||
{convertFileSize(
|
||||
item.memory?.used || item.memory?.allocated,
|
||||
0
|
||||
)}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user