@gammatech/aijsx 0.6.2-dev.2024-05-02 → 0.7.0-dev.2024-05-14

package/dist/index.d.mts

@@ -27,6 +27,13 @@ type RetryProps = {
 };
 declare function Retry({ shouldRetry, retries, maxRetries, children }: RetryProps, ctx: RenderContext): AsyncGenerator<string, void, unknown>;
 
+type FallbackProps = {
+    fallback: AINode;
+    shouldFallback: (error: Error) => boolean;
+    children: AINode;
+};
+declare function Fallback({ shouldFallback, fallback, children }: FallbackProps, ctx: RenderContext): AsyncGenerator<string, void, unknown>;
+
 declare class AITraceAPI {
     private static _instance?;
     private enabled;
@@ -145,7 +152,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-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 +165,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?: {
@@ -226,4 +233,4 @@ type ClaudeImageBlockUrl = {
 type ClaudeImageBlockProps = ClaudeImageBlockBase64 | ClaudeImageBlockUrl;
 declare const ClaudeImageBlock: (props: ClaudeImageBlockProps) => Promise<JSX.Element>;
 
-export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, AnthropicChatCompletionInner, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, OpenAIVisionChatCompletionInner, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, Trace, Tracer, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer, tracing };
+export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, AnthropicChatCompletionInner, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, OpenAIVisionChatCompletionInner, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, Trace, Tracer, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer, tracing };

package/dist/index.d.ts

@@ -27,6 +27,13 @@ type RetryProps = {
 };
 declare function Retry({ shouldRetry, retries, maxRetries, children }: RetryProps, ctx: RenderContext): AsyncGenerator<string, void, unknown>;
 
+type FallbackProps = {
+    fallback: AINode;
+    shouldFallback: (error: Error) => boolean;
+    children: AINode;
+};
+declare function Fallback({ shouldFallback, fallback, children }: FallbackProps, ctx: RenderContext): AsyncGenerator<string, void, unknown>;
+
 declare class AITraceAPI {
     private static _instance?;
     private enabled;
@@ -145,7 +152,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-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 +165,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?: {
@@ -226,4 +233,4 @@ type ClaudeImageBlockUrl = {
 type ClaudeImageBlockProps = ClaudeImageBlockBase64 | ClaudeImageBlockUrl;
 declare const ClaudeImageBlock: (props: ClaudeImageBlockProps) => Promise<JSX.Element>;
 
-export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, AnthropicChatCompletionInner, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, OpenAIVisionChatCompletionInner, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, Trace, Tracer, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer, tracing };
+export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, AnthropicChatCompletionInner, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, OpenAIVisionChatCompletionInner, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, Trace, Tracer, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer, tracing };

package/dist/index.js

@@ -44,6 +44,7 @@ __export(src_exports, {
   ContentTypeImage: () => ContentTypeImage,
   DefaultMaxRetriesContext: () => DefaultMaxRetriesContext,
   EnrichingSpanProcessor: () => EnrichingSpanProcessor,
+  Fallback: () => Fallback,
   LogImplementation: () => LogImplementation,
   NoopLogImplementation: () => NoopLogImplementation,
   OpenAIChatCompletion: () => OpenAIChatCompletion,
@@ -1470,6 +1471,24 @@ async function* Retry({ shouldRetry: shouldRetry4, retries = 0, maxRetries = 3,
   }
 }
 
+// src/fallback.tsx
+async function* Fallback({ shouldFallback, fallback, children }, ctx) {
+  const { render } = ctx;
+  let hasYieldedData = false;
+  try {
+    const result = render(children);
+    for await (const value of result) {
+      hasYieldedData = true;
+      yield value;
+    }
+  } catch (e) {
+    if (hasYieldedData || !shouldFallback(e)) {
+      throw e;
+    }
+    yield* render(fallback);
+  }
+}
+
 // src/prompt/evaluatePrompt.ts
 async function evaluatePrompt(prompt, variables, result) {
   const { error, parsedVariables } = parseVariables(prompt.schema, variables);
@@ -1723,6 +1742,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;
@@ -2642,6 +2665,7 @@ var import_tokenizer4 = require("@anthropic-ai/tokenizer");
   ContentTypeImage,
   DefaultMaxRetriesContext,
   EnrichingSpanProcessor,
+  Fallback,
   LogImplementation,
   NoopLogImplementation,
   OpenAIChatCompletion,

package/dist/index.mjs

@@ -1367,6 +1367,24 @@ async function* Retry({ shouldRetry: shouldRetry4, retries = 0, maxRetries = 3,
   }
 }
 
+// src/fallback.tsx
+async function* Fallback({ shouldFallback, fallback, children }, ctx) {
+  const { render } = ctx;
+  let hasYieldedData = false;
+  try {
+    const result = render(children);
+    for await (const value of result) {
+      hasYieldedData = true;
+      yield value;
+    }
+  } catch (e) {
+    if (hasYieldedData || !shouldFallback(e)) {
+      throw e;
+    }
+    yield* render(fallback);
+  }
+}
+
 // src/prompt/evaluatePrompt.ts
 async function evaluatePrompt(prompt, variables, result) {
   const { error, parsedVariables } = parseVariables(prompt.schema, variables);
@@ -1620,6 +1638,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;
@@ -2538,6 +2560,7 @@ export {
   ContentTypeImage,
   DefaultMaxRetriesContext,
   EnrichingSpanProcessor,
+  Fallback,
   LogImplementation,
   NoopLogImplementation,
   OpenAIChatCompletion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.6.2-dev.2024-05-02",
+  "version": "0.7.0-dev.2024-05-14",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",