@cartanova/qgrid-cli 2.9.4 → 2.9.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/qgrid/expired-token-reminder.js +6 -5
- package/bundle/dist/application/qgrid/qgrid-image-generation.js +12 -3
- package/bundle/dist/application/qgrid/qgrid-response-format.js +14 -12
- package/bundle/dist/application/qgrid/qgrid-run-lifecycle.js +2 -2
- package/bundle/dist/application/qgrid/qgrid.types.js +44 -4
- package/bundle/dist/application/qgrid/tool-emulation.js +4 -2
- package/bundle/dist/application/setting/setting.model.js +8 -2
- package/bundle/dist/utils/providers/openai/openai-backend-protocol.js +22 -3
- package/bundle/dist/utils/providers/openai/openai-direct-client.js +39 -1
- package/bundle/dist/utils/providers/openai/openai-dispatcher.js +47 -21
- package/bundle/dist/utils/providers/openai/openai-image-generation.js +146 -0
- package/bundle/dist/utils/providers/openai/openai-quota.js +11 -3
- package/bundle/dist/utils/providers/openai/openai-refresh.js +7 -5
- package/bundle/dist/utils/slack-notify.js +8 -4
- package/bundle/src/application/qgrid/expired-token-reminder.test.ts +6 -1
- package/bundle/src/application/qgrid/expired-token-reminder.ts +10 -4
- package/bundle/src/application/qgrid/qgrid-image-generation.test.ts +53 -0
- package/bundle/src/application/qgrid/qgrid-image-generation.ts +32 -2
- package/bundle/src/application/qgrid/qgrid-response-format.test.ts +32 -1
- package/bundle/src/application/qgrid/qgrid-response-format.ts +28 -18
- package/bundle/src/application/qgrid/qgrid-run-lifecycle.test.ts +32 -0
- package/bundle/src/application/qgrid/qgrid-run-lifecycle.ts +1 -1
- package/bundle/src/application/qgrid/qgrid.types.ts +47 -5
- package/bundle/src/application/qgrid/tool-emulation.test.ts +25 -0
- package/bundle/src/application/qgrid/tool-emulation.ts +6 -1
- package/bundle/src/application/setting/setting.model.test.ts +20 -0
- package/bundle/src/application/setting/setting.model.ts +10 -2
- package/bundle/src/application/sonamu.generated.http +4 -2
- package/bundle/src/utils/providers/common/provider-dispatcher.ts +8 -2
- package/bundle/src/utils/providers/openai/openai-backend-protocol.test.ts +23 -0
- package/bundle/src/utils/providers/openai/openai-backend-protocol.ts +27 -2
- package/bundle/src/utils/providers/openai/openai-direct-client.ts +48 -1
- package/bundle/src/utils/providers/openai/openai-dispatcher.test.ts +155 -2
- package/bundle/src/utils/providers/openai/openai-dispatcher.ts +54 -19
- package/bundle/src/utils/providers/openai/openai-image-generation.test.ts +152 -0
- package/bundle/src/utils/providers/openai/openai-image-generation.ts +183 -0
- package/bundle/src/utils/providers/openai/openai-quota.test.ts +32 -0
- package/bundle/src/utils/providers/openai/openai-quota.ts +15 -8
- package/bundle/src/utils/providers/openai/openai-refresh.test.ts +18 -0
- package/bundle/src/utils/providers/openai/openai-refresh.ts +11 -4
- package/bundle/src/utils/slack-notify.test.ts +14 -0
- package/bundle/src/utils/slack-notify.ts +19 -3
- package/bundle/web-dist/client/assets/{index-fogJvajr.js → index-BtVmANcA.js} +3 -3
- package/bundle/web-dist/client/assets/{logs-CsY2cqvt.js → logs-BCuaLfPL.js} +1 -1
- package/bundle/web-dist/client/assets/{monit-ChgaLEcD.js → monit-BkGkzl6m.js} +1 -1
- package/bundle/web-dist/client/assets/{routes-BvyiTnOZ.js → routes-DqY8SXcB.js} +1 -1
- package/bundle/web-dist/client/assets/{settings-ZR2J9rWb.js → settings-DbkDAJfh.js} +1 -1
- package/bundle/web-dist/client/assets/{show-CjwO4-So.js → show-Dx5JFzwy.js} +1 -1
- package/bundle/web-dist/client/assets/{tokens-Bx-hG1gm.js → tokens-DHahzDQJ.js} +1 -1
- package/bundle/web-dist/client/assets/{use-oauth-login-flow-Bqax_icS.js → use-oauth-login-flow-Cjdnj_8D.js} +1 -1
- package/bundle/web-dist/client/index.html +1 -1
- package/bundle/web-dist/server/entry-server.generated.js +1 -1
- package/package.json +2 -1
- package/skills/qgrid/SKILL.md +8 -1
- package/skills/qgrid/references/ai-sdk-provider-contract.md +4 -2
- package/skills/qgrid/references/decision-rationale.md +2 -2
- package/skills/qgrid/references/openai-codex-runtime.md +9 -1
- package/skills/qgrid/references/request-log-run-lifecycle.md +1 -1
- package/skills/qgrid/references/token-auth-quota-lifecycle.md +1 -1
|
@@ -6,7 +6,7 @@ import { getLogger } from "@logtape/logtape";
|
|
|
6
6
|
/**
|
|
7
7
|
* OpenAI chatgptAuthTokens refresh handler.
|
|
8
8
|
*
|
|
9
|
-
* - direct
|
|
9
|
+
* - direct transport와 quota 조회의 401에서 같은 refresh 경로를 사용함
|
|
10
10
|
* - qgrid 가 DB 의 refresh_token 으로 새 access_token 을 발급받아 응답
|
|
11
11
|
* - per-token inflight promise 로 concurrent refresh dedup
|
|
12
12
|
* - rotation 감지: 새 refresh_token 있으면 DB 즉시 업데이트
|
|
@@ -70,16 +70,18 @@ async function doRefresh(tokenId) {
|
|
|
70
70
|
const body = await resp.text().catch(() => "");
|
|
71
71
|
let errorCode;
|
|
72
72
|
try {
|
|
73
|
-
|
|
73
|
+
const error = JSON.parse(body).error;
|
|
74
|
+
const code = typeof error === "string" ? error : error && typeof error === "object" && "code" in error ? error.code : void 0;
|
|
75
|
+
if (typeof code === "string" && /^[a-z_]{1,80}$/.test(code)) errorCode = code;
|
|
74
76
|
} catch {}
|
|
75
|
-
logger.error(`OpenAI refresh FAILED token=${token.name}(id=${tokenId}) status=${resp.status} code=${errorCode ?? "
|
|
77
|
+
logger.error(`OpenAI refresh FAILED token=${token.name}(id=${tokenId}) status=${resp.status} code=${errorCode ?? "unknown"}`);
|
|
76
78
|
if (errorCode && PERMANENT_FAILURE_CODES.has(errorCode)) await deactivateAuthDeadToken({
|
|
77
79
|
id: tokenId,
|
|
78
80
|
name: token.name,
|
|
79
81
|
provider: "openai",
|
|
80
82
|
credentials: creds
|
|
81
83
|
}, `openai:${errorCode}`);
|
|
82
|
-
throw new Error(`OpenAI refresh failed: ${resp.status} ${
|
|
84
|
+
throw new Error(`OpenAI refresh failed: ${resp.status} ${errorCode ?? "unknown"}`);
|
|
83
85
|
}
|
|
84
86
|
const data = await resp.json();
|
|
85
87
|
const newRefreshToken = data.refresh_token ?? creds.refreshToken;
|
|
@@ -114,4 +116,4 @@ async function doRefresh(tokenId) {
|
|
|
114
116
|
//#endregion
|
|
115
117
|
export { handleChatgptAuthTokensRefresh };
|
|
116
118
|
|
|
117
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-refresh.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-refresh.ts"],"sourcesContent":["/**\n * OpenAI chatgptAuthTokens refresh handler.\n *\n * - direct HTTPS/WS transport가 401 refresh를 소유하고 저장된 refresh token으로 갱신함\n * - qgrid 가 DB 의 refresh_token 으로 새 access_token 을 발급받아 응답\n * - per-token inflight promise 로 concurrent refresh dedup\n * - rotation 감지: 새 refresh_token 있으면 DB 즉시 업데이트\n */\nimport { getLogger } from \"@logtape/logtape\";\n\nimport { deactivateAuthDeadToken } from \"../../../application/qgrid/token-death\";\nimport { TokenModel } from \"../../../application/token/token.model\";\nimport { type OpenAICredentials } from \"../../../application/token/token.types\";\n\nconst logger = getLogger([\"qgrid\", \"openai-refresh\"]);\n\nimport { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from \"./openai-constants\";\n\n// 재로그인 외 복구 불가한 refresh 실패 코드. 어느 것이든 토큰이 죽었다는 확정 신호다.\nconst PERMANENT_FAILURE_CODES = new Set([\n  \"refresh_token_expired\",\n  \"refresh_token_reused\",\n  \"refresh_token_invalidated\",\n]);\n\n// per-token inflight promise dedup + minimum interval\nconst inflightRefresh = new Map<number, Promise<RefreshResult>>();\nconst lastRefreshTime = new Map<number, number>();\nconst REFRESH_MIN_INTERVAL_MS = 5_000;\n\ninterface RefreshResult {\n  accessToken: string;\n  chatgptAccountId: string;\n  chatgptPlanType?: string;\n}\n\nexport async function handleChatgptAuthTokensRefresh(tokenId: number): Promise<RefreshResult> {\n  logger.info(`refresh requested for token ${tokenId} (pid=${process.pid})`);\n  const existing = inflightRefresh.get(tokenId);\n  if (existing) {\n    logger.info(`refresh dedup for token ${tokenId}`);\n    return existing;\n  }\n\n  const lastAt = lastRefreshTime.get(tokenId) ?? 0;\n  if (Date.now() - lastAt < REFRESH_MIN_INTERVAL_MS) {\n    logger.info(`refresh too soon for token ${tokenId}, reading current creds from DB`);\n    return readCurrentCreds(tokenId);\n  }\n\n  lastRefreshTime.set(tokenId, Date.now());\n  const promise = doRefresh(tokenId);\n  inflightRefresh.set(tokenId, promise);\n\n  try {\n    return await promise;\n  } finally {\n    inflightRefresh.delete(tokenId);\n  }\n}\n\nasync function readCurrentCreds(tokenId: number): Promise<RefreshResult> {\n  const token = await TokenModel.findOne(\"A\", { id: tokenId });\n  if (!token || token.provider !== \"openai\") throw new Error(`token ${tokenId} not found`);\n  const creds = token.credentials as OpenAICredentials;\n  return {\n    accessToken: creds.accessToken,\n    chatgptAccountId: creds.accountId,\n    chatgptPlanType: creds.planType,\n  };\n}\n\nasync function doRefresh(tokenId: number): Promise<RefreshResult> {\n  const token = await TokenModel.findOne(\"A\", { id: tokenId });\n  if (!token || token.provider !== \"openai\") {\n    throw new Error(`token ${tokenId} not found or not openai`);\n  }\n\n  const creds = token.credentials as OpenAICredentials;\n  if (!creds.refreshToken) {\n    throw new Error(`token ${tokenId} has no refreshToken`);\n  }\n\n  logger.info(`refreshing token ${token.name} (id=${tokenId})`);\n\n  const resp = await fetch(OPENAI_TOKEN_URL, {\n    method: \"POST\",\n    // 토큰 엔드포인트는 OAuth 표준 form 인코딩 계약을 강제한다. JSON 으로 보내면\n    // access token 만료 후의 모든 refresh 가 거부되어 토큰이 통째로 죽는다.\n    headers: { \"Content-Type\": \"application/x-www-form-urlencoded\" },\n    body: new URLSearchParams({\n      grant_type: \"refresh_token\",\n      client_id: OPENAI_CLIENT_ID,\n      refresh_token: creds.refreshToken,\n    }),\n  });\n\n  if (!resp.ok) {\n    const body = await resp.text().catch(() => \"\");\n    // 401 본문의 error 코드가 토큰 사망의 결정적 사인이다.\n    //   refresh_token_expired     → refresh_token 자체 만료\n    //   refresh_token_reused      → 이미 사용된(회전 폐기된) refresh_token 재사용 → 패밀리 무효화\n    //   refresh_token_invalidated → 서버측 revoke\n    // 위 3개는 모두 영구 실패. 재등록 외 복구 불가.\n    let errorCode: string | undefined;\n    try {\n      errorCode = (JSON.parse(body) as { error?: string }).error;\n    } catch {}\n    logger.error(\n      `OpenAI refresh FAILED token=${token.name}(id=${tokenId}) status=${resp.status} ` +\n        `code=${errorCode ?? \"?\"} body=${body}`,\n    );\n    // 영구 실패는 errorCode 로만 판정한다 — status 를 함께 요구하면 provider 가\n    // 상태코드를 바꿀 때 판정이 조용히 멎는다.\n    if (errorCode && PERMANENT_FAILURE_CODES.has(errorCode)) {\n      await deactivateAuthDeadToken(\n        { id: tokenId, name: token.name, provider: \"openai\", credentials: creds },\n        `openai:${errorCode}`,\n      );\n    }\n    throw new Error(`OpenAI refresh failed: ${resp.status} ${body}`);\n  }\n\n  const data = (await resp.json()) as {\n    access_token: string;\n    refresh_token?: string;\n    expires_in?: number;\n    id_token?: string;\n  };\n\n  const newRefreshToken = data.refresh_token ?? creds.refreshToken;\n  const rotated =\n    data.refresh_token !== null &&\n    data.refresh_token !== undefined &&\n    data.refresh_token !== creds.refreshToken;\n  if (rotated) {\n    logger.info(`refresh_token rotated for token ${token.name}`);\n  }\n\n  const updatedCreds: OpenAICredentials = {\n    ...creds,\n    accessToken: data.access_token,\n    refreshToken: newRefreshToken,\n    accessTokenExpiresAt: data.expires_in\n      ? Date.now() + data.expires_in * 1000\n      : creds.accessTokenExpiresAt,\n    ...(data.id_token ? { idToken: data.id_token } : {}),\n  };\n\n  // 회전(rotated)이 일어났는데 이 save 가 실패하면, OpenAI 쪽 옛 refresh_token 은 이미\n  // 폐기된 상태에서 DB 에는 옛 토큰이 남는다 → 다음 refresh 가 refresh_token_reused 로\n  // 영구 사망. 이 구간 실패는 토큰 사망의 직접 원인이므로 반드시 크게 남긴다.\n  try {\n    await TokenModel.save([\n      {\n        id: tokenId,\n        provider: \"openai\",\n        credentials: updatedCreds,\n        name: token.name,\n        reauth_required: false,\n      },\n    ]);\n  } catch (e) {\n    logger.error(\n      `OpenAI refresh: DB save FAILED after rotation(rotated=${rotated}) ` +\n        `token=${token.name}(id=${tokenId}) — 옛 refresh_token 폐기됨, DB 미반영 → 토큰 사망 위험. err=${String(e)}`,\n    );\n    throw e;\n  }\n\n  logger.info(`token ${token.name} refreshed successfully (rotated=${rotated})`);\n\n  return {\n    accessToken: data.access_token,\n    chatgptAccountId: creds.accountId,\n    chatgptPlanType: creds.planType,\n  };\n}\n"],"mappings":"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"}
|
|
119
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-refresh.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-refresh.ts"],"sourcesContent":["/**\n * OpenAI chatgptAuthTokens refresh handler.\n *\n * - direct transport와 quota 조회의 401에서 같은 refresh 경로를 사용함\n * - qgrid 가 DB 의 refresh_token 으로 새 access_token 을 발급받아 응답\n * - per-token inflight promise 로 concurrent refresh dedup\n * - rotation 감지: 새 refresh_token 있으면 DB 즉시 업데이트\n */\nimport { getLogger } from \"@logtape/logtape\";\n\nimport { deactivateAuthDeadToken } from \"../../../application/qgrid/token-death\";\nimport { TokenModel } from \"../../../application/token/token.model\";\nimport { type OpenAICredentials } from \"../../../application/token/token.types\";\n\nconst logger = getLogger([\"qgrid\", \"openai-refresh\"]);\n\nimport { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from \"./openai-constants\";\n\n// 재로그인 외 복구 불가한 refresh 실패 코드. 어느 것이든 토큰이 죽었다는 확정 신호다.\nconst PERMANENT_FAILURE_CODES = new Set([\n  \"refresh_token_expired\",\n  \"refresh_token_reused\",\n  \"refresh_token_invalidated\",\n]);\n\n// per-token inflight promise dedup + minimum interval\nconst inflightRefresh = new Map<number, Promise<RefreshResult>>();\nconst lastRefreshTime = new Map<number, number>();\nconst REFRESH_MIN_INTERVAL_MS = 5_000;\n\ninterface RefreshResult {\n  accessToken: string;\n  chatgptAccountId: string;\n  chatgptPlanType?: string;\n}\n\nexport async function handleChatgptAuthTokensRefresh(tokenId: number): Promise<RefreshResult> {\n  logger.info(`refresh requested for token ${tokenId} (pid=${process.pid})`);\n  const existing = inflightRefresh.get(tokenId);\n  if (existing) {\n    logger.info(`refresh dedup for token ${tokenId}`);\n    return existing;\n  }\n\n  const lastAt = lastRefreshTime.get(tokenId) ?? 0;\n  if (Date.now() - lastAt < REFRESH_MIN_INTERVAL_MS) {\n    logger.info(`refresh too soon for token ${tokenId}, reading current creds from DB`);\n    return readCurrentCreds(tokenId);\n  }\n\n  lastRefreshTime.set(tokenId, Date.now());\n  const promise = doRefresh(tokenId);\n  inflightRefresh.set(tokenId, promise);\n\n  try {\n    return await promise;\n  } finally {\n    inflightRefresh.delete(tokenId);\n  }\n}\n\nasync function readCurrentCreds(tokenId: number): Promise<RefreshResult> {\n  const token = await TokenModel.findOne(\"A\", { id: tokenId });\n  if (!token || token.provider !== \"openai\") throw new Error(`token ${tokenId} not found`);\n  const creds = token.credentials as OpenAICredentials;\n  return {\n    accessToken: creds.accessToken,\n    chatgptAccountId: creds.accountId,\n    chatgptPlanType: creds.planType,\n  };\n}\n\nasync function doRefresh(tokenId: number): Promise<RefreshResult> {\n  const token = await TokenModel.findOne(\"A\", { id: tokenId });\n  if (!token || token.provider !== \"openai\") {\n    throw new Error(`token ${tokenId} not found or not openai`);\n  }\n\n  const creds = token.credentials as OpenAICredentials;\n  if (!creds.refreshToken) {\n    throw new Error(`token ${tokenId} has no refreshToken`);\n  }\n\n  logger.info(`refreshing token ${token.name} (id=${tokenId})`);\n\n  const resp = await fetch(OPENAI_TOKEN_URL, {\n    method: \"POST\",\n    // 토큰 엔드포인트는 OAuth 표준 form 인코딩 계약을 강제한다. JSON 으로 보내면\n    // access token 만료 후의 모든 refresh 가 거부되어 토큰이 통째로 죽는다.\n    headers: { \"Content-Type\": \"application/x-www-form-urlencoded\" },\n    body: new URLSearchParams({\n      grant_type: \"refresh_token\",\n      client_id: OPENAI_CLIENT_ID,\n      refresh_token: creds.refreshToken,\n    }),\n  });\n\n  if (!resp.ok) {\n    const body = await resp.text().catch(() => \"\");\n    // 401 본문의 error 코드가 토큰 사망의 결정적 사인이다.\n    //   refresh_token_expired     → refresh_token 자체 만료\n    //   refresh_token_reused      → 이미 사용된(회전 폐기된) refresh_token 재사용 → 패밀리 무효화\n    //   refresh_token_invalidated → 서버측 revoke\n    // 위 3개는 모두 영구 실패. 재등록 외 복구 불가.\n    let errorCode: string | undefined;\n    try {\n      const error = (JSON.parse(body) as { error?: unknown }).error;\n      const code =\n        typeof error === \"string\"\n          ? error\n          : error && typeof error === \"object\" && \"code\" in error\n            ? error.code\n            : undefined;\n      if (typeof code === \"string\" && /^[a-z_]{1,80}$/.test(code)) errorCode = code;\n    } catch {}\n    logger.error(\n      `OpenAI refresh FAILED token=${token.name}(id=${tokenId}) status=${resp.status} ` +\n        `code=${errorCode ?? \"unknown\"}`,\n    );\n    // 영구 실패는 errorCode 로만 판정한다 — status 를 함께 요구하면 provider 가\n    // 상태코드를 바꿀 때 판정이 조용히 멎는다.\n    if (errorCode && PERMANENT_FAILURE_CODES.has(errorCode)) {\n      await deactivateAuthDeadToken(\n        { id: tokenId, name: token.name, provider: \"openai\", credentials: creds },\n        `openai:${errorCode}`,\n      );\n    }\n    throw new Error(`OpenAI refresh failed: ${resp.status} ${errorCode ?? \"unknown\"}`);\n  }\n\n  const data = (await resp.json()) as {\n    access_token: string;\n    refresh_token?: string;\n    expires_in?: number;\n    id_token?: string;\n  };\n\n  const newRefreshToken = data.refresh_token ?? creds.refreshToken;\n  const rotated =\n    data.refresh_token !== null &&\n    data.refresh_token !== undefined &&\n    data.refresh_token !== creds.refreshToken;\n  if (rotated) {\n    logger.info(`refresh_token rotated for token ${token.name}`);\n  }\n\n  const updatedCreds: OpenAICredentials = {\n    ...creds,\n    accessToken: data.access_token,\n    refreshToken: newRefreshToken,\n    accessTokenExpiresAt: data.expires_in\n      ? Date.now() + data.expires_in * 1000\n      : creds.accessTokenExpiresAt,\n    ...(data.id_token ? { idToken: data.id_token } : {}),\n  };\n\n  // 회전(rotated)이 일어났는데 이 save 가 실패하면, OpenAI 쪽 옛 refresh_token 은 이미\n  // 폐기된 상태에서 DB 에는 옛 토큰이 남는다 → 다음 refresh 가 refresh_token_reused 로\n  // 영구 사망. 이 구간 실패는 토큰 사망의 직접 원인이므로 반드시 크게 남긴다.\n  try {\n    await TokenModel.save([\n      {\n        id: tokenId,\n        provider: \"openai\",\n        credentials: updatedCreds,\n        name: token.name,\n        reauth_required: false,\n      },\n    ]);\n  } catch (e) {\n    logger.error(\n      `OpenAI refresh: DB save FAILED after rotation(rotated=${rotated}) ` +\n        `token=${token.name}(id=${tokenId}) — 옛 refresh_token 폐기됨, DB 미반영 → 토큰 사망 위험. err=${String(e)}`,\n    );\n    throw e;\n  }\n\n  logger.info(`token ${token.name} refreshed successfully (rotated=${rotated})`);\n\n  return {\n    accessToken: data.access_token,\n    chatgptAccountId: creds.accountId,\n    chatgptPlanType: creds.planType,\n  };\n}\n"],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { getLogger } from "@logtape/logtape";
|
|
|
12
12
|
const logger = getLogger(["qgrid", "slack"]);
|
|
13
13
|
const SLACK_POST_MESSAGE_URL = "https://slack.com/api/chat.postMessage";
|
|
14
14
|
const SLACK_TIMEOUT_MS = 5e3;
|
|
15
|
+
var SlackNotificationError = class extends Error {};
|
|
15
16
|
/** 상태를 색으로 먼저 읽히게 하는 attachment 색상 바. */
|
|
16
17
|
const SLACK_COLOR = {
|
|
17
18
|
good: "#2eb886",
|
|
@@ -23,6 +24,7 @@ async function notifySlack(notification, readSetting = getSetting) {
|
|
|
23
24
|
const { title, subject, context, color, urgent, now } = notification;
|
|
24
25
|
if (!botToken || !channel) {
|
|
25
26
|
logger.debug(`slack not configured, skipping notification: ${title} ${subject ?? ""}`);
|
|
27
|
+
if (notification.throwOnFailure) throw new SlackNotificationError("Slack 봇 토큰과 채널 ID를 설정해 주세요");
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
28
30
|
if (!urgent && readSetting("slack.enabled", "SLACK_ENABLED") === "false") {
|
|
@@ -65,12 +67,14 @@ async function notifySlack(notification, readSetting = getSetting) {
|
|
|
65
67
|
signal: AbortSignal.timeout(SLACK_TIMEOUT_MS)
|
|
66
68
|
});
|
|
67
69
|
const body = await res.json().catch(() => null);
|
|
68
|
-
if (!body?.ok)
|
|
70
|
+
if (!res.ok || body?.ok !== true) throw new SlackNotificationError(`Slack 알림 발송 실패: ${typeof body?.error === "string" && /^[a-z_]{1,80}$/.test(body.error) ? body.error : `HTTP ${res.status}`}`);
|
|
69
71
|
} catch (e) {
|
|
70
|
-
|
|
72
|
+
const error = e instanceof SlackNotificationError ? e : new SlackNotificationError("Slack 알림 발송 실패: 네트워크 오류 또는 응답 시간 초과");
|
|
73
|
+
logger.warn(error.message);
|
|
74
|
+
if (notification.throwOnFailure) throw error;
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
77
|
//#endregion
|
|
74
|
-
export { SLACK_COLOR, notifySlack };
|
|
78
|
+
export { SLACK_COLOR, SlackNotificationError, notifySlack };
|
|
75
79
|
|
|
76
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"slack-notify.js","names":[],"sources":["../../src/utils/slack-notify.ts"],"sourcesContent":["/**\n * Slack 알림 (chat.postMessage).\n *\n * fail-open: env 미설정이면 조용히 no-op 이고, 전송 실패는 warn 로그로만 남긴다.\n * 조용 시간(주말·20~8시)에는 `urgent` 가 아닌 알림을 보내지 않는다.\n * 알림 경로가 토큰 라우팅이나 오류 전파를 지연·차단해서는 안 된다.\n */\nimport { getLogger } from \"@logtape/logtape\";\n\nimport { getSetting } from \"../application/setting/setting.store\";\nimport { isQuietHours } from \"./quiet-hours\";\n\nconst logger = getLogger([\"qgrid\", \"slack\"]);\n\nconst SLACK_POST_MESSAGE_URL = \"https://slack.com/api/chat.postMessage\";\nconst SLACK_TIMEOUT_MS = 5_000;\n\nexport class SlackNotificationError extends Error {}\n\n/** 상태를 색으로 먼저 읽히게 하는 attachment 색상 바. */\nexport const SLACK_COLOR = {\n  good: \"#2eb886\",\n  bad: \"#e01e5a\",\n} as const;\n\nexport type SlackNotification = {\n  /** 한 줄 제목. 무슨 일이 일어났는지만 담는다. */\n  title: string;\n  /** 제목 옆 코드 스타일로 붙는 대상 식별자. */\n  subject?: string;\n  /** 제목 아래 작은 글씨로 내려가는 부가 정보 — 읽지 않아도 되는 것들. */\n  context?: string;\n  color?: (typeof SLACK_COLOR)[keyof typeof SLACK_COLOR];\n  /**\n   * 조용 시간(주말·20~8시)에도 보낸다. 서비스가 멈춘 상태처럼 지금 알지 않으면 손해가\n   * 커지는 사건에만 쓴다 — 남용하면 조용 시간 자체가 무의미해진다.\n   */\n  urgent?: boolean;\n  /** Manual sends must report delivery failures; background notifications remain fail-open. */\n  throwOnFailure?: boolean;\n  /** 조용 시간 판정 기준 시각. 테스트에서 시계를 고정할 때만 넘긴다. */\n  now?: Date;\n};\n\nexport async function notifySlack(\n  notification: SlackNotification,\n  readSetting: typeof getSetting = getSetting,\n): Promise<void> {\n  const botToken = readSetting(\"slack.botToken\", \"SLACK_BOT_TOKEN\");\n  const channel = readSetting(\"slack.channelId\", \"SLACK_CHANNEL_ID\");\n  const { title, subject, context, color, urgent, now } = notification;\n  if (!botToken || !channel) {\n    logger.debug(`slack not configured, skipping notification: ${title} ${subject ?? \"\"}`);\n    if (notification.throwOnFailure) {\n      throw new SlackNotificationError(\"Slack 봇 토큰과 채널 ID를 설정해 주세요\");\n    }\n    return;\n  }\n\n  // 연휴처럼 규칙으로 잡을 수 없는 기간에 관리자가 내리는 스위치. urgent 는 통과시킨다 —\n  // 끈 상태로 provider 가 전부 죽으면 연휴 내내 서비스가 멈춘 줄 아무도 모른다.\n  if (!urgent && readSetting(\"slack.enabled\", \"SLACK_ENABLED\") === \"false\") {\n    logger.debug(`slack disabled, skipping notification: ${title} ${subject ?? \"\"}`);\n    return;\n  }\n\n  // 만료 알림은 주기적으로 반복되므로 여기서 버려도 다음 근무 시간 첫 주기에 다시 온다.\n  if (!urgent && isQuietHours(now ?? new Date(), readSetting)) {\n    logger.debug(`quiet hours, skipping notification: ${title} ${subject ?? \"\"}`);\n    return;\n  }\n\n  const blocks: unknown[] = [\n    {\n      type: \"section\",\n      text: { type: \"mrkdwn\", text: subject ? `*${title}*  \\`${subject}\\`` : `*${title}*` },\n    },\n  ];\n  if (context) {\n    blocks.push({ type: \"context\", elements: [{ type: \"mrkdwn\", text: context }] });\n  }\n\n  try {\n    const res = await fetch(SLACK_POST_MESSAGE_URL, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json; charset=utf-8\",\n        Authorization: `Bearer ${botToken}`,\n      },\n      body: JSON.stringify({\n        channel,\n        // fallback 은 attachment 안에 둔다. 최상위 text 로 보내면 blocks 가 정상 렌더되는\n        // 화면에서도 함께 출력돼 제목이 두 번 보인다. attachment fallback 은 blocks 를\n        // 못 그리는 클라이언트와 푸시 알림에서만 쓰인다.\n        attachments: [\n          {\n            fallback: subject ? `${title} — ${subject}` : title,\n            ...(color ? { color } : {}),\n            blocks,\n          },\n        ],\n      }),\n      signal: AbortSignal.timeout(SLACK_TIMEOUT_MS),\n    });\n\n    // bot 미초대(not_in_channel)·잘못된 채널 등 가장 흔한 오설정은 HTTP 200 + ok:false 로 온다.\n    // status 만 보면 조용히 성공 처리돼 알림이 통째로 사라진다.\n    const body = (await res.json().catch(() => null)) as { ok?: boolean; error?: string } | null;\n    if (!res.ok || body?.ok !== true) {\n      const code =\n        typeof body?.error === \"string\" && /^[a-z_]{1,80}$/.test(body.error)\n          ? body.error\n          : `HTTP ${res.status}`;\n      throw new SlackNotificationError(`Slack 알림 발송 실패: ${code}`);\n    }\n  } catch (e) {\n    const error =\n      e instanceof SlackNotificationError\n        ? e\n        : new SlackNotificationError(\"Slack 알림 발송 실패: 네트워크 오류 또는 응답 시간 초과\");\n    logger.warn(error.message);\n    if (notification.throwOnFailure) throw error;\n  }\n}\n"],"mappings":";;;;;;;;;;;AAYA,MAAM,SAAS,UAAU,CAAC,SAAS,OAAO,CAAC;AAE3C,MAAM,yBAAyB;AAC/B,MAAM,mBAAmB;AAEzB,IAAa,yBAAb,cAA4C,MAAM,CAAC;;AAGnD,MAAa,cAAc;CACzB,MAAM;CACN,KAAK;AACP;AAqBA,eAAsB,YACpB,cACA,cAAiC,YAClB;CACf,MAAM,WAAW,YAAY,kBAAkB,iBAAiB;CAChE,MAAM,UAAU,YAAY,mBAAmB,kBAAkB;CACjE,MAAM,EAAE,OAAO,SAAS,SAAS,OAAO,QAAQ,QAAQ;CACxD,IAAI,CAAC,YAAY,CAAC,SAAS;EACzB,OAAO,MAAM,gDAAgD,MAAM,GAAG,WAAW,IAAI;EACrF,IAAI,aAAa,gBACf,MAAM,IAAI,uBAAuB,4BAA4B;EAE/D;CACF;CAIA,IAAI,CAAC,UAAU,YAAY,iBAAiB,eAAe,MAAM,SAAS;EACxE,OAAO,MAAM,0CAA0C,MAAM,GAAG,WAAW,IAAI;EAC/E;CACF;CAGA,IAAI,CAAC,UAAU,aAAa,uBAAO,IAAI,KAAK,GAAG,WAAW,GAAG;EAC3D,OAAO,MAAM,uCAAuC,MAAM,GAAG,WAAW,IAAI;EAC5E;CACF;CAEA,MAAM,SAAoB,CACxB;EACE,MAAM;EACN,MAAM;GAAE,MAAM;GAAU,MAAM,UAAU,IAAI,MAAM,OAAO,QAAQ,MAAM,IAAI,MAAM;EAAG;CACtF,CACF;CACA,IAAI,SACF,OAAO,KAAK;EAAE,MAAM;EAAW,UAAU,CAAC;GAAE,MAAM;GAAU,MAAM;EAAQ,CAAC;CAAE,CAAC;CAGhF,IAAI;EACF,MAAM,MAAM,MAAM,MAAM,wBAAwB;GAC9C,QAAQ;GACR,SAAS;IACP,gBAAgB;IAChB,eAAe,UAAU;GAC3B;GACA,MAAM,KAAK,UAAU;IACnB;IAIA,aAAa,CACX;KACE,UAAU,UAAU,GAAG,MAAM,KAAK,YAAY;KAC9C,GAAI,QAAQ,EAAE,MAAM,IAAI,CAAC;KACzB;IACF,CACF;GACF,CAAC;GACD,QAAQ,YAAY,QAAQ,gBAAgB;EAC9C,CAAC;EAID,MAAM,OAAQ,MAAM,IAAI,KAAK,CAAC,CAAC,YAAY,IAAI;EAC/C,IAAI,CAAC,IAAI,MAAM,MAAM,OAAO,MAK1B,MAAM,IAAI,uBAAuB,mBAH/B,OAAO,MAAM,UAAU,YAAY,iBAAiB,KAAK,KAAK,KAAK,IAC/D,KAAK,QACL,QAAQ,IAAI,UACwC;CAE9D,SAAS,GAAG;EACV,MAAM,QACJ,aAAa,yBACT,IACA,IAAI,uBAAuB,qCAAqC;EACtE,OAAO,KAAK,MAAM,OAAO;EACzB,IAAI,aAAa,gBAAgB,MAAM;CACzC;AACF"}
|
|
@@ -157,7 +157,12 @@ describe("expired token reminder scheduling", () => {
|
|
|
157
157
|
const sent = await sendExpiredTokenReminderNow(deps);
|
|
158
158
|
|
|
159
159
|
expect(sent).toBe(1);
|
|
160
|
-
expect(notifySlackMock).toHaveBeenCalledWith(expect.objectContaining({ urgent: true }));
|
|
160
|
+
expect(notifySlackMock).toHaveBeenCalledWith(expect.objectContaining({ urgent: true, throwOnFailure: true }));
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
it("never reports a sent count when manual Slack delivery fails", async () => {
|
|
164
|
+
notifySlackMock.mockRejectedValue(new Error("Slack delivery failed"));
|
|
165
|
+
await expect(sendExpiredTokenReminderNow(deps)).rejects.toThrow("Slack delivery failed");
|
|
161
166
|
});
|
|
162
167
|
|
|
163
168
|
it("보낼 대상이 없으면 0을 돌려주고 아무것도 보내지 않는다", async () => {
|
|
@@ -54,7 +54,10 @@ export function buildReminderContext(
|
|
|
54
54
|
return [...lines, "재로그인이 필요합니다"].filter(Boolean).join("\n");
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
async function sendReminder(
|
|
57
|
+
async function sendReminder(
|
|
58
|
+
deps: ExpiredTokenReminderDeps,
|
|
59
|
+
mode: "scheduled" | "manual",
|
|
60
|
+
): Promise<number> {
|
|
58
61
|
const expired = await deps.findReauthRequired();
|
|
59
62
|
if (expired.length === 0) return 0;
|
|
60
63
|
|
|
@@ -66,7 +69,8 @@ async function sendReminder(deps: ExpiredTokenReminderDeps, urgent = false): Pro
|
|
|
66
69
|
subject: expired.length > 1 ? `${expired.length}건` : (expired[0]!.name ?? "unnamed"),
|
|
67
70
|
context: buildReminderContext(expired, userMap),
|
|
68
71
|
color: SLACK_COLOR.bad,
|
|
69
|
-
urgent,
|
|
72
|
+
urgent: mode === "manual",
|
|
73
|
+
throwOnFailure: mode === "manual",
|
|
70
74
|
});
|
|
71
75
|
return expired.length;
|
|
72
76
|
}
|
|
@@ -80,7 +84,7 @@ async function sendReminder(deps: ExpiredTokenReminderDeps, urgent = false): Pro
|
|
|
80
84
|
export function sendExpiredTokenReminderNow(
|
|
81
85
|
deps: ExpiredTokenReminderDeps = defaultDeps,
|
|
82
86
|
): Promise<number> {
|
|
83
|
-
return sendReminder(deps,
|
|
87
|
+
return sendReminder(deps, "manual");
|
|
84
88
|
}
|
|
85
89
|
|
|
86
90
|
let timer: ReturnType<typeof setInterval> | null = null;
|
|
@@ -104,7 +108,9 @@ function scheduleExpiredTokenReminder(runNow: boolean, deps: ExpiredTokenReminde
|
|
|
104
108
|
);
|
|
105
109
|
|
|
106
110
|
const run = () =>
|
|
107
|
-
sendReminder(deps).catch((e) =>
|
|
111
|
+
sendReminder(deps, "scheduled").catch((e) =>
|
|
112
|
+
logger.warn(`reminder failed: ${(e as Error).message}`),
|
|
113
|
+
);
|
|
108
114
|
|
|
109
115
|
if (runNow) void run();
|
|
110
116
|
timer = setInterval(run, minutes * MINUTE_MS);
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
|
|
3
|
+
import { estimateImageGenerationCostMicroUsd, imageGenerationCostMethod } from "./qgrid-image-generation";
|
|
4
|
+
import { type ImageGenerationMetadata, type QgridContent, type QueryOutput } from "./qgrid.types";
|
|
5
|
+
|
|
6
|
+
const options = { quality: "high" as const, size: "1024x1024" as const, background: "transparent" as const };
|
|
7
|
+
const generation: ImageGenerationMetadata = {
|
|
8
|
+
route: "codex-images", model: "gpt-image-2", background: "transparent",
|
|
9
|
+
size: "1254x1254", quality: "medium",
|
|
10
|
+
};
|
|
11
|
+
function result(content: QgridContent[]): QueryOutput {
|
|
12
|
+
return {
|
|
13
|
+
text: "", content, finishReason: "stop", tokenName: "token", model: "gpt-image-2",
|
|
14
|
+
usage: { input_tokens: 0, output_tokens: 0, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
|
|
15
|
+
durationMs: 10, ttftMs: 0, costUsd: 0, costSource: "pricing_table",
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
describe("standalone image cost estimates", () => {
|
|
20
|
+
it("uses response usage once for multiple outputs without pricing requested settings or driver tokens", () => {
|
|
21
|
+
const output = result([
|
|
22
|
+
{ type: "image", data: "first", generation: { ...generation,
|
|
23
|
+
usage: { input_tokens: 100, output_tokens: 200, total_tokens: 300,
|
|
24
|
+
input_tokens_details: { text_tokens: 40, image_tokens: 60, cached_tokens: 50 } },
|
|
25
|
+
} },
|
|
26
|
+
{ type: "image", data: "second", generation },
|
|
27
|
+
]);
|
|
28
|
+
expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(6_680);
|
|
29
|
+
expect(imageGenerationCostMethod(options, output)).toBe(
|
|
30
|
+
"estimated:gpt-image-2:reported-usage:public-prices:conservative",
|
|
31
|
+
);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("does not substitute requested size pricing when standalone usage is missing", () => {
|
|
35
|
+
expect(estimateImageGenerationCostMicroUsd(result([{ type: "image", data: "png", generation }]), options)).toBeNull();
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it("prices unknown input remainder at the image rate and ignores inconsistent splits", () => {
|
|
39
|
+
for (const [textTokens, imageTokens, expected] of [[40, 10, 6_680], [100, 60, 6_800]]) {
|
|
40
|
+
const output = result([{ type: "image", data: "png", generation: { ...generation, usage: {
|
|
41
|
+
input_tokens: 100, output_tokens: 200, total_tokens: 300,
|
|
42
|
+
input_tokens_details: { text_tokens: textTokens!, image_tokens: imageTokens! },
|
|
43
|
+
} } }]);
|
|
44
|
+
expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(expected);
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it("preserves legacy per-image price assumptions when response metadata is absent", () => {
|
|
49
|
+
const output = result([{ type: "image", data: "first" }, { type: "image", data: "second" }]);
|
|
50
|
+
expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(422_000);
|
|
51
|
+
expect(imageGenerationCostMethod(options, output)).toBe("assumed:gpt-image-2:high:1024x1024:png");
|
|
52
|
+
});
|
|
53
|
+
});
|
|
@@ -46,7 +46,17 @@ export function resolveImageGenerationOptions(
|
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
export function imageGenerationCostMethod(
|
|
49
|
+
export function imageGenerationCostMethod(
|
|
50
|
+
options: ImageGenerationOptions | undefined,
|
|
51
|
+
result?: QueryOutput,
|
|
52
|
+
): string {
|
|
53
|
+
if (
|
|
54
|
+
result?.content.some(
|
|
55
|
+
(item) => item.type === "image" && item.generation?.route === "codex-images",
|
|
56
|
+
)
|
|
57
|
+
) {
|
|
58
|
+
return "estimated:gpt-image-2:reported-usage:public-prices:conservative";
|
|
59
|
+
}
|
|
50
60
|
const resolved = resolveImageGenerationOptions(options);
|
|
51
61
|
return `assumed:${CODEX_IMAGE_GENERATION_MODEL}:${resolved.quality}:${resolved.size}:png`;
|
|
52
62
|
}
|
|
@@ -55,8 +65,28 @@ export function estimateImageGenerationCostMicroUsd(
|
|
|
55
65
|
result: QueryOutput,
|
|
56
66
|
options: ImageGenerationOptions | undefined,
|
|
57
67
|
): number | null {
|
|
58
|
-
const
|
|
68
|
+
const images = result.content.filter((item) => item.type === "image");
|
|
69
|
+
const imageCount = images.length;
|
|
59
70
|
if (imageCount === 0) return null;
|
|
71
|
+
if (images.some((image) => image.generation?.route === "codex-images")) {
|
|
72
|
+
// The standalone response's aggregate usage is carried by its first image only.
|
|
73
|
+
// Do not multiply it by output count or price it as the requested text driver.
|
|
74
|
+
const usage = images.find((image) => image.generation?.usage)?.generation?.usage;
|
|
75
|
+
if (!usage) return null;
|
|
76
|
+
// Public GPT Image 2 rates verified 2026-09-08: text input $5/M, image input
|
|
77
|
+
// $8/M, output $30/M. Amounts below are microUSD, so no /1M conversion.
|
|
78
|
+
// https://developers.openai.com/api/docs/pricing#image-generation
|
|
79
|
+
// Use a consistent reported split; unknown input is conservatively priced as
|
|
80
|
+
// images. Cache discounts and private subscription billing remain unknown.
|
|
81
|
+
const details = usage.input_tokens_details;
|
|
82
|
+
const textTokens =
|
|
83
|
+
details && details.text_tokens + details.image_tokens <= usage.input_tokens
|
|
84
|
+
? details.text_tokens
|
|
85
|
+
: 0;
|
|
86
|
+
return Math.round(
|
|
87
|
+
textTokens * 5 + (usage.input_tokens - textTokens) * 8 + usage.output_tokens * 30,
|
|
88
|
+
);
|
|
89
|
+
}
|
|
60
90
|
const resolved = resolveImageGenerationOptions(options);
|
|
61
91
|
return imageCount * IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size];
|
|
62
92
|
}
|
|
@@ -1,8 +1,39 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
2
|
|
|
3
|
-
import { buildImageGenerationToolSteps, imageGenerationToolArgs } from "./qgrid-response-format";
|
|
3
|
+
import { buildImageGenerationToolSteps, formatImagePartForLog, imageGenerationToolArgs } from "./qgrid-response-format";
|
|
4
|
+
|
|
5
|
+
it("logs observed standalone settings separately from requested controls without a requested-price assumption", () => {
|
|
6
|
+
const requestedOptions = { quality: "high" as const, size: "1024x1024" as const, background: "transparent" as const };
|
|
7
|
+
const generation = {
|
|
8
|
+
route: "codex-images" as const, model: "gpt-image-2" as const,
|
|
9
|
+
quality: "medium", size: "1254x1254", background: "transparent",
|
|
10
|
+
usage: { input_tokens: 10, output_tokens: 100, total_tokens: 110 },
|
|
11
|
+
};
|
|
12
|
+
const [step] = buildImageGenerationToolSteps({
|
|
13
|
+
prompt: "draw", model: "openai/gpt-5.5", imageGenerationOptions: requestedOptions,
|
|
14
|
+
}, [{ type: "image", data: "png", generation }], 0);
|
|
15
|
+
const args = JSON.parse(step!.tool_args);
|
|
16
|
+
expect(args.requestedOptions).toEqual(requestedOptions);
|
|
17
|
+
expect(args.observedGeneration).toEqual(generation);
|
|
18
|
+
expect(args).not.toHaveProperty("pricingAssumption");
|
|
19
|
+
});
|
|
4
20
|
|
|
5
21
|
describe("qgrid response log formatting", () => {
|
|
22
|
+
it("logs the returned MIME and requested output format", () => {
|
|
23
|
+
expect(formatImagePartForLog({ type: "image", data: "webp", mediaType: "image/webp" })).toContain("data:image/webp;base64,webp");
|
|
24
|
+
expect(JSON.parse(imageGenerationToolArgs({ prompt: "draw", imageGenerationOptions: { outputFormat: "webp" } })).tool.outputFormat).toBe("webp");
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("records requested image controls separately from pricing assumptions", () => {
|
|
28
|
+
const requestedOptions = { background: "transparent", size: "1024x1024", quality: "high" } as const;
|
|
29
|
+
const args = JSON.parse(imageGenerationToolArgs({
|
|
30
|
+
prompt: "an isolated circle", imageGeneration: true,
|
|
31
|
+
imageGenerationOptions: requestedOptions,
|
|
32
|
+
}));
|
|
33
|
+
expect(args.requestedOptions).toEqual(requestedOptions);
|
|
34
|
+
expect(args.pricingAssumption).not.toHaveProperty("background");
|
|
35
|
+
});
|
|
36
|
+
|
|
6
37
|
it("includes input images in image-generation tool args", () => {
|
|
7
38
|
expect(
|
|
8
39
|
JSON.parse(
|
|
@@ -2,7 +2,12 @@ import {
|
|
|
2
2
|
CODEX_IMAGE_GENERATION_MODEL,
|
|
3
3
|
resolveImageGenerationOptions,
|
|
4
4
|
} from "./qgrid-image-generation";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
type ImageGenerationMetadata,
|
|
7
|
+
type QgridContent,
|
|
8
|
+
type QueryInput,
|
|
9
|
+
type QueryOutput,
|
|
10
|
+
} from "./qgrid.types";
|
|
6
11
|
|
|
7
12
|
export const CODEX_IMAGE_GENERATION_TOOL_CONFIG = {
|
|
8
13
|
type: "image_generation",
|
|
@@ -21,10 +26,7 @@ export function formatResponseForLog(result: QueryOutput): string {
|
|
|
21
26
|
return result.content
|
|
22
27
|
.flatMap((item) => {
|
|
23
28
|
if (item.type === "text") return [item.text];
|
|
24
|
-
if (item.type === "image")
|
|
25
|
-
const alt = escapeHtmlAttribute(item.revisedPrompt ?? "generated image");
|
|
26
|
-
return [`<img src="data:image/png;base64,${item.data}" alt="${alt}" />`];
|
|
27
|
-
}
|
|
29
|
+
if (item.type === "image") return [formatImagePartForLog(item)];
|
|
28
30
|
return [];
|
|
29
31
|
})
|
|
30
32
|
.filter((part) => part.length > 0)
|
|
@@ -37,12 +39,12 @@ export function getImageParts(result: QueryOutput): Extract<QgridContent, { type
|
|
|
37
39
|
|
|
38
40
|
export function formatImagePartForLog(image: Extract<QgridContent, { type: "image" }>): string {
|
|
39
41
|
const alt = escapeHtmlAttribute(image.revisedPrompt ?? "generated image");
|
|
40
|
-
return `<img src="data
|
|
42
|
+
return `<img src="data:${image.mediaType ?? "image/png"};base64,${image.data}" alt="${alt}" />`;
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
export function imageGenerationToolArgs(
|
|
44
46
|
args: QueryInput,
|
|
45
|
-
options: { includeInputImages?: boolean } = {},
|
|
47
|
+
options: { includeInputImages?: boolean; generation?: ImageGenerationMetadata } = {},
|
|
46
48
|
): string {
|
|
47
49
|
const resolved = resolveImageGenerationOptions(args.imageGenerationOptions);
|
|
48
50
|
const inputImages =
|
|
@@ -51,12 +53,22 @@ export function imageGenerationToolArgs(
|
|
|
51
53
|
prompt: args.prompt,
|
|
52
54
|
...(inputImages.length > 0 ? { inputImages } : {}),
|
|
53
55
|
driverModel: args.model ?? null,
|
|
54
|
-
tool:
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
tool: {
|
|
57
|
+
...CODEX_IMAGE_GENERATION_TOOL_CONFIG,
|
|
58
|
+
...(args.imageGenerationOptions?.outputFormat
|
|
59
|
+
? { outputFormat: args.imageGenerationOptions.outputFormat }
|
|
60
|
+
: {}),
|
|
59
61
|
},
|
|
62
|
+
...(args.imageGenerationOptions ? { requestedOptions: args.imageGenerationOptions } : {}),
|
|
63
|
+
...(options.generation
|
|
64
|
+
? { observedGeneration: options.generation }
|
|
65
|
+
: {
|
|
66
|
+
pricingAssumption: {
|
|
67
|
+
model: CODEX_IMAGE_GENERATION_MODEL,
|
|
68
|
+
quality: resolved.quality,
|
|
69
|
+
size: resolved.size,
|
|
70
|
+
},
|
|
71
|
+
}),
|
|
60
72
|
});
|
|
61
73
|
}
|
|
62
74
|
|
|
@@ -75,18 +87,16 @@ export function buildImageGenerationToolSteps(
|
|
|
75
87
|
}> {
|
|
76
88
|
if (images.length === 0) return [];
|
|
77
89
|
|
|
78
|
-
const firstToolArgs = imageGenerationToolArgs(args, { includeInputImages: true });
|
|
79
|
-
const laterToolArgs =
|
|
80
|
-
images.length > 1
|
|
81
|
-
? imageGenerationToolArgs(args, { includeInputImages: false })
|
|
82
|
-
: firstToolArgs;
|
|
83
90
|
return images.map((image, index) => ({
|
|
84
91
|
step_index: stepIndex,
|
|
85
92
|
type: "tool_call",
|
|
86
93
|
tool_call_index: index,
|
|
87
94
|
tool_call_id: `image_generation:${stepIndex}:${index}`,
|
|
88
95
|
tool_name: "image_generation",
|
|
89
|
-
tool_args:
|
|
96
|
+
tool_args: imageGenerationToolArgs(args, {
|
|
97
|
+
includeInputImages: index === 0,
|
|
98
|
+
generation: image.generation,
|
|
99
|
+
}),
|
|
90
100
|
tool_result: formatImagePartForLog(image),
|
|
91
101
|
}));
|
|
92
102
|
}
|
|
@@ -547,6 +547,38 @@ describe("qgrid run lifecycle TTFT", () => {
|
|
|
547
547
|
);
|
|
548
548
|
});
|
|
549
549
|
|
|
550
|
+
it("keeps standalone image accounting out of text usage and records response usage once", async () => {
|
|
551
|
+
const generation = {
|
|
552
|
+
route: "codex-images" as const, model: "gpt-image-2" as const,
|
|
553
|
+
size: "1254x1254", quality: "medium", background: "transparent",
|
|
554
|
+
};
|
|
555
|
+
aggregateStepUsageMock.mockResolvedValueOnce({
|
|
556
|
+
input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_creation_tokens: 0,
|
|
557
|
+
duration_ms: 120, fallback_count: 0, cost_usd: 0, cost_source: "pricing_table",
|
|
558
|
+
});
|
|
559
|
+
await afterQuery(10, 0, {
|
|
560
|
+
prompt: "draw", model: "openai/gpt-5.5", imageGeneration: true,
|
|
561
|
+
imageGenerationOptions: { quality: "high", size: "1024x1024", background: "transparent" },
|
|
562
|
+
}, queryOutput({
|
|
563
|
+
model: "gpt-image-2", requestedModel: "gpt-5.5", costUsd: 0,
|
|
564
|
+
usage: { input_tokens: 0, output_tokens: 0, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
|
|
565
|
+
content: [
|
|
566
|
+
{ type: "image", data: "first", generation: { ...generation, usage: {
|
|
567
|
+
input_tokens: 10, output_tokens: 100, total_tokens: 110,
|
|
568
|
+
} } },
|
|
569
|
+
{ type: "image", data: "second", generation },
|
|
570
|
+
],
|
|
571
|
+
}));
|
|
572
|
+
expect(appendStepMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
573
|
+
type: "generate", model_name: "openai/gpt-image-2", requested_model_name: "openai/gpt-5.5",
|
|
574
|
+
input_tokens: 0, output_tokens: 0, cost_usd: 0,
|
|
575
|
+
}));
|
|
576
|
+
expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
|
|
577
|
+
input_tokens: 0, output_tokens: 0, cost_usd: 0, image_cost_usd: 3_080,
|
|
578
|
+
image_cost_method: "estimated:gpt-image-2:reported-usage:public-prices:conservative",
|
|
579
|
+
}));
|
|
580
|
+
});
|
|
581
|
+
|
|
550
582
|
it("uses requested image quality and size for cost estimate", async () => {
|
|
551
583
|
await afterQuery(
|
|
552
584
|
10,
|
|
@@ -242,7 +242,7 @@ export async function afterQuery(
|
|
|
242
242
|
image_cost_usd: imageCostMicroUsd,
|
|
243
243
|
image_cost_method:
|
|
244
244
|
imageCostMicroUsd !== null
|
|
245
|
-
? imageGenerationCostMethod(args.imageGenerationOptions)
|
|
245
|
+
? imageGenerationCostMethod(args.imageGenerationOptions, result)
|
|
246
246
|
: null,
|
|
247
247
|
history: filterHistoryForStorage(args.history),
|
|
248
248
|
});
|
|
@@ -12,6 +12,36 @@ export const QgridTool = z.object({
|
|
|
12
12
|
});
|
|
13
13
|
export type QgridTool = z.infer<typeof QgridTool>;
|
|
14
14
|
|
|
15
|
+
// Observed standalone Images response values, distinct from requested generation hints.
|
|
16
|
+
export const ImageGenerationMetadata = z.object({
|
|
17
|
+
route: z.literal("codex-images"),
|
|
18
|
+
model: z.literal("gpt-image-2"),
|
|
19
|
+
background: z.string().optional(),
|
|
20
|
+
quality: z.string().optional(),
|
|
21
|
+
size: z.string().optional(),
|
|
22
|
+
usage: z
|
|
23
|
+
.object({
|
|
24
|
+
input_tokens: z.number().nonnegative(),
|
|
25
|
+
output_tokens: z.number().nonnegative(),
|
|
26
|
+
total_tokens: z.number().nonnegative(),
|
|
27
|
+
input_tokens_details: z
|
|
28
|
+
.object({
|
|
29
|
+
image_tokens: z.number().nonnegative(),
|
|
30
|
+
text_tokens: z.number().nonnegative(),
|
|
31
|
+
cached_tokens: z.number().nonnegative().optional(),
|
|
32
|
+
})
|
|
33
|
+
.optional(),
|
|
34
|
+
output_tokens_details: z
|
|
35
|
+
.object({
|
|
36
|
+
image_tokens: z.number().nonnegative(),
|
|
37
|
+
text_tokens: z.number().nonnegative(),
|
|
38
|
+
})
|
|
39
|
+
.optional(),
|
|
40
|
+
})
|
|
41
|
+
.optional(),
|
|
42
|
+
});
|
|
43
|
+
export type ImageGenerationMetadata = z.infer<typeof ImageGenerationMetadata>;
|
|
44
|
+
|
|
15
45
|
export const QgridContent = z.discriminatedUnion("type", [
|
|
16
46
|
z.object({
|
|
17
47
|
type: z.literal("text"),
|
|
@@ -25,9 +55,11 @@ export const QgridContent = z.discriminatedUnion("type", [
|
|
|
25
55
|
}),
|
|
26
56
|
z.object({
|
|
27
57
|
type: z.literal("image"),
|
|
28
|
-
//
|
|
58
|
+
// Base64 image bytes; older responses without mediaType are PNG.
|
|
29
59
|
data: z.string(),
|
|
60
|
+
mediaType: z.enum(["image/png", "image/jpeg", "image/webp"]).optional(),
|
|
30
61
|
revisedPrompt: z.string().nullish(),
|
|
62
|
+
generation: ImageGenerationMetadata.optional(),
|
|
31
63
|
}),
|
|
32
64
|
]);
|
|
33
65
|
export type QgridContent = z.infer<typeof QgridContent>;
|
|
@@ -50,10 +82,20 @@ export type ImageGenerationQuality = z.infer<typeof ImageGenerationQuality>;
|
|
|
50
82
|
export const ImageGenerationSize = z.enum(["1024x1024", "1024x1536", "1536x1024"]);
|
|
51
83
|
export type ImageGenerationSize = z.infer<typeof ImageGenerationSize>;
|
|
52
84
|
|
|
53
|
-
export const ImageGenerationOptions = z
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
85
|
+
export const ImageGenerationOptions = z
|
|
86
|
+
.object({
|
|
87
|
+
quality: ImageGenerationQuality.optional(),
|
|
88
|
+
size: ImageGenerationSize.optional(),
|
|
89
|
+
background: z.enum(["auto", "opaque", "transparent"]).optional(),
|
|
90
|
+
outputFormat: z.enum(["png", "jpeg", "webp"]).optional(),
|
|
91
|
+
})
|
|
92
|
+
.refine(
|
|
93
|
+
(options) =>
|
|
94
|
+
options.background !== "transparent" ||
|
|
95
|
+
!options.outputFormat ||
|
|
96
|
+
options.outputFormat === "png",
|
|
97
|
+
{ message: "Transparent image generation only supports PNG output", path: ["outputFormat"] },
|
|
98
|
+
);
|
|
57
99
|
export type ImageGenerationOptions = z.infer<typeof ImageGenerationOptions>;
|
|
58
100
|
|
|
59
101
|
export const QgridInputPart = z.discriminatedUnion("type", [
|
|
@@ -22,6 +22,13 @@ const baseResult = {
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
describe("applyToolCallEmulation image parts", () => {
|
|
25
|
+
it("preserves non-PNG MIME types in response content", () => {
|
|
26
|
+
const out = applyToolCallEmulation(baseResult, undefined, {
|
|
27
|
+
images: [{ data: "webp", mediaType: "image/webp", revisedPrompt: null }], answerKind: "text",
|
|
28
|
+
});
|
|
29
|
+
expect(out.content).toContainEqual({ type: "image", data: "webp", mediaType: "image/webp", revisedPrompt: null });
|
|
30
|
+
});
|
|
31
|
+
|
|
25
32
|
const img = { data: "iVBORw0KGgoBAgM", revisedPrompt: "a red circle" };
|
|
26
33
|
|
|
27
34
|
it("appends an image part after text when images are present (no tools)", () => {
|
|
@@ -56,6 +63,24 @@ describe("applyToolCallEmulation image parts", () => {
|
|
|
56
63
|
});
|
|
57
64
|
expect(out.content).toEqual([{ type: "text", text: "here is your image" }]);
|
|
58
65
|
});
|
|
66
|
+
|
|
67
|
+
it("preserves observed image settings and attaches response usage only once", () => {
|
|
68
|
+
const generation = {
|
|
69
|
+
route: "codex-images" as const, model: "gpt-image-2" as const,
|
|
70
|
+
size: "1254x1254", quality: "medium", background: "transparent",
|
|
71
|
+
};
|
|
72
|
+
const usage = { input_tokens: 10, output_tokens: 100, total_tokens: 110 };
|
|
73
|
+
const out = applyToolCallEmulation(baseResult, undefined, {
|
|
74
|
+
answerKind: "text",
|
|
75
|
+
images: [
|
|
76
|
+
{ ...img, generation: { ...generation, usage } },
|
|
77
|
+
{ ...img, generation },
|
|
78
|
+
],
|
|
79
|
+
});
|
|
80
|
+
expect(out.content.filter((item) => item.type === "image").map((item) => item.generation))
|
|
81
|
+
.toEqual([{ ...generation, usage }, generation]);
|
|
82
|
+
expect(out.usage).toEqual(baseResult.usage);
|
|
83
|
+
});
|
|
59
84
|
});
|
|
60
85
|
|
|
61
86
|
describe("applyToolCallEmulation envelope validation", () => {
|