fix(config): ensure fallback to cfg when apiPluginConfig has no image/video property
This commit is contained in:
1 parent
7472270e1f
commit
b612af1c38
4 files changed
+12
-12
No files matched your search
Vendored
+3
-2
@@ -40,8 +40,9 @@ export function resolvePluginApiKey(rawKey) {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
export function resolveImageConfig(cfg, apiPluginConfig) {
|
export function resolveImageConfig(cfg, apiPluginConfig) {
|
||||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config);
|
const direct = apiPluginConfig?.image;
|
||||||
return config?.image;
|
const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.image;
|
||||||
|
return direct ?? fromCfg;
|
||||||
}
|
}
|
||||||
export function resolveConfiguredImageBaseUrl(cfg, pluginCfg) {
|
export function resolveConfiguredImageBaseUrl(cfg, pluginCfg) {
|
||||||
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
||||||
|
|||||||
Vendored
+3
-2
@@ -23,8 +23,9 @@ export function resolvePluginApiKey(rawKey) {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
export function resolveVideoConfig(cfg, apiPluginConfig) {
|
export function resolveVideoConfig(cfg, apiPluginConfig) {
|
||||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config);
|
const direct = apiPluginConfig?.video;
|
||||||
return config?.video;
|
const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.video;
|
||||||
|
return direct ?? fromCfg;
|
||||||
}
|
}
|
||||||
export function resolveConfiguredOpenAIBaseUrl(cfg, pluginCfg) {
|
export function resolveConfiguredOpenAIBaseUrl(cfg, pluginCfg) {
|
||||||
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
return (normalizeOptionalString(pluginCfg?.baseUrl) ??
|
||||||
|
|||||||
+3
-4
@@ -69,10 +69,9 @@ export function resolveImageConfig(
|
|||||||
cfg: ImageGenerationRequest["cfg"] | undefined,
|
cfg: ImageGenerationRequest["cfg"] | undefined,
|
||||||
apiPluginConfig?: Record<string, unknown>,
|
apiPluginConfig?: Record<string, unknown>,
|
||||||
): ImagePluginConfig | undefined {
|
): ImagePluginConfig | undefined {
|
||||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config) as
|
const direct = apiPluginConfig?.image as ImagePluginConfig | undefined;
|
||||||
| { image?: ImagePluginConfig }
|
const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.image as ImagePluginConfig | undefined;
|
||||||
| undefined;
|
return direct ?? fromCfg;
|
||||||
return config?.image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveConfiguredImageBaseUrl(
|
export function resolveConfiguredImageBaseUrl(
|
||||||
|
|||||||
+3
-4
@@ -80,10 +80,9 @@ export function resolveVideoConfig(
|
|||||||
cfg: VideoGenerationRequest["cfg"] | undefined,
|
cfg: VideoGenerationRequest["cfg"] | undefined,
|
||||||
apiPluginConfig?: Record<string, unknown>,
|
apiPluginConfig?: Record<string, unknown>,
|
||||||
): VideoPluginConfig | undefined {
|
): VideoPluginConfig | undefined {
|
||||||
const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config) as
|
const direct = apiPluginConfig?.video as VideoPluginConfig | undefined;
|
||||||
| { video?: VideoPluginConfig }
|
const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.video as VideoPluginConfig | undefined;
|
||||||
| undefined;
|
return direct ?? fromCfg;
|
||||||
return config?.video;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveConfiguredOpenAIBaseUrl(
|
export function resolveConfiguredOpenAIBaseUrl(
|
||||||
|
|||||||
Reference in new issue
Block a user