@gammatech/aijsx 0.5.0-dev.2024-03-11 → 0.5.0-dev.2024-03-12

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, T as Tracer, a as ReadableSpan, b as SpanExporter, A as AIComponent, c as AINode, d as SpanAttributes, E as EvaluatorFn, P as PromptParsed, e as Prompt, N as NotAsyncGenerator, F as FunctionChain, f as StreamChain, g as EvaluatorResult, h as Context, J as JSX } from './jsx-dev-runtime-zWb34twz.mjs';
-export { H as AIElement, j as AIFragment, n as AssistantMessage, B as BoundLogger, q as ChatCompletionError, r as ChatCompletionRequestPayloads, l as ChatCompletionRole, y as CombinedLogger, x as ConsoleLogger, z as Literal, s as LogChatCompletionRequest, t as LogChatCompletionResponse, u as LogLevel, v as Logger, w as NoopLogImplementation, Z as OutputParser, K as PropsOfAIComponent, D as RenderResult, I as Renderable, o as RenderedConversationMessage, Q as Span, M as SpanContext, V as SpanEvent, O as SpanStatus, m as SystemMessage, X as TracingContext, W as TracingContextKey, Y as TracingContextManager, U as UserMessage, G as attachedContextSymbol, p as computeUsage, i as createAIElement, k as createContext } from './jsx-dev-runtime-zWb34twz.mjs';
+import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, T as Tracer, a as ReadableSpan, b as SpanExporter, A as AIComponent, c as AINode, d as SpanAttributes, E as EvaluatorFn, P as PromptParsed, e as Prompt, N as NotAsyncGenerator, F as FunctionChain, f as StreamChain, g as EvaluatorResult, h as Context, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-LS-DZfkv.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-LS-DZfkv.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -65,19 +65,15 @@ declare abstract class EnrichingSpanProcessor implements SpanProcessor {
     shutdown(): Promise<void> | undefined;
 }
 declare class AISpanProcessor extends EnrichingSpanProcessor {
-    private readonly opts;
     protected totalCost: number;
     protected totalUsage: {
         prompt: number;
         completion: number;
         total: number;
     };
-    constructor(exporter: SpanExporter, opts?: {
-        costFn?: CostFn;
-    });
     onTraceComplete(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
-    protected computeCost(span: ReadableSpan): Promise<ReadableSpan>;
+    protected updateCost(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateUsage(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
 }
@@ -140,15 +136,13 @@ declare module '@gammatech/aijsx' {
     }
 }
 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-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';
-declare const OpenAIClientContext: Context<() => OpenAI>;
+declare const OpenAIClientContext: Context<() => ChatCompletionClientAndProvider<OpenAI>>;
 type OpenAIChatCompletionProps = {
     model: ValidOpenAIChatModel;
     maxTokens?: number;
     temperature?: number;
     responseFormat?: ChatCompletionCreateParams.ResponseFormat['type'];
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 declare function OpenAIChatCompletion(props: OpenAIChatCompletionProps, { logger, render, tracer, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
@@ -166,8 +160,6 @@ type OpenAIVisionChatCompletionProps = {
     maxTokens?: number;
     temperature?: number;
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 declare function OpenAIVisionChatCompletion(props: OpenAIVisionChatCompletionProps, { logger, render, tracer, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
@@ -190,14 +182,12 @@ declare module '@gammatech/aijsx' {
  * @see https://docs.anthropic.com/claude/reference/selecting-a-model
  */
 type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229';
-declare const AnthropicClientContext: Context<() => AnthropicClient>;
+declare const AnthropicClientContext: Context<() => ChatCompletionClientAndProvider<AnthropicClient>>;
 type AnthropicChatCompletionProps = {
     model: ValidAnthropicChatModel;
     maxTokens?: number;
     temperature?: number;
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 /**
  * An AI.JSX component that invokes an Anthropic Large Language Model.
@@ -210,20 +200,12 @@ declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, {
 
 type ClaudeImageBlockBase64 = {
     data: string;
-    dimensions?: {
-        width: number;
-        height: number;
-    };
     mediaType: ImageBlockParam.Source['media_type'];
 };
 type ClaudeImageBlockUrl = {
     url: string;
-    dimensions?: {
-        width: number;
-        height: number;
-    };
 };
 type ClaudeImageBlockProps = ClaudeImageBlockBase64 | ClaudeImageBlockUrl;
 declare const ClaudeImageBlock: (props: ClaudeImageBlockProps) => Promise<JSX.Element>;
 
-export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, 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, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, 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

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, T as Tracer, a as ReadableSpan, b as SpanExporter, A as AIComponent, c as AINode, d as SpanAttributes, E as EvaluatorFn, P as PromptParsed, e as Prompt, N as NotAsyncGenerator, F as FunctionChain, f as StreamChain, g as EvaluatorResult, h as Context, J as JSX } from './jsx-dev-runtime-zWb34twz.js';
-export { H as AIElement, j as AIFragment, n as AssistantMessage, B as BoundLogger, q as ChatCompletionError, r as ChatCompletionRequestPayloads, l as ChatCompletionRole, y as CombinedLogger, x as ConsoleLogger, z as Literal, s as LogChatCompletionRequest, t as LogChatCompletionResponse, u as LogLevel, v as Logger, w as NoopLogImplementation, Z as OutputParser, K as PropsOfAIComponent, D as RenderResult, I as Renderable, o as RenderedConversationMessage, Q as Span, M as SpanContext, V as SpanEvent, O as SpanStatus, m as SystemMessage, X as TracingContext, W as TracingContextKey, Y as TracingContextManager, U as UserMessage, G as attachedContextSymbol, p as computeUsage, i as createAIElement, k as createContext } from './jsx-dev-runtime-zWb34twz.js';
+import { R as RenderContext, L as LogImplementation, S as SpanProcessor, C as ContextValues, T as Tracer, a as ReadableSpan, b as SpanExporter, A as AIComponent, c as AINode, d as SpanAttributes, E as EvaluatorFn, P as PromptParsed, e as Prompt, N as NotAsyncGenerator, F as FunctionChain, f as StreamChain, g as EvaluatorResult, h as Context, i as ChatCompletionClientAndProvider, J as JSX } from './jsx-dev-runtime-LS-DZfkv.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-LS-DZfkv.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -65,19 +65,15 @@ declare abstract class EnrichingSpanProcessor implements SpanProcessor {
     shutdown(): Promise<void> | undefined;
 }
 declare class AISpanProcessor extends EnrichingSpanProcessor {
-    private readonly opts;
     protected totalCost: number;
     protected totalUsage: {
         prompt: number;
         completion: number;
         total: number;
     };
-    constructor(exporter: SpanExporter, opts?: {
-        costFn?: CostFn;
-    });
     onTraceComplete(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
-    protected computeCost(span: ReadableSpan): Promise<ReadableSpan>;
+    protected updateCost(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateUsage(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
 }
@@ -140,15 +136,13 @@ declare module '@gammatech/aijsx' {
     }
 }
 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-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';
-declare const OpenAIClientContext: Context<() => OpenAI>;
+declare const OpenAIClientContext: Context<() => ChatCompletionClientAndProvider<OpenAI>>;
 type OpenAIChatCompletionProps = {
     model: ValidOpenAIChatModel;
     maxTokens?: number;
     temperature?: number;
     responseFormat?: ChatCompletionCreateParams.ResponseFormat['type'];
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 declare function OpenAIChatCompletion(props: OpenAIChatCompletionProps, { logger, render, tracer, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
@@ -166,8 +160,6 @@ type OpenAIVisionChatCompletionProps = {
     maxTokens?: number;
     temperature?: number;
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 declare function OpenAIVisionChatCompletion(props: OpenAIVisionChatCompletionProps, { logger, render, tracer, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
@@ -190,14 +182,12 @@ declare module '@gammatech/aijsx' {
  * @see https://docs.anthropic.com/claude/reference/selecting-a-model
  */
 type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229';
-declare const AnthropicClientContext: Context<() => AnthropicClient>;
+declare const AnthropicClientContext: Context<() => ChatCompletionClientAndProvider<AnthropicClient>>;
 type AnthropicChatCompletionProps = {
     model: ValidAnthropicChatModel;
     maxTokens?: number;
     temperature?: number;
     children: AINode;
-    provider?: string;
-    providerRegion?: string;
 };
 /**
  * An AI.JSX component that invokes an Anthropic Large Language Model.
@@ -210,20 +200,12 @@ declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, {
 
 type ClaudeImageBlockBase64 = {
     data: string;
-    dimensions?: {
-        width: number;
-        height: number;
-    };
     mediaType: ImageBlockParam.Source['media_type'];
 };
 type ClaudeImageBlockUrl = {
     url: string;
-    dimensions?: {
-        width: number;
-        height: number;
-    };
 };
 type ClaudeImageBlockProps = ClaudeImageBlockBase64 | ClaudeImageBlockUrl;
 declare const ClaudeImageBlock: (props: ClaudeImageBlockProps) => Promise<JSX.Element>;
 
-export { AIComponent, AINode, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, 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, type AnthropicChatCompletionRequest, AnthropicClientContext, ChatCompletionClientAndProvider, ClaudeImageBlock, ContentTypeImage, Context, type CostFn, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, 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

@@ -1469,10 +1469,6 @@ var EnrichingSpanProcessor = class {
   }
 };
 var AISpanProcessor = class extends EnrichingSpanProcessor {
-  constructor(exporter, opts = {}) {
-    super(exporter);
-    this.opts = opts;
-  }
   totalCost = 0;
   totalUsage = {
     prompt: 0,
@@ -1485,32 +1481,19 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
   }
   async enrichSpan(span) {
     const result1 = await this.evaluatePrompt(span);
-    const result2 = await this.computeCost(result1);
+    const result2 = await this.updateCost(result1);
     const result3 = await this.updateUsage(result2);
     return result3;
   }
-  async computeCost(span) {
-    if (!this.opts.costFn) {
-      return span;
-    }
+  async updateCost(span) {
     if (!isChatCompletionSpan(span)) {
       return span;
     }
-    const cost = this.opts.costFn(span.attributes.tokensUsed, {
-      model: span.attributes.model,
-      provider: span.attributes.provider,
-      providerRegion: span.attributes.providerRegion
-    });
+    const { cost } = span.attributes;
     if (typeof cost === "number") {
       this.totalCost += cost;
     }
-    return {
-      ...span,
-      attributes: {
-        ...span.attributes,
-        cost
-      }
-    };
+    return span;
   }
   async updateUsage(span) {
     if (!isChatCompletionSpan(span)) {
@@ -1762,7 +1745,11 @@ var OpenAIClientContext = createContext(() => {
     return defaultClient;
   }
   const apiKey = getEnvVar("OPENAI_API_KEY", true);
-  defaultClient = new import_openai.OpenAI({ apiKey });
+  const client = new import_openai.OpenAI({ apiKey });
+  defaultClient = {
+    client,
+    provider: "openai"
+  };
   return defaultClient;
 });
 function buildOpenAIMessages(childrenXml) {
@@ -1801,7 +1788,7 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
     "ai.chatCompletion",
     {},
     async function* OpenAIChatCompletionInner(span) {
-      const client = getContext(OpenAIClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(OpenAIClientContext)();
       if (!client) {
         throw new Error("[OpenAI] must supply OpenAI model via context");
       }
@@ -1830,16 +1817,16 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
       const logRequestData = {
         startTime,
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages: renderedMessages,
         request: chatCompletionRequest
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "openai",
         chatCompletionRequest
       });
@@ -1883,6 +1870,7 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
         })
       };
       const tokensUsed = computeUsage([...renderedMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -1894,7 +1882,8 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
       span.setAttributes({
         tokensUsed,
         output: content,
-        finishReason
+        finishReason,
+        cost
       });
     }
   );
@@ -1970,7 +1959,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
     "ai.chatCompletion",
     {},
     async function* OpenAIVIsionChatCompletionInner(span) {
-      const client = getContext(OpenAIClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(OpenAIClientContext)();
       if (!client) {
         throw new Error("[OpenAI] must supply OpenAI model via context");
       }
@@ -2041,16 +2030,16 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
       const logRequestData = {
         startTime,
         model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages: renderedMessages,
         request: chatCompletionRequest
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "openai",
         chatCompletionRequest
       });
@@ -2094,6 +2083,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         })
       };
       const tokensUsed = computeUsage([...renderedMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -2105,6 +2095,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
       span.setAttributes({
         tokensUsed,
         output: content,
+        cost,
         finishReason
       });
     }
@@ -2118,17 +2109,19 @@ var import_openai3 = require("openai");
 var import_sdk = __toESM(require("@anthropic-ai/sdk"));
 var import_tokenizer3 = require("@anthropic-ai/tokenizer");
 var defaultClient2 = null;
-var AnthropicClientContext = createContext(
-  () => {
-    if (defaultClient2) {
-      return defaultClient2;
-    }
-    defaultClient2 = new import_sdk.default({
-      apiKey: getEnvVar("ANTHROPIC_API_KEY", false)
-    });
+var AnthropicClientContext = createContext(() => {
+  if (defaultClient2) {
     return defaultClient2;
   }
-);
+  const client = new import_sdk.default({
+    apiKey: getEnvVar("ANTHROPIC_API_KEY", false)
+  });
+  defaultClient2 = {
+    client,
+    provider: "anthropic"
+  };
+  return defaultClient2;
+});
 var defaultMaxTokens = 4096;
 function buildAnthropicMessages(childrenXml) {
   let system = "";
@@ -2146,7 +2139,6 @@ function buildAnthropicMessages(childrenXml) {
   if (!topLevelValid) {
     throw new Error("Invalid top level chat message tags");
   }
-  const dimensions = /* @__PURE__ */ new WeakMap();
   for (const node of parsed.childNodes) {
     if (node.nodeName === "UserMessage") {
       if (node.childNodes?.length === 1 && node.childNodes[0].nodeName === "#text") {
@@ -2171,7 +2163,6 @@ function buildAnthropicMessages(childrenXml) {
               data: n.attributes.data
             }
           };
-          dimensions.set(imagePart, n.attributes.dimensions);
           return imagePart;
         }
         throw new Error(
@@ -2191,7 +2182,7 @@ function buildAnthropicMessages(childrenXml) {
       system = node.textContent;
     }
   }
-  return { messages, system, dimensions };
+  return { messages, system };
 }
 function AnthropicChatCompletion(props, { render, logger, tracer, getContext }) {
   const startTime = performance.now();
@@ -2199,7 +2190,9 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
     "ai.chatCompletion",
     {},
     async function* AnthropicChatCompletionInner(span) {
-      const client = getContext(AnthropicClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(
+        AnthropicClientContext
+      )();
       if (!client) {
         throw new Error(
           "[AnthropicChatCompletion] must supply AnthropicClient via context"
@@ -2211,7 +2204,6 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
           renderedProps: {
             ClaudeImageBlockParam: {
               data: true,
-              dimensions: true,
               mediaType: true
             }
           }
@@ -2228,16 +2220,16 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
       const logRequestData = {
         startTime,
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages,
         request: anthropicCompletionRequest
       };
       logger.chatCompletionRequest("anthropic", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "anthropic",
         chatCompletionRequest: anthropicCompletionRequest
       });
@@ -2292,6 +2284,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         userMessage.tokens = inputUsage - restMessagesTokens;
       }
       const tokensUsed = computeUsage([...inputMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -2307,6 +2300,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
       span.setAttributes({
         tokensUsed,
         output: content,
+        cost,
         finishReason
       });
     }
@@ -2377,16 +2371,9 @@ var ClaudeImageBlock = async (props) => {
   if ("data" in props) {
     return /* @__PURE__ */ jsx(ClaudeImageBlockParam, { ...props });
   }
-  const { dimensions, url } = props;
+  const { url } = props;
   const { base64, mediaType } = await fetchImageAndConvertToBase64(url);
-  return /* @__PURE__ */ jsx(
-    ClaudeImageBlockParam,
-    {
-      dimensions,
-      mediaType,
-      data: base64
-    }
-  );
+  return /* @__PURE__ */ jsx(ClaudeImageBlockParam, { mediaType, data: base64 });
 };
 
 // src/lib/anthropic/index.ts

package/dist/index.mjs

@@ -1371,10 +1371,6 @@ var EnrichingSpanProcessor = class {
   }
 };
 var AISpanProcessor = class extends EnrichingSpanProcessor {
-  constructor(exporter, opts = {}) {
-    super(exporter);
-    this.opts = opts;
-  }
   totalCost = 0;
   totalUsage = {
     prompt: 0,
@@ -1387,32 +1383,19 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
   }
   async enrichSpan(span) {
     const result1 = await this.evaluatePrompt(span);
-    const result2 = await this.computeCost(result1);
+    const result2 = await this.updateCost(result1);
     const result3 = await this.updateUsage(result2);
     return result3;
   }
-  async computeCost(span) {
-    if (!this.opts.costFn) {
-      return span;
-    }
+  async updateCost(span) {
     if (!isChatCompletionSpan(span)) {
       return span;
     }
-    const cost = this.opts.costFn(span.attributes.tokensUsed, {
-      model: span.attributes.model,
-      provider: span.attributes.provider,
-      providerRegion: span.attributes.providerRegion
-    });
+    const { cost } = span.attributes;
     if (typeof cost === "number") {
       this.totalCost += cost;
     }
-    return {
-      ...span,
-      attributes: {
-        ...span.attributes,
-        cost
-      }
-    };
+    return span;
   }
   async updateUsage(span) {
     if (!isChatCompletionSpan(span)) {
@@ -1664,7 +1647,11 @@ var OpenAIClientContext = createContext(() => {
     return defaultClient;
   }
   const apiKey = getEnvVar("OPENAI_API_KEY", true);
-  defaultClient = new OpenAIClient({ apiKey });
+  const client = new OpenAIClient({ apiKey });
+  defaultClient = {
+    client,
+    provider: "openai"
+  };
   return defaultClient;
 });
 function buildOpenAIMessages(childrenXml) {
@@ -1703,7 +1690,7 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
     "ai.chatCompletion",
     {},
     async function* OpenAIChatCompletionInner(span) {
-      const client = getContext(OpenAIClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(OpenAIClientContext)();
       if (!client) {
         throw new Error("[OpenAI] must supply OpenAI model via context");
       }
@@ -1732,16 +1719,16 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
       const logRequestData = {
         startTime,
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages: renderedMessages,
         request: chatCompletionRequest
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "openai",
         chatCompletionRequest
       });
@@ -1785,6 +1772,7 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
         })
       };
       const tokensUsed = computeUsage([...renderedMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -1796,7 +1784,8 @@ function OpenAIChatCompletion(props, { logger, render, tracer, getContext }) {
       span.setAttributes({
         tokensUsed,
         output: content,
-        finishReason
+        finishReason,
+        cost
       });
     }
   );
@@ -1872,7 +1861,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
     "ai.chatCompletion",
     {},
     async function* OpenAIVIsionChatCompletionInner(span) {
-      const client = getContext(OpenAIClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(OpenAIClientContext)();
       if (!client) {
         throw new Error("[OpenAI] must supply OpenAI model via context");
       }
@@ -1943,16 +1932,16 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
       const logRequestData = {
         startTime,
         model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages: renderedMessages,
         request: chatCompletionRequest
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "openai",
         chatCompletionRequest
       });
@@ -1996,6 +1985,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         })
       };
       const tokensUsed = computeUsage([...renderedMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -2007,6 +1997,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
       span.setAttributes({
         tokensUsed,
         output: content,
+        cost,
         finishReason
       });
     }
@@ -2020,17 +2011,19 @@ import { OpenAI as OpenAIClient3 } from "openai";
 import AnthropicClient from "@anthropic-ai/sdk";
 import { countTokens } from "@anthropic-ai/tokenizer";
 var defaultClient2 = null;
-var AnthropicClientContext = createContext(
-  () => {
-    if (defaultClient2) {
-      return defaultClient2;
-    }
-    defaultClient2 = new AnthropicClient({
-      apiKey: getEnvVar("ANTHROPIC_API_KEY", false)
-    });
+var AnthropicClientContext = createContext(() => {
+  if (defaultClient2) {
     return defaultClient2;
   }
-);
+  const client = new AnthropicClient({
+    apiKey: getEnvVar("ANTHROPIC_API_KEY", false)
+  });
+  defaultClient2 = {
+    client,
+    provider: "anthropic"
+  };
+  return defaultClient2;
+});
 var defaultMaxTokens = 4096;
 function buildAnthropicMessages(childrenXml) {
   let system = "";
@@ -2048,7 +2041,6 @@ function buildAnthropicMessages(childrenXml) {
   if (!topLevelValid) {
     throw new Error("Invalid top level chat message tags");
   }
-  const dimensions = /* @__PURE__ */ new WeakMap();
   for (const node of parsed.childNodes) {
     if (node.nodeName === "UserMessage") {
       if (node.childNodes?.length === 1 && node.childNodes[0].nodeName === "#text") {
@@ -2073,7 +2065,6 @@ function buildAnthropicMessages(childrenXml) {
               data: n.attributes.data
             }
           };
-          dimensions.set(imagePart, n.attributes.dimensions);
           return imagePart;
         }
         throw new Error(
@@ -2093,7 +2084,7 @@ function buildAnthropicMessages(childrenXml) {
       system = node.textContent;
     }
   }
-  return { messages, system, dimensions };
+  return { messages, system };
 }
 function AnthropicChatCompletion(props, { render, logger, tracer, getContext }) {
   const startTime = performance.now();
@@ -2101,7 +2092,9 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
     "ai.chatCompletion",
     {},
     async function* AnthropicChatCompletionInner(span) {
-      const client = getContext(AnthropicClientContext)();
+      const { client, provider, providerRegion, costFn } = getContext(
+        AnthropicClientContext
+      )();
       if (!client) {
         throw new Error(
           "[AnthropicChatCompletion] must supply AnthropicClient via context"
@@ -2113,7 +2106,6 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
           renderedProps: {
             ClaudeImageBlockParam: {
               data: true,
-              dimensions: true,
               mediaType: true
             }
           }
@@ -2130,16 +2122,16 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
       const logRequestData = {
         startTime,
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         inputMessages,
         request: anthropicCompletionRequest
       };
       logger.chatCompletionRequest("anthropic", logRequestData);
       span.setAttributes({
         model: props.model,
-        provider: props.provider,
-        providerRegion: props.providerRegion,
+        provider,
+        providerRegion,
         requestType: "anthropic",
         chatCompletionRequest: anthropicCompletionRequest
       });
@@ -2194,6 +2186,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         userMessage.tokens = inputUsage - restMessagesTokens;
       }
       const tokensUsed = computeUsage([...inputMessages, outputMessage]);
+      const cost = costFn?.(tokensUsed) ?? void 0;
       const responseData = {
         ...logRequestData,
         finishReason,
@@ -2209,6 +2202,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
       span.setAttributes({
         tokensUsed,
         output: content,
+        cost,
         finishReason
       });
     }
@@ -2279,16 +2273,9 @@ var ClaudeImageBlock = async (props) => {
   if ("data" in props) {
     return /* @__PURE__ */ jsx(ClaudeImageBlockParam, { ...props });
   }
-  const { dimensions, url } = props;
+  const { url } = props;
   const { base64, mediaType } = await fetchImageAndConvertToBase64(url);
-  return /* @__PURE__ */ jsx(
-    ClaudeImageBlockParam,
-    {
-      dimensions,
-      mediaType,
-      data: base64
-    }
-  );
+  return /* @__PURE__ */ jsx(ClaudeImageBlockParam, { mediaType, data: base64 });
 };
 
 // src/lib/anthropic/index.ts

package/dist/{jsx-dev-runtime-zWb34twz.d.mts → jsx-dev-runtime-LS-DZfkv.d.mts}

@@ -283,6 +283,15 @@ declare class CombinedLogger extends LogImplementation {
     chatCompletionResponse<_K extends keyof ChatCompletionRequestPayloads>(...args: Parameters<LogImplementation['chatCompletionResponse']>): void;
 }
 
+type ChatCompletionClientAndProvider<K> = {
+    client: K;
+    provider?: string;
+    providerRegion?: string;
+    costFn?: (usage: {
+        prompt: number;
+        completion: number;
+    }) => number;
+};
 type ChatCompletionRole = 'user' | 'system' | 'assistant';
 declare const SystemMessage: (props: {
     children: AINode;
@@ -344,4 +353,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { jsxDEV as $, type AIComponent as A, BoundLogger as B, type ContextValues as C, type RenderResult as D, type EvaluatorFn as E, type FunctionChain as F, attachedContextSymbol as G, type AIElement as H, type Renderable as I, JSX as J, type PropsOfAIComponent as K, LogImplementation as L, type SpanContext as M, type NotAsyncGenerator as N, type SpanStatus as O, type PromptParsed as P, type Span as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, UserMessage as U, type SpanEvent as V, type TracingContextKey as W, type TracingContext as X, type TracingContextManager as Y, type OutputParser as Z, jsx as _, type ReadableSpan as a, jsxs as a0, Fragment as a1, type SpanExporter as b, type AINode as c, type SpanAttributes as d, type Prompt as e, type StreamChain as f, type EvaluatorResult as g, type Context as h, createAIElement as i, AIFragment as j, createContext as k, type ChatCompletionRole as l, SystemMessage as m, AssistantMessage as n, type RenderedConversationMessage as o, computeUsage as p, ChatCompletionError as q, type ChatCompletionRequestPayloads as r, type LogChatCompletionRequest as s, type LogChatCompletionResponse as t, type LogLevel as u, type Logger as v, NoopLogImplementation as w, ConsoleLogger as x, CombinedLogger as y, type Literal as z };
+export { jsx as $, type AIComponent as A, BoundLogger as B, type ContextValues as C, type Literal as D, type EvaluatorFn as E, type FunctionChain as F, type RenderResult as G, attachedContextSymbol as H, type AIElement as I, JSX as J, type Renderable as K, LogImplementation as L, type PropsOfAIComponent as M, type NotAsyncGenerator as N, type SpanContext as O, type PromptParsed as P, type SpanStatus as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, UserMessage as U, type Span as V, type SpanEvent as W, type TracingContextKey as X, type TracingContext as Y, type TracingContextManager as Z, type OutputParser as _, type ReadableSpan as a, jsxDEV as a0, jsxs as a1, Fragment as a2, type SpanExporter as b, type AINode as c, type SpanAttributes as d, type Prompt as e, type StreamChain as f, type EvaluatorResult as g, type Context as h, type ChatCompletionClientAndProvider as i, createAIElement as j, AIFragment as k, createContext as l, type ChatCompletionRole as m, SystemMessage as n, AssistantMessage as o, type RenderedConversationMessage as p, computeUsage as q, ChatCompletionError as r, type ChatCompletionRequestPayloads as s, type LogChatCompletionRequest as t, type LogChatCompletionResponse as u, type LogLevel as v, type Logger as w, NoopLogImplementation as x, ConsoleLogger as y, CombinedLogger as z };

package/dist/{jsx-dev-runtime-zWb34twz.d.ts → jsx-dev-runtime-LS-DZfkv.d.ts}

@@ -283,6 +283,15 @@ declare class CombinedLogger extends LogImplementation {
     chatCompletionResponse<_K extends keyof ChatCompletionRequestPayloads>(...args: Parameters<LogImplementation['chatCompletionResponse']>): void;
 }
 
+type ChatCompletionClientAndProvider<K> = {
+    client: K;
+    provider?: string;
+    providerRegion?: string;
+    costFn?: (usage: {
+        prompt: number;
+        completion: number;
+    }) => number;
+};
 type ChatCompletionRole = 'user' | 'system' | 'assistant';
 declare const SystemMessage: (props: {
     children: AINode;
@@ -344,4 +353,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { jsxDEV as $, type AIComponent as A, BoundLogger as B, type ContextValues as C, type RenderResult as D, type EvaluatorFn as E, type FunctionChain as F, attachedContextSymbol as G, type AIElement as H, type Renderable as I, JSX as J, type PropsOfAIComponent as K, LogImplementation as L, type SpanContext as M, type NotAsyncGenerator as N, type SpanStatus as O, type PromptParsed as P, type Span as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, UserMessage as U, type SpanEvent as V, type TracingContextKey as W, type TracingContext as X, type TracingContextManager as Y, type OutputParser as Z, jsx as _, type ReadableSpan as a, jsxs as a0, Fragment as a1, type SpanExporter as b, type AINode as c, type SpanAttributes as d, type Prompt as e, type StreamChain as f, type EvaluatorResult as g, type Context as h, createAIElement as i, AIFragment as j, createContext as k, type ChatCompletionRole as l, SystemMessage as m, AssistantMessage as n, type RenderedConversationMessage as o, computeUsage as p, ChatCompletionError as q, type ChatCompletionRequestPayloads as r, type LogChatCompletionRequest as s, type LogChatCompletionResponse as t, type LogLevel as u, type Logger as v, NoopLogImplementation as w, ConsoleLogger as x, CombinedLogger as y, type Literal as z };
+export { jsx as $, type AIComponent as A, BoundLogger as B, type ContextValues as C, type Literal as D, type EvaluatorFn as E, type FunctionChain as F, type RenderResult as G, attachedContextSymbol as H, type AIElement as I, JSX as J, type Renderable as K, LogImplementation as L, type PropsOfAIComponent as M, type NotAsyncGenerator as N, type SpanContext as O, type PromptParsed as P, type SpanStatus as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, UserMessage as U, type Span as V, type SpanEvent as W, type TracingContextKey as X, type TracingContext as Y, type TracingContextManager as Z, type OutputParser as _, type ReadableSpan as a, jsxDEV as a0, jsxs as a1, Fragment as a2, type SpanExporter as b, type AINode as c, type SpanAttributes as d, type Prompt as e, type StreamChain as f, type EvaluatorResult as g, type Context as h, type ChatCompletionClientAndProvider as i, createAIElement as j, AIFragment as k, createContext as l, type ChatCompletionRole as m, SystemMessage as n, AssistantMessage as o, type RenderedConversationMessage as p, computeUsage as q, ChatCompletionError as r, type ChatCompletionRequestPayloads as s, type LogChatCompletionRequest as t, type LogChatCompletionResponse as u, type LogLevel as v, type Logger as w, NoopLogImplementation as x, ConsoleLogger as y, CombinedLogger as z };

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

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

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

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

package/dist/jsx-runtime.d.mts

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

package/dist/jsx-runtime.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.5.0-dev.2024-03-11",
+  "version": "0.5.0-dev.2024-03-12",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@tsconfig/node18": "^18.2.2",
     "@types/jest": "^29.0.0",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.18.2",
     "@typescript-eslint/eslint-plugin": "^6.9.1",
     "@typescript-eslint/parser": "^6.9.1",
     "eslint": "^8.41.0",