refactor: drop legacy compatibility fallbacks and strictly structure config under 1h-tools
This commit is contained in:
1 parent
69877803ca
commit
ffe71f24b4
6 files changed
+10
-137
No files matched your search
Vendored
+2
-20
@@ -35,26 +35,8 @@ export function resolvePluginApiKey(rawKey) {
|
||||
return undefined;
|
||||
}
|
||||
export function resolveImageConfig(cfg, apiPluginConfig) {
|
||||
const toolsConfig = (apiPluginConfig ??
|
||||
cfg?.plugins?.entries?.["1h-tools"]?.config ??
|
||||
cfg?.plugins?.entries?.["tools"]?.config);
|
||||
const legacyConfig = (cfg?.plugins?.entries?.["openai-image"]?.config ??
|
||||
cfg?.plugins?.entries?.["bifrost-image"]?.config);
|
||||
const directImageConfig = toolsConfig?.image;
|
||||
const flatToolsConfig = toolsConfig?.baseUrl
|
||||
? {
|
||||
baseUrl: toolsConfig.baseUrl,
|
||||
apiKey: toolsConfig.apiKey,
|
||||
allowPrivateNetwork: toolsConfig.allowPrivateNetwork,
|
||||
defaultModel: toolsConfig.defaultModel,
|
||||
models: toolsConfig.models,
|
||||
}
|
||||
: undefined;
|
||||
return {
|
||||
...legacyConfig,
|
||||
...flatToolsConfig,
|
||||
...directImageConfig,
|
||||
};
|
||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config);
|
||||
return config?.image;
|
||||
}
|
||||
export function resolveConfiguredImageBaseUrl(cfg, pluginCfg) {
|
||||
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
||||
|
||||
Vendored
+2
-19
@@ -18,25 +18,8 @@ export function resolvePluginApiKey(rawKey) {
|
||||
return undefined;
|
||||
}
|
||||
export function resolveVideoConfig(cfg, apiPluginConfig) {
|
||||
const toolsConfig = (apiPluginConfig ??
|
||||
cfg?.plugins?.entries?.["1h-tools"]?.config ??
|
||||
cfg?.plugins?.entries?.["tools"]?.config);
|
||||
const legacyConfig = cfg?.plugins?.entries?.["openai-video"]?.config;
|
||||
const directVideoConfig = toolsConfig?.video;
|
||||
const flatToolsConfig = toolsConfig?.baseUrl
|
||||
? {
|
||||
baseUrl: toolsConfig.baseUrl,
|
||||
apiKey: toolsConfig.apiKey,
|
||||
allowPrivateNetwork: toolsConfig.allowPrivateNetwork,
|
||||
defaultModel: toolsConfig.defaultModel,
|
||||
models: toolsConfig.models,
|
||||
}
|
||||
: undefined;
|
||||
return {
|
||||
...legacyConfig,
|
||||
...flatToolsConfig,
|
||||
...directVideoConfig,
|
||||
};
|
||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config);
|
||||
return config?.video;
|
||||
}
|
||||
export function resolveConfiguredOpenAIBaseUrl(cfg, pluginCfg) {
|
||||
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
||||
|
||||
Reference in new issue
Block a user