ima2-gen 1.1.21 → 1.1.22

package/lib/errorClassify.ts

@@ -1,100 +0,0 @@
-// 0.09.8 — upstream error classifier.
-// Pattern-match upstream OpenAI / OAuth / network errors into stable ImaErrorCode
-// values so the UI can surface localized, actionable messages with CTAs.
-
-/** @typedef {"REF_TOO_LARGE"|"REF_NOT_BASE64"|"REF_EMPTY"|"REF_TOO_MANY"|"MODERATION_REFUSED"|"UPSTREAM_5XX"|"AUTH_CHATGPT_EXPIRED"|"AUTH_API_KEY_INVALID"|"NETWORK_FAILED"|"OAUTH_UNAVAILABLE"|"INVALID_REQUEST"|"INVALID_MODERATION"|"APIKEY_DISABLED"|"SAFETY_REFUSAL"|"EMPTY_RESPONSE"|"STREAM_PARSE_FAILED"|"IMAGE_TOOL_NOT_CALLED"|"WEB_SEARCH_ONLY_RESPONSE"|"IMAGE_TOOL_FAILED"|"IMAGE_TOOL_COMPLETED_WITHOUT_RESULT"|"OAUTH_IMAGE_CAPABILITY_UNAVAILABLE"|"RESPONSES_STREAM_ERROR"|"OAUTH_UPSTREAM_ERROR"|"DB_ERROR"|"UNKNOWN"} ImaErrorCode */
-
-const INVALID_REQUEST_CODES = new Set([
-  "bad_request",
-  "invalid_request",
-  "invalid_request_error",
-  "invalid_value",
-  "invalid_size",
-  "invalid_type",
-  "invalid_parameter",
-  "missing_required_parameter",
-  "unsupported_parameter",
-  "unsupported_value",
-]);
-
-/**
- * Normalize provider-specific request/validation codes into app codes.
- * @param {string | undefined | null} code
- * @returns {ImaErrorCode}
- */
-export function classifyUpstreamErrorCode(code: string | undefined | null) {
-  const s = String(code || "").toLowerCase();
-  if (!s) return "UNKNOWN";
-  if (INVALID_REQUEST_CODES.has(s)) return "INVALID_REQUEST";
-  if (s.includes("moderation_blocked") || s.includes("moderation refused")) return "MODERATION_REFUSED";
-  return "UNKNOWN";
-}
-
-/**
- * Classify an upstream error message into an ImaErrorCode.
- * Order matters: auth session expiry must beat generic "token" matches,
- * and moderation must beat generic 5xx.
- * @param {string | undefined | null} msg
- * @returns {ImaErrorCode}
- */
-export function classifyUpstreamError(msg: string | undefined | null) {
-  const s = String(msg || "").toLowerCase();
-  if (!s) return "UNKNOWN";
-
-  if (s.includes("moderation_blocked") || s.includes("moderation refused")) {
-    return "MODERATION_REFUSED";
-  }
-
-  // ChatGPT sign-in session expiry must precede the generic api-key checks
-  // so it is not misclassified when messages contain both "token" and "api".
-  if (
-    s.includes("token is expired") ||
-    s.includes("sign in again") ||
-    (s.includes("access token") && s.includes("expired")) ||
-    (s.includes("token") && s.includes("expired") && !s.includes("api key"))
-  ) {
-    return "AUTH_CHATGPT_EXPIRED";
-  }
-
-  if (
-    s.includes("incorrect api key") ||
-    s.includes("invalid authentication") ||
-    s.includes("exceeded your current quota") ||
-    s.includes("incorrect organization")
-  ) {
-    return "AUTH_API_KEY_INVALID";
-  }
-
-  if (
-    s.includes("failed to fetch") ||
-    s.includes("econnrefused") ||
-    s.includes("econnreset") ||
-    s.includes("enotfound") ||
-    s.includes("etimedout") ||
-    s.includes("network error")
-  ) {
-    return "NETWORK_FAILED";
-  }
-
-  if (s.includes("oauth") && (s.includes("not running") || s.includes("unavailable") || s.includes("not ready"))) {
-    return "OAUTH_UNAVAILABLE";
-  }
-
-  if (
-    s.includes("invalid_request_error") ||
-    s.includes("invalid_value") ||
-    s.includes("invalid size") ||
-    s.includes("invalid request") ||
-    s.includes("requested resolution") ||
-    s.includes("minimum pixel budget") ||
-    s.includes("unsupported value")
-  ) {
-    return "INVALID_REQUEST";
-  }
-
-  if (s.includes("an error occurred while processing") || /\b5\d\d\b/.test(s)) {
-    return "UPSTREAM_5XX";
-  }
-
-  return "UNKNOWN";
-}

package/lib/generationCancel.ts

@@ -1,28 +0,0 @@
-import { isJobCanceled } from "./inflight.js";
-
-export const GENERATION_CANCELED_CODE = "GENERATION_CANCELED";
-
-export interface GenerationCanceledError extends Error {
-  status: number;
-  code: typeof GENERATION_CANCELED_CODE;
-}
-
-export function makeGenerationCanceledError(): GenerationCanceledError {
-  const err = new Error("Generation canceled") as GenerationCanceledError;
-  err.status = 499;
-  err.code = GENERATION_CANCELED_CODE;
-  return err;
-}
-
-export function isGenerationCanceledError(value: unknown): value is GenerationCanceledError {
-  return Boolean(
-    value &&
-      typeof value === "object" &&
-      "code" in value &&
-      (value as { code?: unknown }).code === GENERATION_CANCELED_CODE,
-  );
-}
-
-export function throwIfJobCanceled(requestId: string | null | undefined) {
-  if (isJobCanceled(requestId)) throw makeGenerationCanceledError();
-}

package/lib/generationErrors.ts

@@ -1,238 +0,0 @@
-import { classifyUpstreamError, classifyUpstreamErrorCode } from "./errorClassify.js";
-import { safeDiagnosticLabel } from "./responsesParse.js";
-import { RESPONSE_DIAGNOSTIC_CODES } from "./responsesErrors.js";
-
-const PASSTHROUGH_CODES = new Set([
-  "OAUTH_UNAVAILABLE",
-  "NETWORK_FAILED",
-  "AUTH_CHATGPT_EXPIRED",
-  "AUTH_API_KEY_INVALID",
-  "UPSTREAM_5XX",
-  "OAUTH_IMAGE_TIMEOUT",
-  "API_KEY_REQUIRED",
-  "INVALID_REQUEST",
-  "OAUTH_UPSTREAM_ERROR",
-]);
-
-const SAFETY_CODES = new Set(["SAFETY_REFUSAL", "MODERATION_REFUSED", "moderation_blocked"]);
-
-function has4kSize(size: unknown) {
-  if (typeof size !== "string") return false;
-  const [w, h] = size.split("x").map((part: string) => Number(part));
-  return Number.isFinite(w) && Number.isFinite(h) && Math.max(w, h) >= 3840;
-}
-
-export interface UpstreamErr {
-  diagnosticReason?: string;
-  referenceMismatchCount?: number;
-  size?: string;
-  upstreamCode?: string;
-  upstreamType?: string;
-  upstreamParam?: string;
-  code?: string;
-  message?: string;
-  status?: number;
-  cause?: unknown;
-  eventType?: string;
-  eventCount?: number;
-  eventTypes?: unknown;
-  webSearchCalls?: number;
-  responseDiagnostics?: unknown;
-  webSearchEnabled?: boolean;
-  toolTypes?: unknown;
-  toolChoiceKind?: string;
-  promptChars?: number;
-  quality?: string;
-  moderation?: string;
-  model?: string;
-  provider?: string;
-  refsCount?: number;
-  inputImageCount?: number;
-  referenceDiagnostics?: unknown;
-  retryKind?: string;
-  initialEventCount?: number;
-  initialEventTypes?: unknown;
-  referencesDroppedOnRetry?: boolean;
-  developerPromptDroppedOnRetry?: boolean;
-  webSearchDroppedOnRetry?: boolean;
-  fallbackEventCount?: number;
-  fallbackEventTypes?: unknown;
-  fallbackImageCallSeen?: boolean;
-  fallbackImageResultCount?: number;
-  name?: string;
-  stack?: string;
-}
-
-function diagnosticReasonFrom(err: UpstreamErr | null | undefined) {
-  if (typeof err?.diagnosticReason === "string" && err.diagnosticReason) return err.diagnosticReason;
-  if (Number(err?.referenceMismatchCount) > 0) return "reference_mime_mismatch_candidate";
-  const responseDiagnosticReason = responseDiagnosticReasonFrom(err);
-  if (responseDiagnosticReason) return responseDiagnosticReason;
-  if (has4kSize(err?.size)) return "experimental_4k_empty_response";
-  return null;
-}
-
-function responseDiagnosticReasonFrom(err: UpstreamErr | null | undefined) {
-  if (!err?.responseDiagnostics || typeof err.responseDiagnostics !== "object") return null;
-  const diagnostics = err.responseDiagnostics as {
-    imageCallSeen?: unknown;
-    imageCallCompleted?: unknown;
-    imageCallFailed?: unknown;
-    imageResultCount?: unknown;
-    messageOutputSeen?: unknown;
-    streamStats?: { bytesRead?: unknown };
-  };
-  const bytesRead = Number(diagnostics.streamStats?.bytesRead);
-  if (Number.isFinite(bytesRead) && bytesRead > 0 && Number(err.eventCount) === 0) return "stream_parse_failed";
-  if (diagnostics.imageCallFailed === true) return "image_tool_failed";
-  if (diagnostics.imageCallCompleted === true && Number(diagnostics.imageResultCount) === 0) return "image_tool_completed_without_result";
-  if (diagnostics.imageCallSeen !== true && Number(err.webSearchCalls) > 0) return "web_search_only_response";
-  if (diagnostics.imageCallSeen !== true && diagnostics.messageOutputSeen === true) return "image_tool_not_called";
-  return null;
-}
-
-function responseDiagnosticCodeFrom(err: UpstreamErr | null | undefined) {
-  const reason = responseDiagnosticReasonFrom(err);
-  if (reason === "stream_parse_failed") return "STREAM_PARSE_FAILED";
-  if (reason === "web_search_only_response") return "WEB_SEARCH_ONLY_RESPONSE";
-  if (reason === "image_tool_not_called") return "IMAGE_TOOL_NOT_CALLED";
-  if (reason === "image_tool_failed") return "IMAGE_TOOL_FAILED";
-  if (reason === "image_tool_completed_without_result") return "IMAGE_TOOL_COMPLETED_WITHOUT_RESULT";
-  return null;
-}
-
-export function errorCodeFrom(err: UpstreamErr | null | undefined): string {
-  if (!err) return "UNKNOWN";
-  const appCode = err.code as string;
-  if (RESPONSE_DIAGNOSTIC_CODES.has(appCode) || appCode === "EMPTY_RESPONSE") return appCode;
-  const upstreamCode = classifyUpstreamErrorCode(err.upstreamCode);
-  if (upstreamCode !== "UNKNOWN") return upstreamCode;
-  const upstreamType = classifyUpstreamErrorCode(err.upstreamType);
-  if (upstreamType !== "UNKNOWN") return upstreamType;
-  // Known app-level codes pass through directly (before message heuristic)
-  if (PASSTHROUGH_CODES.has(appCode) || SAFETY_CODES.has(appCode)) return appCode;
-  const rawCode = classifyUpstreamErrorCode(err.code);
-  if (rawCode !== "UNKNOWN") return rawCode;
-  const direct = classifyUpstreamError(err.message);
-  if (direct !== "UNKNOWN") return direct;
-  const responseDiagnosticCode = responseDiagnosticCodeFrom(err);
-  if (responseDiagnosticCode) return responseDiagnosticCode;
-  const status = Number(err.status);
-  if (Number.isFinite(status) && status >= 400 && status < 500 && !SAFETY_CODES.has(err.code as string)) {
-    return "INVALID_REQUEST";
-  }
-  if (typeof err.code === "string" && err.code) return err.code;
-  if (err.cause) return errorCodeFrom(err.cause as UpstreamErr);
-  return "UNKNOWN";
-}
-
-export function isNonRetryableGenerationError(err: UpstreamErr | null | undefined) {
-  const code = errorCodeFrom(err);
-  if (SAFETY_CODES.has(code)) return false;
-  const status = Number(err?.status);
-  return code === "INVALID_REQUEST" || code === "OAUTH_IMAGE_TIMEOUT" || (Number.isFinite(status) && status >= 400 && status < 500);
-}
-
-export function statusForErrorCode(code: string, fallback = 500) {
-  if (code === "OAUTH_UNAVAILABLE" || code === "NETWORK_FAILED") return 503;
-  if (code === "AUTH_CHATGPT_EXPIRED" || code === "AUTH_API_KEY_INVALID") return 401;
-  if (code === "API_KEY_REQUIRED") return 401;
-  if (code === "UPSTREAM_5XX") return 502;
-  if (code === "RESPONSES_STREAM_ERROR") return 502;
-  if (code === "OAUTH_IMAGE_TIMEOUT") return 504;
-  if (code === "INVALID_REQUEST") return 400;
-  if (RESPONSE_DIAGNOSTIC_CODES.has(code)) return 422;
-  if (code === "SAFETY_REFUSAL" || code === "MODERATION_REFUSED" || code === "moderation_blocked") return 422;
-  return fallback;
-}
-
-function copyEmptyResponseMetadata(target: any, source: UpstreamErr | null | undefined) {
-  if (!source) return;
-  if (typeof source.eventCount === "number") target.eventCount = source.eventCount;
-  if (source.eventTypes) target.eventTypes = source.eventTypes;
-  if (typeof source.webSearchCalls === "number") target.webSearchCalls = source.webSearchCalls;
-  if (source.responseDiagnostics) target.responseDiagnostics = source.responseDiagnostics;
-  if (typeof source.webSearchEnabled === "boolean") target.webSearchEnabled = source.webSearchEnabled;
-  if (Array.isArray(source.toolTypes)) target.toolTypes = source.toolTypes;
-  if (source.toolChoiceKind) target.toolChoiceKind = source.toolChoiceKind;
-  if (typeof source.promptChars === "number") target.promptChars = source.promptChars;
-  if (typeof source.refsCount === "number") target.refsCount = source.refsCount;
-  if (typeof source.inputImageCount === "number") target.inputImageCount = source.inputImageCount;
-  if (Array.isArray(source.referenceDiagnostics)) target.referenceDiagnostics = source.referenceDiagnostics;
-  if (typeof source.referenceMismatchCount === "number") target.referenceMismatchCount = source.referenceMismatchCount;
-  if (source.retryKind) target.retryKind = source.retryKind;
-  if (typeof source.initialEventCount === "number") target.initialEventCount = source.initialEventCount;
-  if (source.initialEventTypes) target.initialEventTypes = source.initialEventTypes;
-  if (typeof source.referencesDroppedOnRetry === "boolean") target.referencesDroppedOnRetry = source.referencesDroppedOnRetry;
-  if (typeof source.developerPromptDroppedOnRetry === "boolean") target.developerPromptDroppedOnRetry = source.developerPromptDroppedOnRetry;
-  if (typeof source.webSearchDroppedOnRetry === "boolean") target.webSearchDroppedOnRetry = source.webSearchDroppedOnRetry;
-  if (typeof source.fallbackEventCount === "number") target.fallbackEventCount = source.fallbackEventCount;
-  if (source.fallbackEventTypes) target.fallbackEventTypes = source.fallbackEventTypes;
-  if (typeof source.fallbackImageCallSeen === "boolean") target.fallbackImageCallSeen = source.fallbackImageCallSeen;
-  if (typeof source.fallbackImageResultCount === "number") target.fallbackImageResultCount = source.fallbackImageResultCount;
-}
-
-export function normalizeGenerationFailure(lastErr: UpstreamErr | null | undefined, options: any = {}) {
-  const code = errorCodeFrom(lastErr);
-  if (PASSTHROUGH_CODES.has(code)) {
-    const err: any = new Error(lastErr?.message || options.proxyMessage || "GPT OAuth proxy/network failure");
-    err.code = code;
-    err.status = lastErr?.status || statusForErrorCode(code);
-    err.cause = lastErr;
-    if (lastErr?.upstreamCode) err.upstreamCode = safeDiagnosticLabel(lastErr.upstreamCode);
-    if (lastErr?.upstreamType) err.upstreamType = safeDiagnosticLabel(lastErr.upstreamType);
-    if (lastErr?.upstreamParam) err.upstreamParam = safeDiagnosticLabel(lastErr.upstreamParam);
-    if (lastErr?.eventType) err.eventType = lastErr.eventType;
-    if (typeof lastErr?.eventCount === "number") err.eventCount = lastErr.eventCount;
-    return err;
-  }
-  if (SAFETY_CODES.has(code)) {
-    const err: any = new Error(options.safetyMessage || lastErr?.message || "Content generation refused after retries");
-    err.code = "SAFETY_REFUSAL";
-    err.status = 422;
-    err.cause = lastErr;
-    return err;
-  }
-  if (RESPONSE_DIAGNOSTIC_CODES.has(code)) {
-    const err: any = new Error(lastErr?.message || "Image generation did not return image data");
-    err.code = code;
-    err.status = lastErr?.status || statusForErrorCode(code, 422);
-    err.cause = lastErr;
-    if (lastErr?.upstreamCode) err.upstreamCode = safeDiagnosticLabel(lastErr.upstreamCode);
-    if (lastErr?.upstreamType) err.upstreamType = safeDiagnosticLabel(lastErr.upstreamType);
-    if (lastErr?.upstreamParam) err.upstreamParam = safeDiagnosticLabel(lastErr.upstreamParam);
-    if (lastErr?.eventType) err.eventType = lastErr.eventType;
-    copyEmptyResponseMetadata(err, lastErr);
-    err.diagnosticReason = diagnosticReasonFrom(lastErr) || code.toLowerCase();
-    return err;
-  }
-  // Empty response with metadata → likely a technical limitation (unsupported size/quality/model)
-  if (typeof lastErr?.eventCount === "number") {
-    const meta: string[] = [];
-    if (lastErr.size) meta.push(`size=${lastErr.size}`);
-    if (lastErr.quality) meta.push(`quality=${lastErr.quality}`);
-    if (lastErr.model) meta.push(`model=${lastErr.model}`);
-    const msg = meta.length
-      ? `No image data returned. This may be an unsupported ${meta.join(", ")} combination. Try a different size or model.`
-      : "No image data returned from the image backend. Try a different size, quality, or prompt.";
-    const err: any = new Error(msg);
-    err.code = "EMPTY_RESPONSE";
-    err.status = 422;
-    err.cause = lastErr;
-    if (lastErr.size) err.size = lastErr.size;
-    if (lastErr.quality) err.quality = lastErr.quality;
-    if (lastErr.model) err.model = lastErr.model;
-    if (lastErr.provider) err.provider = lastErr.provider;
-    if (lastErr.moderation) err.moderation = lastErr.moderation;
-    copyEmptyResponseMetadata(err, lastErr);
-    const diagnosticReason = diagnosticReasonFrom(lastErr);
-    if (diagnosticReason) err.diagnosticReason = diagnosticReason;
-    return err;
-  }
-  // Unrecognized errors → UNKNOWN (do not pretend they are safety refusals)
-  const err: any = new Error(lastErr?.message || options.proxyMessage || "Image generation failed");
-  err.code = "UNKNOWN";
-  err.status = lastErr?.status || 500;
-  err.cause = lastErr;
-  return err;
-}