diff --git a/src/pages/_components/category-select.tsx b/src/pages/_components/category-select.tsx index d858331b..670ef10e 100644 --- a/src/pages/_components/category-select.tsx +++ b/src/pages/_components/category-select.tsx @@ -17,14 +17,7 @@ const CategorySelect = (props: any) => { ); }; - return ( - - ); + return ; }; export default CategorySelect; diff --git a/src/pages/llmodels/config/button-actions.ts b/src/pages/llmodels/config/button-actions.ts index 9fffe0b0..8328d7e7 100644 --- a/src/pages/llmodels/config/button-actions.ts +++ b/src/pages/llmodels/config/button-actions.ts @@ -59,11 +59,11 @@ export const ActionList: ActionItem[] = [ key: 'api', icon: icons.ApiOutlined }, - { - label: 'models.button.accessSettings', - key: 'accessControl', - icon: icons.Permission - }, + // { + // label: 'models.button.accessSettings', + // key: 'accessControl', + // icon: icons.Permission + // }, { label: 'common.button.stop', key: 'stop', diff --git a/src/pages/llmodels/forms/index.tsx b/src/pages/llmodels/forms/index.tsx index b532e499..c51dd9b0 100644 --- a/src/pages/llmodels/forms/index.tsx +++ b/src/pages/llmodels/forms/index.tsx @@ -430,6 +430,7 @@ const DataForm: React.FC = forwardRef((props, ref) => { restart_on_error: true, distributed_inference_across_workers: true, mode: 'throughput', + enable_model_access: true, generic_proxy: false, extended_kv_cache: { enabled: false, diff --git a/src/pages/llmodels/user-models.tsx b/src/pages/llmodels/user-models.tsx index ab36ee0b..9772ccd2 100644 --- a/src/pages/llmodels/user-models.tsx +++ b/src/pages/llmodels/user-models.tsx @@ -146,15 +146,15 @@ const UserModels: React.FC = () => { }; const getStatus = useCallback((model: any) => { - if (!model.replicas && !model.ready_replicas) { + if (!model.replicas && !model.ready_endpoints) { return MyModelsStatusValueMap.Inactive; } - if (model.replicas > 0 && !model.ready_replicas) { + if (model.replicas > 0 && !model.ready_endpoints) { return MyModelsStatusValueMap.Degrade; } - if (model.ready_replicas > 0 && model.replicas > 0) { + if (model.ready_endpoints > 0 && model.replicas > 0) { return MyModelsStatusValueMap.Active; } return MyModelsStatusValueMap.Degrade; diff --git a/src/pages/model-access/components/access-points.tsx b/src/pages/model-access/components/access-points.tsx index 2e545a1a..1717571a 100644 --- a/src/pages/model-access/components/access-points.tsx +++ b/src/pages/model-access/components/access-points.tsx @@ -30,11 +30,6 @@ interface AccessItemProps { } export const childActionList = [ - { - key: 'viewlog', - label: 'common.button.viewlog', - icon: - }, { key: 'fallback', label: 'accesses.table.setAsFallback', @@ -58,30 +53,34 @@ const AccessItem: React.FC = ({ const intl = useIntl(); const renderProviderSource = () => { - const model = sourceModels.find( - (item: any) => item.value === data.provider_id || item.id === data.model - ); - return model.label || '-'; + const model = sourceModels.find((item: any) => { + if (data.model_id) { + return item.value === 'deployments'; + } + return item.value === data.provider_id; + }); + console.log('renderProviderSource model:', data, sourceModels); + return model?.label || '-'; }; return (
- + - {data.provider_model_name} + {data.name} - + {renderProviderSource()} - + - {data.weight && ( + {data.weight > 0 && ( {intl.formatMessage({ id: 'accesses.form.endpoint.weight' })}:{' '} {data.weight} @@ -91,7 +90,9 @@ const AccessItem: React.FC = ({ {data.fallback_status_codes && data.fallback_status_codes?.length > 0 && ( <> - / + {data.weight > 0 && ( + / + )} {intl.formatMessage({ id: 'accesses.table.label.fallback' @@ -101,7 +102,7 @@ const AccessItem: React.FC = ({ )} - + = { Active: 'active', - Inactive: 'inactive' + Unavailable: 'unavailable' }; export const EndpointStatusLabelMap = { [EndpointsStatusValueMap.Active]: 'Active', - [EndpointsStatusValueMap.Inactive]: 'Inactive' + [EndpointsStatusValueMap.Unavailable]: 'Unavailable' }; export const EndpointStatus: Record = { [EndpointsStatusValueMap.Active]: StatusMaps.success, - [EndpointsStatusValueMap.Inactive]: StatusMaps.error + [EndpointsStatusValueMap.Unavailable]: StatusMaps.error }; // actions for each row diff --git a/src/pages/model-access/forms/index.tsx b/src/pages/model-access/forms/index.tsx index 90d9b293..4e49998c 100644 --- a/src/pages/model-access/forms/index.tsx +++ b/src/pages/model-access/forms/index.tsx @@ -63,35 +63,41 @@ const AccessForm: React.FC = forwardRef((props, ref) => { const formatEndpoints = (values: FormData) => { console.log('formatEndpoints values:', values); - let endPoints = [...values.endpoints]; + let endPoints = [...(values.endpoints || [])]; let fallbackEndpoint = values.fallback_endpoint; - if (fallbackEndpoint && endPoints.length > 0) { - endPoints = endPoints?.map((ep) => { - if (ep.model_id === fallbackEndpoint.model_id && ep.model_id) { - return { - ...ep, - fallback_status_codes: ['4xx', '5xx'] - }; + if (fallbackEndpoint) { + const exsitinged = endPoints.find((ep) => { + if (fallbackEndpoint!.model_id) { + return ep.model_id === fallbackEndpoint!.model_id; } - if ( - ep.provider_id === fallbackEndpoint.provider_id && - ep.provider_model_name === fallbackEndpoint.provider_model_name && - !fallbackEndpoint.model_id - ) { - return { - ...ep, - fallback_status_codes: ['4xx', '5xx'] - }; - } - return ep; - }); - } else if (fallbackEndpoint) { - endPoints.push({ - ...fallbackEndpoint, - weight: null, - fallback_status_codes: ['4xx', '5xx'] + return ( + ep.provider_id === fallbackEndpoint!.provider_id && + ep.provider_model_name === fallbackEndpoint!.provider_model_name + ); }); + if (exsitinged) { + endPoints = endPoints.map((ep) => { + if ( + ep.model_id === fallbackEndpoint.model_id || + ep.provider_model_name === fallbackEndpoint.provider_model_name + ) { + return { + ...ep, + fallback_status_codes: ['4xx', '5xx'] + }; + } + return ep; + }); + } + + if (!exsitinged) { + endPoints.push({ + ...fallbackEndpoint, + weight: 0, + fallback_status_codes: ['4xx', '5xx'] + }); + } } return endPoints; diff --git a/src/pages/model-access/index.tsx b/src/pages/model-access/index.tsx index 997e91da..6aef5f71 100644 --- a/src/pages/model-access/index.tsx +++ b/src/pages/model-access/index.tsx @@ -200,6 +200,10 @@ const Accesses: React.FC = () => { ); }; + const setDisableExpand = (record: any) => { + return !record?.endpoints; + }; + useEffect(() => { fetchSourceModels(); }, []); @@ -223,7 +227,8 @@ const Accesses: React.FC = () => { >