@gammatech/aijsx 0.4.0-beta.5 → 0.4.0-beta.6

package/dist/{createElement-gT2wWwEd.d.mts → createElement-M3MXUt8O.d.mts}

@@ -306,4 +306,4 @@ declare function AIFragment({ children }: {
     children: AINode;
 }): Renderable;
 
-export { type AIComponent as A, BoundLogger as B, type ContextValues as C, NoopLogImplementation as D, type EvaluatorFn as E, type FunctionChain as F, ConsoleLogger as G, CombinedLogger as H, type Literal as I, type RenderableStream as J, type RenderResult as K, LogImplementation as L, attachedContextSymbol as M, type NotAsyncGenerator as N, type AIElement as O, type PromptParsed as P, type Renderable as Q, type RenderContext as R, type StreamChain as S, type PropsOfAIComponent as T, UserMessage as U, type EvaluatorResult as V, type OutputParser as W, type PromptRenderResult as X, type Prompt as a, type Context as b, type AINode as c, createAIElement as d, AIFragment as e, LoggerContext as f, createContext as g, type RenderTraceInfo as h, type ChatCompletionRole as i, SystemMessage as j, AssistantMessage as k, type RenderedConversationMessage as l, computeUsage as m, ChatCompletionError as n, type LogChainStart as o, type LogChainComplete as p, type LogChainError as q, type LogPromptStart as r, type LogPromptComplete as s, type LogPromptError as t, type ChatCompletionRequestPayloads as u, type LogChatCompletionRequest as v, type LogChatCompletionResponse as w, type LogLevel as x, type LogContext as y, type Logger as z };
+export { type AIComponent as A, type Logger as B, type ContextValues as C, BoundLogger as D, type EvaluatorFn as E, type FunctionChain as F, NoopLogImplementation as G, ConsoleLogger as H, CombinedLogger as I, type Literal as J, type RenderableStream as K, LogImplementation as L, type RenderResult as M, type NotAsyncGenerator as N, attachedContextSymbol as O, type PromptParsed as P, type AIElement as Q, type RenderContext as R, type StreamChain as S, type Renderable as T, UserMessage as U, type PropsOfAIComponent as V, type OutputParser as W, type PromptRenderResult as X, type Prompt as a, type EvaluatorResult as b, type Context as c, type AINode as d, createAIElement as e, AIFragment as f, LoggerContext as g, createContext as h, type RenderTraceInfo as i, type ChatCompletionRole as j, SystemMessage as k, AssistantMessage as l, type RenderedConversationMessage as m, computeUsage as n, ChatCompletionError as o, type LogChainStart as p, type LogChainComplete as q, type LogChainError as r, type LogPromptStart as s, type LogPromptComplete as t, type LogPromptError as u, type ChatCompletionRequestPayloads as v, type LogChatCompletionRequest as w, type LogChatCompletionResponse as x, type LogLevel as y, type LogContext as z };

package/dist/{createElement-gT2wWwEd.d.ts → createElement-M3MXUt8O.d.ts}

@@ -306,4 +306,4 @@ declare function AIFragment({ children }: {
     children: AINode;
 }): Renderable;
 
-export { type AIComponent as A, BoundLogger as B, type ContextValues as C, NoopLogImplementation as D, type EvaluatorFn as E, type FunctionChain as F, ConsoleLogger as G, CombinedLogger as H, type Literal as I, type RenderableStream as J, type RenderResult as K, LogImplementation as L, attachedContextSymbol as M, type NotAsyncGenerator as N, type AIElement as O, type PromptParsed as P, type Renderable as Q, type RenderContext as R, type StreamChain as S, type PropsOfAIComponent as T, UserMessage as U, type EvaluatorResult as V, type OutputParser as W, type PromptRenderResult as X, type Prompt as a, type Context as b, type AINode as c, createAIElement as d, AIFragment as e, LoggerContext as f, createContext as g, type RenderTraceInfo as h, type ChatCompletionRole as i, SystemMessage as j, AssistantMessage as k, type RenderedConversationMessage as l, computeUsage as m, ChatCompletionError as n, type LogChainStart as o, type LogChainComplete as p, type LogChainError as q, type LogPromptStart as r, type LogPromptComplete as s, type LogPromptError as t, type ChatCompletionRequestPayloads as u, type LogChatCompletionRequest as v, type LogChatCompletionResponse as w, type LogLevel as x, type LogContext as y, type Logger as z };
+export { type AIComponent as A, type Logger as B, type ContextValues as C, BoundLogger as D, type EvaluatorFn as E, type FunctionChain as F, NoopLogImplementation as G, ConsoleLogger as H, CombinedLogger as I, type Literal as J, type RenderableStream as K, LogImplementation as L, type RenderResult as M, type NotAsyncGenerator as N, attachedContextSymbol as O, type PromptParsed as P, type AIElement as Q, type RenderContext as R, type StreamChain as S, type Renderable as T, UserMessage as U, type PropsOfAIComponent as V, type OutputParser as W, type PromptRenderResult as X, type Prompt as a, type EvaluatorResult as b, type Context as c, type AINode as d, createAIElement as e, AIFragment as f, LoggerContext as g, createContext as h, type RenderTraceInfo as i, type ChatCompletionRole as j, SystemMessage as k, AssistantMessage as l, type RenderedConversationMessage as m, computeUsage as n, ChatCompletionError as o, type LogChainStart as p, type LogChainComplete as q, type LogChainError as r, type LogPromptStart as s, type LogPromptComplete as t, type LogPromptError as u, type ChatCompletionRequestPayloads as v, type LogChatCompletionRequest as w, type LogChatCompletionResponse as x, type LogLevel as y, type LogContext as z };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as Context, c as AINode } from './createElement-gT2wWwEd.mjs';
-export { O as AIElement, e as AIFragment, k as AssistantMessage, B as BoundLogger, n as ChatCompletionError, u as ChatCompletionRequestPayloads, i as ChatCompletionRole, H as CombinedLogger, G as ConsoleLogger, V as EvaluatorResult, I as Literal, p as LogChainComplete, q as LogChainError, o as LogChainStart, v as LogChatCompletionRequest, w as LogChatCompletionResponse, y as LogContext, x as LogLevel, s as LogPromptComplete, t as LogPromptError, r as LogPromptStart, z as Logger, f as LoggerContext, D as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, T as PropsOfAIComponent, K as RenderResult, h as RenderTraceInfo, Q as Renderable, J as RenderableStream, l as RenderedConversationMessage, j as SystemMessage, U as UserMessage, M as attachedContextSymbol, m as computeUsage, d as createAIElement, g as createContext } from './createElement-gT2wWwEd.mjs';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-M3MXUt8O.mjs';
+export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-M3MXUt8O.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -60,6 +60,9 @@ declare class ParseVariablesError extends Error {
 declare class PromptInvalidOutputError extends Error {
 }
 
+declare function evaluatePrompt<V extends Record<string, any>>(prompt: Prompt<V>, variables: V, result: string): Promise<EvaluatorResult[]>;
+declare function evaluatePrompt<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, result: O): Promise<EvaluatorResult[]>;
+
 type OpenAIChatCompletionRequest = OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming;
 type OpenAIChatMessage = ChatCompletionSystemMessageParam | ChatCompletionUserMessageParam | ChatCompletionAssistantMessageParam;
 declare module '@gammatech/aijsx' {
@@ -140,4 +143,4 @@ type AnthropicChatCompletionProps = {
  */
 declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, { render, logger, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
-export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };
+export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as Context, c as AINode } from './createElement-gT2wWwEd.js';
-export { O as AIElement, e as AIFragment, k as AssistantMessage, B as BoundLogger, n as ChatCompletionError, u as ChatCompletionRequestPayloads, i as ChatCompletionRole, H as CombinedLogger, G as ConsoleLogger, V as EvaluatorResult, I as Literal, p as LogChainComplete, q as LogChainError, o as LogChainStart, v as LogChatCompletionRequest, w as LogChatCompletionResponse, y as LogContext, x as LogLevel, s as LogPromptComplete, t as LogPromptError, r as LogPromptStart, z as Logger, f as LoggerContext, D as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, T as PropsOfAIComponent, K as RenderResult, h as RenderTraceInfo, Q as Renderable, J as RenderableStream, l as RenderedConversationMessage, j as SystemMessage, U as UserMessage, M as attachedContextSymbol, m as computeUsage, d as createAIElement, g as createContext } from './createElement-gT2wWwEd.js';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-M3MXUt8O.js';
+export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-M3MXUt8O.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -60,6 +60,9 @@ declare class ParseVariablesError extends Error {
 declare class PromptInvalidOutputError extends Error {
 }
 
+declare function evaluatePrompt<V extends Record<string, any>>(prompt: Prompt<V>, variables: V, result: string): Promise<EvaluatorResult[]>;
+declare function evaluatePrompt<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, result: O): Promise<EvaluatorResult[]>;
+
 type OpenAIChatCompletionRequest = OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming;
 type OpenAIChatMessage = ChatCompletionSystemMessageParam | ChatCompletionUserMessageParam | ChatCompletionAssistantMessageParam;
 declare module '@gammatech/aijsx' {
@@ -140,4 +143,4 @@ type AnthropicChatCompletionProps = {
  */
 declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, { render, logger, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
-export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };
+export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, EvaluatorResult, FunctionChain, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, ParseVariablesError, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, evaluatePrompt, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };

package/dist/index.js

@@ -62,6 +62,7 @@ __export(src_exports, {
   createRenderContext: () => createRenderContext,
   createStreamChain: () => createStreamChain,
   defaultMaxTokens: () => defaultMaxTokens,
+  evaluatePrompt: () => evaluatePrompt,
   tokenCountForOpenAIMessage: () => tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage: () => tokenCountForOpenAIVisionMessage,
   tokenLimitForChatModel: () => tokenLimitForChatModel,
@@ -440,6 +441,17 @@ var ParseVariablesError = class extends Error {
 var PromptInvalidOutputError = class extends Error {
 };
 
+// src/prompt/parseVariables.ts
+function parseVariables(schema, variables) {
+  try {
+    return { success: true, result: schema.parse(variables) };
+  } catch (e) {
+    const err = e;
+    const errors = JSON.stringify(err.flatten());
+    return { success: false, errors };
+  }
+}
+
 // src/utils.ts
 var import_nanoid = require("nanoid");
 var uuid = {
@@ -490,8 +502,8 @@ function createRenderContext({
     //
     // We can think of the Root span as a "symlink" to the current
     // application trace span
-    spanId: parentSpanId || uuid.spanId(),
-    parentSpanId: null,
+    spanId: uuid.spanId(),
+    parentSpanId,
     key: "Root",
     renderType: "root",
     parent: null
@@ -697,7 +709,11 @@ var StreamRenderContext = class _StreamRenderContext {
       }
       if (isAIElement(element)) {
         const ctxValues = attachedContextValues(element) || {};
-        const newCtx = self.enterElement(element, ctxValues);
+        const newCtx = self.enterElement(
+          element,
+          ctxValues,
+          !!opts.skipElementSpan
+        );
         const logger = newCtx.logger;
         const isFragment = element.tag.name === "AIFragment";
         try {
@@ -787,15 +803,6 @@ var StreamRenderContext = class _StreamRenderContext {
       }
     }
   }
-  parseVariables(schema, variables) {
-    try {
-      return { success: true, result: schema.parse(variables) };
-    } catch (e) {
-      const err = e;
-      const errors = JSON.stringify(err.flatten());
-      return { success: false, errors };
-    }
-  }
   renderPrompt(prompt, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
@@ -805,7 +812,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema, component: Component } = prompt;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.promptError({
@@ -841,7 +848,9 @@ var StreamRenderContext = class _StreamRenderContext {
       });
       throw error;
     };
-    const generator = this.renderElement(/* @__PURE__ */ jsx(Component, { ...varsToUse }), {});
+    const generator = this.renderElement(/* @__PURE__ */ jsx(Component, { ...varsToUse }), {
+      skipElementSpan: true
+    });
     const result = new AccumulatedRenderResult(generator, {
       onDone: logComplete,
       onError: logError
@@ -858,7 +867,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema, component: Component } = prompt;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.promptError({
@@ -872,9 +881,13 @@ var StreamRenderContext = class _StreamRenderContext {
       throw error;
     }
     try {
-      const output = await this.render(
-        /* @__PURE__ */ jsx(Component, { ...parsedVariables.result })
+      const stream = this.renderElement(
+        /* @__PURE__ */ jsx(Component, { ...parsedVariables.result }),
+        {
+          skipElementSpan: true
+        }
       );
+      const output = await accumResults(stream);
       const parsedOutput = prompt.parse(output);
       if (validateOutput) {
         try {
@@ -916,7 +929,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema } = chain;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.chainError({
@@ -990,34 +1003,42 @@ var StreamRenderContext = class _StreamRenderContext {
     return this.contextValues[context.key] ?? context.defaultValue;
   };
   enterChain(chain) {
+    const info = this.traceInfo.renderType === "root" ? {} : {
+      parentSpanId: this.traceInfo.spanId,
+      parent: this.traceInfo,
+      spanId: uuid.spanId()
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      parentSpanId: this.traceInfo.spanId,
-      spanId: uuid.spanId(),
+      ...info,
       renderType: "chain",
-      key: chain.key,
-      parent: this.traceInfo
+      key: chain.key
     };
     return new _StreamRenderContext(newTraceInfo, this.contextValues);
   }
   enterPrompt(prompt) {
+    const info = this.traceInfo.renderType === "root" ? {} : {
+      parentSpanId: this.traceInfo.spanId,
+      parent: this.traceInfo,
+      spanId: uuid.spanId()
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      parentSpanId: this.traceInfo.spanId,
-      spanId: uuid.spanId(),
+      ...info,
       renderType: "prompt",
-      key: prompt.key,
-      parent: this.traceInfo
+      key: prompt.key
     };
     return new _StreamRenderContext(newTraceInfo, this.contextValues);
   }
   // @internal
-  enterElement(element, newCtx) {
+  enterElement(element, newCtx, skipSpan = false) {
+    const info = skipSpan ? {} : {
+      renderType: "element",
+      key: element.tag.name
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      renderType: "element",
-      key: element.tag.name,
-      parent: this.traceInfo
+      ...info
     };
     return new _StreamRenderContext(newTraceInfo, {
       ...this.contextValues,
@@ -1150,6 +1171,19 @@ function createStreamChain(chain) {
   };
 }
 
+// src/prompt/evaluatePrompt.ts
+async function evaluatePrompt(prompt, variables, result) {
+  const parsed = parseVariables(prompt.schema, variables);
+  if (!parsed.success) {
+    throw new ParseVariablesError(parsed.errors);
+  }
+  return (await Promise.all(
+    prompt.evaluators.map(
+      (evaluator) => evaluator(parsed.result, result)
+    )
+  )).flat();
+}
+
 // src/lib/openai/OpenAI.tsx
 var import_openai = require("openai");
 
@@ -1745,6 +1779,7 @@ var import_tokenizer4 = require("@anthropic-ai/tokenizer");
   createRenderContext,
   createStreamChain,
   defaultMaxTokens,
+  evaluatePrompt,
   tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage,
   tokenLimitForChatModel,

package/dist/index.mjs

@@ -351,6 +351,17 @@ var ParseVariablesError = class extends Error {
 var PromptInvalidOutputError = class extends Error {
 };
 
+// src/prompt/parseVariables.ts
+function parseVariables(schema, variables) {
+  try {
+    return { success: true, result: schema.parse(variables) };
+  } catch (e) {
+    const err = e;
+    const errors = JSON.stringify(err.flatten());
+    return { success: false, errors };
+  }
+}
+
 // src/utils.ts
 import { nanoid } from "nanoid";
 var uuid = {
@@ -401,8 +412,8 @@ function createRenderContext({
     //
     // We can think of the Root span as a "symlink" to the current
     // application trace span
-    spanId: parentSpanId || uuid.spanId(),
-    parentSpanId: null,
+    spanId: uuid.spanId(),
+    parentSpanId,
     key: "Root",
     renderType: "root",
     parent: null
@@ -601,7 +612,11 @@ var StreamRenderContext = class _StreamRenderContext {
       }
       if (isAIElement(element)) {
         const ctxValues = attachedContextValues(element) || {};
-        const newCtx = self.enterElement(element, ctxValues);
+        const newCtx = self.enterElement(
+          element,
+          ctxValues,
+          !!opts.skipElementSpan
+        );
         const logger = newCtx.logger;
         const isFragment = element.tag.name === "AIFragment";
         try {
@@ -691,15 +706,6 @@ var StreamRenderContext = class _StreamRenderContext {
       }
     }
   }
-  parseVariables(schema, variables) {
-    try {
-      return { success: true, result: schema.parse(variables) };
-    } catch (e) {
-      const err = e;
-      const errors = JSON.stringify(err.flatten());
-      return { success: false, errors };
-    }
-  }
   renderPrompt(prompt, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
@@ -709,7 +715,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema, component: Component } = prompt;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.promptError({
@@ -745,7 +751,9 @@ var StreamRenderContext = class _StreamRenderContext {
       });
       throw error;
     };
-    const generator = this.renderElement(/* @__PURE__ */ jsx(Component, { ...varsToUse }), {});
+    const generator = this.renderElement(/* @__PURE__ */ jsx(Component, { ...varsToUse }), {
+      skipElementSpan: true
+    });
     const result = new AccumulatedRenderResult(generator, {
       onDone: logComplete,
       onError: logError
@@ -762,7 +770,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema, component: Component } = prompt;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.promptError({
@@ -776,9 +784,13 @@ var StreamRenderContext = class _StreamRenderContext {
       throw error;
     }
     try {
-      const output = await this.render(
-        /* @__PURE__ */ jsx(Component, { ...parsedVariables.result })
+      const stream = this.renderElement(
+        /* @__PURE__ */ jsx(Component, { ...parsedVariables.result }),
+        {
+          skipElementSpan: true
+        }
       );
+      const output = await accumResults(stream);
       const parsedOutput = prompt.parse(output);
       if (validateOutput) {
         try {
@@ -820,7 +832,7 @@ var StreamRenderContext = class _StreamRenderContext {
       variables
     });
     const { schema } = chain;
-    const parsedVariables = this.parseVariables(schema, variables);
+    const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
       this.logger.chainError({
@@ -894,34 +906,42 @@ var StreamRenderContext = class _StreamRenderContext {
     return this.contextValues[context.key] ?? context.defaultValue;
   };
   enterChain(chain) {
+    const info = this.traceInfo.renderType === "root" ? {} : {
+      parentSpanId: this.traceInfo.spanId,
+      parent: this.traceInfo,
+      spanId: uuid.spanId()
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      parentSpanId: this.traceInfo.spanId,
-      spanId: uuid.spanId(),
+      ...info,
       renderType: "chain",
-      key: chain.key,
-      parent: this.traceInfo
+      key: chain.key
     };
     return new _StreamRenderContext(newTraceInfo, this.contextValues);
   }
   enterPrompt(prompt) {
+    const info = this.traceInfo.renderType === "root" ? {} : {
+      parentSpanId: this.traceInfo.spanId,
+      parent: this.traceInfo,
+      spanId: uuid.spanId()
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      parentSpanId: this.traceInfo.spanId,
-      spanId: uuid.spanId(),
+      ...info,
       renderType: "prompt",
-      key: prompt.key,
-      parent: this.traceInfo
+      key: prompt.key
     };
     return new _StreamRenderContext(newTraceInfo, this.contextValues);
   }
   // @internal
-  enterElement(element, newCtx) {
+  enterElement(element, newCtx, skipSpan = false) {
+    const info = skipSpan ? {} : {
+      renderType: "element",
+      key: element.tag.name
+    };
     const newTraceInfo = {
       ...this.traceInfo,
-      renderType: "element",
-      key: element.tag.name,
-      parent: this.traceInfo
+      ...info
     };
     return new _StreamRenderContext(newTraceInfo, {
       ...this.contextValues,
@@ -1054,6 +1074,19 @@ function createStreamChain(chain) {
   };
 }
 
+// src/prompt/evaluatePrompt.ts
+async function evaluatePrompt(prompt, variables, result) {
+  const parsed = parseVariables(prompt.schema, variables);
+  if (!parsed.success) {
+    throw new ParseVariablesError(parsed.errors);
+  }
+  return (await Promise.all(
+    prompt.evaluators.map(
+      (evaluator) => evaluator(parsed.result, result)
+    )
+  )).flat();
+}
+
 // src/lib/openai/OpenAI.tsx
 import { OpenAI as OpenAIClient } from "openai";
 
@@ -1648,6 +1681,7 @@ export {
   createRenderContext,
   createStreamChain,
   defaultMaxTokens,
+  evaluatePrompt,
   tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage,
   tokenLimitForChatModel,

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

@@ -1,3 +1,3 @@
 export { Fragment, JSX, jsx, jsxDEV, jsxs } from './jsx-runtime.mjs';
-import './createElement-gT2wWwEd.mjs';
+import './createElement-M3MXUt8O.mjs';
 import 'zod';

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

@@ -1,3 +1,3 @@
 export { Fragment, JSX, jsx, jsxDEV, jsxs } from './jsx-runtime.js';
-import './createElement-gT2wWwEd.js';
+import './createElement-M3MXUt8O.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,4 +1,4 @@
-import { A as AIComponent, O as AIElement, e as AIFragment } from './createElement-gT2wWwEd.mjs';
+import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-M3MXUt8O.mjs';
 import 'zod';
 
 /**

package/dist/jsx-runtime.d.ts

@@ -1,4 +1,4 @@
-import { A as AIComponent, O as AIElement, e as AIFragment } from './createElement-gT2wWwEd.js';
+import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-M3MXUt8O.js';
 import 'zod';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.4.0-beta.5",
+  "version": "0.4.0-beta.6",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",