diff --git a/src/pages/backends/config/index.ts b/src/pages/backends/config/index.ts index 63c585f6..3c68d8f5 100644 --- a/src/pages/backends/config/index.ts +++ b/src/pages/backends/config/index.ts @@ -3,7 +3,7 @@ import SGLangLogo from '@/assets/logo/sglang.png'; import vLLMLogo from '@/assets/logo/vllm.png'; import VoxBoxLogo from '@/assets/logo/voxbox.png'; import icons from '@/components/icon-font/icons'; -import { backendOptionsMap } from '@/pages/llmodels/config/backend-parameters'; +import { backendOptionsMap } from '@/pages/llmodels/constants/backend-parameters'; import { GPUDriverMap, ManufacturerMap diff --git a/src/pages/llmodels/catalog.tsx b/src/pages/llmodels/catalog.tsx index 20fa83cf..fc3e4507 100644 --- a/src/pages/llmodels/catalog.tsx +++ b/src/pages/llmodels/catalog.tsx @@ -15,8 +15,8 @@ import React, { useCallback, useEffect, useState } from 'react'; import NoResult from '../_components/no-result'; import PageBox from '../_components/page-box'; import { createModel, queryCatalogItemSpec, queryCatalogList } from './apis'; -import CatalogList from './components/catalog-list'; -import DelopyBuiltInModal from './components/deploy-builtin-modal'; +import CatalogList from './components/catalog/catalog-list'; +import DelopyBuiltInModal from './components/deployment/deploy-builtin-modal'; import { modelCategories, modelSourceMap } from './config'; import { CatalogItem as CatalogItemType, FormData } from './config/types'; diff --git a/src/pages/llmodels/components/catalog-item.tsx b/src/pages/llmodels/components/catalog/catalog-item.tsx similarity index 95% rename from src/pages/llmodels/components/catalog-item.tsx rename to src/pages/llmodels/components/catalog/catalog-item.tsx index 370d16a8..47f3b8f1 100644 --- a/src/pages/llmodels/components/catalog-item.tsx +++ b/src/pages/llmodels/components/catalog/catalog-item.tsx @@ -2,15 +2,15 @@ import fallbackImg from '@/assets/images/img.png'; import AutoTooltip from '@/components/auto-tooltip'; import IconFont from '@/components/icon-font'; import ThemeTag from '@/components/tags-wrapper/theme-tag'; +import { categoryConfig } from '@/pages/_components/model-tag'; import { useIntl } from '@umijs/max'; import { Typography } from 'antd'; import classNames from 'classnames'; import _ from 'lodash'; import React, { useCallback, useMemo } from 'react'; -import { categoryConfig } from '../../_components/model-tag'; -import { modelCategories } from '../config'; -import { CatalogItem as CatalogItemType } from '../config/types'; -import '../style/catalog-item.less'; +import { modelCategories } from '../../config'; +import { CatalogItem as CatalogItemType } from '../../config/types'; +import '../../style/catalog-item.less'; interface CatalogItemProps { activeId: number; diff --git a/src/pages/llmodels/components/catalog-list.tsx b/src/pages/llmodels/components/catalog/catalog-list.tsx similarity index 100% rename from src/pages/llmodels/components/catalog-list.tsx rename to src/pages/llmodels/components/catalog/catalog-list.tsx diff --git a/src/pages/llmodels/components/deploy-builtin-modal.tsx b/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx similarity index 94% rename from src/pages/llmodels/components/deploy-builtin-modal.tsx rename to src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx index 3f33d98a..f5c34e97 100644 --- a/src/pages/llmodels/components/deploy-builtin-modal.tsx +++ b/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx @@ -2,23 +2,28 @@ import ModalFooter from '@/components/modal-footer'; import GSDrawer from '@/components/scroller-modal/gs-drawer'; import { PageActionType } from '@/config/types'; import { createAxiosToken } from '@/hooks/use-chunk-request'; +import ColumnWrapper from '@/pages/_components/column-wrapper'; import { ClusterStatusValueMap } from '@/pages/cluster-management/config'; import { useIntl } from '@umijs/max'; import { Button, message } from 'antd'; import _ from 'lodash'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import styled from 'styled-components'; -import ColumnWrapper from '../../_components/column-wrapper'; -import { queryCatalogItemSpec } from '../apis'; -import { DeployFormKeyMap, sourceOptions } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; -import { CatalogFormContext } from '../config/form-context'; -import { CatalogSpec, FormData, ListItem, SourceType } from '../config/types'; -import { generateGPUIds } from '../config/utils'; -import DataForm from '../forms'; -import { useCheckCompatibility } from '../hooks'; -import useFormInitialValues from '../hooks/use-form-initial-values'; -import CompatibilityAlert from './compatible-alert'; +import { queryCatalogItemSpec } from '../../apis'; +import { DeployFormKeyMap, sourceOptions } from '../../config'; +import { CatalogFormContext } from '../../config/form-context'; +import { + CatalogSpec, + FormData, + ListItem, + SourceType +} from '../../config/types'; +import { backendOptionsMap } from '../../constants/backend-parameters'; +import DataForm from '../../forms'; +import { useCheckCompatibility } from '../../hooks'; +import useFormInitialValues from '../../hooks/use-form-initial-values'; +import { generateGPUIds } from '../../utils'; +import CompatibilityAlert from '../compatible-alert'; const ModesMap: Record = { latency: 'models.form.mode.latency', diff --git a/src/pages/llmodels/components/deploy-modal.tsx b/src/pages/llmodels/components/deployment/deploy-modal.tsx similarity index 96% rename from src/pages/llmodels/components/deploy-modal.tsx rename to src/pages/llmodels/components/deployment/deploy-modal.tsx index d0c8af30..5311287c 100644 --- a/src/pages/llmodels/components/deploy-modal.tsx +++ b/src/pages/llmodels/components/deployment/deploy-modal.tsx @@ -10,24 +10,28 @@ import { Button } from 'antd'; import _ from 'lodash'; import { FC, useEffect, useMemo, useRef, useState } from 'react'; import styled from 'styled-components'; -import ColumnWrapper from '../../_components/column-wrapper'; -import { defaultFormValues, DeployFormKeyMap, modelSourceMap } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; -import { FormData, SourceType } from '../config/types'; -import DataForm from '../forms'; +import ColumnWrapper from '../../../_components/column-wrapper'; +import { + defaultFormValues, + DeployFormKeyMap, + modelSourceMap +} from '../../config'; +import { FormData, SourceType } from '../../config/types'; +import { backendOptionsMap } from '../../constants/backend-parameters'; +import DataForm from '../../forms'; import { MessageStatus, useCheckCompatibility, useSelectModel, WarningStausOptions -} from '../hooks'; -import useCheckBackend from '../hooks/use-check-backend'; -import CompatibilityAlert from './compatible-alert'; -import HFModelFile from './hf-model-file'; -import ModelCard from './model-card'; -import SearchModel from './search-model'; -import Separator from './separator'; -import TitleWrapper from './title-wrapper'; +} from '../../hooks'; +import useCheckBackend from '../../hooks/use-check-backend'; +import CompatibilityAlert from '../compatible-alert'; +import HFModelFile from '../model-source/hf-model-file'; +import ModelCard from '../model-source/model-card'; +import SearchModel from '../model-source/search-model'; +import Separator from '../separator'; +import TitleWrapper from '../title-wrapper'; const pickFieldsFromSpec = ['backend_version', 'backend_parameters', 'env']; const dropFieldsFromForm = [ diff --git a/src/pages/llmodels/components/update-modal.tsx b/src/pages/llmodels/components/deployment/update-modal.tsx similarity index 94% rename from src/pages/llmodels/components/update-modal.tsx rename to src/pages/llmodels/components/deployment/update-modal.tsx index 6c8b00fb..6d5fa713 100644 --- a/src/pages/llmodels/components/update-modal.tsx +++ b/src/pages/llmodels/components/deployment/update-modal.tsx @@ -2,21 +2,21 @@ import ModalFooter from '@/components/modal-footer'; import GSDrawer from '@/components/scroller-modal/gs-drawer'; import { PageAction } from '@/config'; import { PageActionType } from '@/config/types'; +import ColumnWrapper from '@/pages/_components/column-wrapper'; import { useIntl } from '@umijs/max'; import _ from 'lodash'; import React, { useEffect, useRef } from 'react'; -import ColumnWrapper from '../../_components/column-wrapper'; import { DeployFormKeyMap, DO_NOT_NOTIFY_RECREATE, ScheduleValueMap -} from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; -import { FormData } from '../config/types'; -import { generateGPUSelector } from '../config/utils'; -import DataForm from '../forms'; -import { useCheckCompatibility } from '../hooks'; -import CompatibilityAlert from './compatible-alert'; +} from '../../config'; +import { FormData } from '../../config/types'; +import { backendOptionsMap } from '../../constants/backend-parameters'; +import DataForm from '../../forms'; +import { useCheckCompatibility } from '../../hooks'; +import { generateGPUSelector } from '../../utils'; +import CompatibilityAlert from '../compatible-alert'; type AddModalProps = { title: string; diff --git a/src/pages/llmodels/components/instance-item.tsx b/src/pages/llmodels/components/instance/instance-item.tsx similarity index 98% rename from src/pages/llmodels/components/instance-item.tsx rename to src/pages/llmodels/components/instance/instance-item.tsx index 083e78ab..b8bf2e58 100644 --- a/src/pages/llmodels/components/instance-item.tsx +++ b/src/pages/llmodels/components/instance/instance-item.tsx @@ -28,21 +28,21 @@ import { useAtomValue } from 'jotai'; import _ from 'lodash'; import React, { useCallback, useEffect, useMemo } from 'react'; import styled from 'styled-components'; -import { MODEL_INSTANCE_API } from '../apis'; +import { MODEL_INSTANCE_API } from '../../apis'; import { InstanceStatusMap, InstanceStatusMapValue, modelCategoriesMap, status -} from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; -import { generateSource } from '../config/button-actions'; +} from '../../config'; +import { generateSource } from '../../config/button-actions'; import { DistributedServerItem, DistributedServers, ModelInstanceListItem -} from '../config/types'; -import '../style/instance-item.less'; +} from '../../config/types'; +import { backendOptionsMap } from '../../constants/backend-parameters'; +import '../../style/instance-item.less'; interface InstanceItemProps { instanceData: ModelInstanceListItem; diff --git a/src/pages/llmodels/components/instances.tsx b/src/pages/llmodels/components/instance/instances.tsx similarity index 93% rename from src/pages/llmodels/components/instances.tsx rename to src/pages/llmodels/components/instance/instances.tsx index 9a86ceab..4e31b3ef 100644 --- a/src/pages/llmodels/components/instances.tsx +++ b/src/pages/llmodels/components/instance/instances.tsx @@ -2,8 +2,8 @@ import { ListItem as WorkerListItem } from '@/pages/resources/config/types'; import _ from 'lodash'; import React, { useEffect, useMemo } from 'react'; import styled from 'styled-components'; -import { ModelInstanceListItem } from '../config/types'; -import '../style/instance-item.less'; +import { ModelInstanceListItem } from '../../config/types'; +import '../../style/instance-item.less'; import InstanceItem from './instance-item'; const Wrapper = styled.div` diff --git a/src/pages/llmodels/components/file-parts.tsx b/src/pages/llmodels/components/model-source/file-parts.tsx similarity index 100% rename from src/pages/llmodels/components/file-parts.tsx rename to src/pages/llmodels/components/model-source/file-parts.tsx diff --git a/src/pages/llmodels/components/file-skeleton.tsx b/src/pages/llmodels/components/model-source/file-skeleton.tsx similarity index 100% rename from src/pages/llmodels/components/file-skeleton.tsx rename to src/pages/llmodels/components/model-source/file-skeleton.tsx diff --git a/src/pages/llmodels/components/gguf-result.tsx b/src/pages/llmodels/components/model-source/gguf-result.tsx similarity index 100% rename from src/pages/llmodels/components/gguf-result.tsx rename to src/pages/llmodels/components/model-source/gguf-result.tsx diff --git a/src/pages/llmodels/components/hf-model-file.tsx b/src/pages/llmodels/components/model-source/hf-model-file.tsx similarity index 97% rename from src/pages/llmodels/components/hf-model-file.tsx rename to src/pages/llmodels/components/model-source/hf-model-file.tsx index 06e13661..526177bd 100644 --- a/src/pages/llmodels/components/hf-model-file.tsx +++ b/src/pages/llmodels/components/model-source/hf-model-file.tsx @@ -13,12 +13,15 @@ import React, { } from 'react'; import 'simplebar-react/dist/simplebar.min.css'; import styled from 'styled-components'; -import { queryHuggingfaceModelFiles, queryModelScopeModelFiles } from '../apis'; -import { modelSourceMap } from '../config'; -import '../style/hf-model-file.less'; +import { + queryHuggingfaceModelFiles, + queryModelScopeModelFiles +} from '../../apis'; +import { modelSourceMap } from '../../config'; +import '../../style/hf-model-file.less'; +import TitleWrapper from '../title-wrapper'; import FileSkeleton from './file-skeleton'; import ModelFileItem from './model-file-item'; -import TitleWrapper from './title-wrapper'; const ItemFileWrapper = styled.div` display: flex; diff --git a/src/pages/llmodels/components/hf-model-item.tsx b/src/pages/llmodels/components/model-source/hf-model-item.tsx similarity index 89% rename from src/pages/llmodels/components/hf-model-item.tsx rename to src/pages/llmodels/components/model-source/hf-model-item.tsx index 262bb811..a388553d 100644 --- a/src/pages/llmodels/components/hf-model-item.tsx +++ b/src/pages/llmodels/components/model-source/hf-model-item.tsx @@ -4,10 +4,10 @@ import { DownloadOutlined, HeartOutlined } from '@ant-design/icons'; import classNames from 'classnames'; import dayjs from 'dayjs'; import React from 'react'; -import { modelSourceMap } from '../config'; -import { EvaluateResult } from '../config/types'; -import '../style/hf-model-item.less'; -import IncompatiableInfo from './incompatiable-info'; +import { modelSourceMap } from '../../config'; +import { EvaluateResult } from '../../config/types'; +import '../../style/hf-model-item.less'; +import IncompatiableInfo from '../incompatiable-info'; interface HFModelItemProps { title: string; diff --git a/src/pages/llmodels/components/model-card.tsx b/src/pages/llmodels/components/model-source/model-card.tsx similarity index 97% rename from src/pages/llmodels/components/model-card.tsx rename to src/pages/llmodels/components/model-source/model-card.tsx index 083ac76c..42a618ec 100644 --- a/src/pages/llmodels/components/model-card.tsx +++ b/src/pages/llmodels/components/model-source/model-card.tsx @@ -26,10 +26,10 @@ import { downloadModelFile, queryHuggingfaceModelDetail, queryModelScopeModelDetail -} from '../apis'; -import { modelSourceMap } from '../config'; -import '../style/model-card.less'; -import TitleWrapper from './title-wrapper'; +} from '../../apis'; +import { modelSourceMap } from '../../config'; +import '../../style/model-card.less'; +import TitleWrapper from '../title-wrapper'; const MkdTitle = styled.span` cursor: pointer; @@ -354,7 +354,7 @@ const ModelCard: React.FC<{ collapsed={collapsed} loading={loading} > - + {!isGGUF && ( - +
{readmeText && ( <> diff --git a/src/pages/llmodels/components/model-file-item.tsx b/src/pages/llmodels/components/model-source/model-file-item.tsx similarity index 94% rename from src/pages/llmodels/components/model-file-item.tsx rename to src/pages/llmodels/components/model-source/model-file-item.tsx index 9ba94808..c1c6e395 100644 --- a/src/pages/llmodels/components/model-file-item.tsx +++ b/src/pages/llmodels/components/model-source/model-file-item.tsx @@ -7,10 +7,10 @@ import classNames from 'classnames'; import _ from 'lodash'; import React from 'react'; import 'simplebar-react/dist/simplebar.min.css'; -import { getFileType } from '../config/file-type'; -import '../style/hf-model-file.less'; +import { getFileType } from '../../constants/file-type'; +import '../../style/hf-model-file.less'; +import IncompatiableInfo from '../incompatiable-info'; import FileParts from './file-parts'; -import IncompatiableInfo from './incompatiable-info'; interface ModelFileItemProps { data: Record; diff --git a/src/pages/llmodels/components/search-input.tsx b/src/pages/llmodels/components/model-source/search-input.tsx similarity index 97% rename from src/pages/llmodels/components/search-input.tsx rename to src/pages/llmodels/components/model-source/search-input.tsx index a3ece6e5..3f488180 100644 --- a/src/pages/llmodels/components/search-input.tsx +++ b/src/pages/llmodels/components/model-source/search-input.tsx @@ -6,7 +6,7 @@ import { Input } from 'antd'; import React, { useRef } from 'react'; import { useHotkeys } from 'react-hotkeys-hook'; import styled from 'styled-components'; -import { modelSourceMap, modelSourceValueMap } from '../config'; +import { modelSourceMap, modelSourceValueMap } from '../../config'; const SearchInputWrapper = styled.div` position: relative; diff --git a/src/pages/llmodels/components/search-model.tsx b/src/pages/llmodels/components/model-source/search-model.tsx similarity index 97% rename from src/pages/llmodels/components/search-model.tsx rename to src/pages/llmodels/components/model-source/search-model.tsx index 8210c1c8..7b271533 100644 --- a/src/pages/llmodels/components/search-model.tsx +++ b/src/pages/llmodels/components/model-source/search-model.tsx @@ -11,12 +11,16 @@ import { evaluationsModelSpec, queryHuggingfaceModels, queryModelScopeModels -} from '../apis'; -import { ModelScopeSortType, ModelSortType, modelSourceMap } from '../config'; -import { MessageStatus, WarningStausOptions } from '../hooks'; -import useCheckBackend from '../hooks/use-check-backend'; -import useRecognizeAudio from '../hooks/use-recognize-audio'; -import SearchStyle from '../style/search-result.less'; +} from '../../apis'; +import { + ModelScopeSortType, + ModelSortType, + modelSourceMap +} from '../../config'; +import { MessageStatus, WarningStausOptions } from '../../hooks'; +import useCheckBackend from '../../hooks/use-check-backend'; +import useRecognizeAudio from '../../hooks/use-recognize-audio'; +import SearchStyle from '../../style/search-result.less'; import SearchInput from './search-input'; import SearchResult from './search-result'; diff --git a/src/pages/llmodels/components/search-result.tsx b/src/pages/llmodels/components/model-source/search-result.tsx similarity index 97% rename from src/pages/llmodels/components/search-result.tsx rename to src/pages/llmodels/components/model-source/search-result.tsx index 181a9aa3..ceaab557 100644 --- a/src/pages/llmodels/components/search-result.tsx +++ b/src/pages/llmodels/components/model-source/search-result.tsx @@ -6,8 +6,8 @@ import _ from 'lodash'; import React, { useMemo } from 'react'; import 'simplebar-react/dist/simplebar.min.css'; import styled from 'styled-components'; -import { modelSourceMap } from '../config'; -import '../style/search-result.less'; +import { modelSourceMap } from '../../config'; +import '../../style/search-result.less'; import FileSkeleton from './file-skeleton'; import HFModelItem from './hf-model-item'; @@ -122,7 +122,7 @@ const SearchResult: React.FC = (props) => { return ( <>
- +
{resultList.length ? ( diff --git a/src/pages/llmodels/components/table-list.tsx b/src/pages/llmodels/components/table-list.tsx index b97487bd..dd8e8faa 100644 --- a/src/pages/llmodels/components/table-list.tsx +++ b/src/pages/llmodels/components/table-list.tsx @@ -63,9 +63,9 @@ import useEditDeployment from '../hooks/use-edit-deployment'; import useFilterStatus from '../hooks/use-filter-status'; import useFormInitialValues from '../hooks/use-form-initial-values'; import useModelsColumns from '../hooks/use-models-columns'; -import DeployModal from './deploy-modal'; -import Instances from './instances'; -import UpdateModelModal from './update-modal'; +import DeployModal from './deployment/deploy-modal'; +import UpdateModelModal from './deployment/update-modal'; +import Instances from './instance/instances'; import ViewLogsModal from './view-logs-modal'; interface ModelsProps { handleSearch: (params?: any) => void; diff --git a/src/pages/llmodels/config/index.ts b/src/pages/llmodels/config/index.ts index c2863bfb..3f993f50 100644 --- a/src/pages/llmodels/config/index.ts +++ b/src/pages/llmodels/config/index.ts @@ -1,6 +1,6 @@ import { StatusMaps } from '@/config'; import { EditOutlined } from '@ant-design/icons'; -import { backendOptionsMap } from './backend-parameters'; +import { backendOptionsMap } from '../constants/backend-parameters'; export const backendTipsList = [ { diff --git a/src/pages/llmodels/config/test-data.ts b/src/pages/llmodels/config/test-data.ts deleted file mode 100644 index e7b6285f..00000000 --- a/src/pages/llmodels/config/test-data.ts +++ /dev/null @@ -1,204 +0,0 @@ -export default { - items: [ - { - backend_name: 'vLLM', - is_built_in: true, - backend_source: 'built-in', - default_version: '0.13.0', - default_backend_param: [], - versions: [ - { - version: '0.13.0', - is_deprecated: false - }, - { - version: '0.12.0', - is_deprecated: false - }, - { - version: '0.11.2', - is_deprecated: false - }, - { - version: '0.11.0', - is_deprecated: true - }, - { - version: '0.10.2', - is_deprecated: false - }, - { - version: '0.10.1.1', - is_deprecated: true - }, - { - version: '0.10.0', - is_deprecated: true - } - ] - }, - { - backend_name: 'SGLang', - backend_source: 'built-in', - is_built_in: true, - default_version: '0.5.7', - default_backend_param: [], - versions: [ - { - version: '0.5.7', - is_deprecated: false - }, - { - version: '0.5.6.post2', - is_deprecated: false - }, - { - version: '0.5.5.post3', - is_deprecated: false - }, - { - version: '0.5.5', - is_deprecated: true - }, - { - version: '0.5.4.post3', - is_deprecated: false - } - ] - }, - { - backend_name: 'MindIE', - backend_source: 'built-in', - is_built_in: true, - default_version: null, - default_backend_param: [], - versions: [] - }, - { - backend_name: 'VoxBox', - backend_source: 'built-in', - is_built_in: true, - default_version: '0.0.21', - default_backend_param: [], - versions: [ - { - version: '0.0.21', - is_deprecated: false - }, - { - version: '0.0.20', - is_deprecated: true - } - ] - }, - { - backend_name: 'kokoro', - backend_source: 'community', - is_built_in: false, - default_version: '', - default_backend_param: [], - versions: [ - { - version: 'latest', - is_deprecated: false - } - ] - }, - { - backend_name: 'llama.cpp', - backend_source: 'community', - is_built_in: false, - default_version: 'cpu', - default_backend_param: [], - versions: [ - { - version: 'cuda', - is_deprecated: false - }, - { - version: 'cpu', - is_deprecated: false - }, - { - version: 'vulkan', - is_deprecated: false - }, - { - version: 'musa', - is_deprecated: false - }, - { - version: 'rocm', - is_deprecated: false - } - ] - }, - { - backend_name: 'MinerU', - backend_source: 'community', - is_built_in: false, - default_version: 'v2.7.0', - default_backend_param: [], - versions: [ - { - version: 'v2.7.0', - is_deprecated: false - } - ] - }, - { - backend_name: 'paddlex-genai', - backend_source: 'community', - is_built_in: false, - default_version: 'latest', - default_backend_param: [], - versions: [ - { - version: 'latest', - is_deprecated: false - }, - { - version: 'latest-dcu', - is_deprecated: false - }, - { - version: 'latest-metax-gpu', - is_deprecated: false - } - ] - }, - { - backend_name: 'text-embeddings-inference', - is_built_in: false, - backend_source: 'community', - default_version: 'cpu-1.8', - default_backend_param: [], - versions: [ - { - version: 'cpu-1.8', - is_deprecated: false - }, - { - version: 'cuda-sm89-1.8', - is_deprecated: false - }, - { - version: 'cuda-sm86-1.8', - is_deprecated: false - }, - { - version: 'cuda-sm80-1.8', - is_deprecated: false - } - ] - }, - { - backend_name: 'Custom', - backend_source: 'custom', - is_built_in: false, - default_version: null, - default_backend_param: null, - versions: [] - } - ] -}; diff --git a/src/pages/llmodels/config/backend-parameters/index.ts b/src/pages/llmodels/constants/backend-parameters/index.ts similarity index 100% rename from src/pages/llmodels/config/backend-parameters/index.ts rename to src/pages/llmodels/constants/backend-parameters/index.ts diff --git a/src/pages/llmodels/config/backend-parameters/llama.ts b/src/pages/llmodels/constants/backend-parameters/llama.ts similarity index 100% rename from src/pages/llmodels/config/backend-parameters/llama.ts rename to src/pages/llmodels/constants/backend-parameters/llama.ts diff --git a/src/pages/llmodels/config/backend-parameters/mindie.ts b/src/pages/llmodels/constants/backend-parameters/mindie.ts similarity index 100% rename from src/pages/llmodels/config/backend-parameters/mindie.ts rename to src/pages/llmodels/constants/backend-parameters/mindie.ts diff --git a/src/pages/llmodels/config/backend-parameters/sglang.ts b/src/pages/llmodels/constants/backend-parameters/sglang.ts similarity index 100% rename from src/pages/llmodels/config/backend-parameters/sglang.ts rename to src/pages/llmodels/constants/backend-parameters/sglang.ts diff --git a/src/pages/llmodels/config/backend-parameters/vllm.ts b/src/pages/llmodels/constants/backend-parameters/vllm.ts similarity index 100% rename from src/pages/llmodels/config/backend-parameters/vllm.ts rename to src/pages/llmodels/constants/backend-parameters/vllm.ts diff --git a/src/pages/llmodels/config/file-type.ts b/src/pages/llmodels/constants/file-type.ts similarity index 100% rename from src/pages/llmodels/config/file-type.ts rename to src/pages/llmodels/constants/file-type.ts diff --git a/src/pages/llmodels/constants/index.ts b/src/pages/llmodels/constants/index.ts new file mode 100644 index 00000000..e69de29b diff --git a/src/pages/llmodels/download/index.tsx b/src/pages/llmodels/download/index.tsx index 3b82bd89..14329de9 100644 --- a/src/pages/llmodels/download/index.tsx +++ b/src/pages/llmodels/download/index.tsx @@ -6,9 +6,9 @@ import { debounce } from 'lodash'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; import ColumnWrapper from '../../_components/column-wrapper'; -import HFModelFile from '../components/hf-model-file'; -import ModelCard from '../components/model-card'; -import SearchModel from '../components/search-model'; +import HFModelFile from '../components/model-source/hf-model-file'; +import ModelCard from '../components/model-source/model-card'; +import SearchModel from '../components/model-source/search-model'; import Separator from '../components/separator'; import TitleWrapper from '../components/title-wrapper'; import { modelSourceMap } from '../config'; diff --git a/src/pages/llmodels/forms/advance-config.tsx b/src/pages/llmodels/forms/advance-config.tsx index 94be4fd2..f52b8374 100644 --- a/src/pages/llmodels/forms/advance-config.tsx +++ b/src/pages/llmodels/forms/advance-config.tsx @@ -9,9 +9,9 @@ import { Form } from 'antd'; import _ from 'lodash'; import { useMemo } from 'react'; import { modelCategories } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; import BackendParametersList from './backend-parameters-list'; const AdvanceConfig = () => { diff --git a/src/pages/llmodels/forms/backend-parameters-list.tsx b/src/pages/llmodels/forms/backend-parameters-list.tsx index 8e71546c..4d26eb4d 100644 --- a/src/pages/llmodels/forms/backend-parameters-list.tsx +++ b/src/pages/llmodels/forms/backend-parameters-list.tsx @@ -4,11 +4,11 @@ import { Form } from 'antd'; import _ from 'lodash'; import { useMemo } from 'react'; import { backendParamsHolderTips, getBackendParamsTips } from '../config'; -import BackendParameters, { - backendOptionsMap -} from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import BackendParameters, { + backendOptionsMap +} from '../constants/backend-parameters'; const BackendParametersList: React.FC = () => { const intl = useIntl(); diff --git a/src/pages/llmodels/forms/backend.tsx b/src/pages/llmodels/forms/backend.tsx index e57b3d55..c3656401 100644 --- a/src/pages/llmodels/forms/backend.tsx +++ b/src/pages/llmodels/forms/backend.tsx @@ -7,8 +7,8 @@ import { Form, Select } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; import { backendTipsList } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; +import { backendOptionsMap } from '../constants/backend-parameters'; import useCompareEnvs from '../hooks/use-compare-envs'; import EnvsOverridePopover from './envs-override-popover'; diff --git a/src/pages/llmodels/forms/custom-backend.tsx b/src/pages/llmodels/forms/custom-backend.tsx index 4f0f61e2..1222afc2 100644 --- a/src/pages/llmodels/forms/custom-backend.tsx +++ b/src/pages/llmodels/forms/custom-backend.tsx @@ -4,9 +4,9 @@ import useAppUtils from '@/hooks/use-app-utils'; import { useIntl } from '@umijs/max'; import { Form } from 'antd'; import React from 'react'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; const CustomBackend: React.FC = () => { const intl = useIntl(); diff --git a/src/pages/llmodels/forms/index.tsx b/src/pages/llmodels/forms/index.tsx index 50dc3ad6..b0e16b8a 100644 --- a/src/pages/llmodels/forms/index.tsx +++ b/src/pages/llmodels/forms/index.tsx @@ -20,7 +20,6 @@ import { modelSourceMap, ScheduleValueMap } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; import { FormContext } from '../config/form-context'; import { BackendOption, @@ -28,10 +27,11 @@ import { FormData, SourceType } from '../config/types'; -import { generateGPUIds } from '../config/utils'; +import { backendOptionsMap } from '../constants/backend-parameters'; import { useGenerateGPUOptions } from '../hooks/use-form-initial-values'; import useQueryBackends from '../hooks/use-query-backends'; import { useQueryContextLength } from '../services/use-query-context-length'; +import { generateGPUIds } from '../utils'; import AdvanceConfig from './advance-config'; import BasicForm from './basic'; import Performance from './performance'; diff --git a/src/pages/llmodels/forms/kv-cache.tsx b/src/pages/llmodels/forms/kv-cache.tsx index 952cf16f..99af680b 100644 --- a/src/pages/llmodels/forms/kv-cache.tsx +++ b/src/pages/llmodels/forms/kv-cache.tsx @@ -4,9 +4,9 @@ import { useIntl } from '@umijs/max'; import { Form } from 'antd'; import _ from 'lodash'; import { useMemo, useRef } from 'react'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; const KVCacheForm = () => { const intl = useIntl(); diff --git a/src/pages/llmodels/forms/local-path-source.tsx b/src/pages/llmodels/forms/local-path-source.tsx index 4fef4bc0..afcf087e 100644 --- a/src/pages/llmodels/forms/local-path-source.tsx +++ b/src/pages/llmodels/forms/local-path-source.tsx @@ -6,9 +6,9 @@ import { Form } from 'antd'; import _ from 'lodash'; import React, { useRef } from 'react'; import { DeployFormKeyMap, localPathTipsList, modelSourceMap } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; import useCheckBackend from '../hooks/use-check-backend'; const LocalPathForm: React.FC = () => { diff --git a/src/pages/llmodels/forms/schedule-type.tsx b/src/pages/llmodels/forms/schedule-type.tsx index d9d484b1..ca97c246 100644 --- a/src/pages/llmodels/forms/schedule-type.tsx +++ b/src/pages/llmodels/forms/schedule-type.tsx @@ -15,9 +15,9 @@ import { scheduleList, ScheduleValueMap } from '../config'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; const InputWrapper = styled.div` padding: 8px 4px; diff --git a/src/pages/llmodels/forms/speculative-decode.tsx b/src/pages/llmodels/forms/speculative-decode.tsx index 9ae0b6ee..fc65d03e 100644 --- a/src/pages/llmodels/forms/speculative-decode.tsx +++ b/src/pages/llmodels/forms/speculative-decode.tsx @@ -8,9 +8,9 @@ import { useIntl } from '@umijs/max'; import { Form } from 'antd'; import _ from 'lodash'; import { useMemo, useRef } from 'react'; -import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; import useQueryDraftModels from '../hooks/use-query-draftModels'; const AlgorithmMap = { diff --git a/src/pages/llmodels/hooks/index.ts b/src/pages/llmodels/hooks/index.ts index aab1cb89..75847cf0 100644 --- a/src/pages/llmodels/hooks/index.ts +++ b/src/pages/llmodels/hooks/index.ts @@ -9,12 +9,12 @@ import _ from 'lodash'; import { useEffect, useRef, useState } from 'react'; import { evaluationsModelSpec } from '../apis'; import { modelSourceMap, modelTaskMap } from '../config'; +import { EvaluateResult, FormData } from '../config/types'; import { backendOptionsMap, BuiltInBackendOptions -} from '../config/backend-parameters'; -import { EvaluateResult, FormData } from '../config/types'; -import { generateGPUIds } from '../config/utils'; +} from '../constants/backend-parameters'; +import { generateGPUIds } from '../utils'; import useCheckBackend from './use-check-backend'; import useRecognizeAudio from './use-recognize-audio'; diff --git a/src/pages/llmodels/hooks/use-check-backend.ts b/src/pages/llmodels/hooks/use-check-backend.ts index 76d18a40..34aa2b93 100644 --- a/src/pages/llmodels/hooks/use-check-backend.ts +++ b/src/pages/llmodels/hooks/use-check-backend.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { backendOptionsMap } from '../config/backend-parameters'; +import { backendOptionsMap } from '../constants/backend-parameters'; export default function useCheckBackend() { // handle for ascend npu only diff --git a/src/pages/llmodels/hooks/use-query-backends.ts b/src/pages/llmodels/hooks/use-query-backends.ts index 222ec9bc..e51f7f81 100644 --- a/src/pages/llmodels/hooks/use-query-backends.ts +++ b/src/pages/llmodels/hooks/use-query-backends.ts @@ -8,8 +8,8 @@ import { useAtom } from 'jotai'; import _ from 'lodash'; import { useState } from 'react'; import { queryBackendList } from '../apis'; -import { backendOptionsMap } from '../config/backend-parameters'; import { BackendOption } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; interface BackendGroup { label: string; diff --git a/src/pages/llmodels/config/utils.ts b/src/pages/llmodels/utils/index.ts similarity index 93% rename from src/pages/llmodels/config/utils.ts rename to src/pages/llmodels/utils/index.ts index ac80ce9e..d27adb31 100644 --- a/src/pages/llmodels/config/utils.ts +++ b/src/pages/llmodels/utils/index.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { backendOptionsMap } from '../config/backend-parameters'; -import { FormData } from './types'; +import { FormData } from '../config/types'; +import { backendOptionsMap } from '../constants/backend-parameters'; // generate the gpu_selector field for form initial values, when eidting a model export const generateGPUSelector = (data: any, gpuOptions: any[]) => { diff --git a/src/pages/resources/components/model-files.tsx b/src/pages/resources/components/model-files.tsx index a7b3049d..7b1aa38a 100644 --- a/src/pages/resources/components/model-files.tsx +++ b/src/pages/resources/components/model-files.tsx @@ -10,14 +10,14 @@ import useTableFetch from '@/hooks/use-table-fetch'; import NoResult from '@/pages/_components/no-result'; import PageBox from '@/pages/_components/page-box'; import { createModel } from '@/pages/llmodels/apis'; -import DeployModal from '@/pages/llmodels/components/deploy-modal'; +import DeployModal from '@/pages/llmodels/components/deployment/deploy-modal'; import { modelSourceMap } from '@/pages/llmodels/config'; -import { backendOptionsMap } from '@/pages/llmodels/config/backend-parameters'; import { modalConfig, onLineSourceOptions } from '@/pages/llmodels/config/button-actions'; import { SourceType } from '@/pages/llmodels/config/types'; +import { backendOptionsMap } from '@/pages/llmodels/constants/backend-parameters'; import DownloadModal from '@/pages/llmodels/download'; import useCheckBackend from '@/pages/llmodels/hooks/use-check-backend'; import { useGenerateWorkerOptions } from '@/pages/llmodels/hooks/use-form-initial-values';