fix(openai): extend Azure image timeout · openclaw/opencl...

Recent Commits to openclaw:main

steipete · 2026-04-26 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ Docs: https://docs.openclaw.ai`
`66`	`66`	internal calls no longer hit `scope-upgrade` pairing prompts while remote,
`67`	`67`	`browser, node, device-token, and explicit-device paths still require normal`
`68`	`68`	`pairing approval. Fixes #63548.`
	`69`	`+- Providers/Azure OpenAI: give deployment-scoped image generation requests a`
	`70`	+ longer 600s default timeout so slow `gpt-image-2` generations can complete
	`71`	+ without a per-call `timeoutMs`. Fixes #71705. Thanks @voytas75.
`69`	`72`	`- CLI/gateway: keep diagnostic probes from creating first-time read-only device`
`70`	`73`	`pairings, while still reusing cached device tokens for detailed read probes.`
`71`	`74`	`Fixes #71766. Thanks @SunboZ.`

Original file line number	Diff line number	Diff line change
`@@ -543,6 +543,8 @@ For image-generation requests on a recognized Azure host, OpenClaw:`
`543`	`543`	- Sends the `api-key` header instead of `Authorization: Bearer`
`544`	`544`	- Uses deployment-scoped paths (`/openai/deployments/{deployment}/...`)
`545`	`545`	- Appends `?api-version=...` to each request
	`546`	`+- Uses a 600s default request timeout for Azure image-generation calls.`
	`547`	+ Per-call `timeoutMs` values still override this default.
`546`	`548`
`547`	`549`	`Other base URLs (public OpenAI, OpenAI-compatible proxies) keep the standard`
`548`	`550`	`OpenAI image request shape.`

Original file line number	Diff line number	Diff line change
`@@ -1316,6 +1316,35 @@ describe("openai image generation provider", () => {`
`1316`	`1316`	`n: 1,`
`1317`	`1317`	`size: "1024x1024",`
`1318`	`1318`	`},`
	`1319`	`+timeoutMs: 600_000,`
	`1320`	`+}),`
	`1321`	`+);`
	`1322`	`+});`
	`1323`	`+`
	`1324`	`+it("lets explicit timeoutMs override the Azure image default", async () => {`
	`1325`	`+mockGeneratedPngResponse();`
	`1326`	`+`
	`1327`	`+const provider = buildOpenAIImageGenerationProvider();`
	`1328`	`+await provider.generateImage({`
	`1329`	`+provider: "openai",`
	`1330`	`+model: "gpt-image-2-1",`
	`1331`	`+prompt: "Azure cat",`
	`1332`	`+cfg: {`
	`1333`	`+models: {`
	`1334`	`+providers: {`
	`1335`	`+openai: {`
	`1336`	`+baseUrl: "https://myresource.openai.azure.com/openai/v1",`
	`1337`	`+models: [],`
	`1338`	`+},`
	`1339`	`+},`
	`1340`	`+},`
	`1341`	`+},`
	`1342`	`+timeoutMs: 123_456,`
	`1343`	`+});`
	`1344`	`+`
	`1345`	`+expect(postJsonRequestMock).toHaveBeenCalledWith(`
	`1346`	`+expect.objectContaining({`
	`1347`	`+timeoutMs: 123_456,`
`1319`	`1348`	`}),`
`1320`	`1349`	`);`
`1321`	`1350`	`});`

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ const DEFAULT_OPENAI_CODEX_IMAGE_RESPONSES_MODEL = "gpt-5.5";`
`32`	`32`	`const OPENAI_CODEX_IMAGE_INSTRUCTIONS = "You are an image generation assistant.";`
`33`	`33`	`const OPENAI_TRANSPARENT_BACKGROUND_IMAGE_MODEL = "gpt-image-1.5";`
`34`	`34`	`const DEFAULT_OPENAI_IMAGE_TIMEOUT_MS = 180_000;`
	`35`	`+const DEFAULT_AZURE_OPENAI_IMAGE_TIMEOUT_MS = 600_000;`
`35`	`36`	`const DEFAULT_OUTPUT_MIME = "image/png";`
`36`	`37`	`const DEFAULT_OUTPUT_EXTENSION = "png";`
`37`	`38`	`const DEFAULT_SIZE = "1024x1024";`
`@@ -91,8 +92,14 @@ function sanitizeLogValue(value: unknown): string {`
`91`	`92`	`: cleaned;`
`92`	`93`	`}`
`93`	`94`
`94`		`-function resolveOpenAIImageTimeoutMs(timeoutMs: number \| undefined): number {`
`95`		`-return timeoutMs ?? DEFAULT_OPENAI_IMAGE_TIMEOUT_MS;`
	`95`	`+function resolveOpenAIImageTimeoutMs(`
	`96`	`+timeoutMs: number \| undefined,`
	`97`	`+options?: { isAzure?: boolean },`
	`98`	`+): number {`
	`99`	`+return (`
	`100`	`+timeoutMs ??`
	`101`	`+(options?.isAzure ? DEFAULT_AZURE_OPENAI_IMAGE_TIMEOUT_MS : DEFAULT_OPENAI_IMAGE_TIMEOUT_MS)`
	`102`	`+);`
`96`	`103`	`}`
`97`	`104`
`98`	`105`	`function resolveOpenAIImageCount(count: number \| undefined): number {`
`@@ -746,7 +753,7 @@ export function buildOpenAIImageGenerationProvider(): ImageGenerationProvider {`
`746`	`753`	`});`
`747`	`754`	`const count = resolveOpenAIImageCount(req.count);`
`748`	`755`	`const size = req.size ?? DEFAULT_SIZE;`
`749`		`-const timeoutMs = resolveOpenAIImageTimeoutMs(req.timeoutMs);`
	`756`	`+const timeoutMs = resolveOpenAIImageTimeoutMs(req.timeoutMs, { isAzure });`
`750`	`757`	`const url = isAzure`
`751`	`758`	`? buildAzureImageUrl(rawBaseUrl, model, isEdit ? "edits" : "generations")`
`752`	`759`	: `${baseUrl}/images/${isEdit ? "edits" : "generations"}`;

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

推荐订阅源

Recent Commits to openclaw:main