From 37fc63def8a883faa2b45e8bb42a5892c856f6f3 Mon Sep 17 00:00:00 2001 From: scarqin Date: Thu, 26 Dec 2024 15:52:43 +0800 Subject: [PATCH] feat: apikey --- .../src/components/AIProviderSelect/index.tsx | 2 +- .../core/src/pages/aiSetting/AIFlowChart.tsx | 6 +-- .../src/pages/aiSetting/AiSettingList.tsx | 3 +- .../core/src/pages/keySettings/index.tsx | 50 ++++++++----------- 4 files changed, 27 insertions(+), 34 deletions(-) diff --git a/frontend/packages/core/src/components/AIProviderSelect/index.tsx b/frontend/packages/core/src/components/AIProviderSelect/index.tsx index 77d4bf76..3437fb1b 100644 --- a/frontend/packages/core/src/components/AIProviderSelect/index.tsx +++ b/frontend/packages/core/src/components/AIProviderSelect/index.tsx @@ -41,7 +41,7 @@ const AIProviderSelect: React.FC = ({ value, onChange, st const fetchProviders = async () => { if (isMounted) setLoading(true) try { - const response = await fetchData('simple/ai/providers', { method: 'GET' }) + const response = await fetchData('simple/ai/providers/configured', { method: 'GET' }) const { code, data, msg } = response if (code === STATUS_CODE.SUCCESS) { isMounted && setProviders(data.providers) diff --git a/frontend/packages/core/src/pages/aiSetting/AIFlowChart.tsx b/frontend/packages/core/src/pages/aiSetting/AIFlowChart.tsx index 4ccf38d1..06bf6549 100644 --- a/frontend/packages/core/src/pages/aiSetting/AIFlowChart.tsx +++ b/frontend/packages/core/src/pages/aiSetting/AIFlowChart.tsx @@ -73,8 +73,8 @@ const AIFlowChart = () => { useEffect(() => { // Mock API call - replace with actual API call fetchData('ai/providers/configured', { - method: 'GET', - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + method: 'GET' + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }).then((response) => { const mockApiResponse: ApiResponse = response as ApiResponse setModelData(mockApiResponse.data.providers) @@ -115,7 +115,7 @@ const AIFlowChart = () => { position: positions[`${model.id}-keys`], data: { title: 'API Keys', - keys: model.keys.map((key, index) => ({ + keys: (model.keys || []).map((key, index) => ({ id: key.id, status: key.status, priority: index + 1 diff --git a/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx b/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx index 98795299..5d2af89a 100644 --- a/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx +++ b/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx @@ -55,8 +55,9 @@ const AiSettingList = () => { const getAiSettingList = () => { setLoading(true) return fetchData[] }>>( - `ai/providers`, + `ai/providers/unconfigured`, { method: 'GET', eoTransformKeys: ['default_llm', 'default_llm_logo'] } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' ) .then((response) => { const { code, data, msg } = response diff --git a/frontend/packages/core/src/pages/keySettings/index.tsx b/frontend/packages/core/src/pages/keySettings/index.tsx index 8f4c441f..58e8dc93 100644 --- a/frontend/packages/core/src/pages/keySettings/index.tsx +++ b/frontend/packages/core/src/pages/keySettings/index.tsx @@ -46,8 +46,8 @@ const KeySettings: React.FC = () => { message.loading($t(RESPONSE_TIPS.loading)) const { code, data, msg } = await fetchData>('ai/resource/key', { method: 'GET', - eoParams: { provider: selectedProvider, id: entity!.id }, - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + eoParams: { provider: selectedProvider, id: entity!.id } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }) message.destroy() if (code !== STATUS_CODE.SUCCESS) { @@ -56,7 +56,6 @@ const KeySettings: React.FC = () => { } entity = data?.info } else { - provider.default_config = '{"apikey":"******"}' entity = { name: `key${total}`, config: provider.default_config, @@ -115,8 +114,8 @@ const KeySettings: React.FC = () => { provider: selectedProvider, id: id, branchID: 0 - }, - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }) if (response.code === STATUS_CODE.SUCCESS) { @@ -138,22 +137,13 @@ const KeySettings: React.FC = () => { eoParams: { provider: selectedProvider, id: id - }, - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }) if (response.code === STATUS_CODE.SUCCESS) { message.success(newStatus === 'disable' ? $t('停用成功') : $t('启用成功')) - setApiKeys( - apiKeys.map((key) => - key.id === id - ? ({ - ...key, - status: newStatus === 'disable' ? 'disabled' : 'normal' - } as APIKey) - : (key as APIKey) - ) - ) + pageListRef.current?.reload() } else { message.error(response.msg || RESPONSE_TIPS.error) } @@ -163,6 +153,7 @@ const KeySettings: React.FC = () => { } const handleDragSortEnd = async (beforeIndex: number, afterIndex: number, newDataSource: APIKey[]) => { + console.log(beforeIndex, afterIndex, newDataSource) try { const response = await fetchData>('ai/resource/key/sort', { method: 'PUT', @@ -170,8 +161,8 @@ const KeySettings: React.FC = () => { origin: newDataSource[beforeIndex].id, target: newDataSource[afterIndex].id, sort: afterIndex > beforeIndex ? 'before' : 'after' - }, - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }) if (response.code === STATUS_CODE.SUCCESS) { @@ -195,8 +186,8 @@ const KeySettings: React.FC = () => { page_size: params.pageSize, keyword: searchWord, page: params.current - }, - eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' + } + // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/' }) if (response.code === STATUS_CODE.SUCCESS) { @@ -258,14 +249,15 @@ const KeySettings: React.FC = () => { ), - - handleDelete(entity.id)} - btnTitle={$t('删除')} - /> + entity.can_delete !== false && ( + handleDelete(entity.id as string)} + btnTitle={$t('删除')} + /> + ) ] } ]