@gammatech/aijsx 0.6.1-dev.2024-04-17 → 0.6.3-dev.2024-05-14

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, a as Context, A as AINode, T as Tracer, b as ReadableSpan, c as SpanExporter, d as AIComponent, e as SpanAttributes, E as EvaluatorFn, P as PromptParsed, f as Prompt, N as NotAsyncGenerator, F as FunctionChain, g as StreamChain, h as EvaluatorResult, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-n4ojN2eR.mjs';
-export { I as AIElement, k as AIFragment, o as AssistantMessage, B as BoundLogger, r as ChatCompletionError, s as ChatCompletionRequestPayloads, m as ChatCompletionRole, z as CombinedLogger, y as ConsoleLogger, D as Literal, t as LogChatCompletionRequest, u as LogChatCompletionResponse, v as LogLevel, w as Logger, x as NoopLogImplementation, _ as OutputParser, M as PropsOfAIComponent, G as RenderResult, K as Renderable, p as RenderedConversationMessage, V as Span, O as SpanContext, W as SpanEvent, Q as SpanStatus, n as SystemMessage, Y as TracingContext, X as TracingContextKey, Z as TracingContextManager, U as UserMessage, H as attachedContextSymbol, q as computeUsage, j as createAIElement, l as createContext } from './jsx-dev-runtime-n4ojN2eR.mjs';
+import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, a as Context, A as AINode, T as Tracer, b as ReadableSpan, c as SpanExporter, d as AIComponent, e as SpanAttributes, E as EvaluatorFn, P as PromptParsed, f as Prompt, N as NotAsyncGenerator, F as FunctionChain, g as StreamChain, h as EvaluatorResult, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-6M25UAsb.mjs';
+export { I as AIElement, k as AIFragment, o as AssistantMessage, B as BoundLogger, r as ChatCompletionError, s as ChatCompletionRequestPayloads, m as ChatCompletionRole, z as CombinedLogger, y as ConsoleLogger, D as Literal, t as LogChatCompletionRequest, u as LogChatCompletionResponse, v as LogLevel, w as Logger, x as NoopLogImplementation, _ as OutputParser, M as PropsOfAIComponent, G as RenderResult, K as Renderable, p as RenderedConversationMessage, V as Span, O as SpanContext, W as SpanEvent, Q as SpanStatus, n as SystemMessage, Y as TracingContext, X as TracingContextKey, Z as TracingContextManager, U as UserMessage, H as attachedContextSymbol, q as computeUsage, j as createAIElement, l as createContext } from './jsx-dev-runtime-6M25UAsb.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -145,7 +145,7 @@ declare module '@gammatech/aijsx' {
         openai: OpenAIChatCompletionRequest;
     }
 }
-type ValidOpenAIChatModel = 'gpt-4' | 'gpt-4-0314' | 'gpt-4-0613' | 'gpt-4-32k' | 'gpt-4-32k-0314' | 'gpt-4-32k-0613' | 'gpt-4-1106-preview' | 'gpt-4-0125-preview' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-0301' | 'gpt-3.5-turbo-0613' | 'gpt-3.5-turbo-16k' | 'gpt-3.5-turbo-16k-0613' | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo-0125';
+type ValidOpenAIChatModel = 'gpt-4o' | 'gpt-4o-2024-05-13' | 'gpt-4-turbo-2024-04-09' | 'gpt-4-turbo' | 'gpt-4o' | 'gpt-4' | 'gpt-4-0314' | 'gpt-4-0613' | 'gpt-4-32k' | 'gpt-4-32k-0314' | 'gpt-4-32k-0613' | 'gpt-4-1106-preview' | 'gpt-4-0125-preview' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-0301' | 'gpt-3.5-turbo-0613' | 'gpt-3.5-turbo-16k' | 'gpt-3.5-turbo-16k-0613' | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo-0125';
 declare const OpenAIClientContext: Context<() => ChatCompletionClientAndProvider<OpenAI>>;
 type OpenAIChatCompletionProps = {
     model: ValidOpenAIChatModel;
@@ -158,7 +158,7 @@ type OpenAIChatCompletionProps = {
 };
 declare function OpenAIChatCompletion(props: OpenAIChatCompletionProps, ctx: RenderContext): AINode;
 
-type ValidOpenAIVisionModel = 'gpt-4-vision-preview';
+type ValidOpenAIVisionModel = 'gpt-4o' | 'gpt-4o-2024-05-13' | 'gpt-4-turbo-2024-04-09' | 'gpt-4-turbo' | 'gpt-4-vision-preview';
 declare const ContentTypeImage: (_props: {
     url: string;
     dimensions?: {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, a as Context, A as AINode, T as Tracer, b as ReadableSpan, c as SpanExporter, d as AIComponent, e as SpanAttributes, E as EvaluatorFn, P as PromptParsed, f as Prompt, N as NotAsyncGenerator, F as FunctionChain, g as StreamChain, h as EvaluatorResult, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-n4ojN2eR.js';
-export { I as AIElement, k as AIFragment, o as AssistantMessage, B as BoundLogger, r as ChatCompletionError, s as ChatCompletionRequestPayloads, m as ChatCompletionRole, z as CombinedLogger, y as ConsoleLogger, D as Literal, t as LogChatCompletionRequest, u as LogChatCompletionResponse, v as LogLevel, w as Logger, x as NoopLogImplementation, _ as OutputParser, M as PropsOfAIComponent, G as RenderResult, K as Renderable, p as RenderedConversationMessage, V as Span, O as SpanContext, W as SpanEvent, Q as SpanStatus, n as SystemMessage, Y as TracingContext, X as TracingContextKey, Z as TracingContextManager, U as UserMessage, H as attachedContextSymbol, q as computeUsage, j as createAIElement, l as createContext } from './jsx-dev-runtime-n4ojN2eR.js';
+import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, a as Context, A as AINode, T as Tracer, b as ReadableSpan, c as SpanExporter, d as AIComponent, e as SpanAttributes, E as EvaluatorFn, P as PromptParsed, f as Prompt, N as NotAsyncGenerator, F as FunctionChain, g as StreamChain, h as EvaluatorResult, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-6M25UAsb.js';
+export { I as AIElement, k as AIFragment, o as AssistantMessage, B as BoundLogger, r as ChatCompletionError, s as ChatCompletionRequestPayloads, m as ChatCompletionRole, z as CombinedLogger, y as ConsoleLogger, D as Literal, t as LogChatCompletionRequest, u as LogChatCompletionResponse, v as LogLevel, w as Logger, x as NoopLogImplementation, _ as OutputParser, M as PropsOfAIComponent, G as RenderResult, K as Renderable, p as RenderedConversationMessage, V as Span, O as SpanContext, W as SpanEvent, Q as SpanStatus, n as SystemMessage, Y as TracingContext, X as TracingContextKey, Z as TracingContextManager, U as UserMessage, H as attachedContextSymbol, q as computeUsage, j as createAIElement, l as createContext } from './jsx-dev-runtime-6M25UAsb.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -145,7 +145,7 @@ declare module '@gammatech/aijsx' {
         openai: OpenAIChatCompletionRequest;
     }
 }
-type ValidOpenAIChatModel = 'gpt-4' | 'gpt-4-0314' | 'gpt-4-0613' | 'gpt-4-32k' | 'gpt-4-32k-0314' | 'gpt-4-32k-0613' | 'gpt-4-1106-preview' | 'gpt-4-0125-preview' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-0301' | 'gpt-3.5-turbo-0613' | 'gpt-3.5-turbo-16k' | 'gpt-3.5-turbo-16k-0613' | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo-0125';
+type ValidOpenAIChatModel = 'gpt-4o' | 'gpt-4o-2024-05-13' | 'gpt-4-turbo-2024-04-09' | 'gpt-4-turbo' | 'gpt-4o' | 'gpt-4' | 'gpt-4-0314' | 'gpt-4-0613' | 'gpt-4-32k' | 'gpt-4-32k-0314' | 'gpt-4-32k-0613' | 'gpt-4-1106-preview' | 'gpt-4-0125-preview' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-0301' | 'gpt-3.5-turbo-0613' | 'gpt-3.5-turbo-16k' | 'gpt-3.5-turbo-16k-0613' | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo-0125';
 declare const OpenAIClientContext: Context<() => ChatCompletionClientAndProvider<OpenAI>>;
 type OpenAIChatCompletionProps = {
     model: ValidOpenAIChatModel;
@@ -158,7 +158,7 @@ type OpenAIChatCompletionProps = {
 };
 declare function OpenAIChatCompletion(props: OpenAIChatCompletionProps, ctx: RenderContext): AINode;
 
-type ValidOpenAIVisionModel = 'gpt-4-vision-preview';
+type ValidOpenAIVisionModel = 'gpt-4o' | 'gpt-4o-2024-05-13' | 'gpt-4-turbo-2024-04-09' | 'gpt-4-turbo' | 'gpt-4-vision-preview';
 declare const ContentTypeImage: (_props: {
     url: string;
     dimensions?: {

package/dist/index.js

@@ -96,9 +96,10 @@ var computeUsage = (messages) => {
   };
 };
 var ChatCompletionError = class extends Error {
-  constructor(message, chatCompletionRequest, shouldRetry4 = false) {
+  constructor(message, chatCompletionRequest, status, shouldRetry4 = false) {
     super(message);
     this.chatCompletionRequest = chatCompletionRequest;
+    this.status = status;
     this.shouldRetry = shouldRetry4;
   }
   name = "ChatCompletionError";
@@ -1722,6 +1723,10 @@ function tokenLimitForChatModel(model) {
     case "gpt-4-32k-0314":
     case "gpt-4-32k-0613":
       return 32768 - TOKENS_CONSUMED_BY_REPLY_PREFIX;
+    case "gpt-4o":
+    case "gpt-4o-2024-05-13":
+    case "gpt-4-turbo-2024-04-09":
+    case "gpt-4-turbo":
     case "gpt-4-1106-preview":
     case "gpt-4-0125-preview":
       return 128e3 - TOKENS_CONSUMED_BY_REPLY_PREFIX;
@@ -1929,10 +1934,16 @@ async function* OpenAIChatCompletionInner(props, { logger, render, tracer, getCo
       throw new ChatCompletionError(
         `OpenAIClient.APIError: ${ex.message}`,
         logRequestData,
+        ex.status,
         retry
       );
     } else if (ex instanceof Error) {
-      throw new ChatCompletionError(ex.message, logRequestData, retry);
+      throw new ChatCompletionError(
+        ex.message,
+        logRequestData,
+        void 0,
+        retry
+      );
     }
     throw ex;
   }
@@ -2157,10 +2168,16 @@ async function* OpenAIVisionChatCompletionInner(props, { logger, render, tracer,
       throw new ChatCompletionError(
         `OpenAIClient.APIError: ${ex.message}`,
         logRequestData,
+        ex.status,
         retry
       );
     } else if (ex instanceof Error) {
-      throw new ChatCompletionError(ex.message, logRequestData, retry);
+      throw new ChatCompletionError(
+        ex.message,
+        logRequestData,
+        void 0,
+        retry
+      );
     }
     throw ex;
   }
@@ -2329,6 +2346,33 @@ function buildAnthropicMessages(childrenXml) {
 var shouldRetry3 = (error) => {
   return error instanceof ChatCompletionError && error.shouldRetry;
 };
+var RE_INTERNAL_SERVER_MESSASGE = /The system encountered an unexpected error during processing/i;
+var RE_RATE_LIMIT_MESSAGE = /Too many requests, please wait before trying again/;
+var extractStatusFromError = (error) => {
+  if (typeof error !== "object" || !(error instanceof Error)) {
+    return;
+  }
+  if (error instanceof import_sdk.default.APIError && typeof error.status === "number") {
+    return error.status;
+  }
+  const causeName = error.cause?.name;
+  if (causeName === "ValidationException") {
+    return 400;
+  } else if (causeName === "InternalServerException") {
+    return 500;
+  } else if (causeName === "ModelStreamErrorException") {
+    return 424;
+  } else if (causeName === "ThrottlingException") {
+    return 429;
+  }
+  if (RE_INTERNAL_SERVER_MESSASGE.test(error.message)) {
+    return 500;
+  }
+  if (RE_RATE_LIMIT_MESSAGE.test(error.message)) {
+    return 429;
+  }
+  return void 0;
+};
 function AnthropicChatCompletion(props, ctx) {
   const defaultMaxRetries = ctx.getContext(DefaultMaxRetriesContext);
   return /* @__PURE__ */ jsx(
@@ -2407,10 +2451,15 @@ async function* AnthropicChatCompletionInner(props, { render, logger, tracer, ge
       throw new ChatCompletionError(
         `AnthropicClient.APIError: ${err.message}`,
         logRequestData,
+        extractStatusFromError(err),
         retry
       );
     } else if (err instanceof Error) {
-      throw new ChatCompletionError(err.message, logRequestData);
+      throw new ChatCompletionError(
+        err.message,
+        logRequestData,
+        extractStatusFromError(err)
+      );
     }
     throw err;
   }
@@ -2434,15 +2483,9 @@ async function* AnthropicChatCompletionInner(props, { render, logger, tracer, ge
       }
     }
   } catch (e) {
-    let retry = false;
-    try {
-      const isValidationExceptionAWS = e?.cause?.name === "ValidationException";
-      const isValidationExceptionAnthropic = e?.error?.error?.type === "invalid_request_error";
-      retry = !isValidationExceptionAWS && !isValidationExceptionAnthropic;
-    } catch (inner) {
-      console.error(inner);
-    }
-    throw new ChatCompletionError(e.message, logRequestData, retry);
+    const status = extractStatusFromError(e);
+    const retry = status === 429 || status === 500;
+    throw new ChatCompletionError(e.message, logRequestData, status, retry);
   }
   const outputMessage = {
     role: "assistant",

package/dist/index.mjs

@@ -26,9 +26,10 @@ var computeUsage = (messages) => {
   };
 };
 var ChatCompletionError = class extends Error {
-  constructor(message, chatCompletionRequest, shouldRetry4 = false) {
+  constructor(message, chatCompletionRequest, status, shouldRetry4 = false) {
     super(message);
     this.chatCompletionRequest = chatCompletionRequest;
+    this.status = status;
     this.shouldRetry = shouldRetry4;
   }
   name = "ChatCompletionError";
@@ -1619,6 +1620,10 @@ function tokenLimitForChatModel(model) {
     case "gpt-4-32k-0314":
     case "gpt-4-32k-0613":
       return 32768 - TOKENS_CONSUMED_BY_REPLY_PREFIX;
+    case "gpt-4o":
+    case "gpt-4o-2024-05-13":
+    case "gpt-4-turbo-2024-04-09":
+    case "gpt-4-turbo":
     case "gpt-4-1106-preview":
     case "gpt-4-0125-preview":
       return 128e3 - TOKENS_CONSUMED_BY_REPLY_PREFIX;
@@ -1826,10 +1831,16 @@ async function* OpenAIChatCompletionInner(props, { logger, render, tracer, getCo
       throw new ChatCompletionError(
         `OpenAIClient.APIError: ${ex.message}`,
         logRequestData,
+        ex.status,
         retry
       );
     } else if (ex instanceof Error) {
-      throw new ChatCompletionError(ex.message, logRequestData, retry);
+      throw new ChatCompletionError(
+        ex.message,
+        logRequestData,
+        void 0,
+        retry
+      );
     }
     throw ex;
   }
@@ -2054,10 +2065,16 @@ async function* OpenAIVisionChatCompletionInner(props, { logger, render, tracer,
       throw new ChatCompletionError(
         `OpenAIClient.APIError: ${ex.message}`,
         logRequestData,
+        ex.status,
         retry
       );
     } else if (ex instanceof Error) {
-      throw new ChatCompletionError(ex.message, logRequestData, retry);
+      throw new ChatCompletionError(
+        ex.message,
+        logRequestData,
+        void 0,
+        retry
+      );
     }
     throw ex;
   }
@@ -2226,6 +2243,33 @@ function buildAnthropicMessages(childrenXml) {
 var shouldRetry3 = (error) => {
   return error instanceof ChatCompletionError && error.shouldRetry;
 };
+var RE_INTERNAL_SERVER_MESSASGE = /The system encountered an unexpected error during processing/i;
+var RE_RATE_LIMIT_MESSAGE = /Too many requests, please wait before trying again/;
+var extractStatusFromError = (error) => {
+  if (typeof error !== "object" || !(error instanceof Error)) {
+    return;
+  }
+  if (error instanceof AnthropicClient.APIError && typeof error.status === "number") {
+    return error.status;
+  }
+  const causeName = error.cause?.name;
+  if (causeName === "ValidationException") {
+    return 400;
+  } else if (causeName === "InternalServerException") {
+    return 500;
+  } else if (causeName === "ModelStreamErrorException") {
+    return 424;
+  } else if (causeName === "ThrottlingException") {
+    return 429;
+  }
+  if (RE_INTERNAL_SERVER_MESSASGE.test(error.message)) {
+    return 500;
+  }
+  if (RE_RATE_LIMIT_MESSAGE.test(error.message)) {
+    return 429;
+  }
+  return void 0;
+};
 function AnthropicChatCompletion(props, ctx) {
   const defaultMaxRetries = ctx.getContext(DefaultMaxRetriesContext);
   return /* @__PURE__ */ jsx(
@@ -2304,10 +2348,15 @@ async function* AnthropicChatCompletionInner(props, { render, logger, tracer, ge
       throw new ChatCompletionError(
         `AnthropicClient.APIError: ${err.message}`,
         logRequestData,
+        extractStatusFromError(err),
         retry
       );
     } else if (err instanceof Error) {
-      throw new ChatCompletionError(err.message, logRequestData);
+      throw new ChatCompletionError(
+        err.message,
+        logRequestData,
+        extractStatusFromError(err)
+      );
     }
     throw err;
   }
@@ -2331,15 +2380,9 @@ async function* AnthropicChatCompletionInner(props, { render, logger, tracer, ge
       }
     }
   } catch (e) {
-    let retry = false;
-    try {
-      const isValidationExceptionAWS = e?.cause?.name === "ValidationException";
-      const isValidationExceptionAnthropic = e?.error?.error?.type === "invalid_request_error";
-      retry = !isValidationExceptionAWS && !isValidationExceptionAnthropic;
-    } catch (inner) {
-      console.error(inner);
-    }
-    throw new ChatCompletionError(e.message, logRequestData, retry);
+    const status = extractStatusFromError(e);
+    const retry = status === 429 || status === 500;
+    throw new ChatCompletionError(e.message, logRequestData, status, retry);
   }
   const outputMessage = {
     role: "assistant",

package/dist/{jsx-dev-runtime-n4ojN2eR.d.mts → jsx-dev-runtime-6M25UAsb.d.mts}

@@ -314,9 +314,10 @@ declare const computeUsage: (messages: RenderedConversationMessage[]) => {
 };
 declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
+    readonly status: number | undefined;
     readonly shouldRetry: boolean;
     readonly name = "ChatCompletionError";
-    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, shouldRetry?: boolean);
+    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean);
 }
 
 declare function createAIElement<P extends {

package/dist/{jsx-dev-runtime-n4ojN2eR.d.ts → jsx-dev-runtime-6M25UAsb.d.ts}

@@ -314,9 +314,10 @@ declare const computeUsage: (messages: RenderedConversationMessage[]) => {
 };
 declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
+    readonly status: number | undefined;
     readonly shouldRetry: boolean;
     readonly name = "ChatCompletionError";
-    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, shouldRetry?: boolean);
+    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean);
 }
 
 declare function createAIElement<P extends {

package/dist/jsx-dev-runtime.d.mts

@@ -1,2 +1,2 @@
-export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-n4ojN2eR.mjs';
+export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-6M25UAsb.mjs';
 import 'zod';

package/dist/jsx-dev-runtime.d.ts

@@ -1,2 +1,2 @@
-export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-n4ojN2eR.js';
+export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-6M25UAsb.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,2 +1,2 @@
-export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-n4ojN2eR.mjs';
+export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-6M25UAsb.mjs';
 import 'zod';

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-n4ojN2eR.js';
+export { a2 as Fragment, J as JSX, $ as jsx, a0 as jsxDEV, a1 as jsxs } from './jsx-dev-runtime-6M25UAsb.js';
 import 'zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.6.1-dev.2024-04-17",
+  "version": "0.6.3-dev.2024-05-14",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",