@cartanova/qgrid-cli 2.10.4 → 2.10.5
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/qgrid/qgrid-image-generation.js +6 -2
- package/bundle/dist/application/qgrid/qgrid-response-format.js +4 -4
- package/bundle/dist/application/qgrid/qgrid.frame.js +2 -2
- package/bundle/dist/application/qgrid/qgrid.types.js +4 -8
- package/bundle/dist/application/request-log/request-log.model.js +21 -15
- package/bundle/dist/utils/providers/openai/openai-backend-protocol.js +19 -8
- package/bundle/src/application/qgrid/qgrid-image-generation.test.ts +18 -0
- package/bundle/src/application/qgrid/qgrid-image-generation.ts +14 -3
- package/bundle/src/application/qgrid/qgrid-response-format.test.ts +9 -0
- package/bundle/src/application/qgrid/qgrid-response-format.ts +10 -7
- package/bundle/src/application/qgrid/qgrid.frame.ts +4 -2
- package/bundle/src/application/qgrid/qgrid.types.ts +14 -4
- package/bundle/src/application/request-log/request-log.model.test.ts +17 -12
- package/bundle/src/application/request-log/request-log.model.ts +8 -2
- package/bundle/src/utils/providers/openai/openai-backend-protocol.test.ts +19 -1
- package/bundle/src/utils/providers/openai/openai-backend-protocol.ts +22 -0
- package/bundle/src/utils/providers/openai/openai-dispatcher.test.ts +12 -0
- package/bundle/web-dist/client/assets/cost-CY2BJEPC.js +1 -0
- package/bundle/web-dist/client/assets/{index-reW8VvJF.js → index-Dxw7DiXF.js} +3 -3
- package/bundle/web-dist/client/assets/logs-3n_U4qnI.js +1 -0
- package/bundle/web-dist/client/assets/{monit-DkABv7PG.js → monit-E8eGW1Sj.js} +1 -1
- package/bundle/web-dist/client/assets/{routes-BRmQ4M3-.js → routes-7spLfIGZ.js} +2 -2
- package/bundle/web-dist/client/assets/{settings-BHvtycEZ.js → settings-BdosZFNC.js} +1 -1
- package/bundle/web-dist/client/assets/{show-qeTIzgDZ.js → show-b2PFNI3D.js} +1 -1
- package/bundle/web-dist/client/assets/{tokens-5Bep_G-w.js → tokens-CBdHb2_U.js} +1 -1
- package/bundle/web-dist/client/assets/{use-oauth-login-flow-Cx-QO25M.js → use-oauth-login-flow-Cyn3YPqW.js} +1 -1
- package/bundle/web-dist/client/index.html +1 -1
- package/bundle/web-dist/server/assets/{cost-CSH_t17I.js → cost-59jBdx-I.js} +8 -3
- package/bundle/web-dist/server/assets/{logs-CagNGTBj.js → logs-CaaWO9-Z.js} +6 -4
- package/bundle/web-dist/server/assets/{monit-DSxs4Jnl.js → monit-CBil92fJ.js} +1 -1
- package/bundle/web-dist/server/assets/{routes-i-sTqXMX.js → routes-DtVf9yqo.js} +3 -3
- package/bundle/web-dist/server/assets/{show-C4jk1Hrp.js → show-8NNdRxhM.js} +1 -1
- package/bundle/web-dist/server/entry-server.generated.js +5 -5
- package/package.json +3 -2
- package/skills/qgrid/SKILL.md +1 -1
- package/skills/qgrid/references/ai-sdk-provider-contract.md +1 -1
- package/skills/qgrid/references/decision-rationale.md +2 -2
- package/skills/qgrid/references/openai-codex-runtime.md +5 -1
- package/bundle/web-dist/client/assets/cost-CpjVoAqp.js +0 -1
- package/bundle/web-dist/client/assets/logs-DDIt97D1.js +0 -1
|
@@ -128,13 +128,24 @@ function normalizeOpenAIEvent(raw) {
|
|
|
128
128
|
};
|
|
129
129
|
if ((type === "response.output_item.added" || type === "response.output_item.done") && event.item && typeof event.item === "object") {
|
|
130
130
|
const item = event.item;
|
|
131
|
-
if (item.type === "image_generation_call" && typeof item.result === "string")
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
131
|
+
if (item.type === "image_generation_call" && typeof item.result === "string") {
|
|
132
|
+
const header = Buffer.from(item.result.slice(0, 32), "base64");
|
|
133
|
+
const size = (header.length >= 24 && header.subarray(0, 8).equals(Buffer.from("89504e470d0a1a0a", "hex")) && header.readUInt32BE(16) > 0 && header.readUInt32BE(20) > 0 ? `${header.readUInt32BE(16)}x${header.readUInt32BE(20)}` : void 0) ?? (typeof item.size === "string" && /^[1-9]\d*x[1-9]\d*$/.test(item.size) ? item.size : void 0);
|
|
134
|
+
return {
|
|
135
|
+
type: "image",
|
|
136
|
+
...typeof item.id === "string" ? { id: item.id } : {},
|
|
137
|
+
base64: item.result,
|
|
138
|
+
mimeType: imageMimeType(item.result, item.output_format),
|
|
139
|
+
generation: {
|
|
140
|
+
route: "codex-responses",
|
|
141
|
+
...size ? { size } : {},
|
|
142
|
+
...typeof item.model === "string" ? { model: item.model } : {},
|
|
143
|
+
...typeof item.quality === "string" ? { quality: item.quality } : {},
|
|
144
|
+
...typeof item.background === "string" ? { background: item.background } : {}
|
|
145
|
+
},
|
|
146
|
+
...typeof item.revised_prompt === "string" ? { revisedPrompt: item.revised_prompt } : typeof item.revisedPrompt === "string" ? { revisedPrompt: item.revisedPrompt } : {}
|
|
147
|
+
};
|
|
148
|
+
}
|
|
138
149
|
return {
|
|
139
150
|
type: "output-item",
|
|
140
151
|
item,
|
|
@@ -162,4 +173,4 @@ function normalizeOpenAIEvent(raw) {
|
|
|
162
173
|
//#endregion
|
|
163
174
|
export { CHATGPT_CODEX_RESPONSES_URL, CODEX_CLI_ORIGINATOR, CODEX_CLI_VERSION, OpenAIProtocolError, buildCodexIdentityHeaders, buildOpenAIResponsesRequest, codexCliUserAgent, imageMimeType, normalizeOpenAIEvent };
|
|
164
175
|
|
|
165
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-backend-protocol.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-backend-protocol.ts"],"sourcesContent":["import os from \"node:os\";\n\nimport { type ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport { type OpenAIEffort } from \"../common/effort\";\n\nexport const CHATGPT_CODEX_RESPONSES_URL =\n  \"https://chatgpt.com/backend-api/codex/responses\" as const;\n\nexport const CODEX_CLI_ORIGINATOR = \"codex_cli_rs\" as const;\nexport const CODEX_CLI_VERSION = \"0.147.0\" as const;\n\nexport interface CodexUserAgentPlatform {\n  osType: string;\n  osVersion: string;\n  architecture: string;\n  terminal: string;\n}\n\nfunction codexPlatform(): CodexUserAgentPlatform {\n  const names: Partial<Record<NodeJS.Platform, string>> = {\n    darwin: \"Mac OS\",\n    linux: \"Linux\",\n    win32: \"Windows\",\n  };\n  const terminal = process.env.TERM_PROGRAM;\n  const terminalVersion = process.env.TERM_PROGRAM_VERSION;\n  return {\n    osType: names[process.platform] ?? process.platform,\n    osVersion: os.release(),\n    architecture: process.arch,\n    terminal: terminal ? `${terminal}${terminalVersion ? `/${terminalVersion}` : \"\"}` : \"unknown\",\n  };\n}\n\n/** Matches the platform/terminal suffix emitted by the pinned Rust Codex CLI. */\nexport function codexCliUserAgent(platform: CodexUserAgentPlatform = codexPlatform()): string {\n  return `codex_cli_rs/${CODEX_CLI_VERSION} (${platform.osType} ${platform.osVersion}; ${platform.architecture}) ${platform.terminal}`;\n}\n\nexport type JsonValue =\n  | null\n  | boolean\n  | number\n  | string\n  | JsonValue[]\n  | { [key: string]: JsonValue };\n\n/** Raw Responses API items. Keeping these opaque preserves the complete conversation history. */\nexport type OpenAIResponseItem = Record<string, unknown>;\n\nexport interface OpenAIOutputSchema {\n  name?: string;\n  schema: JsonValue;\n}\n\nexport interface OpenAIResponsesOptions {\n  model: string;\n  instructions?: string;\n  history: readonly OpenAIResponseItem[];\n  tools?: readonly OpenAIResponseItem[];\n  toolChoice?: string | OpenAIResponseItem;\n  parallelToolCalls?: boolean;\n  reasoning?: {\n    effort?: OpenAIEffort | \"none\";\n    summary?: \"auto\" | \"concise\" | \"detailed\";\n  };\n  verbosity?: \"low\" | \"medium\" | \"high\";\n  serviceTier?: string;\n  promptCacheKey?: string;\n  outputSchema?: OpenAIOutputSchema;\n  imageGeneration?: boolean | OpenAIResponseItem;\n}\n\nexport interface OpenAIResponsesRequest {\n  model: string;\n  instructions?: string;\n  input: OpenAIResponseItem[];\n  tools?: OpenAIResponseItem[];\n  tool_choice: string | OpenAIResponseItem;\n  parallel_tool_calls: boolean;\n  reasoning: OpenAIResponsesOptions[\"reasoning\"] | null;\n  store: false;\n  stream: true;\n  include: string[];\n  service_tier?: string;\n  prompt_cache_key?: string;\n  text?: {\n    verbosity?: \"low\" | \"medium\" | \"high\";\n    format?: {\n      type: \"json_schema\";\n      strict: true;\n      schema: JsonValue;\n      name: string;\n    };\n  };\n}\n\nexport function buildOpenAIResponsesRequest(\n  options: OpenAIResponsesOptions,\n): OpenAIResponsesRequest {\n  const tools = options.tools ? [...options.tools] : [];\n  if (options.imageGeneration) {\n    tools.push(\n      options.imageGeneration === true\n        ? { type: \"image_generation\" }\n        : { type: \"image_generation\", ...options.imageGeneration },\n    );\n  }\n\n  const text =\n    options.verbosity || options.outputSchema\n      ? {\n          ...(options.verbosity ? { verbosity: options.verbosity } : {}),\n          ...(options.outputSchema\n            ? {\n                format: {\n                  type: \"json_schema\" as const,\n                  strict: true as const,\n                  schema: options.outputSchema.schema,\n                  name: options.outputSchema.name ?? \"codex_output_schema\",\n                },\n              }\n            : {}),\n        }\n      : undefined;\n\n  return {\n    model: options.model,\n    ...(options.instructions ? { instructions: options.instructions } : {}),\n    // Copy the array, not its items: raw items must arrive byte-for-byte equivalent.\n    input: [...options.history],\n    ...(tools.length ? { tools } : {}),\n    tool_choice: options.toolChoice ?? \"auto\",\n    parallel_tool_calls: options.parallelToolCalls ?? true,\n    reasoning: options.reasoning ?? null,\n    store: false,\n    stream: true,\n    include: [\"reasoning.encrypted_content\"],\n    ...(options.serviceTier ? { service_tier: options.serviceTier } : {}),\n    ...(options.promptCacheKey ? { prompt_cache_key: options.promptCacheKey } : {}),\n    ...(text ? { text } : {}),\n  };\n}\n\nexport function buildCodexIdentityHeaders(\n  accessToken: string,\n  accountId: string,\n  correlation?: { sessionId?: string; threadId?: string; clientRequestId?: string },\n): Record<string, string> {\n  return {\n    Accept: \"text/event-stream\",\n    Authorization: `Bearer ${accessToken}`,\n    \"ChatGPT-Account-ID\": accountId,\n    \"Content-Type\": \"application/json\",\n    originator: CODEX_CLI_ORIGINATOR,\n    \"User-Agent\": codexCliUserAgent(),\n    ...(correlation?.sessionId ? { \"session-id\": correlation.sessionId } : {}),\n    ...(correlation?.threadId ? { \"thread-id\": correlation.threadId } : {}),\n    ...(correlation?.clientRequestId ? { \"x-client-request-id\": correlation.clientRequestId } : {}),\n  };\n}\n\nexport interface OpenAIUsage {\n  inputTokens: number;\n  cachedInputTokens: number;\n  outputTokens: number;\n  reasoningTokens: number;\n  totalTokens: number;\n}\n\nexport type OpenAINormalizedEvent =\n  | { type: \"created\"; responseId?: string }\n  | { type: \"text-delta\"; text: string; itemId?: string }\n  | {\n      type: \"image\";\n      id?: string;\n      base64: string;\n      mimeType: \"image/png\" | \"image/jpeg\" | \"image/webp\";\n      revisedPrompt?: string;\n      generation?: ImageGenerationMetadata;\n    }\n  | { type: \"output-item\"; item: OpenAIResponseItem; completed?: boolean }\n  | { type: \"completed\"; responseId: string; usage?: OpenAIUsage; model?: string }\n  | { type: \"error\"; error: OpenAIProtocolError };\n\nexport class OpenAIProtocolError extends Error {\n  constructor(\n    message: string,\n    public readonly code?: string,\n    public readonly status?: number,\n    public readonly retryAfterMs?: number,\n  ) {\n    super(message);\n    this.name = \"OpenAIProtocolError\";\n  }\n}\n\nfunction usageFrom(value: unknown): OpenAIUsage | undefined {\n  if (!value || typeof value !== \"object\") return undefined;\n  const usage = value as Record<string, unknown>;\n  const inputDetails = (usage.input_tokens_details ?? {}) as Record<string, unknown>;\n  const outputDetails = (usage.output_tokens_details ?? {}) as Record<string, unknown>;\n  return {\n    inputTokens: Number(usage.input_tokens ?? 0),\n    cachedInputTokens: Number(inputDetails.cached_tokens ?? 0),\n    outputTokens: Number(usage.output_tokens ?? 0),\n    reasoningTokens: Number(outputDetails.reasoning_tokens ?? 0),\n    totalTokens: Number(usage.total_tokens ?? 0),\n  };\n}\n\nexport function imageMimeType(\n  base64: string,\n  outputFormat?: unknown,\n): \"image/png\" | \"image/jpeg\" | \"image/webp\" {\n  // Inspect only the header, without decoding a potentially large image twice.\n  const header = Buffer.from(base64.slice(0, 24), \"base64\");\n  if (header.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10])))\n    return \"image/png\";\n  if (header[0] === 255 && header[1] === 216 && header[2] === 255) return \"image/jpeg\";\n  if (header.toString(\"ascii\", 0, 4) === \"RIFF\" && header.toString(\"ascii\", 8, 12) === \"WEBP\")\n    return \"image/webp\";\n  if (outputFormat === \"jpeg\") return \"image/jpeg\";\n  if (outputFormat === \"webp\") return \"image/webp\";\n  if (outputFormat === undefined || outputFormat === \"png\") return \"image/png\";\n  throw new OpenAIProtocolError(`Unsupported image output format: ${String(outputFormat)}`);\n}\n\nexport function normalizeOpenAIEvent(raw: unknown): OpenAINormalizedEvent | undefined {\n  if (!raw || typeof raw !== \"object\") return undefined;\n  const event = raw as Record<string, unknown>;\n  const type = String(event.type ?? \"\");\n  if (type === \"response.created\") {\n    const response = event.response as Record<string, unknown> | undefined;\n    return { type: \"created\", ...(response?.id ? { responseId: String(response.id) } : {}) };\n  }\n  if (type === \"response.output_text.delta\" && typeof event.delta === \"string\") {\n    return {\n      type: \"text-delta\",\n      text: event.delta,\n      ...(typeof event.item_id === \"string\" ? { itemId: event.item_id } : {}),\n    };\n  }\n  if (\n    (type === \"response.output_item.added\" || type === \"response.output_item.done\") &&\n    event.item &&\n    typeof event.item === \"object\"\n  ) {\n    const item = event.item as OpenAIResponseItem;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      return {\n        type: \"image\",\n        ...(typeof item.id === \"string\" ? { id: item.id } : {}),\n        base64: item.result,\n        mimeType: imageMimeType(item.result, item.output_format),\n        ...(typeof item.revised_prompt === \"string\"\n          ? { revisedPrompt: item.revised_prompt }\n          : typeof item.revisedPrompt === \"string\"\n            ? { revisedPrompt: item.revisedPrompt }\n            : {}),\n      };\n    }\n    return { type: \"output-item\", item, completed: type === \"response.output_item.done\" };\n  }\n  if (type === \"response.completed\") {\n    const response = (event.response ?? {}) as Record<string, unknown>;\n    return {\n      type: \"completed\",\n      responseId: String(response.id ?? \"\"),\n      ...(response.usage ? { usage: usageFrom(response.usage) } : {}),\n      ...(typeof response.model === \"string\" ? { model: response.model } : {}),\n    };\n  }\n  if (type === \"error\" || type === \"response.failed\" || type === \"response.incomplete\") {\n    const source = (event.error ?? event.response ?? event) as Record<string, unknown>;\n    const nested = (source.error ?? source) as Record<string, unknown>;\n    return {\n      type: \"error\",\n      error: new OpenAIProtocolError(\n        String(nested.message ?? `OpenAI stream ended with ${type}`),\n        typeof nested.code === \"string\" ? nested.code : undefined,\n      ),\n    };\n  }\n  return undefined;\n}\n"],"mappings":"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"}
|
|
176
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-backend-protocol.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-backend-protocol.ts"],"sourcesContent":["import os from \"node:os\";\n\nimport { type ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport { type OpenAIEffort } from \"../common/effort\";\n\nexport const CHATGPT_CODEX_RESPONSES_URL =\n  \"https://chatgpt.com/backend-api/codex/responses\" as const;\n\nexport const CODEX_CLI_ORIGINATOR = \"codex_cli_rs\" as const;\nexport const CODEX_CLI_VERSION = \"0.147.0\" as const;\n\nexport interface CodexUserAgentPlatform {\n  osType: string;\n  osVersion: string;\n  architecture: string;\n  terminal: string;\n}\n\nfunction codexPlatform(): CodexUserAgentPlatform {\n  const names: Partial<Record<NodeJS.Platform, string>> = {\n    darwin: \"Mac OS\",\n    linux: \"Linux\",\n    win32: \"Windows\",\n  };\n  const terminal = process.env.TERM_PROGRAM;\n  const terminalVersion = process.env.TERM_PROGRAM_VERSION;\n  return {\n    osType: names[process.platform] ?? process.platform,\n    osVersion: os.release(),\n    architecture: process.arch,\n    terminal: terminal ? `${terminal}${terminalVersion ? `/${terminalVersion}` : \"\"}` : \"unknown\",\n  };\n}\n\n/** Matches the platform/terminal suffix emitted by the pinned Rust Codex CLI. */\nexport function codexCliUserAgent(platform: CodexUserAgentPlatform = codexPlatform()): string {\n  return `codex_cli_rs/${CODEX_CLI_VERSION} (${platform.osType} ${platform.osVersion}; ${platform.architecture}) ${platform.terminal}`;\n}\n\nexport type JsonValue =\n  | null\n  | boolean\n  | number\n  | string\n  | JsonValue[]\n  | { [key: string]: JsonValue };\n\n/** Raw Responses API items. Keeping these opaque preserves the complete conversation history. */\nexport type OpenAIResponseItem = Record<string, unknown>;\n\nexport interface OpenAIOutputSchema {\n  name?: string;\n  schema: JsonValue;\n}\n\nexport interface OpenAIResponsesOptions {\n  model: string;\n  instructions?: string;\n  history: readonly OpenAIResponseItem[];\n  tools?: readonly OpenAIResponseItem[];\n  toolChoice?: string | OpenAIResponseItem;\n  parallelToolCalls?: boolean;\n  reasoning?: {\n    effort?: OpenAIEffort | \"none\";\n    summary?: \"auto\" | \"concise\" | \"detailed\";\n  };\n  verbosity?: \"low\" | \"medium\" | \"high\";\n  serviceTier?: string;\n  promptCacheKey?: string;\n  outputSchema?: OpenAIOutputSchema;\n  imageGeneration?: boolean | OpenAIResponseItem;\n}\n\nexport interface OpenAIResponsesRequest {\n  model: string;\n  instructions?: string;\n  input: OpenAIResponseItem[];\n  tools?: OpenAIResponseItem[];\n  tool_choice: string | OpenAIResponseItem;\n  parallel_tool_calls: boolean;\n  reasoning: OpenAIResponsesOptions[\"reasoning\"] | null;\n  store: false;\n  stream: true;\n  include: string[];\n  service_tier?: string;\n  prompt_cache_key?: string;\n  text?: {\n    verbosity?: \"low\" | \"medium\" | \"high\";\n    format?: {\n      type: \"json_schema\";\n      strict: true;\n      schema: JsonValue;\n      name: string;\n    };\n  };\n}\n\nexport function buildOpenAIResponsesRequest(\n  options: OpenAIResponsesOptions,\n): OpenAIResponsesRequest {\n  const tools = options.tools ? [...options.tools] : [];\n  if (options.imageGeneration) {\n    tools.push(\n      options.imageGeneration === true\n        ? { type: \"image_generation\" }\n        : { type: \"image_generation\", ...options.imageGeneration },\n    );\n  }\n\n  const text =\n    options.verbosity || options.outputSchema\n      ? {\n          ...(options.verbosity ? { verbosity: options.verbosity } : {}),\n          ...(options.outputSchema\n            ? {\n                format: {\n                  type: \"json_schema\" as const,\n                  strict: true as const,\n                  schema: options.outputSchema.schema,\n                  name: options.outputSchema.name ?? \"codex_output_schema\",\n                },\n              }\n            : {}),\n        }\n      : undefined;\n\n  return {\n    model: options.model,\n    ...(options.instructions ? { instructions: options.instructions } : {}),\n    // Copy the array, not its items: raw items must arrive byte-for-byte equivalent.\n    input: [...options.history],\n    ...(tools.length ? { tools } : {}),\n    tool_choice: options.toolChoice ?? \"auto\",\n    parallel_tool_calls: options.parallelToolCalls ?? true,\n    reasoning: options.reasoning ?? null,\n    store: false,\n    stream: true,\n    include: [\"reasoning.encrypted_content\"],\n    ...(options.serviceTier ? { service_tier: options.serviceTier } : {}),\n    ...(options.promptCacheKey ? { prompt_cache_key: options.promptCacheKey } : {}),\n    ...(text ? { text } : {}),\n  };\n}\n\nexport function buildCodexIdentityHeaders(\n  accessToken: string,\n  accountId: string,\n  correlation?: { sessionId?: string; threadId?: string; clientRequestId?: string },\n): Record<string, string> {\n  return {\n    Accept: \"text/event-stream\",\n    Authorization: `Bearer ${accessToken}`,\n    \"ChatGPT-Account-ID\": accountId,\n    \"Content-Type\": \"application/json\",\n    originator: CODEX_CLI_ORIGINATOR,\n    \"User-Agent\": codexCliUserAgent(),\n    ...(correlation?.sessionId ? { \"session-id\": correlation.sessionId } : {}),\n    ...(correlation?.threadId ? { \"thread-id\": correlation.threadId } : {}),\n    ...(correlation?.clientRequestId ? { \"x-client-request-id\": correlation.clientRequestId } : {}),\n  };\n}\n\nexport interface OpenAIUsage {\n  inputTokens: number;\n  cachedInputTokens: number;\n  outputTokens: number;\n  reasoningTokens: number;\n  totalTokens: number;\n}\n\nexport type OpenAINormalizedEvent =\n  | { type: \"created\"; responseId?: string }\n  | { type: \"text-delta\"; text: string; itemId?: string }\n  | {\n      type: \"image\";\n      id?: string;\n      base64: string;\n      mimeType: \"image/png\" | \"image/jpeg\" | \"image/webp\";\n      revisedPrompt?: string;\n      generation?: ImageGenerationMetadata;\n    }\n  | { type: \"output-item\"; item: OpenAIResponseItem; completed?: boolean }\n  | { type: \"completed\"; responseId: string; usage?: OpenAIUsage; model?: string }\n  | { type: \"error\"; error: OpenAIProtocolError };\n\nexport class OpenAIProtocolError extends Error {\n  constructor(\n    message: string,\n    public readonly code?: string,\n    public readonly status?: number,\n    public readonly retryAfterMs?: number,\n  ) {\n    super(message);\n    this.name = \"OpenAIProtocolError\";\n  }\n}\n\nfunction usageFrom(value: unknown): OpenAIUsage | undefined {\n  if (!value || typeof value !== \"object\") return undefined;\n  const usage = value as Record<string, unknown>;\n  const inputDetails = (usage.input_tokens_details ?? {}) as Record<string, unknown>;\n  const outputDetails = (usage.output_tokens_details ?? {}) as Record<string, unknown>;\n  return {\n    inputTokens: Number(usage.input_tokens ?? 0),\n    cachedInputTokens: Number(inputDetails.cached_tokens ?? 0),\n    outputTokens: Number(usage.output_tokens ?? 0),\n    reasoningTokens: Number(outputDetails.reasoning_tokens ?? 0),\n    totalTokens: Number(usage.total_tokens ?? 0),\n  };\n}\n\nexport function imageMimeType(\n  base64: string,\n  outputFormat?: unknown,\n): \"image/png\" | \"image/jpeg\" | \"image/webp\" {\n  // Inspect only the header, without decoding a potentially large image twice.\n  const header = Buffer.from(base64.slice(0, 24), \"base64\");\n  if (header.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10])))\n    return \"image/png\";\n  if (header[0] === 255 && header[1] === 216 && header[2] === 255) return \"image/jpeg\";\n  if (header.toString(\"ascii\", 0, 4) === \"RIFF\" && header.toString(\"ascii\", 8, 12) === \"WEBP\")\n    return \"image/webp\";\n  if (outputFormat === \"jpeg\") return \"image/jpeg\";\n  if (outputFormat === \"webp\") return \"image/webp\";\n  if (outputFormat === undefined || outputFormat === \"png\") return \"image/png\";\n  throw new OpenAIProtocolError(`Unsupported image output format: ${String(outputFormat)}`);\n}\n\nexport function normalizeOpenAIEvent(raw: unknown): OpenAINormalizedEvent | undefined {\n  if (!raw || typeof raw !== \"object\") return undefined;\n  const event = raw as Record<string, unknown>;\n  const type = String(event.type ?? \"\");\n  if (type === \"response.created\") {\n    const response = event.response as Record<string, unknown> | undefined;\n    return { type: \"created\", ...(response?.id ? { responseId: String(response.id) } : {}) };\n  }\n  if (type === \"response.output_text.delta\" && typeof event.delta === \"string\") {\n    return {\n      type: \"text-delta\",\n      text: event.delta,\n      ...(typeof event.item_id === \"string\" ? { itemId: event.item_id } : {}),\n    };\n  }\n  if (\n    (type === \"response.output_item.added\" || type === \"response.output_item.done\") &&\n    event.item &&\n    typeof event.item === \"object\"\n  ) {\n    const item = event.item as OpenAIResponseItem;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      // PNG exposes dimensions in its fixed header. Other formats retain the\n      // backend's observed size; never substitute requested image controls.\n      const header = Buffer.from(item.result.slice(0, 32), \"base64\");\n      const pngSize =\n        header.length >= 24 &&\n        header.subarray(0, 8).equals(Buffer.from(\"89504e470d0a1a0a\", \"hex\")) &&\n        header.readUInt32BE(16) > 0 &&\n        header.readUInt32BE(20) > 0\n          ? `${header.readUInt32BE(16)}x${header.readUInt32BE(20)}`\n          : undefined;\n      const size =\n        pngSize ??\n        (typeof item.size === \"string\" && /^[1-9]\\d*x[1-9]\\d*$/.test(item.size)\n          ? item.size\n          : undefined);\n      return {\n        type: \"image\",\n        ...(typeof item.id === \"string\" ? { id: item.id } : {}),\n        base64: item.result,\n        mimeType: imageMimeType(item.result, item.output_format),\n        generation: {\n          route: \"codex-responses\",\n          ...(size ? { size } : {}),\n          ...(typeof item.model === \"string\" ? { model: item.model } : {}),\n          ...(typeof item.quality === \"string\" ? { quality: item.quality } : {}),\n          ...(typeof item.background === \"string\" ? { background: item.background } : {}),\n        },\n        ...(typeof item.revised_prompt === \"string\"\n          ? { revisedPrompt: item.revised_prompt }\n          : typeof item.revisedPrompt === \"string\"\n            ? { revisedPrompt: item.revisedPrompt }\n            : {}),\n      };\n    }\n    return { type: \"output-item\", item, completed: type === \"response.output_item.done\" };\n  }\n  if (type === \"response.completed\") {\n    const response = (event.response ?? {}) as Record<string, unknown>;\n    return {\n      type: \"completed\",\n      responseId: String(response.id ?? \"\"),\n      ...(response.usage ? { usage: usageFrom(response.usage) } : {}),\n      ...(typeof response.model === \"string\" ? { model: response.model } : {}),\n    };\n  }\n  if (type === \"error\" || type === \"response.failed\" || type === \"response.incomplete\") {\n    const source = (event.error ?? event.response ?? event) as Record<string, unknown>;\n    const nested = (source.error ?? source) as Record<string, unknown>;\n    return {\n      type: \"error\",\n      error: new OpenAIProtocolError(\n        String(nested.message ?? `OpenAI stream ended with ${type}`),\n        typeof nested.code === \"string\" ? nested.code : undefined,\n      ),\n    };\n  }\n  return undefined;\n}\n"],"mappings":"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"}
|
|
@@ -17,6 +17,24 @@ function result(content: QgridContent[]): QueryOutput {
|
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
describe("standalone image cost estimates", () => {
|
|
20
|
+
it("accepts size hints without promising public API resolution limits", () => {
|
|
21
|
+
for (const size of ["auto", "1152x2560", "841x1870", "2160x3840"]) {
|
|
22
|
+
expect(QueryInput.parse({ prompt: "draw", imageGenerationOptions: { size } }).imageGenerationOptions?.size).toBe(size);
|
|
23
|
+
}
|
|
24
|
+
for (const size of ["9:20", "0x1024", "1.5x1024", "-1x1024", "9007199254740992x1"]) {
|
|
25
|
+
expect(QueryInput.safeParse({ prompt: "draw", imageGenerationOptions: { size } }).success).toBe(false);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it("leaves custom/auto size and observed hosted image costs unknown", () => {
|
|
30
|
+
const output = result([{ type: "image", data: "png" }]);
|
|
31
|
+
for (const size of ["auto", "1152x2560"] as const) {
|
|
32
|
+
expect(estimateImageGenerationCostMicroUsd(output, { size })).toBeNull();
|
|
33
|
+
}
|
|
34
|
+
expect(estimateImageGenerationCostMicroUsd(result([{ type: "image", data: "png", generation: {
|
|
35
|
+
route: "codex-responses", size: "841x1870", quality: "low",
|
|
36
|
+
} }]), options)).toBeNull();
|
|
37
|
+
});
|
|
20
38
|
it("accepts automatic image mode while preserving boolean requests", () => {
|
|
21
39
|
for (const imageGeneration of [true, false, "auto"] as const) {
|
|
22
40
|
expect(QueryInput.parse({ prompt: "chat", imageGeneration }).imageGeneration).toBe(imageGeneration);
|
|
@@ -18,7 +18,7 @@ export type ResolvedImageGenerationOptions = {
|
|
|
18
18
|
// https://developers.openai.com/api/docs/guides/image-generation#calculating-costs
|
|
19
19
|
const IMAGE_OUTPUT_COST_MICRO_USD: Record<
|
|
20
20
|
ImageGenerationQuality,
|
|
21
|
-
Record<ImageGenerationSize, number
|
|
21
|
+
Partial<Record<ImageGenerationSize, number>>
|
|
22
22
|
> = {
|
|
23
23
|
low: {
|
|
24
24
|
"1024x1024": 6_000,
|
|
@@ -49,7 +49,13 @@ export function resolveImageGenerationOptions(
|
|
|
49
49
|
export function imageGenerationCostMethod(
|
|
50
50
|
options: ImageGenerationOptions | undefined,
|
|
51
51
|
result?: QueryOutput,
|
|
52
|
-
): string {
|
|
52
|
+
): string | null {
|
|
53
|
+
if (
|
|
54
|
+
result?.content.some(
|
|
55
|
+
(item) => item.type === "image" && item.generation?.route === "codex-responses",
|
|
56
|
+
)
|
|
57
|
+
)
|
|
58
|
+
return null;
|
|
53
59
|
if (
|
|
54
60
|
result?.content.some(
|
|
55
61
|
(item) => item.type === "image" && item.generation?.route === "codex-images",
|
|
@@ -58,6 +64,7 @@ export function imageGenerationCostMethod(
|
|
|
58
64
|
return "estimated:gpt-image-2:reported-usage:public-prices:conservative";
|
|
59
65
|
}
|
|
60
66
|
const resolved = resolveImageGenerationOptions(options);
|
|
67
|
+
if (IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size] === undefined) return null;
|
|
61
68
|
return `assumed:${CODEX_IMAGE_GENERATION_MODEL}:${resolved.quality}:${resolved.size}:png`;
|
|
62
69
|
}
|
|
63
70
|
|
|
@@ -68,6 +75,9 @@ export function estimateImageGenerationCostMicroUsd(
|
|
|
68
75
|
const images = result.content.filter((item) => item.type === "image");
|
|
69
76
|
const imageCount = images.length;
|
|
70
77
|
if (imageCount === 0) return null;
|
|
78
|
+
// Hosted Responses reports observed settings but no trustworthy image usage
|
|
79
|
+
// or guaranteed image model. Requested size/quality cannot price that output.
|
|
80
|
+
if (images.some((image) => image.generation?.route === "codex-responses")) return null;
|
|
71
81
|
if (images.some((image) => image.generation?.route === "codex-images")) {
|
|
72
82
|
// The standalone response's aggregate usage is carried by its first image only.
|
|
73
83
|
// Do not multiply it by output count or price it as the requested text driver.
|
|
@@ -88,5 +98,6 @@ export function estimateImageGenerationCostMicroUsd(
|
|
|
88
98
|
);
|
|
89
99
|
}
|
|
90
100
|
const resolved = resolveImageGenerationOptions(options);
|
|
91
|
-
|
|
101
|
+
const unitCost = IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size];
|
|
102
|
+
return unitCost === undefined ? null : imageCount * unitCost;
|
|
92
103
|
}
|
|
@@ -19,6 +19,15 @@ 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 hosted observations separate without inventing a price assumption", () => {
|
|
23
|
+
const args = { prompt: "draw in 9:20", imageGenerationOptions: { size: "1152x2560" } };
|
|
24
|
+
const generation = { route: "codex-responses" as const, size: "841x1870", quality: "low" };
|
|
25
|
+
const observed = JSON.parse(imageGenerationToolArgs(args, { generation }));
|
|
26
|
+
expect(observed.requestedOptions.size).toBe("1152x2560");
|
|
27
|
+
expect(observed.observedGeneration).toEqual(generation);
|
|
28
|
+
expect(observed).not.toHaveProperty("pricingAssumption");
|
|
29
|
+
expect(JSON.parse(imageGenerationToolArgs(args))).not.toHaveProperty("pricingAssumption");
|
|
30
|
+
});
|
|
22
31
|
it("logs the returned MIME and requested output format", () => {
|
|
23
32
|
expect(formatImagePartForLog({ type: "image", data: "webp", mediaType: "image/webp" })).toContain("data:image/webp;base64,webp");
|
|
24
33
|
expect(JSON.parse(imageGenerationToolArgs({ prompt: "draw", imageGenerationOptions: { outputFormat: "webp" } })).tool.outputFormat).toBe("webp");
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
CODEX_IMAGE_GENERATION_MODEL,
|
|
3
|
+
imageGenerationCostMethod,
|
|
3
4
|
resolveImageGenerationOptions,
|
|
4
5
|
} from "./qgrid-image-generation";
|
|
5
6
|
import {
|
|
@@ -62,13 +63,15 @@ export function imageGenerationToolArgs(
|
|
|
62
63
|
...(args.imageGenerationOptions ? { requestedOptions: args.imageGenerationOptions } : {}),
|
|
63
64
|
...(options.generation
|
|
64
65
|
? { observedGeneration: options.generation }
|
|
65
|
-
:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
66
|
+
: imageGenerationCostMethod(args.imageGenerationOptions)
|
|
67
|
+
? {
|
|
68
|
+
pricingAssumption: {
|
|
69
|
+
model: CODEX_IMAGE_GENERATION_MODEL,
|
|
70
|
+
quality: resolved.quality,
|
|
71
|
+
size: resolved.size,
|
|
72
|
+
},
|
|
73
|
+
}
|
|
74
|
+
: {}),
|
|
72
75
|
});
|
|
73
76
|
}
|
|
74
77
|
|
|
@@ -500,8 +500,10 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
500
500
|
// 화면의 목록 필터를 그대로 받아 같은 조건의 합계를 돌려준다 — 목록과 비용이
|
|
501
501
|
// 서로 다른 모수를 보면 사용자에게는 숫자가 어긋난 것으로 읽힌다.
|
|
502
502
|
@api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
|
|
503
|
-
async totalCost(
|
|
504
|
-
|
|
503
|
+
async totalCost(
|
|
504
|
+
params?: RequestLogListParams,
|
|
505
|
+
): Promise<{ usd: number; unknownImageCostCount: number }> {
|
|
506
|
+
return RequestLogModel.totalCost(params);
|
|
505
507
|
}
|
|
506
508
|
|
|
507
509
|
@api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
|
|
@@ -12,10 +12,10 @@ export const QgridTool = z.object({
|
|
|
12
12
|
});
|
|
13
13
|
export type QgridTool = z.infer<typeof QgridTool>;
|
|
14
14
|
|
|
15
|
-
// Observed
|
|
15
|
+
// Observed image response values, distinct from requested generation hints.
|
|
16
16
|
export const ImageGenerationMetadata = z.object({
|
|
17
|
-
route: z.
|
|
18
|
-
model: z.
|
|
17
|
+
route: z.enum(["codex-images", "codex-responses"]),
|
|
18
|
+
model: z.string().optional(),
|
|
19
19
|
background: z.string().optional(),
|
|
20
20
|
quality: z.string().optional(),
|
|
21
21
|
size: z.string().optional(),
|
|
@@ -79,7 +79,17 @@ export type ServiceTier = z.infer<typeof ServiceTier>;
|
|
|
79
79
|
export const ImageGenerationQuality = z.enum(["low", "medium", "high"]);
|
|
80
80
|
export type ImageGenerationQuality = z.infer<typeof ImageGenerationQuality>;
|
|
81
81
|
|
|
82
|
-
|
|
82
|
+
// Subscription-backend hints, not public Images API resolution guarantees.
|
|
83
|
+
export const ImageGenerationSize = z.union([
|
|
84
|
+
z.literal("auto"),
|
|
85
|
+
z
|
|
86
|
+
.string()
|
|
87
|
+
.regex(/^[1-9]\d*x[1-9]\d*$/)
|
|
88
|
+
.refine(
|
|
89
|
+
(size) => size.split("x").every((edge) => Number.isSafeInteger(Number(edge))),
|
|
90
|
+
"Image dimensions must be positive safe integers",
|
|
91
|
+
),
|
|
92
|
+
]);
|
|
83
93
|
export type ImageGenerationSize = z.infer<typeof ImageGenerationSize>;
|
|
84
94
|
|
|
85
95
|
export const ImageGenerationOptions = z
|
|
@@ -564,7 +564,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
564
564
|
* @param confirmedTotal SUM 쿼리가 돌려줄 micro-USD 합계
|
|
565
565
|
* @param legacyRows 재계산 대상 row 들
|
|
566
566
|
*/
|
|
567
|
-
function mockTotalCostQueries(confirmedTotal: number, legacyRows: unknown[]) {
|
|
567
|
+
function mockTotalCostQueries(confirmedTotal: number, legacyRows: unknown[], unknownImageCostCount = 0) {
|
|
568
568
|
// subset qb 는 SELECT 를 비우고(clear) 집계/축소된 컬럼만 다시 얹는다 — 구현과 같은 체인.
|
|
569
569
|
const sumChain = {
|
|
570
570
|
where: vi.fn(),
|
|
@@ -572,7 +572,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
572
572
|
whereRaw: vi.fn(),
|
|
573
573
|
clear: vi.fn(),
|
|
574
574
|
select: vi.fn(),
|
|
575
|
-
first: vi.fn(async () => ({ total: confirmedTotal })),
|
|
575
|
+
first: vi.fn(async () => ({ total: confirmedTotal, unknownImageCostCount })),
|
|
576
576
|
};
|
|
577
577
|
sumChain.where.mockReturnValue(sumChain);
|
|
578
578
|
sumChain.whereIn.mockReturnValue(sumChain);
|
|
@@ -606,7 +606,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
606
606
|
it("uses exact stored cost for rows with a cost source", async () => {
|
|
607
607
|
mockTotalCostQueries(3_000, []);
|
|
608
608
|
|
|
609
|
-
await expect(RequestLogModel.totalCost()).resolves.
|
|
609
|
+
await expect(RequestLogModel.totalCost()).resolves.toEqual({ usd: 0.003, unknownImageCostCount: 0 });
|
|
610
610
|
});
|
|
611
611
|
|
|
612
612
|
it("sums every row in SQL without a cost_source predicate", async () => {
|
|
@@ -637,7 +637,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
637
637
|
},
|
|
638
638
|
]);
|
|
639
639
|
|
|
640
|
-
await expect(RequestLogModel.totalCost()).resolves.toBeCloseTo(0.4725, 10);
|
|
640
|
+
await expect(RequestLogModel.totalCost().then((result) => result.usd)).resolves.toBeCloseTo(0.4725, 10);
|
|
641
641
|
});
|
|
642
642
|
|
|
643
643
|
it("adds only the delta for legacy rows already counted in the SQL sum", async () => {
|
|
@@ -656,7 +656,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
656
656
|
},
|
|
657
657
|
]);
|
|
658
658
|
|
|
659
|
-
await expect(RequestLogModel.totalCost()).resolves.toBeCloseTo(0.4725, 10);
|
|
659
|
+
await expect(RequestLogModel.totalCost().then((result) => result.usd)).resolves.toBeCloseTo(0.4725, 10);
|
|
660
660
|
});
|
|
661
661
|
|
|
662
662
|
it("leaves the stored value untouched for legacy rows without a model name", async () => {
|
|
@@ -675,7 +675,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
675
675
|
},
|
|
676
676
|
]);
|
|
677
677
|
|
|
678
|
-
await expect(RequestLogModel.totalCost()).resolves.toBeCloseTo(0.005, 10);
|
|
678
|
+
await expect(RequestLogModel.totalCost().then((result) => result.usd)).resolves.toBeCloseTo(0.005, 10);
|
|
679
679
|
});
|
|
680
680
|
|
|
681
681
|
it("applies list filters to both cost queries so totals match the filtered list", async () => {
|
|
@@ -721,7 +721,7 @@ describe("RequestLogModel cost provenance", () => {
|
|
|
721
721
|
},
|
|
722
722
|
]);
|
|
723
723
|
|
|
724
|
-
await expect(RequestLogModel.totalCost()).resolves.toBeCloseTo(0.4755, 10);
|
|
724
|
+
await expect(RequestLogModel.totalCost().then((result) => result.usd)).resolves.toBeCloseTo(0.4755, 10);
|
|
725
725
|
});
|
|
726
726
|
});
|
|
727
727
|
|
|
@@ -738,10 +738,13 @@ describe("RequestLogModel PostgreSQL", () => {
|
|
|
738
738
|
{ cost_usd: 5_000, image_cost_usd: 10_000, cost_source: "provider" },
|
|
739
739
|
{ cost_usd: 1_000, image_cost_usd: 20_000, cost_source: null },
|
|
740
740
|
{ cost_usd: 900_000, image_cost_usd: 700_000, cost_source: null },
|
|
741
|
+
{ cost_usd: 1_000, image_cost_usd: null, cost_source: "provider", is_image_generation: true },
|
|
742
|
+
{ cost_usd: 2_000, image_cost_usd: null, cost_source: "provider", is_image_generation: false },
|
|
743
|
+
{ cost_usd: 500_000, image_cost_usd: null, cost_source: "provider", is_image_generation: true },
|
|
741
744
|
].entries()) {
|
|
742
745
|
const id = await RequestLogModel.createRun({
|
|
743
746
|
user_prompt: "cost regression",
|
|
744
|
-
project_name: index
|
|
747
|
+
project_name: index === 2 || index === 5 ? `${projectName}-other` : projectName,
|
|
745
748
|
});
|
|
746
749
|
ids.push(id);
|
|
747
750
|
await RequestLogModel.getPuri("w").table("request_logs").where("id", id).update({
|
|
@@ -754,10 +757,12 @@ describe("RequestLogModel PostgreSQL", () => {
|
|
|
754
757
|
|
|
755
758
|
const params = { sonamuFilter: { project_name: projectName }, num: 0, page: 1 };
|
|
756
759
|
const { rows } = await RequestLogModel.findMany("C", params);
|
|
757
|
-
expect(rows.map((row) => row.id)).toEqual(expect.arrayContaining(ids
|
|
758
|
-
expect(rows).toHaveLength(
|
|
759
|
-
//
|
|
760
|
-
await
|
|
760
|
+
expect(rows.map((row) => row.id)).toEqual(expect.arrayContaining([ids[0], ids[1], ids[3], ids[4]]));
|
|
761
|
+
expect(rows).toHaveLength(4);
|
|
762
|
+
// .038 known images + .001 hosted driver + .002 text; other project excluded.
|
|
763
|
+
const total = await RequestLogModel.totalCost(params);
|
|
764
|
+
expect(total.usd).toBeCloseTo(0.041, 10);
|
|
765
|
+
expect(total.unknownImageCostCount).toBe(1);
|
|
761
766
|
} finally {
|
|
762
767
|
await RequestLogModel.del(ids);
|
|
763
768
|
}
|
|
@@ -820,7 +820,9 @@ class RequestLogModelClass extends BaseModelClass<
|
|
|
820
820
|
* 필터 조건을 여기서 다시 구현하지 않고 `applyListFilters` 를 공유하는 것이 핵심이다 —
|
|
821
821
|
* 두 쿼리가 각자 필터를 가지면 화면에서 필터를 걸었을 때 행 수와 비용이 조용히 어긋난다.
|
|
822
822
|
*/
|
|
823
|
-
async totalCost(
|
|
823
|
+
async totalCost(
|
|
824
|
+
rawParams: RequestLogListParams = { num: 0, page: 1 },
|
|
825
|
+
): Promise<{ usd: number; unknownImageCostCount: number }> {
|
|
824
826
|
const params = {
|
|
825
827
|
num: 0,
|
|
826
828
|
page: 1,
|
|
@@ -843,6 +845,9 @@ class RequestLogModelClass extends BaseModelClass<
|
|
|
843
845
|
total: Puri.rawNumber(
|
|
844
846
|
"COALESCE(SUM(GREATEST(request_logs.cost_usd, 0) + COALESCE(request_logs.image_cost_usd, 0)), 0)",
|
|
845
847
|
),
|
|
848
|
+
unknownImageCostCount: Puri.rawNumber(
|
|
849
|
+
"COUNT(*) FILTER (WHERE request_logs.is_image_generation = true AND request_logs.image_cost_usd IS NULL)",
|
|
850
|
+
),
|
|
846
851
|
})
|
|
847
852
|
.first();
|
|
848
853
|
|
|
@@ -867,7 +872,7 @@ class RequestLogModelClass extends BaseModelClass<
|
|
|
867
872
|
const storedTotal = Number(stored?.total ?? 0) / MICRO_USD;
|
|
868
873
|
|
|
869
874
|
// legacy row 는 위 SUM 에 저장값으로 이미 포함되어 있다. 재계산값과의 차액만 더한다.
|
|
870
|
-
|
|
875
|
+
const usd = legacyRows.reduce((sum, row) => {
|
|
871
876
|
const alreadySummed = Math.max(row.cost_usd ?? 0, 0) / MICRO_USD;
|
|
872
877
|
const usage = normalizedUsageForCost(row);
|
|
873
878
|
if (!usage.model) return sum;
|
|
@@ -884,6 +889,7 @@ class RequestLogModelClass extends BaseModelClass<
|
|
|
884
889
|
alreadySummed
|
|
885
890
|
);
|
|
886
891
|
}, storedTotal);
|
|
892
|
+
return { usd, unknownImageCostCount: Number(stored?.unknownImageCostCount ?? 0) };
|
|
887
893
|
}
|
|
888
894
|
|
|
889
895
|
async distinctProjectNames(): Promise<string[]> {
|
|
@@ -8,6 +8,24 @@ import {
|
|
|
8
8
|
} from "./openai-backend-protocol";
|
|
9
9
|
|
|
10
10
|
describe("OpenAI Codex backend protocol", () => {
|
|
11
|
+
it.each(["png", "jpeg", "webp"])("preserves reported hosted %s generation settings", (output_format) => {
|
|
12
|
+
expect(normalizeOpenAIEvent({ type: "response.output_item.done", item: {
|
|
13
|
+
type: "image_generation_call", result: "aGVsbG8=", output_format,
|
|
14
|
+
size: "841x1870", quality: "low", background: "opaque",
|
|
15
|
+
} })).toMatchObject({ generation: {
|
|
16
|
+
route: "codex-responses", size: "841x1870", quality: "low", background: "opaque",
|
|
17
|
+
} });
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("reports PNG byte dimensions instead of a conflicting backend size", () => {
|
|
21
|
+
const bytes = Buffer.alloc(24);
|
|
22
|
+
Buffer.from("89504e470d0a1a0a", "hex").copy(bytes);
|
|
23
|
+
bytes.writeUInt32BE(841, 16);
|
|
24
|
+
bytes.writeUInt32BE(1870, 20);
|
|
25
|
+
expect(normalizeOpenAIEvent({ type: "response.output_item.done", item: {
|
|
26
|
+
type: "image_generation_call", result: bytes.toString("base64"), size: "1152x2560",
|
|
27
|
+
} })).toMatchObject({ generation: { route: "codex-responses", size: "841x1870" } });
|
|
28
|
+
});
|
|
11
29
|
it("distinguishes partial function items from completed arguments", () => {
|
|
12
30
|
const item = { type: "function_call", call_id: "call", name: "generate_transparent_image", arguments: "{}" };
|
|
13
31
|
expect(normalizeOpenAIEvent({ type: "response.output_item.added", item })).toEqual({ type: "output-item", item, completed: false });
|
|
@@ -129,6 +147,6 @@ describe("OpenAI Codex backend protocol", () => {
|
|
|
129
147
|
type: "response.output_item.done",
|
|
130
148
|
item: { type: "image_generation_call", id: "img", result: "aGVsbG8=", revised_prompt: "better" },
|
|
131
149
|
}),
|
|
132
|
-
).toEqual({ type: "image", id: "img", base64: "aGVsbG8=", mimeType: "image/png", revisedPrompt: "better" });
|
|
150
|
+
).toEqual({ type: "image", id: "img", base64: "aGVsbG8=", mimeType: "image/png", revisedPrompt: "better", generation: { route: "codex-responses" } });
|
|
133
151
|
});
|
|
134
152
|
});
|
|
@@ -248,11 +248,33 @@ export function normalizeOpenAIEvent(raw: unknown): OpenAINormalizedEvent | unde
|
|
|
248
248
|
) {
|
|
249
249
|
const item = event.item as OpenAIResponseItem;
|
|
250
250
|
if (item.type === "image_generation_call" && typeof item.result === "string") {
|
|
251
|
+
// PNG exposes dimensions in its fixed header. Other formats retain the
|
|
252
|
+
// backend's observed size; never substitute requested image controls.
|
|
253
|
+
const header = Buffer.from(item.result.slice(0, 32), "base64");
|
|
254
|
+
const pngSize =
|
|
255
|
+
header.length >= 24 &&
|
|
256
|
+
header.subarray(0, 8).equals(Buffer.from("89504e470d0a1a0a", "hex")) &&
|
|
257
|
+
header.readUInt32BE(16) > 0 &&
|
|
258
|
+
header.readUInt32BE(20) > 0
|
|
259
|
+
? `${header.readUInt32BE(16)}x${header.readUInt32BE(20)}`
|
|
260
|
+
: undefined;
|
|
261
|
+
const size =
|
|
262
|
+
pngSize ??
|
|
263
|
+
(typeof item.size === "string" && /^[1-9]\d*x[1-9]\d*$/.test(item.size)
|
|
264
|
+
? item.size
|
|
265
|
+
: undefined);
|
|
251
266
|
return {
|
|
252
267
|
type: "image",
|
|
253
268
|
...(typeof item.id === "string" ? { id: item.id } : {}),
|
|
254
269
|
base64: item.result,
|
|
255
270
|
mimeType: imageMimeType(item.result, item.output_format),
|
|
271
|
+
generation: {
|
|
272
|
+
route: "codex-responses",
|
|
273
|
+
...(size ? { size } : {}),
|
|
274
|
+
...(typeof item.model === "string" ? { model: item.model } : {}),
|
|
275
|
+
...(typeof item.quality === "string" ? { quality: item.quality } : {}),
|
|
276
|
+
...(typeof item.background === "string" ? { background: item.background } : {}),
|
|
277
|
+
},
|
|
256
278
|
...(typeof item.revised_prompt === "string"
|
|
257
279
|
? { revisedPrompt: item.revised_prompt }
|
|
258
280
|
: typeof item.revisedPrompt === "string"
|
|
@@ -144,6 +144,18 @@ describe("OpenAIDispatcher direct runtime", () => {
|
|
|
144
144
|
}
|
|
145
145
|
});
|
|
146
146
|
|
|
147
|
+
it.each(["auto", "1152x2560"])("forwards %s size hints and preserves hosted observations", async (size) => {
|
|
148
|
+
const args = QueryInput.parse({ prompt: "draw in 9:20", imageGeneration: true, imageGenerationOptions: { size } });
|
|
149
|
+
const generation = { route: "codex-responses" as const, size: "841x1870", quality: "low" };
|
|
150
|
+
const d = dispatcher((options) => {
|
|
151
|
+
expect(buildOpenAIResponsesRequest(options).tools).toContainEqual({ type: "image_generation", size });
|
|
152
|
+
return events({ type: "image", base64: "data", mimeType: "image/png", generation }, { type: "completed", responseId: "r" });
|
|
153
|
+
});
|
|
154
|
+
await d.onTokenAdded(1, "one", credentials);
|
|
155
|
+
const result = await d.generate(request({ imageGeneration: args.imageGeneration, imageGenerationOptions: args.imageGenerationOptions }));
|
|
156
|
+
expect(result.images).toMatchObject([{ generation }]);
|
|
157
|
+
});
|
|
158
|
+
|
|
147
159
|
beforeEach(() => { refreshMock.mockReset(); });
|
|
148
160
|
|
|
149
161
|
it("refreshes a quota 401 once, shares the recovery, and uses the new credentials", async () => {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
var e=1e6,t=4;function n(t){return t/e}function r(e,n=!1){return`${n?`Known `:``}$${e.toFixed(t)}`}function i(e){return r(n(e))}function a(e){let t=e.is_image_generation&&e.image_cost_usd===null;return e.cost_usd===null&&e.image_cost_usd===null?t?`Unknown`:`—`:r(n((e.cost_usd??0)+(e.image_cost_usd??0)),t)}function o(e){return e.input_tokens<=0?`—`:`${Math.round(e.cache_read_tokens/e.input_tokens*100)}%`}export{r as i,i as n,a as r,o as t};
|