|
1 | 1 | import { useMemo } from "react"; |
2 | 2 | import { useAccessStore, useAppConfig } from "../store"; |
3 | 3 | import { collectModelsWithDefaultModel } from "./model"; |
| 4 | +import { getServerSideConfig } from "../config/server"; |
4 | 5 |
|
5 | 6 | export function useAllModels() { |
6 | 7 | const accessStore = useAccessStore(); |
7 | 8 | const configStore = useAppConfig(); |
| 9 | + |
| 10 | + // 安全获取服务器配置(避免客户端报错) |
| 11 | + const serverConfig = typeof window === 'undefined' ? |
| 12 | + getServerSideConfig() : |
| 13 | + { customModels: '', defaultModel: '' }; |
| 14 | + |
| 15 | + |
8 | 16 | const models = useMemo(() => { |
| 17 | + |
| 18 | + const combinedCustomModels = [ |
| 19 | + serverConfig.customModels, // 服务器配置优先 |
| 20 | + configStore.customModels, |
| 21 | + accessStore.customModels |
| 22 | + ] |
| 23 | + .filter(Boolean) // 移除空值 |
| 24 | + .join(","); |
| 25 | + |
| 26 | + |
9 | 27 | return collectModelsWithDefaultModel( |
10 | 28 | configStore.models, |
11 | | - [configStore.customModels, accessStore.customModels].join(","), |
| 29 | + //[configStore.customModels, accessStore.customModels].join(","), |
| 30 | + // 直接使用服务器配置的customModels |
| 31 | + |
| 32 | + combinedCustomModels, |
12 | 33 | accessStore.defaultModel, |
13 | 34 | ); |
14 | 35 | }, [ |
15 | 36 | accessStore.customModels, |
| 37 | + serverConfig.customModels, // 依赖项改为serverConfig.customModels |
16 | 38 | accessStore.defaultModel, |
17 | 39 | configStore.customModels, |
18 | 40 | configStore.models, |
| 41 | + serverConfig.customModels, // 依赖项 |
| 42 | + serverConfig.defaultModel |
19 | 43 | ]); |
20 | 44 |
|
21 | 45 | return models; |
|
0 commit comments