From 907105a492d0cc6fd3a18d8c3eee03e4f5124525 Mon Sep 17 00:00:00 2001 From: jialin Date: Tue, 3 Jun 2025 15:10:17 +0800 Subject: [PATCH] fix: set default spec to form --- package.json | 1 + pnpm-lock.yaml | 20 +++++---- src/components/upload-audio/index.tsx | 9 +++- .../components/deploy-builtin-modal.tsx | 7 ++- .../llmodels/components/deploy-modal.tsx | 30 +++++++++++-- src/pages/llmodels/config/llama-config.ts | 16 +++++++ src/pages/llmodels/hooks/index.ts | 9 +++- .../playground/components/message-input.tsx | 43 +++++++++++++++++++ src/pages/playground/config/types.ts | 1 + src/utils/load-audio-file.ts | 9 ++++ 10 files changed, 128 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index c87ba26a..5ff5cae7 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@umijs/max": "^4.2.11", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", + "ahooks": "^3.8.5", "ansi-to-html": "^0.7.2", "antd": "^5.21.6", "antd-style": "^3.6.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a18a32f4..7162a8d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ dependencies: '@xterm/xterm': specifier: ^5.5.0 version: 5.5.0 + ahooks: + specifier: ^3.8.5 + version: 3.8.5(react@18.2.0) ansi-to-html: specifier: ^0.7.2 version: 0.7.2 @@ -290,7 +293,7 @@ packages: '@umijs/bundler-utils': 4.2.8 '@umijs/plugins': 4.2.8(@babel/core@7.26.0)(@types/react-dom@18.3.0)(@types/react@18.3.1)(antd@5.21.6)(dva@2.5.0-beta.2)(rc-field-form@2.7.0)(react-dom@18.2.0)(react@18.2.0) '@umijs/utils': 4.2.8 - ahooks: 3.8.0(react@18.2.0) + ahooks: 3.8.5(react@18.2.0) antd-mobile-alita: 2.3.4(react-dom@18.2.0)(react@18.2.0) antd-mobile-icons: 0.2.2 babel-plugin-import: 1.13.8 @@ -7595,22 +7598,22 @@ packages: dev: false optional: true - /ahooks@3.8.0(react@18.2.0): - resolution: {integrity: sha512-M01m+mxLRNNeJ/PCT3Fom26UyreTj6oMqJBetUrJnK4VNI5j6eMA543Xxo53OBXn6XibA2FXKcCCgrT6YCTtKQ==, tarball: https://registry.npmjs.org/ahooks/-/ahooks-3.8.0.tgz} + /ahooks@3.8.5(react@18.2.0): + resolution: {integrity: sha512-Y+MLoJpBXVdjsnnBjE5rOSPkQ4DK+8i5aPDzLJdIOsCpo/fiAeXcBY1Y7oWgtOK0TpOz0gFa/XcyO1UGdoqLcw==, tarball: https://registry.npmjs.org/ahooks/-/ahooks-3.8.5.tgz} engines: {node: '>=8.0.0'} peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 dependencies: '@babel/runtime': 7.26.0 dayjs: 1.11.11 intersection-observer: 0.12.2 - js-cookie: 2.2.1 + js-cookie: 3.0.5 lodash: 4.17.21 react: 18.2.0 react-fast-compare: 3.2.2 resize-observer-polyfill: 1.5.1 screenfull: 5.2.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: false /ajv-formats@2.1.1(ajv@8.13.0): @@ -12759,8 +12762,9 @@ packages: react: 18.2.0 dev: false - /js-cookie@2.2.1: - resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==, tarball: https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz} + /js-cookie@3.0.5: + resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==, tarball: https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz} + engines: {node: '>=14'} dev: false /js-sdsl@4.4.2: diff --git a/src/components/upload-audio/index.tsx b/src/components/upload-audio/index.tsx index 5c65c9bd..13399ba1 100644 --- a/src/components/upload-audio/index.tsx +++ b/src/components/upload-audio/index.tsx @@ -7,10 +7,14 @@ interface UploadAudioProps { accept?: string; maxCount?: number; type?: 'text' | 'primary' | 'default'; + icon?: React.ReactNode; + size?: 'small' | 'middle' | 'large'; + shape?: 'circle' | 'round' | 'default'; onChange?: (data: { file: any; fileList: any[] }) => void; } const UploadAudio: React.FC = (props) => { + const { icon, accept, type, size = 'large', shape = 'circle' } = props; const intl = useIntl(); const beforeUpload = (file: any) => { return false; @@ -48,9 +52,10 @@ const UploadAudio: React.FC = (props) => { }} > diff --git a/src/pages/llmodels/components/deploy-builtin-modal.tsx b/src/pages/llmodels/components/deploy-builtin-modal.tsx index 0409b43a..6dc76aa7 100644 --- a/src/pages/llmodels/components/deploy-builtin-modal.tsx +++ b/src/pages/llmodels/components/deploy-builtin-modal.tsx @@ -127,7 +127,12 @@ const AddModal: React.FC = (props) => { const pickSomeFieldsValue = () => { const formData = form.current?.getFieldsValue(); - return _.pick(formData, ['worker_selector', 'gpu_selector', 'env']); + return _.pick(formData, [ + 'worker_selector', + 'gpu_selector', + 'env', + 'backend_version' + ]); }; const generateSubmitData = (formData: FormData) => { diff --git a/src/pages/llmodels/components/deploy-modal.tsx b/src/pages/llmodels/components/deploy-modal.tsx index f3b8b8de..246c6c88 100644 --- a/src/pages/llmodels/components/deploy-modal.tsx +++ b/src/pages/llmodels/components/deploy-modal.tsx @@ -36,6 +36,12 @@ const resetFields = [ 'env' ]; +const resetFieldsByFile = [ + 'cpu_offloading', + 'distributed_inference_across_workers', + 'backend_parameters' +]; + const ModalFooterStyle = { padding: '16px 24px', display: 'flex', @@ -94,6 +100,7 @@ const AddModal: FC = (props) => { handleBackendChangeBefore, cancelEvaluate, handleOnValuesChange, + handleEvaluateOnChange, warningStatus, submitAnyway } = useCheckCompatibility(); @@ -135,22 +142,37 @@ const AddModal: FC = (props) => { return categories || null; }; - const handleSelectModelFile = (item: any, evaluate?: boolean) => { - form.current?.form?.resetFields(resetFields); + const handleSelectModelFile = async (item: any, evaluate?: boolean) => { + form.current?.form?.resetFields(resetFieldsByFile); const modelInfo = onSelectModel(selectedModel, props.source); form.current?.setFieldsValue?.({ file_name: item.fakeName, - ...getDefaultSpec(item), ...modelInfo, categories: getCategory(item) }); + await new Promise((resolve) => { + setTimeout(() => { + resolve(true); + }, 0); + }); + if (item.fakeName) { - handleOnValuesChange?.({ + const evaluateRes = await handleEvaluateOnChange?.({ changedValues: {}, allValues: form.current?.form?.getFieldsValue?.(), source: props.source }); + const defaultSpec = getDefaultSpec({ + evaluateResult: evaluateRes + }); + console.log('defaultSpec', defaultSpec); + form.current?.setFieldsValue?.({ + file_name: item.fakeName, + ...defaultSpec, + ...modelInfo, + categories: getCategory(item) + }); } }; diff --git a/src/pages/llmodels/config/llama-config.ts b/src/pages/llmodels/config/llama-config.ts index 61819dfb..b01bca48 100644 --- a/src/pages/llmodels/config/llama-config.ts +++ b/src/pages/llmodels/config/llama-config.ts @@ -592,6 +592,22 @@ const options = [ { label: '--context-shift', value: '--context-shift' + }, + { + label: '--visual-max-image-cache', + value: '--visual-max-image-cache' + }, + { + label: '--max-projected-cache', + value: '--max-projected-cache' + }, + { + label: '--swa-full', + value: '--swa-full' + }, + { + label: '--no-enable-reasoning', + value: '--no-enable-reasoning' } ]; diff --git a/src/pages/llmodels/hooks/index.ts b/src/pages/llmodels/hooks/index.ts index 065c65aa..4ac61aeb 100644 --- a/src/pages/llmodels/hooks/index.ts +++ b/src/pages/llmodels/hooks/index.ts @@ -7,6 +7,7 @@ import { import { ListItem as WorkerListItem } from '@/pages/resources/config/types'; import { convertFileSize } from '@/utils'; import { useIntl } from '@umijs/max'; +import { useDebounceFn } from 'ahooks'; import _ from 'lodash'; import { useEffect, useRef, useState } from 'react'; import { evaluationsModelSpec, queryGPUList } from '../apis'; @@ -522,7 +523,7 @@ export const useCheckCompatibility = () => { cacheFormValuesRef.current = allValues; const data = getSourceRepoConfigValue(source, allValues); const gpuSelector = generateGPUIds(data.values); - await handleDoEvalute({ + return await handleDoEvalute({ ...data.values, ...gpuSelector }); @@ -546,7 +547,10 @@ export const useCheckCompatibility = () => { return res; }; - const debounceHandleValuesChange = _.debounce(handleOnValuesChange, 500); + const { run: debounceHandleValuesChange } = useDebounceFn( + handleOnValuesChange, + { wait: 500 } + ); const cancelEvaluate = () => { checkTokenRef.current?.cancel(); @@ -570,6 +574,7 @@ export const useCheckCompatibility = () => { cancelEvaluate, handleBackendChangeBefore, handleOnValuesChange: debounceHandleValuesChange, + handleEvaluateOnChange: handleOnValuesChange, warningStatus, checkTokenRef, submitAnyway diff --git a/src/pages/playground/components/message-input.tsx b/src/pages/playground/components/message-input.tsx index 2d408f2b..1dee5502 100644 --- a/src/pages/playground/components/message-input.tsx +++ b/src/pages/playground/components/message-input.tsx @@ -1,5 +1,6 @@ import IconFont from '@/components/icon-font'; import HotKeys, { KeyMap } from '@/config/hotkeys'; +import { convertFileToBase64 } from '@/utils/load-audio-file'; import { ClearOutlined, SendOutlined, SwapOutlined } from '@ant-design/icons'; import { useIntl } from '@umijs/max'; import { Button, Checkbox, Divider, Input, Tooltip } from 'antd'; @@ -19,6 +20,12 @@ import '../style/message-input.less'; import ThumbImg from './thumb-img'; import UploadImg from './upload-img'; +const audioTypeMap: Record = { + 'audio/wav': 'wav', + 'audio/mp3': 'mp3', + 'audio/mpeg': 'mp3' +}; + type CurrentMessage = Omit; type ActionType = @@ -260,6 +267,26 @@ const MessageInput: React.FC = forwardRef( }); }; + const handleUploadAudioChange = async (data: { + file: any; + fileList: any[]; + }) => { + // convert audio file to base64 + try { + console.log('audio file====', data.file); + const base64Audio = await convertFileToBase64(data.file); + setMessage({ + ...message, + audio: { + format: audioTypeMap[data.file.type], + dataUrl: base64Audio + } + }); + } catch (error) { + console.error('Error converting audio to Base64:', error); + } + }; + const handleDeleteImg = (uid: number | string) => { const list = _.filter( message.imgs, @@ -360,6 +387,22 @@ const MessageInput: React.FC = forwardRef( size="middle" > )} + {/* {actions.includes('upload') && message.role === Roles.User && ( + } + onChange={handleUploadAudioChange} + > + )} */} + {actions.includes('upload') && message.role === Roles.User && ( + + )} {tools} {actions.includes('clear') && ( => { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result as string); + reader.onerror = (error) => reject(error); + }); +}; + export const loadAudioData = async (data: any, type: string) => { return new Promise((resolve, reject) => { try {