diff --git a/src/locales/en-US/benchmark.ts b/src/locales/en-US/benchmark.ts index b8e41429..d6905ed5 100644 --- a/src/locales/en-US/benchmark.ts +++ b/src/locales/en-US/benchmark.ts @@ -40,6 +40,7 @@ export default { 'benchmark.table.filter.bygpu': 'Filter by GPU', 'benchmark.table.filter.bymodel': 'Filter by Model', 'benchmark.table.filter.bydataset': 'Filter by Dataset', + 'benchmark.table.filter.byProfile': 'Filter by Profile', 'benchmark.table.avg': 'Avg', 'benchmark.table.columnSettings': 'Column Settings', 'benchmark.detail.summary.results': 'Test Results', diff --git a/src/locales/ja-JP/benchmark.ts b/src/locales/ja-JP/benchmark.ts index b8e41429..d6905ed5 100644 --- a/src/locales/ja-JP/benchmark.ts +++ b/src/locales/ja-JP/benchmark.ts @@ -40,6 +40,7 @@ export default { 'benchmark.table.filter.bygpu': 'Filter by GPU', 'benchmark.table.filter.bymodel': 'Filter by Model', 'benchmark.table.filter.bydataset': 'Filter by Dataset', + 'benchmark.table.filter.byProfile': 'Filter by Profile', 'benchmark.table.avg': 'Avg', 'benchmark.table.columnSettings': 'Column Settings', 'benchmark.detail.summary.results': 'Test Results', diff --git a/src/locales/ru-RU/benchmark.ts b/src/locales/ru-RU/benchmark.ts index b8e41429..d6905ed5 100644 --- a/src/locales/ru-RU/benchmark.ts +++ b/src/locales/ru-RU/benchmark.ts @@ -40,6 +40,7 @@ export default { 'benchmark.table.filter.bygpu': 'Filter by GPU', 'benchmark.table.filter.bymodel': 'Filter by Model', 'benchmark.table.filter.bydataset': 'Filter by Dataset', + 'benchmark.table.filter.byProfile': 'Filter by Profile', 'benchmark.table.avg': 'Avg', 'benchmark.table.columnSettings': 'Column Settings', 'benchmark.detail.summary.results': 'Test Results', diff --git a/src/locales/zh-CN/benchmark.ts b/src/locales/zh-CN/benchmark.ts index 0db0bdb0..8afbd08b 100644 --- a/src/locales/zh-CN/benchmark.ts +++ b/src/locales/zh-CN/benchmark.ts @@ -40,6 +40,7 @@ export default { 'benchmark.table.filter.bygpu': '按 GPU 过滤', 'benchmark.table.filter.bymodel': '按模型过滤', 'benchmark.table.filter.bydataset': '按数据集过滤', + 'benchmark.table.filter.byProfile': '按模式过滤', 'benchmark.table.avg': '均值', 'benchmark.table.columnSettings': '列设置', 'benchmark.detail.summary.results': '测试结果', diff --git a/src/pages/benchmark/components/left-actions.tsx b/src/pages/benchmark/components/left-actions.tsx index 87eba1bb..a5699c53 100644 --- a/src/pages/benchmark/components/left-actions.tsx +++ b/src/pages/benchmark/components/left-actions.tsx @@ -5,12 +5,13 @@ import { useIntl } from '@umijs/max'; import { Button, Input, Space } from 'antd'; import _ from 'lodash'; import React from 'react'; +import { profileOptions } from '../../benchmark/config'; export interface RightActionsProps { handleInputChange: (e: React.ChangeEvent) => void; handleSearch: () => void; handleQueryChange: (value: any, option?: any) => void; - modelList?: Global.BaseOption[]; + modelList?: Global.BaseOption[]; datasetList?: Global.BaseOption[]; } @@ -34,7 +35,7 @@ const RightActions: React.FC = ({ const modelOptions = modelList ?.filter((item) => { - return item.categories.includes(modelCategoriesMap.llm); + return item.categories?.includes(modelCategoriesMap.llm); }) .map((item) => ({ label: item.label, @@ -84,17 +85,16 @@ const RightActions: React.FC = ({ ({ - ...item, - label: item.label, - value: item.label + options={profileOptions.map((item) => ({ + label: intl.formatMessage({ id: item.label }), + value: item.value }))} onChange={(value, option) => handleQueryChange({ - dataset_name: value, + profile: value, page: 1 }) } diff --git a/src/pages/llmodels/forms/envs-override-popover.tsx b/src/pages/llmodels/forms/envs-override-popover.tsx index 96140014..1a02cc43 100644 --- a/src/pages/llmodels/forms/envs-override-popover.tsx +++ b/src/pages/llmodels/forms/envs-override-popover.tsx @@ -166,7 +166,7 @@ const EnvsOverridePopover: React.FC = (props) => { icon={} type="warning" showIcon - title={'有环境变量冲突,点击查看详情'} + title={'检测到环境变量值不一致,请确认使用的值'} > diff --git a/src/pages/maas-provider/config/types.ts b/src/pages/maas-provider/config/types.ts index 65cf9a1c..427cfc6b 100644 --- a/src/pages/maas-provider/config/types.ts +++ b/src/pages/maas-provider/config/types.ts @@ -1,7 +1,7 @@ import { maasProviderType } from '.'; export interface ProviderModel { name: string; - category: string; + category?: string; accessible: boolean | null; } export interface FormData { diff --git a/src/pages/maas-provider/forms/index.tsx b/src/pages/maas-provider/forms/index.tsx index e80885ad..daf7f3c0 100644 --- a/src/pages/maas-provider/forms/index.tsx +++ b/src/pages/maas-provider/forms/index.tsx @@ -143,6 +143,10 @@ const ProviderForm: React.FC = forwardRef((props, ref) => { ); form.setFieldsValue({ ...currentData, + models: (currentData.models || []).map((item) => ({ + ...item, + category: item.category || null + })), api_key: apiTokensList?.[0] || '', api_tokens: apiTokensList?.slice(1) || [], proxy_enabled: !!currentData.proxy_url, diff --git a/src/pages/maas-provider/forms/model-item.tsx b/src/pages/maas-provider/forms/model-item.tsx index a2ebe484..21bdadf8 100644 --- a/src/pages/maas-provider/forms/model-item.tsx +++ b/src/pages/maas-provider/forms/model-item.tsx @@ -1,7 +1,7 @@ import AutoComplete from '@/components/seal-form/auto-complete'; import SealSelect from '@/components/seal-form/seal-select'; import { PageAction } from '@/config'; -import { categoryOptions } from '@/pages/llmodels/config'; +import { categoryOptions, modelCategoriesMap } from '@/pages/llmodels/config'; import { CheckCircleFilled, LoadingOutlined, @@ -197,9 +197,16 @@ const ModelItem: React.FC = ({ = ({ -