refactor: share fal provider http auth · openclaw/opencla...

Recent Commits to openclaw:main

vincentkoc · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,48 @@`
	`1`	`+import { type AuthProfileStore, type OpenClawConfig } from "openclaw/plugin-sdk/provider-auth";`
	`2`	`+import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";`
	`3`	`+import {`
	`4`	`+resolveProviderHttpRequestConfig,`
	`5`	`+type ProviderRequestCapability,`
	`6`	`+} from "openclaw/plugin-sdk/provider-http";`
	`7`	`+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";`
	`8`	`+`
	`9`	`+const DEFAULT_FAL_BASE_URL = "https://fal.run";`
	`10`	`+`
	`11`	`+type FalAuthenticatedRequest = {`
	`12`	`+cfg?: OpenClawConfig;`
	`13`	`+agentDir?: string;`
	`14`	`+authStore?: AuthProfileStore;`
	`15`	`+};`
	`16`	`+`
	`17`	`+function resolveFalConfiguredBaseUrl(cfg?: OpenClawConfig): string \| undefined {`
	`18`	`+return normalizeOptionalString(cfg?.models?.providers?.fal?.baseUrl);`
	`19`	`+}`
	`20`	`+`
	`21`	`+export async function resolveFalHttpRequestConfig(params: {`
	`22`	`+req: FalAuthenticatedRequest;`
	`23`	`+baseUrl?: string;`
	`24`	`+capability: ProviderRequestCapability;`
	`25`	`+}): Promise<ReturnType<typeof resolveProviderHttpRequestConfig>> {`
	`26`	`+const auth = await resolveApiKeyForProvider({`
	`27`	`+provider: "fal",`
	`28`	`+cfg: params.req.cfg,`
	`29`	`+agentDir: params.req.agentDir,`
	`30`	`+store: params.req.authStore,`
	`31`	`+});`
	`32`	`+if (!auth.apiKey) {`
	`33`	`+throw new Error("fal API key missing");`
	`34`	`+}`
	`35`	`+`
	`36`	`+return resolveProviderHttpRequestConfig({`
	`37`	`+baseUrl: params.baseUrl ?? resolveFalConfiguredBaseUrl(params.req.cfg),`
	`38`	`+defaultBaseUrl: DEFAULT_FAL_BASE_URL,`
	`39`	`+allowPrivateNetwork: false,`
	`40`	`+defaultHeaders: {`
	`41`	+Authorization: `Key ${auth.apiKey}`,
	`42`	`+"Content-Type": "application/json",`
	`43`	`+},`
	`44`	`+provider: "fal",`
	`45`	`+capability: params.capability,`
	`46`	`+transport: "http",`
	`47`	`+});`
	`48`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,9 @@ import {`
`8`	`8`	`toImageDataUrl,`
`9`	`9`	`} from "openclaw/plugin-sdk/image-generation";`
`10`	`10`	`import { isProviderApiKeyConfigured } from "openclaw/plugin-sdk/provider-auth";`
`11`		`-import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";`
`12`	`11`	`import {`
`13`	`12`	`assertOkOrThrowHttpError,`
`14`	`13`	`assertOkOrThrowProviderError,`
`15`		`-resolveProviderHttpRequestConfig,`
`16`	`14`	`} from "openclaw/plugin-sdk/provider-http";`
`17`	`15`	`import {`
`18`	`16`	`buildHostnameAllowlistPolicyFromSuffixAllowlist,`
`@@ -26,8 +24,8 @@ import {`
`26`	`24`	`normalizeLowercaseStringOrEmpty,`
`27`	`25`	`normalizeOptionalString,`
`28`	`26`	`} from "openclaw/plugin-sdk/string-coerce-runtime";`
	`27`	`+import { resolveFalHttpRequestConfig } from "./http-config.js";`
`29`	`28`
`30`		`-const DEFAULT_FAL_BASE_URL = "https://fal.run";`
`31`	`29`	`const DEFAULT_FAL_IMAGE_MODEL = "fal-ai/flux/dev";`
`32`	`30`	`const DEFAULT_FAL_EDIT_SUBPATH = "image-to-image";`
`33`	`31`	`const FAL_KREA_2_MODEL_PREFIX = "krea/v2/";`
`@@ -551,15 +549,6 @@ export function buildFalImageGenerationProvider(): ImageGenerationProvider {`
`551`	`549`	`},`
`552`	`550`	`},`
`553`	`551`	`async generateImage(req) {`
`554`		`-const auth = await resolveApiKeyForProvider({`
`555`		`-provider: "fal",`
`556`		`-cfg: req.cfg,`
`557`		`-agentDir: req.agentDir,`
`558`		`-store: req.authStore,`
`559`		`-});`
`560`		`-if (!auth.apiKey) {`
`561`		`-throw new Error("fal API key missing");`
`562`		`-}`
`563`	`552`	`const inputImageCount = req.inputImages?.length ?? 0;`
`564`	`553`	`const hasInputImages = inputImageCount > 0;`
`565`	`554`	`const requestedModel = req.model?.trim() \|\| DEFAULT_FAL_IMAGE_MODEL;`
`@@ -588,20 +577,8 @@ export function buildFalImageGenerationProvider(): ImageGenerationProvider {`
`588`	`577`	`if (!schema.supportsOutputFormat && req.outputFormat) {`
`589`	`578`	throw new Error(`fal ${requestedModel} does not support outputFormat overrides`);
`590`	`579`	`}`
`591`		`-const explicitBaseUrl = req.cfg?.models?.providers?.fal?.baseUrl?.trim();`
`592`	`580`	`const { baseUrl, allowPrivateNetwork, headers, dispatcherPolicy } =`
`593`		`-resolveProviderHttpRequestConfig({`
`594`		`-baseUrl: explicitBaseUrl,`
`595`		`-defaultBaseUrl: DEFAULT_FAL_BASE_URL,`
`596`		`-allowPrivateNetwork: false,`
`597`		`-defaultHeaders: {`
`598`		-Authorization: `Key ${auth.apiKey}`,
`599`		`-"Content-Type": "application/json",`
`600`		`-},`
`601`		`-provider: "fal",`
`602`		`-capability: "image",`
`603`		`-transport: "http",`
`604`		`-});`
	`581`	`+await resolveFalHttpRequestConfig({ req, capability: "image" });`
`605`	`582`	`const networkPolicy = resolveFalNetworkPolicy({ baseUrl, allowPrivateNetwork });`
`606`	`583`	`const requestBody: Record<string, unknown> = {`
`607`	`584`	`prompt: req.prompt,`

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,10 @@ import {`
`5`	`5`	`type MusicGenerationRequest,`
`6`	`6`	`} from "openclaw/plugin-sdk/music-generation";`
`7`	`7`	`import { isProviderApiKeyConfigured } from "openclaw/plugin-sdk/provider-auth";`
`8`		`-import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";`
`9`		`-import {`
`10`		`-assertOkOrThrowHttpError,`
`11`		`-postJsonRequest,`
`12`		`-resolveProviderHttpRequestConfig,`
`13`		`-} from "openclaw/plugin-sdk/provider-http";`
	`8`	`+import { assertOkOrThrowHttpError, postJsonRequest } from "openclaw/plugin-sdk/provider-http";`
`14`	`9`	`import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";`
	`10`	`+import { resolveFalHttpRequestConfig } from "./http-config.js";`
`15`	`11`
`16`		`-const DEFAULT_FAL_BASE_URL = "https://fal.run";`
`17`	`12`	`const DEFAULT_FAL_MUSIC_MODEL = "fal-ai/minimax-music/v2.6";`
`18`	`13`	`const FAL_ACE_STEP_MODEL = "fal-ai/ace-step/prompt-to-audio";`
`19`	`14`	`const FAL_STABLE_AUDIO_MODEL = "fal-ai/stable-audio-25/text-to-audio";`
`@@ -29,10 +24,6 @@ function resolveFalMusicModel(model: string \| undefined): string {`
`29`	`24`	`return normalizeOptionalString(model) ?? DEFAULT_FAL_MUSIC_MODEL;`
`30`	`25`	`}`
`31`	`26`
`32`		`-function resolveFalMusicBaseUrl(req: MusicGenerationRequest): string \| undefined {`
`33`		`-return normalizeOptionalString(req.cfg?.models?.providers?.fal?.baseUrl);`
`34`		`-}`
`35`		`-`
`36`	`27`	`function buildFalMinimaxBody(req: MusicGenerationRequest): Record<string, unknown> {`
`37`	`28`	`const lyrics = normalizeOptionalString(req.lyrics);`
`38`	`29`	`if (lyrics && req.instrumental === true) {`
`@@ -145,29 +136,8 @@ export function buildFalMusicGenerationProvider(): MusicGenerationProvider {`
`145`	`136`	`throw new Error("fal music generation does not support image reference inputs.");`
`146`	`137`	`}`
`147`	`138`
`148`		`-const auth = await resolveApiKeyForProvider({`
`149`		`-provider: "fal",`
`150`		`-cfg: req.cfg,`
`151`		`-agentDir: req.agentDir,`
`152`		`-store: req.authStore,`
`153`		`-});`
`154`		`-if (!auth.apiKey) {`
`155`		`-throw new Error("fal API key missing");`
`156`		`-}`
`157`		`-`
`158`	`139`	`const { baseUrl, allowPrivateNetwork, headers, dispatcherPolicy } =`
`159`		`-resolveProviderHttpRequestConfig({`
`160`		`-baseUrl: resolveFalMusicBaseUrl(req),`
`161`		`-defaultBaseUrl: DEFAULT_FAL_BASE_URL,`
`162`		`-allowPrivateNetwork: false,`
`163`		`-defaultHeaders: {`
`164`		-Authorization: `Key ${auth.apiKey}`,
`165`		`-"Content-Type": "application/json",`
`166`		`-},`
`167`		`-provider: "fal",`
`168`		`-capability: "audio",`
`169`		`-transport: "http",`
`170`		`-});`
	`140`	`+await resolveFalHttpRequestConfig({ req, capability: "audio" });`
`171`	`141`	`const model = resolveFalMusicModel(req.model);`
`172`	`142`	`const { response, release } = await postJsonRequest({`
`173`	`143`	url: `${baseUrl}/${model}`,

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`	`1`	`import { extensionForMime } from "openclaw/plugin-sdk/media-mime";`
`2`	`2`	`import { isProviderApiKeyConfigured } from "openclaw/plugin-sdk/provider-auth";`
`3`		`-import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";`
`4`		`-import {`
`5`		`-assertOkOrThrowHttpError,`
`6`		`-resolveProviderHttpRequestConfig,`
`7`		`-} from "openclaw/plugin-sdk/provider-http";`
	`3`	`+import { assertOkOrThrowHttpError } from "openclaw/plugin-sdk/provider-http";`
`8`	`4`	`import {`
`9`	`5`	`fetchWithSsrFGuard,`
`10`	`6`	`type SsrFPolicy,`
`@@ -20,8 +16,8 @@ import type {`
`20`	`16`	`VideoGenerationProvider,`
`21`	`17`	`VideoGenerationRequest,`
`22`	`18`	`} from "openclaw/plugin-sdk/video-generation";`
	`19`	`+import { resolveFalHttpRequestConfig } from "./http-config.js";`
`23`	`20`
`24`		`-const DEFAULT_FAL_BASE_URL = "https://fal.run";`
`25`	`21`	`const DEFAULT_FAL_QUEUE_BASE_URL = "https://queue.fal.run";`
`26`	`22`	`const DEFAULT_FAL_VIDEO_MODEL = "fal-ai/minimax/video-01-live";`
`27`	`23`	`const HEYGEN_VIDEO_AGENT_MODEL = "fal-ai/heygen/v2/video-agent";`
`@@ -573,28 +569,8 @@ export function buildFalVideoGenerationProvider(): VideoGenerationProvider {`
`573`	`569`	`async generateVideo(req) {`
`574`	`570`	`const model = normalizeOptionalString(req.model) \|\| DEFAULT_FAL_VIDEO_MODEL;`
`575`	`571`	`validateFalVideoReferenceInputs({ req, model });`
`576`		`-const auth = await resolveApiKeyForProvider({`
`577`		`-provider: "fal",`
`578`		`-cfg: req.cfg,`
`579`		`-agentDir: req.agentDir,`
`580`		`-store: req.authStore,`
`581`		`-});`
`582`		`-if (!auth.apiKey) {`
`583`		`-throw new Error("fal API key missing");`
`584`		`-}`
`585`	`572`	`const { baseUrl, allowPrivateNetwork, headers, dispatcherPolicy } =`
`586`		`-resolveProviderHttpRequestConfig({`
`587`		`-baseUrl: normalizeOptionalString(req.cfg?.models?.providers?.fal?.baseUrl),`
`588`		`-defaultBaseUrl: DEFAULT_FAL_BASE_URL,`
`589`		`-allowPrivateNetwork: false,`
`590`		`-defaultHeaders: {`
`591`		-Authorization: `Key ${auth.apiKey}`,
`592`		`-"Content-Type": "application/json",`
`593`		`-},`
`594`		`-provider: "fal",`
`595`		`-capability: "video",`
`596`		`-transport: "http",`
`597`		`-});`
	`573`	`+await resolveFalHttpRequestConfig({ req, capability: "video" });`
`598`	`574`	`const requestBody = buildFalVideoRequestBody({ req, model });`
`599`	`575`	`const policy = buildPolicy(allowPrivateNetwork);`
`600`	`576`	`const queueBaseUrl = resolveFalQueueBaseUrl(baseUrl);`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main