@absolutejs/ai 0.6.4 → 0.6.6

package/dist/ai/providers/openai.js

@@ -1,14 +1,201 @@
 // @bun
+// src/ai/providers/openaiSchema.ts
+var record = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var openaiSchema = (schema) => {
+  const result = { ...schema };
+  for (const key of [
+    "properties",
+    "$defs",
+    "definitions",
+    "patternProperties"
+  ]) {
+    const value = result[key];
+    if (record(value))
+      result[key] = Object.fromEntries(Object.entries(value).map(([name, child]) => [
+        name,
+        record(child) ? openaiSchema(child) : child
+      ]));
+  }
+  for (const key of [
+    "items",
+    "additionalProperties",
+    "not",
+    "if",
+    "then",
+    "else"
+  ])
+    if (record(result[key]))
+      result[key] = openaiSchema(result[key]);
+  for (const key of ["anyOf", "oneOf", "allOf", "prefixItems"])
+    if (Array.isArray(result[key]))
+      result[key] = result[key].map((child) => record(child) ? openaiSchema(child) : child);
+  const names = result.propertyNames;
+  if (record(names) && Array.isArray(names.enum) && names.enum.every((key) => typeof key === "string") && Object.keys(names).every((key) => ["enum", "type", "description", "title"].includes(key)) && !result.patternProperties) {
+    const existing = record(result.properties) ? result.properties : {};
+    const additional = result.additionalProperties;
+    const entries = names.enum.filter((key) => Object.hasOwn(existing, key) || additional !== false).map((key) => [
+      key,
+      Object.hasOwn(existing, key) ? existing[key] : record(additional) ? additional : {}
+    ]);
+    result.properties = Object.fromEntries(entries);
+    result.additionalProperties = false;
+    delete result.propertyNames;
+  }
+  return result;
+};
+var isStrictCompatible = (schema) => {
+  if (Array.isArray(schema))
+    return schema.every(isStrictCompatible);
+  if (!record(schema))
+    return true;
+  if (schema.propertyNames || schema.patternProperties)
+    return false;
+  const properties = record(schema.properties) ? schema.properties : {};
+  if (schema.type === "object" || schema.properties || schema.additionalProperties !== undefined) {
+    const required = Array.isArray(schema.required) ? schema.required : [];
+    if (schema.additionalProperties !== false || !Object.keys(properties).every((key) => required.includes(key)))
+      return false;
+  }
+  const nested = [
+    schema.items,
+    schema.anyOf,
+    schema.oneOf,
+    schema.allOf,
+    schema.additionalProperties
+  ];
+  for (const map of [properties, schema.$defs, schema.definitions])
+    if (record(map))
+      nested.push(...Object.values(map));
+  return nested.every(isStrictCompatible);
+};
+
+// src/ai/errors/providerError.ts
+var PROVIDER_STATUS_PAGES = {
+  anthropic: "https://status.claude.com",
+  gemini: "https://status.cloud.google.com",
+  google: "https://status.cloud.google.com",
+  openai: "https://status.openai.com",
+  openrouter: "https://status.openrouter.ai"
+};
+var RETRYABLE_STATUSES = new Set([
+  408,
+  409,
+  425,
+  429,
+  500,
+  502,
+  503,
+  504,
+  529
+]);
+var CONNECTION_ERROR_PATTERNS = [
+  "econnreset",
+  "econnrefused",
+  "etimedout",
+  "enotfound",
+  "eai_again",
+  "socket hang up",
+  "fetch failed",
+  "network",
+  "terminated",
+  "timed out",
+  "timeout",
+  "and not retryable",
+  "no response body"
+];
+var isAbortError = (err) => err instanceof Error && (err.name === "AbortError" || /\babort(ed)?\b/i.test(err.message));
+var providerStatusPage = (provider) => PROVIDER_STATUS_PAGES[provider] ?? null;
+var BILLING_ERROR_TYPES = new Set([
+  "credit_balance_exhausted",
+  "insufficient_quota",
+  "billing_hard_limit_reached",
+  "billing_not_active",
+  "insufficient_credits"
+]);
+
+class ProviderError extends Error {
+  provider;
+  status;
+  type;
+  retryable;
+  billingUnavailable;
+  notSent;
+  metadata;
+  statusPageUrl;
+  constructor(init) {
+    super(init.message, init.cause === undefined ? undefined : { cause: init.cause });
+    this.name = "ProviderError";
+    this.provider = init.provider;
+    this.status = init.status ?? null;
+    this.type = init.type ?? (typeof init.metadata?.code === "string" ? init.metadata.code : typeof init.metadata?.type === "string" ? init.metadata.type : null);
+    this.billingUnavailable = BILLING_ERROR_TYPES.has(this.type ?? "") || init.status === 402 || init.provider === "anthropic" && init.status === 400 && /credit balance is too low/i.test(String(init.metadata?.message ?? init.message));
+    this.notSent = init.notSent === true;
+    this.retryable = !this.billingUnavailable && init.retryable;
+    this.metadata = init.metadata;
+    this.statusPageUrl = providerStatusPage(init.provider);
+  }
+  static fromResponse(provider, status, body, type) {
+    let metadata;
+    try {
+      const parsed = JSON.parse(body);
+      const details = parsed?.error ?? parsed;
+      if (details && typeof details === "object" && !Array.isArray(details))
+        metadata = details;
+    } catch {}
+    return new ProviderError({
+      metadata,
+      message: `${capitalize(provider)} API error ${status}: ${body}`,
+      provider,
+      retryable: RETRYABLE_STATUSES.has(status),
+      status,
+      type: type ?? null
+    });
+  }
+  static from(err, provider) {
+    if (err instanceof ProviderError)
+      return err;
+    if (isProviderError(err))
+      return new ProviderError({
+        provider: err.provider,
+        message: err.message,
+        status: err.status,
+        type: err.type,
+        retryable: err.retryable,
+        notSent: err.notSent,
+        metadata: err.metadata,
+        cause: err
+      });
+    if (isAbortError(err))
+      throw err;
+    const rawMessage = err instanceof Error ? err.message : String(err ?? "");
+    const lower = rawMessage.toLowerCase();
+    const statusMatch = lower.match(/api error\s+(\d{3})/);
+    const status = statusMatch ? Number(statusMatch[1]) : null;
+    const retryable = status !== null && RETRYABLE_STATUSES.has(status) || status === null && CONNECTION_ERROR_PATTERNS.some((pattern) => lower.includes(pattern));
+    return new ProviderError({
+      cause: err,
+      message: rawMessage || `${capitalize(provider)} request failed`,
+      provider,
+      retryable,
+      status
+    });
+  }
+}
+var capitalize = (value) => value.charAt(0).toUpperCase() + value.slice(1);
+var isProviderError = (error) => error instanceof Error && error.name === "ProviderError" && ("provider" in error) && typeof error.provider === "string" && ("status" in error) && (error.status === null || typeof error.status === "number") && ("retryable" in error) && typeof error.retryable === "boolean" && ("billingUnavailable" in error) && typeof error.billingUnavailable === "boolean" && ("notSent" in error) && typeof error.notSent === "boolean";
+
 // src/ai/inputCapacity.ts
 class AIInputError extends Error {
   code;
   providerStatus;
   requestId;
-  constructor(code, message, providerStatus, requestId) {
+  providerError;
+  constructor(code, message, providerStatus, requestId, providerError) {
     super(message);
     this.code = code;
     this.providerStatus = providerStatus;
     this.requestId = requestId;
+    this.providerError = providerError;
     this.name = "AIInputError";
   }
 }
@@ -31,7 +218,7 @@ var inspectAIInput = async (provider, params) => {
     provider.inputCapacity.countTokens(params)
   ]).catch((error) => {
     if (error instanceof Error && error.name === "AIInputError" && "code" in error && (error.code === "capacity_unavailable" || error.code === "input_too_large" || error.code === "unsupported_content"))
-      throw new AIInputError(error.code, error.message, "providerStatus" in error && typeof error.providerStatus === "number" ? error.providerStatus : undefined, "requestId" in error && typeof error.requestId === "string" ? error.requestId : undefined);
+      throw new AIInputError(error.code, error.message, "providerStatus" in error && typeof error.providerStatus === "number" ? error.providerStatus : undefined, "requestId" in error && typeof error.requestId === "string" ? error.requestId : undefined, "providerError" in error && isProviderError(error.providerError) ? ProviderError.from(error.providerError, error.providerError.provider) : undefined);
     throw error;
   });
   const inputTokens = inputTokenCount(tokens);
@@ -63,7 +250,7 @@ var cacheModelLimits = (load, ttlMs = 300000) => {
     return limits;
   };
 };
-var capacityJson = async (response) => {
+var capacityJson = async (response, provider = "unknown") => {
   if (!response.ok) {
     const payload = await response.json().catch(() => {
       return;
@@ -74,7 +261,7 @@ var capacityJson = async (response) => {
     const message = nested?.message ?? record?.message;
     const detail = typeof message === "string" ? message.slice(0, 1000) : undefined;
     const id = response.headers.get("request-id") ?? response.headers.get("x-request-id") ?? record?.request_id;
-    throw new AIInputError("capacity_unavailable", `Model capacity request failed (${response.status}).${detail ? ` ${detail}` : ""}`, response.status, typeof id === "string" ? id.slice(0, 200) : undefined);
+    throw new AIInputError("capacity_unavailable", `Model capacity request failed (${response.status}).${detail ? ` ${detail}` : ""}`, response.status, typeof id === "string" ? id.slice(0, 200) : undefined, ProviderError.fromResponse(provider, response.status, JSON.stringify({ error: nested ?? record ?? {} })));
   }
   const value = await response.json();
   if (!value || typeof value !== "object" || Array.isArray(value))
@@ -304,113 +491,10 @@ var openaiInputCapacity = (config) => ({
       body: JSON.stringify(counted),
       signal: params.signal ? AbortSignal.any([params.signal, AbortSignal.timeout(15000)]) : AbortSignal.timeout(15000)
     });
-    return inputTokenCount((await capacityJson(response)).input_tokens);
+    return inputTokenCount((await capacityJson(response, "openai")).input_tokens);
   }
 });
 
-// src/ai/errors/providerError.ts
-var PROVIDER_STATUS_PAGES = {
-  anthropic: "https://status.claude.com",
-  gemini: "https://status.cloud.google.com",
-  google: "https://status.cloud.google.com",
-  openai: "https://status.openai.com",
-  openrouter: "https://status.openrouter.ai"
-};
-var RETRYABLE_STATUSES = new Set([
-  408,
-  409,
-  425,
-  429,
-  500,
-  502,
-  503,
-  504,
-  529
-]);
-var CONNECTION_ERROR_PATTERNS = [
-  "econnreset",
-  "econnrefused",
-  "etimedout",
-  "enotfound",
-  "eai_again",
-  "socket hang up",
-  "fetch failed",
-  "network",
-  "terminated",
-  "timed out",
-  "timeout",
-  "and not retryable",
-  "no response body"
-];
-var isAbortError = (err) => err instanceof Error && (err.name === "AbortError" || /\babort(ed)?\b/i.test(err.message));
-var providerStatusPage = (provider) => PROVIDER_STATUS_PAGES[provider] ?? null;
-var BILLING_ERROR_TYPES = new Set([
-  "credit_balance_exhausted",
-  "insufficient_quota",
-  "billing_hard_limit_reached",
-  "billing_not_active",
-  "insufficient_credits"
-]);
-
-class ProviderError extends Error {
-  provider;
-  status;
-  type;
-  retryable;
-  billingUnavailable;
-  notSent;
-  metadata;
-  statusPageUrl;
-  constructor(init) {
-    super(init.message, init.cause === undefined ? undefined : { cause: init.cause });
-    this.name = "ProviderError";
-    this.provider = init.provider;
-    this.status = init.status ?? null;
-    this.type = init.type ?? (typeof init.metadata?.code === "string" ? init.metadata.code : typeof init.metadata?.type === "string" ? init.metadata.type : null);
-    this.billingUnavailable = BILLING_ERROR_TYPES.has(this.type ?? "") || init.status === 402;
-    this.notSent = init.notSent === true;
-    this.retryable = !this.billingUnavailable && init.retryable;
-    this.metadata = init.metadata;
-    this.statusPageUrl = providerStatusPage(init.provider);
-  }
-  static fromResponse(provider, status, body, type) {
-    let metadata;
-    try {
-      const parsed = JSON.parse(body);
-      const details = parsed?.error ?? parsed;
-      if (details && typeof details === "object" && !Array.isArray(details))
-        metadata = details;
-    } catch {}
-    return new ProviderError({
-      metadata,
-      message: `${capitalize(provider)} API error ${status}: ${body}`,
-      provider,
-      retryable: RETRYABLE_STATUSES.has(status),
-      status,
-      type: type ?? null
-    });
-  }
-  static from(err, provider) {
-    if (err instanceof ProviderError)
-      return err;
-    if (isAbortError(err))
-      throw err;
-    const rawMessage = err instanceof Error ? err.message : String(err ?? "");
-    const lower = rawMessage.toLowerCase();
-    const statusMatch = lower.match(/api error\s+(\d{3})/);
-    const status = statusMatch ? Number(statusMatch[1]) : null;
-    const retryable = status !== null && RETRYABLE_STATUSES.has(status) || status === null && CONNECTION_ERROR_PATTERNS.some((pattern) => lower.includes(pattern));
-    return new ProviderError({
-      cause: err,
-      message: rawMessage || `${capitalize(provider)} request failed`,
-      provider,
-      retryable,
-      status
-    });
-  }
-}
-var capitalize = (value) => value.charAt(0).toUpperCase() + value.slice(1);
-
 // src/ai/resilience.ts
 var DEFAULT_CONFIG = {
   baseDelayMs: 500,
@@ -540,6 +624,29 @@ var withResilience = (provider, providerName = "unknown") => {
   let billingFailure = null;
   let billingRetryAt = 0;
   let billingProbe = false;
+  const inspectAvailable = async (inspect) => {
+    if (billingFailure && Date.now() < billingRetryAt) {
+      throw new ProviderError({
+        provider: providerName,
+        message: "Provider billing is unavailable",
+        type: billingFailure.type,
+        status: billingFailure.status,
+        metadata: billingFailure.metadata,
+        retryable: false,
+        notSent: true
+      });
+    }
+    try {
+      return await inspect();
+    } catch (error) {
+      const nested = error instanceof Error && "providerError" in error ? error.providerError : error;
+      if (isProviderError(nested) && nested.billingUnavailable) {
+        billingFailure = ProviderError.from(nested, providerName);
+        billingRetryAt = Date.now() + billingCooldownMs;
+      }
+      throw error;
+    }
+  };
   const billingCooldownMs = 5 * 60000;
   const attempt = async function* (params, attemptNo) {
     let yielded = false;
@@ -567,33 +674,39 @@ var withResilience = (provider, providerName = "unknown") => {
       if (providerError.retryable)
         noteFailure(providerName, providerError);
       throw providerError;
+    } finally {
+      billingProbe = false;
     }
   };
   return {
     ...provider,
-    stream: (params) => {
+    ...provider.inputCapacity ? {
+      inputCapacity: {
+        ...provider.inputCapacity,
+        getLimits: (params) => inspectAvailable(() => provider.inputCapacity.getLimits(params)),
+        countTokens: (params) => inspectAvailable(() => provider.inputCapacity.countTokens(params))
+      }
+    } : {},
+    stream: async function* (params) {
       if (billingFailure && (Date.now() < billingRetryAt || billingProbe)) {
         const failure = billingFailure;
-        return async function* () {
-          throw new ProviderError({
-            provider: providerName,
-            message: "Provider billing is unavailable",
-            type: failure.type,
-            status: failure.status,
-            retryable: false,
-            notSent: true
-          });
-        }();
+        throw new ProviderError({
+          provider: providerName,
+          message: "Provider billing is unavailable",
+          type: failure.type,
+          status: failure.status,
+          metadata: failure.metadata,
+          retryable: false,
+          notSent: true
+        });
       }
-      if (billingFailure)
-        billingProbe = true;
       const tripped = circuitOpen(providerName);
       if (tripped) {
-        return async function* () {
-          throw tripped;
-        }();
+        throw tripped;
       }
-      return attempt(params, 0);
+      if (billingFailure)
+        billingProbe = true;
+      yield* attempt(params, 0);
     }
   };
 };
@@ -602,7 +715,7 @@ var withResilience = (provider, providerName = "unknown") => {
 var instrumentAIProvider = (provider, providerName) => {
   const resilient = withResilience(provider, providerName);
   return {
-    ...provider,
+    ...resilient,
     stream: (params) => {
       if (!params.onUsage && !params.onSpan) {
         return resilient.stream(params);
@@ -962,30 +1075,11 @@ var buildInput = (messages) => {
   }
   return input;
 };
-var isStrictCompatible = (schema) => {
-  if (Array.isArray(schema))
-    return schema.every(isStrictCompatible);
-  if (!isRecord(schema))
-    return true;
-  const { properties } = schema;
-  if (isRecord(properties)) {
-    const required = Array.isArray(schema.required) ? schema.required : [];
-    if (schema.additionalProperties !== false)
-      return false;
-    if (!Object.keys(properties).every((key) => required.includes(key)))
-      return false;
-  }
-  const nested = [schema.items, schema.anyOf];
-  for (const map of [properties, schema.$defs, schema.definitions])
-    if (isRecord(map))
-      nested.push(...Object.values(map));
-  return nested.every(isStrictCompatible);
-};
 var mapToolDefinition = (tool) => ({
   description: tool.description,
   name: tool.name,
-  parameters: tool.input_schema,
-  strict: isStrictCompatible(tool.input_schema),
+  parameters: openaiSchema(tool.input_schema),
+  strict: isStrictCompatible(openaiSchema(tool.input_schema)),
   type: "function"
 });
 var buildTools = (tools, isImageModel) => {
@@ -1042,7 +1136,7 @@ var buildResponsesRequestBody = (params, isImageModel, capabilityModel = params.
       body.text = {
         format: {
           name: params.responseFormat.name,
-          schema: params.responseFormat.schema,
+          schema: openaiSchema(params.responseFormat.schema),
           strict: params.responseFormat.strict ?? true,
           type: "json_schema"
         }
@@ -1509,7 +1603,7 @@ var mapToolDefinitions = (tools) => tools.map((tool) => ({
   function: {
     description: tool.description,
     name: tool.name,
-    parameters: tool.input_schema
+    parameters: openaiSchema(tool.input_schema)
   },
   type: "function"
 }));
@@ -1635,7 +1729,7 @@ var buildRequestBody = (params, capabilityModel = params.model, providerName = "
       body.response_format = {
         json_schema: {
           name: params.responseFormat.name,
-          schema: params.responseFormat.schema,
+          schema: openaiSchema(params.responseFormat.schema),
           strict: params.responseFormat.strict ?? true
         },
         type: "json_schema"
@@ -2028,5 +2122,5 @@ export {
   openai
 };
 
-//# debugId=0CC011402536F35664756E2164756E21
+//# debugId=E5102C547733AF4E64756E2164756E21
 //# sourceMappingURL=openai.js.map