root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: painting cache

Browse Source
This commit is contained in:
jialin
2024-12-27 14:56:06 +08:00
parent 542f048a67
commit bca56bfaad
17 changed files with 1411 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/playground/components/ground-images.tsx
+4 -1
View File
@@ -52,7 +52,8 @@ const advancedFieldsDefaultValus = {
cfg_scale: 4.5,
sampling_steps: 10,
negative_prompt: null,
schedule_method: 'discrete'
schedule_method: 'discrete',
preview: null
};
const openaiCompatibleFieldsDefaultValus = {
@@ -237,6 +238,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
width: imgSize[0],
loading: true,
progressType: stream_options.chunk_results ? 'dashboard' : 'line',
preview: false,
uid: setMessageId()
};
});
@@ -302,6 +304,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
uid: imgItem.uid,
span: imgItem.span,
loading: stream_options.chunk_results ? progress < 100 : false,
preview: progress >= 100,
progress: progress
};
});
src/pages/playground/components/image-edit.tsx
+66 -59
View File
@@ -13,7 +13,7 @@ import {
} from '@/utils/fetch-chunk-data';
import { SwapOutlined } from '@ant-design/icons';
import { useIntl, useSearchParams } from '@umijs/max';
import { Button, Divider, Form, Image, Tooltip } from 'antd';
import { Button, Divider, Form, Tooltip } from 'antd';
import classNames from 'classnames';
import _ from 'lodash';
import 'overlayscrollbars/overlayscrollbars.css';
@@ -28,7 +28,6 @@ import React, {
useState
} from 'react';
import { EDIT_IMAGE_API } from '../apis';
import { promptList } from '../config';
import {
ImageAdvancedParamsConfig,
ImageCustomSizeConfig,
@@ -54,6 +53,7 @@ const advancedFieldsDefaultValus = {
cfg_scale: 4.5,
sample_steps: 10,
negative_prompt: null,
preview: null,
schedule: 'discrete'
};
@@ -83,6 +83,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
span?: number;
loading?: boolean;
progress?: number;
preview?: boolean;
}[]
>([]);
@@ -103,8 +104,14 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
const inputRef = useRef<any>(null);
const [image, setImage] = useState<string>('');
const [mask, setMask] = useState<string>('');
const [showOriginal, setShowOriginal] = useState<boolean>(false);
const [uploadList, setUploadList] = useState<any[]>([]);
const [imageStatus, setImageStatus] = useState<{
isOriginal: boolean;
isResetNeeded: boolean;
}>({
isOriginal: false,
isResetNeeded: false
});
const size = Form.useWatch('size', form.current?.form);
@@ -123,20 +130,6 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
};
});
const generateNumber = (min: number, max: number) => {
return Math.floor(Math.random() * (max - min + 1) + min);
};
const handleRandomPrompt = useCallback(() => {
const randomIndex = generateNumber(0, promptList.length - 1);
const randomPrompt = promptList[randomIndex];
inputRef.current?.handleInputChange({
target: {
value: randomPrompt
}
});
}, []);
const setImageSize = useCallback(() => {
let size: Record<string, string | number> = {
span: 12
@@ -156,12 +149,20 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
return size;
}, [parameters.n]);
const imageFile = useMemo(() => {
return base64ToFile(image, 'image');
}, [image]);
const maskFile = useMemo(() => {
return base64ToFile(mask, 'mask');
}, [mask]);
const finalParameters = useMemo(() => {
if (parameters.size === 'custom') {
return {
..._.omit(parameters, ['width', 'height', 'preview']),
image: base64ToFile(image, 'image'),
mask: base64ToFile(mask, 'mask'),
image: imageFile,
mask: maskFile,
size:
parameters.width && parameters.height
? `${parameters.width}x${parameters.height}`
@@ -169,11 +170,11 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
};
}
return {
image: base64ToFile(image, 'image'),
mask: base64ToFile(mask, 'mask'),
image: imageFile,
mask: maskFile,
..._.omit(parameters, ['width', 'height', 'random_seed', 'preview'])
};
}, [parameters, image, mask]);
}, [parameters, maskFile, imageFile]);
const viewCodeContent = useMemo(() => {
if (isOpenaiCompatible) {
@@ -248,6 +249,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
width: imgSize[0],
loading: true,
progressType: stream_options.chunk_results ? 'dashboard' : 'line',
preview: false,
uid: setMessageId()
};
});
@@ -313,6 +315,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
uid: imgItem.uid,
span: imgItem.span,
loading: stream_options.chunk_results ? progress < 100 : false,
preview: progress >= 100,
progress: progress
};
});
@@ -480,17 +483,27 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
const img = _.get(base64List, '[0].dataUrl', '');
setUploadList(base64List);
setImage(img);
setImageStatus({
isOriginal: false,
isResetNeeded: true
});
setImageList([]);
}, []);
const handleOnSave = useCallback((url: string) => {
console.log('url:', url);
setImageStatus({
isOriginal: true,
isResetNeeded: false
});
setMask(url);
}, []);
const renderImageEditor = useMemo(() => {
console.log('image:', image);
if (image) {
return (
<CanvasImageEditor
imageStatus={imageStatus}
imageSrc={image}
disabled={loading}
onSave={handleOnSave}
@@ -524,14 +537,37 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
</div>
</UploadImg>
);
}, [image, loading, handleOnSave, handleUpdateImageList]);
}, [image, loading, imageStatus, handleOnSave, handleUpdateImageList]);
const handleOnImgClick = useCallback((item: any) => {
console.log('item:', item);
const handleOnImgClick = useCallback((item: any, isOrigin: boolean) => {
setImage(item.dataUrl);
setShowOriginal(true);
setImageStatus({
isOriginal: isOrigin,
isResetNeeded: false
});
}, []);
const renderOriginImage = useMemo(() => {
if (!uploadList.length) {
return null;
}
return (
<>
<SingleImage
{...uploadList[0]}
height={125}
maxHeight={125}
preview={true}
loading={false}
autoSize={false}
editable={false}
autoBgColor={false}
onClick={() => handleOnImgClick(uploadList[0], true)}
></SingleImage>
</>
);
}, [uploadList, handleOnImgClick]);
useEffect(() => {
return () => {
requestToken.current?.abort?.();
@@ -613,16 +649,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
alignItems: 'center'
}}
>
{uploadList.length > 0 && (
<Image
onClick={() => handleOnImgClick(uploadList[0])}
src={uploadList[0]?.dataUrl}
style={{
height: 125,
objectFit: 'cover'
}}
></Image>
)}
{renderOriginImage}
{imageList.length > 0 && (
<>
<Divider
@@ -655,12 +682,12 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
height={125}
maxHeight={125}
key={item.uid}
preview={true}
preview={item.preview}
loading={item.loading}
autoSize={false}
editable={false}
autoBgColor={false}
onClick={() => handleOnImgClick(item)}
onClick={() => handleOnImgClick(item, false)}
></SingleImage>
</div>
);
@@ -668,26 +695,6 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
</div>
</>
)}
{/* <ThumbImg
column={parameters.n}
style={{
padding: 0,
height: '100%',
justifyContent: 'center',
flexDirection: 'column',
flexWrap: 'unset',
alignItems: 'center'
}}
preview={false}
autoBgColor={false}
editable={false}
dataList={imageList}
loading={loading}
onClick={handleOnImgClick}
responseable={true}
gutter={[8, 16]}
autoSize={true}
></ThumbImg> */}
</div>
</div>
</div>
src/pages/playground/components/thumb-img.tsx
+4 -7
View File
@@ -11,7 +11,6 @@ const ThumbImg: React.FC<{
rows: number;
cols: number;
};
preview?: boolean;
editable?: boolean;
onDelete?: (uid: number) => void;
onClick?: (item: any) => void;
@@ -27,7 +26,6 @@ const ThumbImg: React.FC<{
rows: 1,
cols: 1
},
preview = true,
column = 2,
dataList,
editable,
@@ -48,7 +46,6 @@ const ThumbImg: React.FC<{
const handleOnClick = useCallback(
(item: any) => {
console.log('item=======', item);
onClick?.(item);
},
[onClick]
@@ -110,7 +107,7 @@ const ThumbImg: React.FC<{
alignItems: 'flex-start'
}
};
}, [dataList, responseable, column]);
}, [dataList.length, responseable, column]);
return (
<>
@@ -141,7 +138,7 @@ const ThumbImg: React.FC<{
>
<SingleImage
{...item}
preview={preview}
preview={item.preview}
style={{ ...(responseableStyle[index] || {}) }}
loading={item.loading}
autoSize={autoSize}
@@ -177,7 +174,7 @@ const ThumbImg: React.FC<{
>
<SingleImage
{...item}
preview={preview}
preview={item.preview}
style={{ ...(responseableStyle[index + 2] || {}) }}
loading={item.loading}
autoSize={autoSize}
@@ -198,7 +195,7 @@ const ThumbImg: React.FC<{
return (
<SingleImage
{...item}
preview={preview}
preview={item.preview}
key={item.uid}
autoSize={autoSize}
editable={editable}
src/pages/playground/config/params-config.ts
+9 -7
View File
@@ -216,15 +216,16 @@ export const ImageconstExtraConfig: ParamsSchema[] = [
label: 'playground.params.style.natural',
value: 'natural',
locale: true
}
},
{ label: 'common.options.none', value: null, locale: true }
],
attrs: {
allowClear: true
},
label: {
text: 'playground.params.style',
isLocalized: true
},
attrs: {
allowNull: true
},
rules: [
{
required: false
@@ -316,7 +317,7 @@ export const ImageAdvancedParamsConfig: ParamsSchema[] = [
},
{
type: 'Input',
name: 'negative_prompt', //ng_deepnegative_v1_75t,(badhandv4:1.2),EasyNegative,(worst quality:2),
name: 'negative_prompt', // e.g. ng_deepnegative_v1_75t,(badhandv4:1.2),EasyNegative,(worst quality:2),
label: {
text: 'playground.image.params.negativePrompt',
isLocalized: true
@@ -335,14 +336,15 @@ export const ImageAdvancedParamsConfig: ParamsSchema[] = [
name: 'preview',
options: [
{ label: 'Faster', value: 'preview_faster' },
{ label: 'Normal', value: 'preview' }
{ label: 'Normal', value: 'preview' },
{ label: 'common.options.none', value: null, locale: true }
],
label: {
text: 'Preview',
isLocalized: false
},
attrs: {
allowClear: true
allowNull: true
},
rules: [
{
src/pages/playground/config/types.ts
+1 -1
View File
@@ -34,7 +34,7 @@ export interface ParamsSchema {
isLocalized?: boolean;
};
style?: React.CSSProperties;
options?: Global.BaseOption<string | number>[];
options?: Global.BaseOption<string | number | null>[];
value?: string | number | boolean | string[];
min?: number;
max?: number;