@gammatech/aijsx 0.16.3-dev.2024-11-17 → 0.16.5-dev.2024-11-25

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-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 LlmEvaluatorFn, k as PromptParsed, J as JSX } from './jsx-dev-runtime-RvJm3SlM.mjs';
-export { F as AIElement, m as AIFragment, B as BoundLogger, o as ChatMessage, p as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, q as ImagePartProps, x as Literal, r as LogChatCompletionResponse, s as LogLevel, u as Logger, N as NoopLogImplementation, X as OutputParser, H as PropsOfAIComponent, y as RenderResult, G as Renderable, O as Span, K as SpanContext, Q as SpanEvent, M as SpanStatus, V as TracingContext, U as TracingContextKey, W as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-RvJm3SlM.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 LlmEvaluatorFn, k as PromptParsed, J as JSX } from './jsx-dev-runtime-CwVVc96-.mjs';
+export { F as AIElement, m as AIFragment, B as BoundLogger, o as ChatMessage, p as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, q as ImagePartProps, x as Literal, r as LogChatCompletionResponse, s as LogLevel, u as Logger, N as NoopLogImplementation, X as OutputParser, H as PropsOfAIComponent, y as RenderResult, G as Renderable, O as Span, K as SpanContext, Q as SpanEvent, M as SpanStatus, V as TracingContext, U as TracingContextKey, W as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-CwVVc96-.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -121,8 +121,10 @@ declare class SpanTreeNode {
     addChild(child: SpanTreeNode): void;
     descendents(fn: (node: SpanTreeNode) => void): void;
     everyDescendent(fn: (node: SpanTreeNode) => boolean): boolean;
+    getRoot(): SpanTreeNode;
     getRootByName(name: string): SpanTreeNode | null;
     getNearestAttribute<K>(key: string): K | null;
+    getRootSpanId(): string;
     getRootAttribute<K>(key: string): K | null;
 }
 
@@ -151,6 +153,7 @@ declare class AISpanProcessor implements SpanProcessor {
     shutdown(): Promise<void> | undefined;
     onRootPromptDone(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
+    protected addRootSpanId(span: ReadableSpan): Promise<ReadableSpan>;
     protected addPromptKeys(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
 }
@@ -195,10 +198,12 @@ declare namespace ProcessedAISpanAttributes {
         totalCost?: Cost;
         parentPromptKey?: string;
         rootPromptKey?: string;
+        rootSpanId: string;
     };
     type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K> & {
         parentPromptKey?: string;
         rootPromptKey?: string;
+        rootSpanId: string;
     };
 }
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-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 LlmEvaluatorFn, k as PromptParsed, J as JSX } from './jsx-dev-runtime-RvJm3SlM.js';
-export { F as AIElement, m as AIFragment, B as BoundLogger, o as ChatMessage, p as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, q as ImagePartProps, x as Literal, r as LogChatCompletionResponse, s as LogLevel, u as Logger, N as NoopLogImplementation, X as OutputParser, H as PropsOfAIComponent, y as RenderResult, G as Renderable, O as Span, K as SpanContext, Q as SpanEvent, M as SpanStatus, V as TracingContext, U as TracingContextKey, W as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-RvJm3SlM.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 LlmEvaluatorFn, k as PromptParsed, J as JSX } from './jsx-dev-runtime-CwVVc96-.js';
+export { F as AIElement, m as AIFragment, B as BoundLogger, o as ChatMessage, p as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, q as ImagePartProps, x as Literal, r as LogChatCompletionResponse, s as LogLevel, u as Logger, N as NoopLogImplementation, X as OutputParser, H as PropsOfAIComponent, y as RenderResult, G as Renderable, O as Span, K as SpanContext, Q as SpanEvent, M as SpanStatus, V as TracingContext, U as TracingContextKey, W as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-CwVVc96-.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -121,8 +121,10 @@ declare class SpanTreeNode {
     addChild(child: SpanTreeNode): void;
     descendents(fn: (node: SpanTreeNode) => void): void;
     everyDescendent(fn: (node: SpanTreeNode) => boolean): boolean;
+    getRoot(): SpanTreeNode;
     getRootByName(name: string): SpanTreeNode | null;
     getNearestAttribute<K>(key: string): K | null;
+    getRootSpanId(): string;
     getRootAttribute<K>(key: string): K | null;
 }
 
@@ -151,6 +153,7 @@ declare class AISpanProcessor implements SpanProcessor {
     shutdown(): Promise<void> | undefined;
     onRootPromptDone(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
+    protected addRootSpanId(span: ReadableSpan): Promise<ReadableSpan>;
     protected addPromptKeys(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
 }
@@ -195,10 +198,12 @@ declare namespace ProcessedAISpanAttributes {
         totalCost?: Cost;
         parentPromptKey?: string;
         rootPromptKey?: string;
+        rootSpanId: string;
     };
     type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K> & {
         parentPromptKey?: string;
         rootPromptKey?: string;
+        rootSpanId: string;
     };
 }
 

package/dist/index.js

@@ -109,7 +109,12 @@ var ImagePart = (_props) => {
   return null;
 };
 async function fetchImageAndConvertToBase64(url) {
-  const response = await fetch(url);
+  let response;
+  try {
+    response = await fetch(url);
+  } catch (error) {
+    throw new Error(`Failed to fetch image URL ${url}: ${error.message}`);
+  }
   const contentType = response.headers.get("content-type");
   if (!contentType || !RE_ALLOWED_MEDIA_TYPES.test(contentType)) {
     throw new Error(`Unsupported media type: ${contentType}`);
@@ -1767,6 +1772,15 @@ var SpanTreeNode = class {
     });
     return result;
   }
+  getRoot() {
+    let node = this;
+    let found = this;
+    while (node) {
+      found = node;
+      node = node.parent;
+    }
+    return found;
+  }
   getRootByName(name) {
     let node = this;
     let found = null;
@@ -1781,6 +1795,9 @@ var SpanTreeNode = class {
   getNearestAttribute(key) {
     return getNearestAttribute(this.parent, key);
   }
+  getRootSpanId() {
+    return this.getRoot().span.spanContext.spanId;
+  }
   getRootAttribute(key) {
     return getFarthestAttribute(this, key);
   }
@@ -1885,7 +1902,22 @@ var AISpanProcessor = class {
   async enrichSpan(span) {
     const result1 = await this.evaluatePrompt(span);
     const result2 = await this.addPromptKeys(result1);
-    return result2;
+    const result3 = await this.addRootSpanId(result2);
+    return result3;
+  }
+  async addRootSpanId(span) {
+    const node = this.spanTree.findNode(span.spanContext.spanId);
+    if (!node) {
+      return span;
+    }
+    const final = {
+      ...span,
+      attributes: {
+        ...span.attributes,
+        rootSpanId: node.getRootSpanId()
+      }
+    };
+    return final;
   }
   async addPromptKeys(span) {
     if (!isChatCompletionSpan(span) && !isPromptSpan(span)) {
@@ -1897,7 +1929,8 @@ var AISpanProcessor = class {
     }
     const extraAttributes = {
       parentPromptKey: node.getNearestAttribute("promptKey"),
-      rootPromptKey: node.getRootAttribute("promptKey")
+      rootPromptKey: node.getRootAttribute("promptKey"),
+      rootSpanId: node.getRootSpanId()
     };
     const final = {
       ...span,
@@ -2663,7 +2696,6 @@ async function* AnthropicChatCompletionInner(props, ctx) {
           const cacheCreated = inputUsage.cache_creation_input_tokens || 0;
           const cacheRead = inputUsage.cache_read_input_tokens || 0;
           const promptTokens = inputUsage.input_tokens + cacheCreated + cacheRead;
-          logger.info(`inputUsage: ${JSON.stringify(inputUsage, null, 2)}`);
           tokensUsed.prompt = promptTokens;
           tokensUsed.cachedPromptTokensCreated = cacheCreated;
           tokensUsed.cachedPromptTokensRead = cacheRead;

package/dist/index.mjs

@@ -41,7 +41,12 @@ var ImagePart = (_props) => {
   return null;
 };
 async function fetchImageAndConvertToBase64(url) {
-  const response = await fetch(url);
+  let response;
+  try {
+    response = await fetch(url);
+  } catch (error) {
+    throw new Error(`Failed to fetch image URL ${url}: ${error.message}`);
+  }
   const contentType = response.headers.get("content-type");
   if (!contentType || !RE_ALLOWED_MEDIA_TYPES.test(contentType)) {
     throw new Error(`Unsupported media type: ${contentType}`);
@@ -1666,6 +1671,15 @@ var SpanTreeNode = class {
     });
     return result;
   }
+  getRoot() {
+    let node = this;
+    let found = this;
+    while (node) {
+      found = node;
+      node = node.parent;
+    }
+    return found;
+  }
   getRootByName(name) {
     let node = this;
     let found = null;
@@ -1680,6 +1694,9 @@ var SpanTreeNode = class {
   getNearestAttribute(key) {
     return getNearestAttribute(this.parent, key);
   }
+  getRootSpanId() {
+    return this.getRoot().span.spanContext.spanId;
+  }
   getRootAttribute(key) {
     return getFarthestAttribute(this, key);
   }
@@ -1784,7 +1801,22 @@ var AISpanProcessor = class {
   async enrichSpan(span) {
     const result1 = await this.evaluatePrompt(span);
     const result2 = await this.addPromptKeys(result1);
-    return result2;
+    const result3 = await this.addRootSpanId(result2);
+    return result3;
+  }
+  async addRootSpanId(span) {
+    const node = this.spanTree.findNode(span.spanContext.spanId);
+    if (!node) {
+      return span;
+    }
+    const final = {
+      ...span,
+      attributes: {
+        ...span.attributes,
+        rootSpanId: node.getRootSpanId()
+      }
+    };
+    return final;
   }
   async addPromptKeys(span) {
     if (!isChatCompletionSpan(span) && !isPromptSpan(span)) {
@@ -1796,7 +1828,8 @@ var AISpanProcessor = class {
     }
     const extraAttributes = {
       parentPromptKey: node.getNearestAttribute("promptKey"),
-      rootPromptKey: node.getRootAttribute("promptKey")
+      rootPromptKey: node.getRootAttribute("promptKey"),
+      rootSpanId: node.getRootSpanId()
     };
     const final = {
       ...span,
@@ -2562,7 +2595,6 @@ async function* AnthropicChatCompletionInner(props, ctx) {
           const cacheCreated = inputUsage.cache_creation_input_tokens || 0;
           const cacheRead = inputUsage.cache_read_input_tokens || 0;
           const promptTokens = inputUsage.input_tokens + cacheCreated + cacheRead;
-          logger.info(`inputUsage: ${JSON.stringify(inputUsage, null, 2)}`);
           tokensUsed.prompt = promptTokens;
           tokensUsed.cachedPromptTokensCreated = cacheCreated;
           tokensUsed.cachedPromptTokensRead = cacheRead;

package/dist/{jsx-dev-runtime-RvJm3SlM.d.mts → jsx-dev-runtime-CwVVc96-.d.mts}

@@ -107,10 +107,10 @@ type EvaluatorResult = {
     debug?: string;
 };
 type EvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any> = (variables: V, result: O) => Promise<EvaluatorResult | EvaluatorResult[]>;
-type LlmEvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any> = (ctx: RenderContext, options: {
+type LlmEvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any, E = O> = (ctx: RenderContext, options: {
     variables: V;
     output: O;
-    expected?: O;
+    expected?: E;
 }) => Promise<EvaluatorResult | EvaluatorResult[]>;
 type OutputParser<O> = {
     schema: ZodTypeAny;

package/dist/{jsx-dev-runtime-RvJm3SlM.d.ts → jsx-dev-runtime-CwVVc96-.d.ts}

@@ -107,10 +107,10 @@ type EvaluatorResult = {
     debug?: string;
 };
 type EvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any> = (variables: V, result: O) => Promise<EvaluatorResult | EvaluatorResult[]>;
-type LlmEvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any> = (ctx: RenderContext, options: {
+type LlmEvaluatorFn<V extends Record<string, any> = Record<string, any>, O = any, E = O> = (ctx: RenderContext, options: {
     variables: V;
     output: O;
-    expected?: O;
+    expected?: E;
 }) => Promise<EvaluatorResult | EvaluatorResult[]>;
 type OutputParser<O> = {
     schema: ZodTypeAny;

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

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

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

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

package/dist/jsx-runtime.d.mts

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

package/dist/jsx-runtime.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.16.3-dev.2024-11-17",
+  "version": "0.16.5-dev.2024-11-25",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",