@cartanova/qgrid-cli 2.10.5 → 2.10.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/dist/application/monit/monit.frame.js +1 -1
- package/bundle/dist/application/qgrid/expired-token-reminder.js +1 -1
- package/bundle/dist/application/qgrid/oauth.js +1 -1
- package/bundle/dist/application/qgrid/qgrid-image-generation.js +7 -11
- package/bundle/dist/application/qgrid/qgrid-response-format.js +4 -4
- package/bundle/dist/application/qgrid/qgrid-run-lifecycle.js +24 -7
- package/bundle/dist/application/qgrid/qgrid.dispatcher.js +8 -3
- package/bundle/dist/application/qgrid/qgrid.frame.js +24 -10
- package/bundle/dist/application/qgrid/token-death.js +1 -1
- package/bundle/dist/application/qgrid/token-window-keepalive.js +1 -1
- package/bundle/dist/application/qgrid/tool-emulation.js +1 -1
- package/bundle/dist/application/request-log/request-log.model.js +2 -2
- package/bundle/dist/i18n/sd.generated.js +3 -3
- package/bundle/dist/sonamu.config.js +2 -2
- package/bundle/dist/utils/providers/anthropic/anthropic-dispatcher.js +1 -1
- package/bundle/dist/utils/providers/anthropic/anthropic-thinking.js +1 -1
- package/bundle/dist/utils/providers/openai/openai-backend-protocol.js +13 -2
- package/bundle/dist/utils/providers/openai/openai-direct-client.js +5 -4
- package/bundle/dist/utils/providers/openai/openai-dispatcher.js +111 -57
- package/bundle/dist/utils/providers/openai/openai-image-generation.js +25 -17
- package/bundle/dist/utils/providers/openai/openai-refresh.js +1 -1
- package/bundle/src/application/qgrid/qgrid-image-generation.test.ts +19 -8
- package/bundle/src/application/qgrid/qgrid-image-generation.ts +17 -24
- package/bundle/src/application/qgrid/qgrid-response-format.test.ts +4 -2
- package/bundle/src/application/qgrid/qgrid-response-format.ts +7 -10
- package/bundle/src/application/qgrid/qgrid-run-lifecycle.test.ts +87 -9
- package/bundle/src/application/qgrid/qgrid-run-lifecycle.ts +45 -5
- package/bundle/src/application/qgrid/qgrid.dispatcher.test.ts +136 -2
- package/bundle/src/application/qgrid/qgrid.dispatcher.ts +11 -1
- package/bundle/src/application/qgrid/qgrid.frame.test.ts +73 -0
- package/bundle/src/application/qgrid/qgrid.frame.ts +39 -4
- package/bundle/src/application/request-log/request-log.entity.json +2 -2
- package/bundle/src/application/sonamu.generated.http +2 -2
- package/bundle/src/i18n/sd.generated.ts +2 -2
- package/bundle/src/utils/providers/openai/openai-backend-protocol.test.ts +23 -1
- package/bundle/src/utils/providers/openai/openai-backend-protocol.ts +24 -2
- package/bundle/src/utils/providers/openai/openai-direct-client.test.ts +15 -0
- package/bundle/src/utils/providers/openai/openai-direct-client.ts +14 -4
- package/bundle/src/utils/providers/openai/openai-dispatcher.test.ts +223 -32
- package/bundle/src/utils/providers/openai/openai-dispatcher.ts +174 -72
- package/bundle/src/utils/providers/openai/openai-image-generation.test.ts +89 -0
- package/bundle/src/utils/providers/openai/openai-image-generation.ts +26 -15
- package/bundle/web-dist/client/assets/cost-DH2jZbrw.js +1 -0
- package/bundle/web-dist/client/assets/{index-Dxw7DiXF.js → index-D9ryIyL-.js} +4 -4
- package/bundle/web-dist/client/assets/logs-CLf2VNfk.js +1 -0
- package/bundle/web-dist/client/assets/{monit-E8eGW1Sj.js → monit-DojxOLj6.js} +1 -1
- package/bundle/web-dist/client/assets/{routes-7spLfIGZ.js → routes-DXJhNvbI.js} +2 -2
- package/bundle/web-dist/client/assets/{services.generated-jnPHYMER.js → services.generated-DqFYgWsY.js} +1 -1
- package/bundle/web-dist/client/assets/{settings-BdosZFNC.js → settings-bopyz9pa.js} +1 -1
- package/bundle/web-dist/client/assets/{show-b2PFNI3D.js → show-DbLD3MzB.js} +1 -1
- package/bundle/web-dist/client/assets/{tokens-CBdHb2_U.js → tokens-2-AIi9sZ.js} +1 -1
- package/bundle/web-dist/client/assets/{use-oauth-login-flow-Cyn3YPqW.js → use-oauth-login-flow-CnqTWs_H.js} +1 -1
- package/bundle/web-dist/client/assets/{use-update-token-mutation-DQCwCYfR.js → use-update-token-mutation-Cxb9K0fM.js} +1 -1
- package/bundle/web-dist/client/index.html +2 -2
- package/bundle/web-dist/server/assets/{cost-59jBdx-I.js → cost-eEHeTRT5.js} +4 -5
- package/bundle/web-dist/server/assets/{lazyRouteComponent-CUR-kWzI.js → lazyRouteComponent-Bi0fYGLs.js} +2 -2
- package/bundle/web-dist/server/assets/{logs-CaaWO9-Z.js → logs-CIVFxfoi.js} +10 -9
- package/bundle/web-dist/server/assets/{monit-CBil92fJ.js → monit-DBXezg7R.js} +4 -4
- package/bundle/web-dist/server/assets/{plus-Bvdj8Pwx.js → plus-BH-t4cm_.js} +1 -1
- package/bundle/web-dist/server/assets/{react-dom-CyuShs9K.js → react-dom-CZ2eynd8.js} +1 -1
- package/bundle/web-dist/server/assets/{refresh-cw-3QAiSWBd.js → refresh-cw-CosAdcz0.js} +1 -1
- package/bundle/web-dist/server/assets/{routes-DtVf9yqo.js → routes-COWYIvA-.js} +6 -7
- package/bundle/web-dist/server/assets/{services.generated-FPwsG9p3.js → services.generated-607iwhMI.js} +2 -2
- package/bundle/web-dist/server/assets/{settings-DeHNwoMv.js → settings-C_6dpK5p.js} +3 -3
- package/bundle/web-dist/server/assets/{show-8NNdRxhM.js → show-DY396-LD.js} +8 -20
- package/bundle/web-dist/server/assets/{tokens-odgS2-9q.js → tokens-COvV7qUP.js} +4 -4
- package/bundle/web-dist/server/assets/{use-oauth-login-flow-DTQKdYBO.js → use-oauth-login-flow-VYCYf3uv.js} +1 -1
- package/bundle/web-dist/server/assets/{use-update-token-mutation-xvXbPrCI.js → use-update-token-mutation-D8XYV5of.js} +1 -1
- package/bundle/web-dist/server/entry-server.generated.js +10 -10
- package/package.json +1 -1
- package/skills/qgrid/SKILL.md +9 -8
- package/skills/qgrid/references/ai-sdk-provider-contract.md +25 -16
- package/skills/qgrid/references/decision-rationale.md +8 -8
- package/skills/qgrid/references/openai-codex-runtime.md +19 -11
- package/skills/qgrid/references/request-log-run-lifecycle.md +4 -2
- package/skills/qgrid/references/sonamu-api-web-flow.md +2 -2
- package/skills/qgrid/references/verification-and-debugging.md +23 -9
- package/bundle/web-dist/client/assets/cost-CY2BJEPC.js +0 -1
- package/bundle/web-dist/client/assets/logs-3n_U4qnI.js +0 -1
|
@@ -17,10 +17,11 @@ const PNG_SIGNATURE = Buffer.from([
|
|
|
17
17
|
10
|
|
18
18
|
]);
|
|
19
19
|
function buildStandaloneImageRequest(options) {
|
|
20
|
-
if (options.outputSchema || options.tools?.length) throw new OpenAIProtocolError("
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (
|
|
20
|
+
if (options.outputSchema || options.tools?.length) throw new OpenAIProtocolError("Standalone image generation does not support tools or structured output");
|
|
21
|
+
if (!options.imageGeneration) throw new OpenAIProtocolError("Standalone images require image generation to be enabled");
|
|
22
|
+
const controls = typeof options.imageGeneration === "object" ? options.imageGeneration : {};
|
|
23
|
+
if (options.model !== "gpt-image-2" && controls.background !== "transparent") throw new OpenAIProtocolError("Standalone images require an explicit transparent background request");
|
|
24
|
+
if (controls.output_format && controls.output_format !== "png") throw new OpenAIProtocolError("Standalone image generation only supports PNG output");
|
|
24
25
|
const text = [];
|
|
25
26
|
const images = [];
|
|
26
27
|
if (options.instructions) text.push(`System instructions:\n${options.instructions}`);
|
|
@@ -30,14 +31,14 @@ function buildStandaloneImageRequest(options) {
|
|
|
30
31
|
images.push({ image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}` });
|
|
31
32
|
continue;
|
|
32
33
|
}
|
|
33
|
-
if (item.type !== "message" && typeof item.role !== "string") throw new OpenAIProtocolError("Unsupported conversation item for
|
|
34
|
+
if (item.type !== "message" && typeof item.role !== "string") throw new OpenAIProtocolError("Unsupported conversation item for standalone image generation");
|
|
34
35
|
if (typeof item.content === "string") {
|
|
35
36
|
text.push(`${item.role ?? "user"}:\n${item.content}`);
|
|
36
37
|
continue;
|
|
37
38
|
}
|
|
38
|
-
if (!Array.isArray(item.content)) throw new OpenAIProtocolError("Unsupported message content for
|
|
39
|
+
if (!Array.isArray(item.content)) throw new OpenAIProtocolError("Unsupported message content for standalone image generation");
|
|
39
40
|
for (const part of item.content) {
|
|
40
|
-
if (!part || typeof part !== "object") throw new OpenAIProtocolError("Unsupported message part for
|
|
41
|
+
if (!part || typeof part !== "object") throw new OpenAIProtocolError("Unsupported message part for standalone image generation");
|
|
41
42
|
if ([
|
|
42
43
|
"input_text",
|
|
43
44
|
"output_text",
|
|
@@ -47,24 +48,24 @@ function buildStandaloneImageRequest(options) {
|
|
|
47
48
|
const url = typeof part.image_url === "string" ? part.image_url : part.image_url?.url;
|
|
48
49
|
if (typeof url !== "string" || !/^(https:\/\/|data:image\/)/i.test(url)) throw new OpenAIProtocolError("Image references must be HTTPS URLs or image data URLs");
|
|
49
50
|
images.push({ image_url: url });
|
|
50
|
-
} else throw new OpenAIProtocolError("Unsupported message part for
|
|
51
|
+
} else throw new OpenAIProtocolError("Unsupported message part for standalone image generation");
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
|
-
if (images.length > 5) throw new OpenAIProtocolError("
|
|
54
|
+
if (images.length > 5) throw new OpenAIProtocolError("Standalone image editing supports at most 5 reference images");
|
|
54
55
|
if (!text.some((part) => part.trim())) throw new OpenAIProtocolError("Image prompt is empty");
|
|
55
56
|
return {
|
|
56
57
|
url: CHATGPT_CODEX_RESPONSES_URL.replace(/\/responses$/, `/images/${images.length ? "edits" : "generations"}`),
|
|
57
58
|
body: {
|
|
58
59
|
model: "gpt-image-2",
|
|
59
60
|
prompt: text.join("\n\n"),
|
|
60
|
-
background:
|
|
61
|
+
...controls.background ? { background: controls.background } : {},
|
|
61
62
|
...controls.quality ? { quality: controls.quality } : {},
|
|
62
63
|
...controls.size ? { size: controls.size } : {},
|
|
63
64
|
...images.length ? { images } : {}
|
|
64
65
|
}
|
|
65
66
|
};
|
|
66
67
|
}
|
|
67
|
-
function
|
|
68
|
+
function inspectGeneratedPng(base64, requireTransparency) {
|
|
68
69
|
if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) throw new OpenAIProtocolError("Invalid or oversized generated PNG");
|
|
69
70
|
const bytes = Buffer.from(base64, "base64");
|
|
70
71
|
if (bytes.length < 33 || !bytes.subarray(0, 8).equals(PNG_SIGNATURE) || bytes.toString("ascii", 12, 16) !== "IHDR") throw new OpenAIProtocolError("Image generation did not return a PNG");
|
|
@@ -77,6 +78,10 @@ function inspectTransparentPng(base64) {
|
|
|
77
78
|
} catch {
|
|
78
79
|
throw new OpenAIProtocolError("Image generation returned an invalid PNG");
|
|
79
80
|
}
|
|
81
|
+
if (!requireTransparency) return {
|
|
82
|
+
width: image.width,
|
|
83
|
+
height: image.height
|
|
84
|
+
};
|
|
80
85
|
let transparent = false;
|
|
81
86
|
let visible = false;
|
|
82
87
|
for (let i = 3; i < image.data.length; i += 4) {
|
|
@@ -89,7 +94,7 @@ function inspectTransparentPng(base64) {
|
|
|
89
94
|
}
|
|
90
95
|
throw new OpenAIProtocolError("Image generation did not return visible content on a transparent background");
|
|
91
96
|
}
|
|
92
|
-
async function readStandaloneImageResponse(response) {
|
|
97
|
+
async function readStandaloneImageResponse(response, requireTransparency) {
|
|
93
98
|
if (!response.body) throw new OpenAIProtocolError("Image response had no body");
|
|
94
99
|
const reader = response.body.getReader();
|
|
95
100
|
const chunks = [];
|
|
@@ -114,6 +119,8 @@ async function readStandaloneImageResponse(response) {
|
|
|
114
119
|
revised_prompt: z.string().nullish()
|
|
115
120
|
})).min(1).max(16),
|
|
116
121
|
quality: z.string().optional(),
|
|
122
|
+
model: z.string().optional(),
|
|
123
|
+
background: z.string().optional(),
|
|
117
124
|
usage: ImageGenerationMetadata.shape.usage
|
|
118
125
|
});
|
|
119
126
|
let parsed;
|
|
@@ -122,8 +129,9 @@ async function readStandaloneImageResponse(response) {
|
|
|
122
129
|
} catch {
|
|
123
130
|
throw new OpenAIProtocolError("Invalid standalone image response");
|
|
124
131
|
}
|
|
132
|
+
const background = parsed.background ?? (requireTransparency ? "transparent" : void 0);
|
|
125
133
|
return parsed.data.map((item, index) => {
|
|
126
|
-
const dimensions =
|
|
134
|
+
const dimensions = inspectGeneratedPng(item.b64_json, requireTransparency);
|
|
127
135
|
return {
|
|
128
136
|
type: "image",
|
|
129
137
|
base64: item.b64_json,
|
|
@@ -131,8 +139,8 @@ async function readStandaloneImageResponse(response) {
|
|
|
131
139
|
...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
|
|
132
140
|
generation: {
|
|
133
141
|
route: "codex-images",
|
|
134
|
-
model: "gpt-image-2",
|
|
135
|
-
background:
|
|
142
|
+
model: parsed.model ?? "gpt-image-2",
|
|
143
|
+
...background ? { background } : {},
|
|
136
144
|
size: `${dimensions.width}x${dimensions.height}`,
|
|
137
145
|
...parsed.quality ? { quality: parsed.quality } : {},
|
|
138
146
|
...index === 0 && parsed.usage ? { usage: parsed.usage } : {}
|
|
@@ -141,6 +149,6 @@ async function readStandaloneImageResponse(response) {
|
|
|
141
149
|
});
|
|
142
150
|
}
|
|
143
151
|
//#endregion
|
|
144
|
-
export { buildStandaloneImageRequest,
|
|
152
|
+
export { buildStandaloneImageRequest, readStandaloneImageResponse };
|
|
145
153
|
|
|
146
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-image-generation.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-image-generation.ts"],"sourcesContent":["import { PNG } from \"pngjs\";\nimport { z } from \"zod\";\n\nimport { ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport {\n  CHATGPT_CODEX_RESPONSES_URL,\n  imageMimeType,\n  OpenAIProtocolError,\n  type OpenAINormalizedEvent,\n  type OpenAIResponsesOptions,\n} from \"./openai-backend-protocol\";\n\nconst MAX_PNG_BYTES = 32 * 1024 * 1024;\nconst MAX_IMAGE_PIXELS = 4096 * 4096;\nconst MAX_RESPONSE_BYTES = 64 * 1024 * 1024;\nconst PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);\n\nexport function buildStandaloneImageRequest(options: OpenAIResponsesOptions) {\n  if (options.outputSchema || options.tools?.length) {\n    throw new OpenAIProtocolError(\n      \"Transparent image generation does not support tools or structured output\",\n    );\n  }\n  const controls = options.imageGeneration;\n  if (!controls || controls === true || controls.background !== \"transparent\") {\n    throw new OpenAIProtocolError(\n      \"Standalone images require an explicit transparent background request\",\n    );\n  }\n  if (controls.output_format && controls.output_format !== \"png\") {\n    throw new OpenAIProtocolError(\"Transparent image generation only supports PNG output\");\n  }\n  const text: string[] = [];\n  const images: Array<{ image_url: string }> = [];\n  if (options.instructions) text.push(`System instructions:\\n${options.instructions}`);\n  for (const item of options.history) {\n    if (item.type === \"reasoning\") continue;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      images.push({\n        image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}`,\n      });\n      continue;\n    }\n    if (item.type !== \"message\" && typeof item.role !== \"string\") {\n      throw new OpenAIProtocolError(\n        \"Unsupported conversation item for transparent image generation\",\n      );\n    }\n    if (typeof item.content === \"string\") {\n      text.push(`${item.role ?? \"user\"}:\\n${item.content}`);\n      continue;\n    }\n    if (!Array.isArray(item.content)) {\n      throw new OpenAIProtocolError(\"Unsupported message content for transparent image generation\");\n    }\n    for (const part of item.content) {\n      if (!part || typeof part !== \"object\") {\n        throw new OpenAIProtocolError(\"Unsupported message part for transparent image generation\");\n      }\n      if (\n        [\"input_text\", \"output_text\", \"text\"].includes(part.type) &&\n        typeof part.text === \"string\"\n      ) {\n        text.push(`${item.role ?? \"user\"}:\\n${part.text}`);\n      } else if (part.type === \"input_image\" || part.type === \"image_url\") {\n        const url = typeof part.image_url === \"string\" ? part.image_url : part.image_url?.url;\n        if (typeof url !== \"string\" || !/^(https:\\/\\/|data:image\\/)/i.test(url)) {\n          throw new OpenAIProtocolError(\"Image references must be HTTPS URLs or image data URLs\");\n        }\n        images.push({ image_url: url });\n      } else {\n        throw new OpenAIProtocolError(\"Unsupported message part for transparent image generation\");\n      }\n    }\n  }\n  if (images.length > 5)\n    throw new OpenAIProtocolError(\"Transparent image editing supports at most 5 reference images\");\n  if (!text.some((part) => part.trim())) throw new OpenAIProtocolError(\"Image prompt is empty\");\n  return {\n    url: CHATGPT_CODEX_RESPONSES_URL.replace(\n      /\\/responses$/,\n      `/images/${images.length ? \"edits\" : \"generations\"}`,\n    ),\n    body: {\n      model: \"gpt-image-2\",\n      prompt: text.join(\"\\n\\n\"),\n      background: \"transparent\",\n      ...(controls.quality ? { quality: controls.quality } : {}),\n      ...(controls.size ? { size: controls.size } : {}),\n      ...(images.length ? { images } : {}),\n    },\n  };\n}\n\n// Decode before accepting the result: an alpha channel alone can still be fully opaque.\nexport function inspectTransparentPng(base64: string): { width: number; height: number } {\n  if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) {\n    throw new OpenAIProtocolError(\"Invalid or oversized generated PNG\");\n  }\n  const bytes = Buffer.from(base64, \"base64\");\n  if (\n    bytes.length < 33 ||\n    !bytes.subarray(0, 8).equals(PNG_SIGNATURE) ||\n    bytes.toString(\"ascii\", 12, 16) !== \"IHDR\"\n  ) {\n    throw new OpenAIProtocolError(\"Image generation did not return a PNG\");\n  }\n  const width = bytes.readUInt32BE(16);\n  const height = bytes.readUInt32BE(20);\n  if (!width || !height || width * height > MAX_IMAGE_PIXELS) {\n    throw new OpenAIProtocolError(\"Generated PNG dimensions exceed the decoding limit\");\n  }\n  let image: PNG;\n  try {\n    image = PNG.sync.read(bytes);\n  } catch {\n    throw new OpenAIProtocolError(\"Image generation returned an invalid PNG\");\n  }\n  let transparent = false;\n  let visible = false;\n  for (let i = 3; i < image.data.length; i += 4) {\n    transparent ||= image.data[i] === 0;\n    visible ||= image.data[i]! > 0;\n    if (transparent && visible) return { width: image.width, height: image.height };\n  }\n  throw new OpenAIProtocolError(\n    \"Image generation did not return visible content on a transparent background\",\n  );\n}\n\nexport async function readStandaloneImageResponse(\n  response: Response,\n): Promise<OpenAINormalizedEvent[]> {\n  if (!response.body) throw new OpenAIProtocolError(\"Image response had no body\");\n  const reader = response.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let size = 0;\n  try {\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      size += value.byteLength;\n      if (size > MAX_RESPONSE_BYTES) {\n        await reader.cancel();\n        throw new OpenAIProtocolError(\"Image response exceeded the size limit\");\n      }\n      chunks.push(value);\n    }\n  } finally {\n    reader.releaseLock();\n  }\n  const schema = z.object({\n    data: z\n      .array(z.object({ b64_json: z.string().min(1), revised_prompt: z.string().nullish() }))\n      .min(1)\n      .max(16),\n    quality: z.string().optional(),\n    usage: ImageGenerationMetadata.shape.usage,\n  });\n  let parsed: z.infer<typeof schema>;\n  try {\n    parsed = schema.parse(JSON.parse(Buffer.concat(chunks).toString(\"utf8\")));\n  } catch {\n    throw new OpenAIProtocolError(\"Invalid standalone image response\");\n  }\n  return parsed.data.map((item, index) => {\n    const dimensions = inspectTransparentPng(item.b64_json);\n    return {\n      type: \"image\",\n      base64: item.b64_json,\n      mimeType: \"image/png\",\n      ...(item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {}),\n      generation: {\n        route: \"codex-images\",\n        model: \"gpt-image-2\",\n        background: \"transparent\",\n        size: `${dimensions.width}x${dimensions.height}`,\n        ...(parsed.quality ? { quality: parsed.quality } : {}),\n        ...(index === 0 && parsed.usage ? { usage: parsed.usage } : {}),\n      },\n    };\n  });\n}\n"],"mappings":"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"}
|
|
154
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-image-generation.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-image-generation.ts"],"sourcesContent":["import { PNG } from \"pngjs\";\nimport { z } from \"zod\";\n\nimport { ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport {\n  CHATGPT_CODEX_RESPONSES_URL,\n  imageMimeType,\n  OpenAIProtocolError,\n  type OpenAINormalizedEvent,\n  type OpenAIResponsesOptions,\n} from \"./openai-backend-protocol\";\n\nconst MAX_PNG_BYTES = 32 * 1024 * 1024;\nconst MAX_IMAGE_PIXELS = 4096 * 4096;\nconst MAX_RESPONSE_BYTES = 64 * 1024 * 1024;\nconst PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);\n\nexport function buildStandaloneImageRequest(options: OpenAIResponsesOptions) {\n  if (options.outputSchema || options.tools?.length) {\n    throw new OpenAIProtocolError(\n      \"Standalone image generation does not support tools or structured output\",\n    );\n  }\n  if (!options.imageGeneration) {\n    throw new OpenAIProtocolError(\"Standalone images require image generation to be enabled\");\n  }\n  const controls = typeof options.imageGeneration === \"object\" ? options.imageGeneration : {};\n  if (options.model !== \"gpt-image-2\" && controls.background !== \"transparent\") {\n    throw new OpenAIProtocolError(\n      \"Standalone images require an explicit transparent background request\",\n    );\n  }\n  if (controls.output_format && controls.output_format !== \"png\") {\n    throw new OpenAIProtocolError(\"Standalone image generation only supports PNG output\");\n  }\n  const text: string[] = [];\n  const images: Array<{ image_url: string }> = [];\n  if (options.instructions) text.push(`System instructions:\\n${options.instructions}`);\n  for (const item of options.history) {\n    if (item.type === \"reasoning\") continue;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      images.push({\n        image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}`,\n      });\n      continue;\n    }\n    if (item.type !== \"message\" && typeof item.role !== \"string\") {\n      throw new OpenAIProtocolError(\n        \"Unsupported conversation item for standalone image generation\",\n      );\n    }\n    if (typeof item.content === \"string\") {\n      text.push(`${item.role ?? \"user\"}:\\n${item.content}`);\n      continue;\n    }\n    if (!Array.isArray(item.content)) {\n      throw new OpenAIProtocolError(\"Unsupported message content for standalone image generation\");\n    }\n    for (const part of item.content) {\n      if (!part || typeof part !== \"object\") {\n        throw new OpenAIProtocolError(\"Unsupported message part for standalone image generation\");\n      }\n      if (\n        [\"input_text\", \"output_text\", \"text\"].includes(part.type) &&\n        typeof part.text === \"string\"\n      ) {\n        text.push(`${item.role ?? \"user\"}:\\n${part.text}`);\n      } else if (part.type === \"input_image\" || part.type === \"image_url\") {\n        const url = typeof part.image_url === \"string\" ? part.image_url : part.image_url?.url;\n        if (typeof url !== \"string\" || !/^(https:\\/\\/|data:image\\/)/i.test(url)) {\n          throw new OpenAIProtocolError(\"Image references must be HTTPS URLs or image data URLs\");\n        }\n        images.push({ image_url: url });\n      } else {\n        throw new OpenAIProtocolError(\"Unsupported message part for standalone image generation\");\n      }\n    }\n  }\n  if (images.length > 5)\n    throw new OpenAIProtocolError(\"Standalone image editing supports at most 5 reference images\");\n  if (!text.some((part) => part.trim())) throw new OpenAIProtocolError(\"Image prompt is empty\");\n  return {\n    url: CHATGPT_CODEX_RESPONSES_URL.replace(\n      /\\/responses$/,\n      `/images/${images.length ? \"edits\" : \"generations\"}`,\n    ),\n    body: {\n      model: \"gpt-image-2\",\n      prompt: text.join(\"\\n\\n\"),\n      ...(controls.background ? { background: controls.background } : {}),\n      ...(controls.quality ? { quality: controls.quality } : {}),\n      ...(controls.size ? { size: controls.size } : {}),\n      ...(images.length ? { images } : {}),\n    },\n  };\n}\n\nfunction inspectGeneratedPng(\n  base64: string,\n  requireTransparency: boolean,\n): { width: number; height: number } {\n  if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) {\n    throw new OpenAIProtocolError(\"Invalid or oversized generated PNG\");\n  }\n  const bytes = Buffer.from(base64, \"base64\");\n  if (\n    bytes.length < 33 ||\n    !bytes.subarray(0, 8).equals(PNG_SIGNATURE) ||\n    bytes.toString(\"ascii\", 12, 16) !== \"IHDR\"\n  ) {\n    throw new OpenAIProtocolError(\"Image generation did not return a PNG\");\n  }\n  const width = bytes.readUInt32BE(16);\n  const height = bytes.readUInt32BE(20);\n  if (!width || !height || width * height > MAX_IMAGE_PIXELS) {\n    throw new OpenAIProtocolError(\"Generated PNG dimensions exceed the decoding limit\");\n  }\n  let image: PNG;\n  try {\n    image = PNG.sync.read(bytes);\n  } catch {\n    throw new OpenAIProtocolError(\"Image generation returned an invalid PNG\");\n  }\n  if (!requireTransparency) return { width: image.width, height: image.height };\n  // An alpha channel alone can still be fully opaque or have no visible content.\n  let transparent = false;\n  let visible = false;\n  for (let i = 3; i < image.data.length; i += 4) {\n    transparent ||= image.data[i] === 0;\n    visible ||= image.data[i]! > 0;\n    if (transparent && visible) return { width: image.width, height: image.height };\n  }\n  throw new OpenAIProtocolError(\n    \"Image generation did not return visible content on a transparent background\",\n  );\n}\n\nexport async function readStandaloneImageResponse(\n  response: Response,\n  requireTransparency: boolean,\n): Promise<OpenAINormalizedEvent[]> {\n  if (!response.body) throw new OpenAIProtocolError(\"Image response had no body\");\n  const reader = response.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let size = 0;\n  try {\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      size += value.byteLength;\n      if (size > MAX_RESPONSE_BYTES) {\n        await reader.cancel();\n        throw new OpenAIProtocolError(\"Image response exceeded the size limit\");\n      }\n      chunks.push(value);\n    }\n  } finally {\n    reader.releaseLock();\n  }\n  const schema = z.object({\n    data: z\n      .array(z.object({ b64_json: z.string().min(1), revised_prompt: z.string().nullish() }))\n      .min(1)\n      .max(16),\n    quality: z.string().optional(),\n    model: z.string().optional(),\n    background: z.string().optional(),\n    usage: ImageGenerationMetadata.shape.usage,\n  });\n  let parsed: z.infer<typeof schema>;\n  try {\n    parsed = schema.parse(JSON.parse(Buffer.concat(chunks).toString(\"utf8\")));\n  } catch {\n    throw new OpenAIProtocolError(\"Invalid standalone image response\");\n  }\n  const background = parsed.background ?? (requireTransparency ? \"transparent\" : undefined);\n  return parsed.data.map((item, index) => {\n    const dimensions = inspectGeneratedPng(item.b64_json, requireTransparency);\n    return {\n      type: \"image\",\n      base64: item.b64_json,\n      mimeType: \"image/png\",\n      ...(item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {}),\n      generation: {\n        route: \"codex-images\",\n        model: parsed.model ?? \"gpt-image-2\",\n        ...(background ? { background } : {}),\n        size: `${dimensions.width}x${dimensions.height}`,\n        ...(parsed.quality ? { quality: parsed.quality } : {}),\n        ...(index === 0 && parsed.usage ? { usage: parsed.usage } : {}),\n      },\n    };\n  });\n}\n"],"mappings":";;;;;AAYA,MAAM,gBAAgB,KAAK,OAAO;AAClC,MAAM,mBAAmB,OAAO;AAChC,MAAM,qBAAqB,KAAK,OAAO;AACvC,MAAM,gBAAgB,OAAO,KAAK;CAAC;CAAK;CAAI;CAAI;CAAI;CAAI;CAAI;CAAI;AAAE,CAAC;AAEnE,SAAgB,4BAA4B,SAAiC;CAC3E,IAAI,QAAQ,gBAAgB,QAAQ,OAAO,QACzC,MAAM,IAAI,oBACR,yEACF;CAEF,IAAI,CAAC,QAAQ,iBACX,MAAM,IAAI,oBAAoB,0DAA0D;CAE1F,MAAM,WAAW,OAAO,QAAQ,oBAAoB,WAAW,QAAQ,kBAAkB,CAAC;CAC1F,IAAI,QAAQ,UAAU,iBAAiB,SAAS,eAAe,eAC7D,MAAM,IAAI,oBACR,sEACF;CAEF,IAAI,SAAS,iBAAiB,SAAS,kBAAkB,OACvD,MAAM,IAAI,oBAAoB,sDAAsD;CAEtF,MAAM,OAAiB,CAAC;CACxB,MAAM,SAAuC,CAAC;CAC9C,IAAI,QAAQ,cAAc,KAAK,KAAK,yBAAyB,QAAQ,cAAc;CACnF,KAAK,MAAM,QAAQ,QAAQ,SAAS;EAClC,IAAI,KAAK,SAAS,aAAa;EAC/B,IAAI,KAAK,SAAS,2BAA2B,OAAO,KAAK,WAAW,UAAU;GAC5E,OAAO,KAAK,EACV,WAAW,QAAQ,cAAc,KAAK,QAAQ,KAAK,aAAa,EAAE,UAAU,KAAK,SACnF,CAAC;GACD;EACF;EACA,IAAI,KAAK,SAAS,aAAa,OAAO,KAAK,SAAS,UAClD,MAAM,IAAI,oBACR,+DACF;EAEF,IAAI,OAAO,KAAK,YAAY,UAAU;GACpC,KAAK,KAAK,GAAG,KAAK,QAAQ,OAAO,KAAK,KAAK,SAAS;GACpD;EACF;EACA,IAAI,CAAC,MAAM,QAAQ,KAAK,OAAO,GAC7B,MAAM,IAAI,oBAAoB,6DAA6D;EAE7F,KAAK,MAAM,QAAQ,KAAK,SAAS;GAC/B,IAAI,CAAC,QAAQ,OAAO,SAAS,UAC3B,MAAM,IAAI,oBAAoB,0DAA0D;GAE1F,IACE;IAAC;IAAc;IAAe;GAAM,CAAC,CAAC,SAAS,KAAK,IAAI,KACxD,OAAO,KAAK,SAAS,UAErB,KAAK,KAAK,GAAG,KAAK,QAAQ,OAAO,KAAK,KAAK,MAAM;QAC5C,IAAI,KAAK,SAAS,iBAAiB,KAAK,SAAS,aAAa;IACnE,MAAM,MAAM,OAAO,KAAK,cAAc,WAAW,KAAK,YAAY,KAAK,WAAW;IAClF,IAAI,OAAO,QAAQ,YAAY,CAAC,8BAA8B,KAAK,GAAG,GACpE,MAAM,IAAI,oBAAoB,wDAAwD;IAExF,OAAO,KAAK,EAAE,WAAW,IAAI,CAAC;GAChC,OACE,MAAM,IAAI,oBAAoB,0DAA0D;EAE5F;CACF;CACA,IAAI,OAAO,SAAS,GAClB,MAAM,IAAI,oBAAoB,8DAA8D;CAC9F,IAAI,CAAC,KAAK,MAAM,SAAS,KAAK,KAAK,CAAC,GAAG,MAAM,IAAI,oBAAoB,uBAAuB;CAC5F,OAAO;EACL,KAAK,4BAA4B,QAC/B,gBACA,WAAW,OAAO,SAAS,UAAU,eACvC;EACA,MAAM;GACJ,OAAO;GACP,QAAQ,KAAK,KAAK,MAAM;GACxB,GAAI,SAAS,aAAa,EAAE,YAAY,SAAS,WAAW,IAAI,CAAC;GACjE,GAAI,SAAS,UAAU,EAAE,SAAS,SAAS,QAAQ,IAAI,CAAC;GACxD,GAAI,SAAS,OAAO,EAAE,MAAM,SAAS,KAAK,IAAI,CAAC;GAC/C,GAAI,OAAO,SAAS,EAAE,OAAO,IAAI,CAAC;EACpC;CACF;AACF;AAEA,SAAS,oBACP,QACA,qBACmC;CACnC,IAAI,OAAO,SAAS,KAAK,KAAK,gBAAgB,CAAC,IAAI,KAAK,CAAC,yBAAyB,KAAK,MAAM,GAC3F,MAAM,IAAI,oBAAoB,oCAAoC;CAEpE,MAAM,QAAQ,OAAO,KAAK,QAAQ,QAAQ;CAC1C,IACE,MAAM,SAAS,MACf,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,aAAa,KAC1C,MAAM,SAAS,SAAS,IAAI,EAAE,MAAM,QAEpC,MAAM,IAAI,oBAAoB,uCAAuC;CAEvE,MAAM,QAAQ,MAAM,aAAa,EAAE;CACnC,MAAM,SAAS,MAAM,aAAa,EAAE;CACpC,IAAI,CAAC,SAAS,CAAC,UAAU,QAAQ,SAAS,kBACxC,MAAM,IAAI,oBAAoB,oDAAoD;CAEpF,IAAI;CACJ,IAAI;EACF,QAAQ,IAAI,KAAK,KAAK,KAAK;CAC7B,QAAQ;EACN,MAAM,IAAI,oBAAoB,0CAA0C;CAC1E;CACA,IAAI,CAAC,qBAAqB,OAAO;EAAE,OAAO,MAAM;EAAO,QAAQ,MAAM;CAAO;CAE5E,IAAI,cAAc;CAClB,IAAI,UAAU;CACd,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,KAAK,QAAQ,KAAK,GAAG;EAC7C,gBAAgB,MAAM,KAAK,OAAO;EAClC,YAAY,MAAM,KAAK,KAAM;EAC7B,IAAI,eAAe,SAAS,OAAO;GAAE,OAAO,MAAM;GAAO,QAAQ,MAAM;EAAO;CAChF;CACA,MAAM,IAAI,oBACR,6EACF;AACF;AAEA,eAAsB,4BACpB,UACA,qBACkC;CAClC,IAAI,CAAC,SAAS,MAAM,MAAM,IAAI,oBAAoB,4BAA4B;CAC9E,MAAM,SAAS,SAAS,KAAK,UAAU;CACvC,MAAM,SAAuB,CAAC;CAC9B,IAAI,OAAO;CACX,IAAI;EACF,OAAO,MAAM;GACX,MAAM,EAAE,MAAM,UAAU,MAAM,OAAO,KAAK;GAC1C,IAAI,MAAM;GACV,QAAQ,MAAM;GACd,IAAI,OAAO,oBAAoB;IAC7B,MAAM,OAAO,OAAO;IACpB,MAAM,IAAI,oBAAoB,wCAAwC;GACxE;GACA,OAAO,KAAK,KAAK;EACnB;CACF,UAAU;EACR,OAAO,YAAY;CACrB;CACA,MAAM,SAAS,EAAE,OAAO;EACtB,MAAM,EACH,MAAM,EAAE,OAAO;GAAE,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;GAAG,gBAAgB,EAAE,OAAO,CAAC,CAAC,QAAQ;EAAE,CAAC,CAAC,CAAC,CACtF,IAAI,CAAC,CAAC,CACN,IAAI,EAAE;EACT,SAAS,EAAE,OAAO,CAAC,CAAC,SAAS;EAC7B,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS;EAC3B,YAAY,EAAE,OAAO,CAAC,CAAC,SAAS;EAChC,OAAO,wBAAwB,MAAM;CACvC,CAAC;CACD,IAAI;CACJ,IAAI;EACF,SAAS,OAAO,MAAM,KAAK,MAAM,OAAO,OAAO,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC;CAC1E,QAAQ;EACN,MAAM,IAAI,oBAAoB,mCAAmC;CACnE;CACA,MAAM,aAAa,OAAO,eAAe,sBAAsB,gBAAgB;CAC/E,OAAO,OAAO,KAAK,KAAK,MAAM,UAAU;EACtC,MAAM,aAAa,oBAAoB,KAAK,UAAU,mBAAmB;EACzE,OAAO;GACL,MAAM;GACN,QAAQ,KAAK;GACb,UAAU;GACV,GAAI,KAAK,iBAAiB,EAAE,eAAe,KAAK,eAAe,IAAI,CAAC;GACpE,YAAY;IACV,OAAO;IACP,OAAO,OAAO,SAAS;IACvB,GAAI,aAAa,EAAE,WAAW,IAAI,CAAC;IACnC,MAAM,GAAG,WAAW,MAAM,GAAG,WAAW;IACxC,GAAI,OAAO,UAAU,EAAE,SAAS,OAAO,QAAQ,IAAI,CAAC;IACpD,GAAI,UAAU,KAAK,OAAO,QAAQ,EAAE,OAAO,OAAO,MAAM,IAAI,CAAC;GAC/D;EACF;CACF,CAAC;AACH"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TokenModel } from "../../../application/token/token.model.js";
|
|
2
|
-
import { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from "./openai-constants.js";
|
|
3
2
|
import { deactivateAuthDeadToken } from "../../../application/qgrid/token-death.js";
|
|
3
|
+
import { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from "./openai-constants.js";
|
|
4
4
|
import { getLogger } from "@logtape/logtape";
|
|
5
5
|
//#region src/utils/providers/openai/openai-refresh.ts
|
|
6
6
|
/**
|
|
@@ -16,7 +16,7 @@ function result(content: QgridContent[]): QueryOutput {
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
describe("
|
|
19
|
+
describe("image cost estimates", () => {
|
|
20
20
|
it("accepts size hints without promising public API resolution limits", () => {
|
|
21
21
|
for (const size of ["auto", "1152x2560", "841x1870", "2160x3840"]) {
|
|
22
22
|
expect(QueryInput.parse({ prompt: "draw", imageGenerationOptions: { size } }).imageGenerationOptions?.size).toBe(size);
|
|
@@ -26,14 +26,15 @@ describe("standalone image cost estimates", () => {
|
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
28
|
|
|
29
|
-
it("
|
|
29
|
+
it("uses the default size price for custom/auto hints and prices hosted output without usage", () => {
|
|
30
30
|
const output = result([{ type: "image", data: "png" }]);
|
|
31
31
|
for (const size of ["auto", "1152x2560"] as const) {
|
|
32
|
-
expect(estimateImageGenerationCostMicroUsd(output, { size })).
|
|
32
|
+
expect(estimateImageGenerationCostMicroUsd(output, { size })).toBe(41_000);
|
|
33
|
+
expect(imageGenerationCostMethod({ size }, output)).toBe("assumed:gpt-image-2:medium:1536x1024:png");
|
|
33
34
|
}
|
|
34
35
|
expect(estimateImageGenerationCostMicroUsd(result([{ type: "image", data: "png", generation: {
|
|
35
36
|
route: "codex-responses", size: "841x1870", quality: "low",
|
|
36
|
-
} }]), options)).
|
|
37
|
+
} }]), options)).toBe(211_000);
|
|
37
38
|
});
|
|
38
39
|
it("accepts automatic image mode while preserving boolean requests", () => {
|
|
39
40
|
for (const imageGeneration of [true, false, "auto"] as const) {
|
|
@@ -41,9 +42,9 @@ describe("standalone image cost estimates", () => {
|
|
|
41
42
|
}
|
|
42
43
|
expect(QueryInput.safeParse({ prompt: "chat", imageGeneration: "required" }).success).toBe(false);
|
|
43
44
|
});
|
|
44
|
-
it("uses
|
|
45
|
+
it.each(["codex-images", "codex-responses"] as const)("uses %s usage once for multiple outputs instead of size or driver tokens", (route) => {
|
|
45
46
|
const output = result([
|
|
46
|
-
{ type: "image", data: "first", generation: { ...generation,
|
|
47
|
+
{ type: "image", data: "first", generation: { ...generation, route,
|
|
47
48
|
usage: { input_tokens: 100, output_tokens: 200, total_tokens: 300,
|
|
48
49
|
input_tokens_details: { text_tokens: 40, image_tokens: 60, cached_tokens: 50 } },
|
|
49
50
|
} },
|
|
@@ -55,8 +56,18 @@ describe("standalone image cost estimates", () => {
|
|
|
55
56
|
);
|
|
56
57
|
});
|
|
57
58
|
|
|
58
|
-
it("
|
|
59
|
-
|
|
59
|
+
it("falls back to per-image pricing when standalone usage is missing", () => {
|
|
60
|
+
const output = result([{ type: "image", data: "png", generation }]);
|
|
61
|
+
expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(211_000);
|
|
62
|
+
expect(imageGenerationCostMethod(options, output)).toBe("assumed:gpt-image-2:high:1024x1024:png");
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it("respects reported zero usage instead of applying a per-image price", () => {
|
|
66
|
+
const output = result([{ type: "image", data: "png", generation: { ...generation,
|
|
67
|
+
usage: { input_tokens: 0, output_tokens: 0, total_tokens: 0 },
|
|
68
|
+
} }]);
|
|
69
|
+
expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(0);
|
|
70
|
+
expect(imageGenerationCostMethod(options, output)).toBe("estimated:gpt-image-2:reported-usage:public-prices:conservative");
|
|
60
71
|
});
|
|
61
72
|
|
|
62
73
|
it("prices unknown input remainder at the image rate and ignores inconsistent splits", () => {
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type ImageGenerationOptions,
|
|
3
3
|
type ImageGenerationQuality,
|
|
4
|
-
type ImageGenerationSize,
|
|
5
4
|
type QueryOutput,
|
|
6
5
|
} from "./qgrid.types";
|
|
7
6
|
|
|
8
7
|
export const CODEX_IMAGE_GENERATION_MODEL = "gpt-image-2";
|
|
9
8
|
export const DEFAULT_IMAGE_GENERATION_QUALITY: ImageGenerationQuality = "medium";
|
|
10
|
-
export const DEFAULT_IMAGE_GENERATION_SIZE
|
|
9
|
+
export const DEFAULT_IMAGE_GENERATION_SIZE = "1536x1024";
|
|
10
|
+
|
|
11
|
+
type PricedImageSize = "1024x1024" | "1024x1536" | "1536x1024";
|
|
11
12
|
|
|
12
13
|
export type ResolvedImageGenerationOptions = {
|
|
13
14
|
quality: ImageGenerationQuality;
|
|
14
|
-
size:
|
|
15
|
+
size: PricedImageSize;
|
|
15
16
|
};
|
|
16
17
|
|
|
17
18
|
// OpenAI gpt-image-2 image output cost estimates by quality/size:
|
|
18
19
|
// https://developers.openai.com/api/docs/guides/image-generation#calculating-costs
|
|
19
20
|
const IMAGE_OUTPUT_COST_MICRO_USD: Record<
|
|
20
21
|
ImageGenerationQuality,
|
|
21
|
-
|
|
22
|
+
Record<PricedImageSize, number>
|
|
22
23
|
> = {
|
|
23
24
|
low: {
|
|
24
25
|
"1024x1024": 6_000,
|
|
@@ -40,31 +41,27 @@ const IMAGE_OUTPUT_COST_MICRO_USD: Record<
|
|
|
40
41
|
export function resolveImageGenerationOptions(
|
|
41
42
|
options: ImageGenerationOptions | undefined,
|
|
42
43
|
): ResolvedImageGenerationOptions {
|
|
44
|
+
const size = options?.size;
|
|
43
45
|
return {
|
|
44
46
|
quality: options?.quality ?? DEFAULT_IMAGE_GENERATION_QUALITY,
|
|
45
|
-
|
|
47
|
+
// Unknown/custom sizes use the default price, without changing output hints.
|
|
48
|
+
size:
|
|
49
|
+
size === "1024x1024" || size === "1024x1536" || size === "1536x1024"
|
|
50
|
+
? size
|
|
51
|
+
: DEFAULT_IMAGE_GENERATION_SIZE,
|
|
46
52
|
};
|
|
47
53
|
}
|
|
48
54
|
|
|
49
55
|
export function imageGenerationCostMethod(
|
|
50
56
|
options: ImageGenerationOptions | undefined,
|
|
51
57
|
result?: QueryOutput,
|
|
52
|
-
): string
|
|
53
|
-
if (
|
|
54
|
-
result?.content.some(
|
|
55
|
-
(item) => item.type === "image" && item.generation?.route === "codex-responses",
|
|
56
|
-
)
|
|
57
|
-
)
|
|
58
|
-
return null;
|
|
58
|
+
): string {
|
|
59
59
|
if (
|
|
60
|
-
result?.content.some(
|
|
61
|
-
(item) => item.type === "image" && item.generation?.route === "codex-images",
|
|
62
|
-
)
|
|
60
|
+
result?.content.some((item) => item.type === "image" && item.generation?.usage !== undefined)
|
|
63
61
|
) {
|
|
64
62
|
return "estimated:gpt-image-2:reported-usage:public-prices:conservative";
|
|
65
63
|
}
|
|
66
64
|
const resolved = resolveImageGenerationOptions(options);
|
|
67
|
-
if (IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size] === undefined) return null;
|
|
68
65
|
return `assumed:${CODEX_IMAGE_GENERATION_MODEL}:${resolved.quality}:${resolved.size}:png`;
|
|
69
66
|
}
|
|
70
67
|
|
|
@@ -75,14 +72,10 @@ export function estimateImageGenerationCostMicroUsd(
|
|
|
75
72
|
const images = result.content.filter((item) => item.type === "image");
|
|
76
73
|
const imageCount = images.length;
|
|
77
74
|
if (imageCount === 0) return null;
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (images.some((image) => image.generation?.route === "codex-images")) {
|
|
82
|
-
// The standalone response's aggregate usage is carried by its first image only.
|
|
75
|
+
const usage = images.find((image) => image.generation?.usage)?.generation?.usage;
|
|
76
|
+
if (usage) {
|
|
77
|
+
// Response-level image usage is carried by its first image only.
|
|
83
78
|
// Do not multiply it by output count or price it as the requested text driver.
|
|
84
|
-
const usage = images.find((image) => image.generation?.usage)?.generation?.usage;
|
|
85
|
-
if (!usage) return null;
|
|
86
79
|
// Public GPT Image 2 rates verified 2026-09-08: text input $5/M, image input
|
|
87
80
|
// $8/M, output $30/M. Amounts below are microUSD, so no /1M conversion.
|
|
88
81
|
// https://developers.openai.com/api/docs/pricing#image-generation
|
|
@@ -99,5 +92,5 @@ export function estimateImageGenerationCostMicroUsd(
|
|
|
99
92
|
}
|
|
100
93
|
const resolved = resolveImageGenerationOptions(options);
|
|
101
94
|
const unitCost = IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size];
|
|
102
|
-
return
|
|
95
|
+
return imageCount * unitCost;
|
|
103
96
|
}
|
|
@@ -19,14 +19,16 @@ it("logs observed standalone settings separately from requested controls without
|
|
|
19
19
|
});
|
|
20
20
|
|
|
21
21
|
describe("qgrid response log formatting", () => {
|
|
22
|
-
it("keeps custom requests and
|
|
22
|
+
it("keeps custom requests and observations separate from fallback price assumptions", () => {
|
|
23
23
|
const args = { prompt: "draw in 9:20", imageGenerationOptions: { size: "1152x2560" } };
|
|
24
24
|
const generation = { route: "codex-responses" as const, size: "841x1870", quality: "low" };
|
|
25
25
|
const observed = JSON.parse(imageGenerationToolArgs(args, { generation }));
|
|
26
26
|
expect(observed.requestedOptions.size).toBe("1152x2560");
|
|
27
27
|
expect(observed.observedGeneration).toEqual(generation);
|
|
28
28
|
expect(observed).not.toHaveProperty("pricingAssumption");
|
|
29
|
-
expect(JSON.parse(imageGenerationToolArgs(args))).
|
|
29
|
+
expect(JSON.parse(imageGenerationToolArgs(args)).pricingAssumption).toEqual({
|
|
30
|
+
model: "gpt-image-2", quality: "medium", size: "1536x1024",
|
|
31
|
+
});
|
|
30
32
|
});
|
|
31
33
|
it("logs the returned MIME and requested output format", () => {
|
|
32
34
|
expect(formatImagePartForLog({ type: "image", data: "webp", mediaType: "image/webp" })).toContain("data:image/webp;base64,webp");
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
CODEX_IMAGE_GENERATION_MODEL,
|
|
3
|
-
imageGenerationCostMethod,
|
|
4
3
|
resolveImageGenerationOptions,
|
|
5
4
|
} from "./qgrid-image-generation";
|
|
6
5
|
import {
|
|
@@ -63,15 +62,13 @@ export function imageGenerationToolArgs(
|
|
|
63
62
|
...(args.imageGenerationOptions ? { requestedOptions: args.imageGenerationOptions } : {}),
|
|
64
63
|
...(options.generation
|
|
65
64
|
? { observedGeneration: options.generation }
|
|
66
|
-
:
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
: {}),
|
|
65
|
+
: {
|
|
66
|
+
pricingAssumption: {
|
|
67
|
+
model: CODEX_IMAGE_GENERATION_MODEL,
|
|
68
|
+
quality: resolved.quality,
|
|
69
|
+
size: resolved.size,
|
|
70
|
+
},
|
|
71
|
+
}),
|
|
75
72
|
});
|
|
76
73
|
}
|
|
77
74
|
|
|
@@ -436,13 +436,15 @@ describe("qgrid run lifecycle TTFT", () => {
|
|
|
436
436
|
);
|
|
437
437
|
});
|
|
438
438
|
|
|
439
|
-
it("
|
|
439
|
+
it("stores the hosted per-image estimate when image usage is absent", async () => {
|
|
440
440
|
await afterQuery(
|
|
441
441
|
10,
|
|
442
442
|
2,
|
|
443
443
|
{ prompt: "draw", imageGeneration: true },
|
|
444
444
|
queryOutput({
|
|
445
|
-
content: [{ type: "image", data: "iVBORw0KGgoBAgM", revisedPrompt: "green triangle"
|
|
445
|
+
content: [{ type: "image", data: "iVBORw0KGgoBAgM", revisedPrompt: "green triangle",
|
|
446
|
+
generation: { route: "codex-responses", size: "841x1870" },
|
|
447
|
+
}],
|
|
446
448
|
}),
|
|
447
449
|
);
|
|
448
450
|
|
|
@@ -456,36 +458,67 @@ describe("qgrid run lifecycle TTFT", () => {
|
|
|
456
458
|
);
|
|
457
459
|
});
|
|
458
460
|
|
|
459
|
-
it(
|
|
461
|
+
it.each([
|
|
462
|
+
["openai/gpt-5.5", "transparent"],
|
|
463
|
+
["openai/gpt-image-2", "opaque"],
|
|
464
|
+
] as const)("keeps standalone %s accounting out of text usage and records image usage once", async (model, background) => {
|
|
460
465
|
const generation = {
|
|
461
466
|
route: "codex-images" as const, model: "gpt-image-2" as const,
|
|
462
|
-
size: "1254x1254", quality: "medium", background
|
|
467
|
+
size: "1254x1254", quality: "medium", background,
|
|
463
468
|
};
|
|
464
469
|
aggregateStepUsageMock.mockResolvedValueOnce({
|
|
465
470
|
input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_creation_tokens: 0,
|
|
466
471
|
duration_ms: 120, fallback_count: 0, cost_usd: 0, cost_source: "pricing_table",
|
|
467
472
|
});
|
|
468
473
|
await afterQuery(10, 0, {
|
|
469
|
-
prompt: "draw", model
|
|
470
|
-
imageGenerationOptions: { quality: "high", size: "1024x1024", background
|
|
474
|
+
prompt: "draw", model, imageGeneration: true,
|
|
475
|
+
imageGenerationOptions: { quality: "high", size: "1024x1024", background },
|
|
471
476
|
}, queryOutput({
|
|
472
|
-
model: "gpt-image-2",
|
|
477
|
+
model: "gpt-image-2", costUsd: 0,
|
|
473
478
|
usage: { input_tokens: 0, output_tokens: 0, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
|
|
474
479
|
content: [
|
|
475
480
|
{ type: "image", data: "first", generation: { ...generation, usage: {
|
|
476
481
|
input_tokens: 10, output_tokens: 100, total_tokens: 110,
|
|
482
|
+
input_tokens_details: { text_tokens: 4, image_tokens: 6 },
|
|
477
483
|
} } },
|
|
478
484
|
{ type: "image", data: "second", generation },
|
|
479
485
|
],
|
|
480
486
|
}));
|
|
481
487
|
expect(appendStepMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
482
|
-
type: "generate", model_name: "openai/gpt-image-2", requested_model_name:
|
|
488
|
+
type: "generate", model_name: "openai/gpt-image-2", requested_model_name: model,
|
|
483
489
|
input_tokens: 0, output_tokens: 0, cost_usd: 0,
|
|
484
490
|
}));
|
|
485
491
|
expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
486
|
-
input_tokens: 0, output_tokens: 0, cost_usd: 0, image_cost_usd:
|
|
492
|
+
input_tokens: 0, output_tokens: 0, cost_usd: 0, image_cost_usd: 3_068,
|
|
493
|
+
image_cost_method: "estimated:gpt-image-2:reported-usage:public-prices:conservative",
|
|
494
|
+
}));
|
|
495
|
+
});
|
|
496
|
+
|
|
497
|
+
it("records auto chat driver cost and standalone image usage cost separately", async () => {
|
|
498
|
+
aggregateStepUsageMock.mockResolvedValueOnce({
|
|
499
|
+
input_tokens: 100, output_tokens: 20, cache_read_tokens: 0, cache_creation_tokens: 0,
|
|
500
|
+
duration_ms: 120, fallback_count: 0, cost_usd: 20, cost_source: "pricing_table",
|
|
501
|
+
});
|
|
502
|
+
await afterQuery(10, 0, {
|
|
503
|
+
prompt: "draw", model: "openai/gpt-6-luna", imageGeneration: "auto",
|
|
504
|
+
}, queryOutput({
|
|
505
|
+
model: "gpt-6-luna", costUsd: 0.00002,
|
|
506
|
+
usage: { input_tokens: 100, output_tokens: 20, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
|
|
507
|
+
content: [{ type: "image", data: "image", generation: {
|
|
508
|
+
route: "codex-images", model: "gpt-image-2", background: "opaque",
|
|
509
|
+
usage: {
|
|
510
|
+
input_tokens: 10, output_tokens: 100, total_tokens: 110,
|
|
511
|
+
input_tokens_details: { text_tokens: 4, image_tokens: 6 },
|
|
512
|
+
},
|
|
513
|
+
} }],
|
|
514
|
+
}));
|
|
515
|
+
expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
516
|
+
model_name: "openai/gpt-6-luna", requested_model_name: "openai/gpt-6-luna",
|
|
517
|
+
input_tokens: 100, output_tokens: 20, cost_usd: 20, image_cost_usd: 3_068,
|
|
518
|
+
is_image_generation: true,
|
|
487
519
|
image_cost_method: "estimated:gpt-image-2:reported-usage:public-prices:conservative",
|
|
488
520
|
}));
|
|
521
|
+
expect(appendStepMock.mock.calls.filter(([, step]) => step.type === "generate")).toHaveLength(1);
|
|
489
522
|
});
|
|
490
523
|
|
|
491
524
|
it("uses requested image quality and size for cost estimate", async () => {
|
|
@@ -609,6 +642,7 @@ describe("qgrid run lifecycle TTFT", () => {
|
|
|
609
642
|
|
|
610
643
|
describe("qgrid run lifecycle terminal rollup", () => {
|
|
611
644
|
beforeEach(() => {
|
|
645
|
+
appendStepMock.mockReset().mockResolvedValue(1);
|
|
612
646
|
aggregateStepUsageMock.mockReset().mockResolvedValue({
|
|
613
647
|
input_tokens: 120,
|
|
614
648
|
output_tokens: 30,
|
|
@@ -624,6 +658,50 @@ describe("qgrid run lifecycle terminal rollup", () => {
|
|
|
624
658
|
finishRunMock.mockReset();
|
|
625
659
|
});
|
|
626
660
|
|
|
661
|
+
it.each(["error", "aborted"] as const)("records a completed chat stage once before %s rollup", async (status) => {
|
|
662
|
+
const args = { prompt: "draw", model: "openai/gpt-6-astra", imageGeneration: "auto" as const };
|
|
663
|
+
const result = queryOutput({ model: "gpt-6-luna", requestedModel: "gpt-6-astra" });
|
|
664
|
+
const completedStep = { stepIndex: 2, result };
|
|
665
|
+
if (status === "error") await finishRunWithError(10, "image failed", args, completedStep);
|
|
666
|
+
else await finishRunAborted(10, args, completedStep);
|
|
667
|
+
expect(appendStepMock).toHaveBeenCalledOnce();
|
|
668
|
+
expect(appendStepMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
669
|
+
step_index: 2, type: "generate", model_name: "openai/gpt-6-luna",
|
|
670
|
+
requested_model_name: "openai/gpt-6-astra", input_tokens: 5, output_tokens: 7,
|
|
671
|
+
cost_usd: 1_000, cost_source: "pricing_table", ttft_ms: 39,
|
|
672
|
+
}));
|
|
673
|
+
expect(appendStepMock.mock.invocationCallOrder[0]).toBeLessThan(aggregateStepUsageMock.mock.invocationCallOrder[0]!);
|
|
674
|
+
expect(finishRunMock).toHaveBeenCalledOnce();
|
|
675
|
+
expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
676
|
+
status, error_message: status === "error" ? "image failed" : "client disconnected",
|
|
677
|
+
token_name: "tok-A", model_name: "openai/gpt-6-luna", requested_model_name: "openai/gpt-6-astra",
|
|
678
|
+
// Existing steps and the final completed driver are rolled up together.
|
|
679
|
+
input_tokens: 120, output_tokens: 30, cost_usd: 7_500, cost_source: "mixed",
|
|
680
|
+
}));
|
|
681
|
+
const finish = finishRunMock.mock.calls[0]![1];
|
|
682
|
+
expect(finish.image_cost_usd).toBeUndefined();
|
|
683
|
+
expect(finish.image_cost_method).toBeUndefined();
|
|
684
|
+
expect(finish.is_image_generation).toBeUndefined();
|
|
685
|
+
});
|
|
686
|
+
|
|
687
|
+
it("still attempts aggregation and terminal status when the completed driver step cannot be logged", async () => {
|
|
688
|
+
appendStepMock.mockRejectedValueOnce(new Error("step write failed"));
|
|
689
|
+
await expect(finishRunWithError(10, "image failed", {
|
|
690
|
+
prompt: "draw", model: "openai/gpt-6-luna",
|
|
691
|
+
}, { stepIndex: 0, result: queryOutput({ model: "gpt-6-luna" }) })).resolves.toBeUndefined();
|
|
692
|
+
expect(aggregateStepUsageMock).toHaveBeenCalledWith(10);
|
|
693
|
+
expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
694
|
+
status: "error", error_message: "image failed", model_name: "openai/gpt-6-luna", token_name: "tok-A",
|
|
695
|
+
}));
|
|
696
|
+
});
|
|
697
|
+
|
|
698
|
+
it("does not replace the original failure when terminal persistence also fails", async () => {
|
|
699
|
+
finishRunMock.mockRejectedValueOnce(new Error("terminal write failed"));
|
|
700
|
+
await expect(finishRunWithError(10, "image failed", { prompt: "draw" }, {
|
|
701
|
+
stepIndex: 0, result: queryOutput(),
|
|
702
|
+
})).resolves.toBeUndefined();
|
|
703
|
+
});
|
|
704
|
+
|
|
627
705
|
it("keeps incurred step usage and cost when a run ends in error", async () => {
|
|
628
706
|
await finishRunWithError(10, "provider failed", {
|
|
629
707
|
prompt: "continue",
|