@gammatech/aijsx 0.16.0-dev.2024-11-05 → 0.16.1-dev.2024-11-05

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, R as RenderContext, a as LogImplementation, S as SpanProcessor, C as ContextValues, b as Context, T as Tracer, c as ReadableSpan, d as SpanAttributes, e as SpanExporter, f as AIComponent, P as Prompt, g as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, h as EvaluatorFn, i as PromptParsed, J as JSX } from './jsx-dev-runtime-yLtSq2UV.mjs';
-export { z as AIElement, k as AIFragment, B as BoundLogger, p as ChatCompletionUsage, m as ChatMessage, n as ChatRole, v as CombinedLogger, u as ConsoleLogger, I as ImagePart, o as ImagePartProps, w as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, N as NoopLogImplementation, W as OutputParser, G as PropsOfAIComponent, x as RenderResult, F as Renderable, M as Span, H as SpanContext, O as SpanEvent, K as SpanStatus, U as TracingContext, Q as TracingContextKey, V as TracingContextManager, y as attachedContextSymbol, j as createAIElement, l as createContext, t as toDebugMessage } from './jsx-dev-runtime-yLtSq2UV.mjs';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatCompletionUsage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-yyAW1PnA.mjs';
+export { z as AIElement, l as AIFragment, B as BoundLogger, n as ChatMessage, o as ChatRole, v as CombinedLogger, u as ConsoleLogger, I as ImagePart, p as ImagePartProps, w as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, N as NoopLogImplementation, W as OutputParser, G as PropsOfAIComponent, x as RenderResult, F as Renderable, M as Span, H as SpanContext, O as SpanEvent, K as SpanStatus, U as TracingContext, Q as TracingContextKey, V as TracingContextManager, y as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-yyAW1PnA.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -35,12 +35,7 @@ type ChatCompletionClientAndProvider<K> = {
     client: K;
     provider?: string;
     providerRegion?: string;
-    costFn?: (model: string, usage: {
-        prompt: number;
-        completion: number;
-        cachedPromptTokensCreated: number;
-        cachedPromptTokensRead: number;
-    }) => number;
+    costFn?: (model: string, usage: Omit<ChatCompletionUsage, 'total'>) => number;
 };
 type GetChatCompletionClientAndProvider<Model, Client> = (model: Model, args: {
     retryCount: number;
@@ -168,11 +163,6 @@ type TraceProps = {
 declare const Trace: AIComponent<TraceProps>;
 
 type Cost = number;
-type Usage = {
-    prompt: number;
-    completion: number;
-    total: number;
-};
 declare namespace AISpanAttributes {
     type Prompt = {
         prompt: Prompt;
@@ -192,7 +182,7 @@ declare namespace AISpanAttributes {
         inputMessages: DebugMessage[];
         finishReason: string | null;
         output: string;
-        tokensUsed: Usage;
+        tokensUsed: ChatCompletionUsage;
         [key: string]: any;
     };
 }
@@ -201,7 +191,7 @@ declare namespace ProcessedAISpanAttributes {
         prompt: never;
         evaluatorResults: Record<string, EvaluatorResult>;
         evaluatorError?: string;
-        totalUsage?: Usage;
+        totalUsage?: ChatCompletionUsage;
         totalCost?: Cost;
         parentPromptKey?: string;
         rootPromptKey?: string;
@@ -330,4 +320,4 @@ type GoogleChatCompletionProps = {
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 
-export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, Accumulate, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EvaluatorFn, EvaluatorResult, Fallback, type GetChatCompletionClientAndProvider, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, RetryLastErrorContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createPrompt, createRenderContext, evaluatePrompt, AnthropicPromptCacheDebugger as experimental__AnthropicPromptCacheDebugger, isPromptParsed, tracing };
+export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, Accumulate, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatCompletionUsage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EvaluatorFn, EvaluatorResult, Fallback, type GetChatCompletionClientAndProvider, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, RetryLastErrorContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createPrompt, createRenderContext, evaluatePrompt, AnthropicPromptCacheDebugger as experimental__AnthropicPromptCacheDebugger, isPromptParsed, tracing };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, R as RenderContext, a as LogImplementation, S as SpanProcessor, C as ContextValues, b as Context, T as Tracer, c as ReadableSpan, d as SpanAttributes, e as SpanExporter, f as AIComponent, P as Prompt, g as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, h as EvaluatorFn, i as PromptParsed, J as JSX } from './jsx-dev-runtime-yLtSq2UV.js';
-export { z as AIElement, k as AIFragment, B as BoundLogger, p as ChatCompletionUsage, m as ChatMessage, n as ChatRole, v as CombinedLogger, u as ConsoleLogger, I as ImagePart, o as ImagePartProps, w as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, N as NoopLogImplementation, W as OutputParser, G as PropsOfAIComponent, x as RenderResult, F as Renderable, M as Span, H as SpanContext, O as SpanEvent, K as SpanStatus, U as TracingContext, Q as TracingContextKey, V as TracingContextManager, y as attachedContextSymbol, j as createAIElement, l as createContext, t as toDebugMessage } from './jsx-dev-runtime-yLtSq2UV.js';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatCompletionUsage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-yyAW1PnA.js';
+export { z as AIElement, l as AIFragment, B as BoundLogger, n as ChatMessage, o as ChatRole, v as CombinedLogger, u as ConsoleLogger, I as ImagePart, p as ImagePartProps, w as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, N as NoopLogImplementation, W as OutputParser, G as PropsOfAIComponent, x as RenderResult, F as Renderable, M as Span, H as SpanContext, O as SpanEvent, K as SpanStatus, U as TracingContext, Q as TracingContextKey, V as TracingContextManager, y as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-yyAW1PnA.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -35,12 +35,7 @@ type ChatCompletionClientAndProvider<K> = {
     client: K;
     provider?: string;
     providerRegion?: string;
-    costFn?: (model: string, usage: {
-        prompt: number;
-        completion: number;
-        cachedPromptTokensCreated: number;
-        cachedPromptTokensRead: number;
-    }) => number;
+    costFn?: (model: string, usage: Omit<ChatCompletionUsage, 'total'>) => number;
 };
 type GetChatCompletionClientAndProvider<Model, Client> = (model: Model, args: {
     retryCount: number;
@@ -168,11 +163,6 @@ type TraceProps = {
 declare const Trace: AIComponent<TraceProps>;
 
 type Cost = number;
-type Usage = {
-    prompt: number;
-    completion: number;
-    total: number;
-};
 declare namespace AISpanAttributes {
     type Prompt = {
         prompt: Prompt;
@@ -192,7 +182,7 @@ declare namespace AISpanAttributes {
         inputMessages: DebugMessage[];
         finishReason: string | null;
         output: string;
-        tokensUsed: Usage;
+        tokensUsed: ChatCompletionUsage;
         [key: string]: any;
     };
 }
@@ -201,7 +191,7 @@ declare namespace ProcessedAISpanAttributes {
         prompt: never;
         evaluatorResults: Record<string, EvaluatorResult>;
         evaluatorError?: string;
-        totalUsage?: Usage;
+        totalUsage?: ChatCompletionUsage;
         totalCost?: Cost;
         parentPromptKey?: string;
         rootPromptKey?: string;
@@ -330,4 +320,4 @@ type GoogleChatCompletionProps = {
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 
-export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, Accumulate, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EvaluatorFn, EvaluatorResult, Fallback, type GetChatCompletionClientAndProvider, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, RetryLastErrorContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createPrompt, createRenderContext, evaluatePrompt, AnthropicPromptCacheDebugger as experimental__AnthropicPromptCacheDebugger, isPromptParsed, tracing };
+export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, Accumulate, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatCompletionUsage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EvaluatorFn, EvaluatorResult, Fallback, type GetChatCompletionClientAndProvider, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, RetryLastErrorContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createPrompt, createRenderContext, evaluatePrompt, AnthropicPromptCacheDebugger as experimental__AnthropicPromptCacheDebugger, isPromptParsed, tracing };

package/dist/index.js

@@ -1854,7 +1854,9 @@ var AISpanProcessor = class {
     const totalUsage = {
       prompt: 0,
       completion: 0,
-      total: 0
+      total: 0,
+      cachedPromptTokensCreated: 0,
+      cachedPromptTokensRead: 0
     };
     const root = this.spanTree.findNode(rootSpan.spanContext.spanId);
     root?.descendents(({ span }) => {
@@ -1871,6 +1873,8 @@ var AISpanProcessor = class {
       totalUsage.prompt += tokensUsed.prompt;
       totalUsage.completion += tokensUsed.completion;
       totalUsage.total += tokensUsed.total;
+      totalUsage.cachedPromptTokensCreated += tokensUsed.cachedPromptTokensCreated;
+      totalUsage.cachedPromptTokensRead += tokensUsed.cachedPromptTokensRead;
     });
     rootSpan.attributes.totalCost = totalCost;
     rootSpan.attributes.totalUsage = totalUsage;

package/dist/index.mjs

@@ -1753,7 +1753,9 @@ var AISpanProcessor = class {
     const totalUsage = {
       prompt: 0,
       completion: 0,
-      total: 0
+      total: 0,
+      cachedPromptTokensCreated: 0,
+      cachedPromptTokensRead: 0
     };
     const root = this.spanTree.findNode(rootSpan.spanContext.spanId);
     root?.descendents(({ span }) => {
@@ -1770,6 +1772,8 @@ var AISpanProcessor = class {
       totalUsage.prompt += tokensUsed.prompt;
       totalUsage.completion += tokensUsed.completion;
       totalUsage.total += tokensUsed.total;
+      totalUsage.cachedPromptTokensCreated += tokensUsed.cachedPromptTokensCreated;
+      totalUsage.cachedPromptTokensRead += tokensUsed.cachedPromptTokensRead;
     });
     rootSpan.attributes.totalCost = totalCost;
     rootSpan.attributes.totalUsage = totalUsage;

package/dist/{jsx-dev-runtime-yLtSq2UV.d.mts → jsx-dev-runtime-yyAW1PnA.d.mts}

@@ -362,4 +362,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { type AINode as A, BoundLogger as B, type ContextValues as C, type DebugMessage as D, type EvaluatorResult as E, type Renderable as F, type PropsOfAIComponent as G, type SpanContext as H, ImagePart as I, JSX as J, type SpanStatus as K, type LogChatCompletionRequest as L, type Span as M, NoopLogImplementation as N, type SpanEvent as O, type Prompt as P, type TracingContextKey as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContext as U, type TracingContextManager as V, type OutputParser as W, jsx as X, jsxDEV as Y, jsxs as Z, Fragment as _, LogImplementation as a, type Context as b, type ReadableSpan as c, type SpanAttributes as d, type SpanExporter as e, type AIComponent as f, type ChatCompletionRequestPayloads as g, type EvaluatorFn as h, type PromptParsed as i, createAIElement as j, AIFragment as k, createContext as l, type ChatMessage as m, type ChatRole as n, type ImagePartProps as o, type ChatCompletionUsage as p, type LogChatCompletionResponse as q, type LogLevel as r, type Logger as s, toDebugMessage as t, ConsoleLogger as u, CombinedLogger as v, type Literal as w, type RenderResult as x, attachedContextSymbol as y, type AIElement as z };
+export { type AINode as A, BoundLogger as B, type ChatCompletionUsage as C, type DebugMessage as D, type EvaluatorResult as E, type Renderable as F, type PropsOfAIComponent as G, type SpanContext as H, ImagePart as I, JSX as J, type SpanStatus as K, type LogChatCompletionRequest as L, type Span as M, NoopLogImplementation as N, type SpanEvent as O, type Prompt as P, type TracingContextKey as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContext as U, type TracingContextManager as V, type OutputParser as W, jsx as X, jsxDEV as Y, jsxs as Z, Fragment as _, LogImplementation as a, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanAttributes as e, type SpanExporter as f, type AIComponent as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, createAIElement as k, AIFragment as l, createContext as m, type ChatMessage as n, type ChatRole as o, type ImagePartProps as p, type LogChatCompletionResponse as q, type LogLevel as r, type Logger as s, toDebugMessage as t, ConsoleLogger as u, CombinedLogger as v, type Literal as w, type RenderResult as x, attachedContextSymbol as y, type AIElement as z };

package/dist/{jsx-dev-runtime-yLtSq2UV.d.ts → jsx-dev-runtime-yyAW1PnA.d.ts}

@@ -362,4 +362,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { type AINode as A, BoundLogger as B, type ContextValues as C, type DebugMessage as D, type EvaluatorResult as E, type Renderable as F, type PropsOfAIComponent as G, type SpanContext as H, ImagePart as I, JSX as J, type SpanStatus as K, type LogChatCompletionRequest as L, type Span as M, NoopLogImplementation as N, type SpanEvent as O, type Prompt as P, type TracingContextKey as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContext as U, type TracingContextManager as V, type OutputParser as W, jsx as X, jsxDEV as Y, jsxs as Z, Fragment as _, LogImplementation as a, type Context as b, type ReadableSpan as c, type SpanAttributes as d, type SpanExporter as e, type AIComponent as f, type ChatCompletionRequestPayloads as g, type EvaluatorFn as h, type PromptParsed as i, createAIElement as j, AIFragment as k, createContext as l, type ChatMessage as m, type ChatRole as n, type ImagePartProps as o, type ChatCompletionUsage as p, type LogChatCompletionResponse as q, type LogLevel as r, type Logger as s, toDebugMessage as t, ConsoleLogger as u, CombinedLogger as v, type Literal as w, type RenderResult as x, attachedContextSymbol as y, type AIElement as z };
+export { type AINode as A, BoundLogger as B, type ChatCompletionUsage as C, type DebugMessage as D, type EvaluatorResult as E, type Renderable as F, type PropsOfAIComponent as G, type SpanContext as H, ImagePart as I, JSX as J, type SpanStatus as K, type LogChatCompletionRequest as L, type Span as M, NoopLogImplementation as N, type SpanEvent as O, type Prompt as P, type TracingContextKey as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContext as U, type TracingContextManager as V, type OutputParser as W, jsx as X, jsxDEV as Y, jsxs as Z, Fragment as _, LogImplementation as a, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanAttributes as e, type SpanExporter as f, type AIComponent as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, createAIElement as k, AIFragment as l, createContext as m, type ChatMessage as n, type ChatRole as o, type ImagePartProps as p, type LogChatCompletionResponse as q, type LogLevel as r, type Logger as s, toDebugMessage as t, ConsoleLogger as u, CombinedLogger as v, type Literal as w, type RenderResult as x, attachedContextSymbol as y, type AIElement as z };

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

@@ -1,2 +1,2 @@
-export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yLtSq2UV.mjs';
+export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yyAW1PnA.mjs';
 import 'zod';

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

@@ -1,2 +1,2 @@
-export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yLtSq2UV.js';
+export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yyAW1PnA.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,2 +1,2 @@
-export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yLtSq2UV.mjs';
+export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yyAW1PnA.mjs';
 import 'zod';

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yLtSq2UV.js';
+export { _ as Fragment, J as JSX, X as jsx, Y as jsxDEV, Z as jsxs } from './jsx-dev-runtime-yyAW1PnA.js';
 import 'zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.16.0-dev.2024-11-05",
+  "version": "0.16.1-dev.2024-11-05",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",