@gammatech/aijsx 0.9.3-dev.2024-05-31 → 0.10.0-dev.2024-06-04

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanExporter, f as AIComponent, g as SpanAttributes, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, N as NotAsyncGenerator, F as FunctionChain, k as StreamChain, J as JSX } from './jsx-dev-runtime-uCZBuaDe.mjs';
-export { G as AIElement, m as AIFragment, B as BoundLogger, o as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, p as ImagePartProps, x as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, u as NoopLogImplementation, Y as OutputParser, K as PropsOfAIComponent, y as RenderResult, H as Renderable, Q as Span, M as SpanContext, U as SpanEvent, O as SpanStatus, W as TracingContext, V as TracingContextKey, X as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-uCZBuaDe.mjs';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanExporter, f as AIComponent, g as SpanAttributes, 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-vXV-PExh.mjs';
+export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-vXV-PExh.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -85,6 +85,24 @@ declare class AITraceAPI {
 }
 declare const tracing: AITraceAPI;
 
+declare class SpanTree {
+    roots: SpanTreeNode[];
+    findSpan: any;
+    addSpan(span: ReadableSpan): boolean;
+    findNode(id: string): SpanTreeNode | null;
+}
+declare class SpanTreeNode {
+    readonly id: string;
+    readonly name: string;
+    readonly parent: SpanTreeNode | null;
+    readonly children: SpanTreeNode[];
+    readonly attrs: Record<string, any>;
+    constructor(id: string, name: string, parent: SpanTreeNode | null, children: SpanTreeNode[], attrs: Record<string, any>);
+    addChild(child: SpanTreeNode): void;
+    getNearestAttribute<K>(key: string): K | null;
+    getRootAttribute<K>(key: string): K | null;
+}
+
 type CostFn = (tokensUsed: {
     prompt: number;
     completion: number;
@@ -109,6 +127,7 @@ declare abstract class EnrichingSpanProcessor implements SpanProcessor {
     }[];
     protected onAllDonePromise: Promise<void> | null;
     protected onAllDonePromiseResolve: (() => void) | null;
+    protected spanTree: SpanTree;
     constructor(exporter: SpanExporter);
     onStart(span: ReadableSpan): Promise<void>;
     onEnd(span: ReadableSpan): Promise<void>;
@@ -125,6 +144,7 @@ declare class AISpanProcessor extends EnrichingSpanProcessor {
     };
     onTraceComplete(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
+    protected addPromptKeys(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateCost(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateUsage(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
@@ -151,11 +171,6 @@ declare namespace AISpanAttributes {
         output: string;
         parsedOutput?: any;
     };
-    type Chain = {
-        chainKey: string;
-        chainType: string;
-        variables: Record<string, any>;
-    };
     type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = {
         model: string;
         cost?: number;
@@ -178,12 +193,13 @@ declare namespace ProcessedAISpanAttributes {
         evaluatorError?: string;
         totalUsage?: Usage;
         totalCost?: Cost;
+        parentPromptKey?: string;
+        rootPromptKey?: string;
     };
-    type Chain = AISpanAttributes.Chain & {
-        totalUsage?: Usage;
-        totalCost?: Cost;
+    type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K> & {
+        parentPromptKey?: string;
+        rootPromptKey?: string;
     };
-    type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K>;
 }
 
 /**
@@ -208,19 +224,6 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
 
-declare function createFunctionChain<I extends ZodObject<ZodRawShape>, R extends NotAsyncGenerator<any>>(chain: {
-    key: string;
-    run: (variables: z.infer<I>, context: RenderContext) => R;
-    outputSchema?: ZodTypeAny;
-    schema: I;
-}): FunctionChain<z.infer<I>, R>;
-declare function createStreamChain<I extends ZodObject<ZodRawShape>, M extends ZodTypeAny, R extends AsyncGenerator<any, any, any>>(chain: {
-    key: string;
-    run: (variables: z.infer<I>, context: RenderContext) => R;
-    schema: I;
-    messageSchema?: M;
-}): StreamChain<z.infer<I>, R>;
-
 declare class ParseVariablesError extends Error {
 }
 declare class PromptInvalidOutputError extends Error {
@@ -299,4 +302,4 @@ type GoogleChatCompletionProps = {
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 
-export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatMessage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, FunctionChain, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, SystemMessage, type TokenizerFn, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, anthropicTokenizer, computeUsage, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, openaiTokenizer, tracing };
+export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatMessage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, type TokenizerFn, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, anthropicTokenizer, computeUsage, createPrompt, createRenderContext, evaluatePrompt, openaiTokenizer, tracing };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanExporter, f as AIComponent, g as SpanAttributes, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, N as NotAsyncGenerator, F as FunctionChain, k as StreamChain, J as JSX } from './jsx-dev-runtime-uCZBuaDe.js';
-export { G as AIElement, m as AIFragment, B as BoundLogger, o as ChatRole, w as CombinedLogger, v as ConsoleLogger, I as ImagePart, p as ImagePartProps, x as Literal, q as LogChatCompletionResponse, r as LogLevel, s as Logger, u as NoopLogImplementation, Y as OutputParser, K as PropsOfAIComponent, y as RenderResult, H as Renderable, Q as Span, M as SpanContext, U as SpanEvent, O as SpanStatus, W as TracingContext, V as TracingContextKey, X as TracingContextManager, z as attachedContextSymbol, l as createAIElement, n as createContext, t as toDebugMessage } from './jsx-dev-runtime-uCZBuaDe.js';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanExporter, f as AIComponent, g as SpanAttributes, 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-vXV-PExh.js';
+export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-vXV-PExh.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -85,6 +85,24 @@ declare class AITraceAPI {
 }
 declare const tracing: AITraceAPI;
 
+declare class SpanTree {
+    roots: SpanTreeNode[];
+    findSpan: any;
+    addSpan(span: ReadableSpan): boolean;
+    findNode(id: string): SpanTreeNode | null;
+}
+declare class SpanTreeNode {
+    readonly id: string;
+    readonly name: string;
+    readonly parent: SpanTreeNode | null;
+    readonly children: SpanTreeNode[];
+    readonly attrs: Record<string, any>;
+    constructor(id: string, name: string, parent: SpanTreeNode | null, children: SpanTreeNode[], attrs: Record<string, any>);
+    addChild(child: SpanTreeNode): void;
+    getNearestAttribute<K>(key: string): K | null;
+    getRootAttribute<K>(key: string): K | null;
+}
+
 type CostFn = (tokensUsed: {
     prompt: number;
     completion: number;
@@ -109,6 +127,7 @@ declare abstract class EnrichingSpanProcessor implements SpanProcessor {
     }[];
     protected onAllDonePromise: Promise<void> | null;
     protected onAllDonePromiseResolve: (() => void) | null;
+    protected spanTree: SpanTree;
     constructor(exporter: SpanExporter);
     onStart(span: ReadableSpan): Promise<void>;
     onEnd(span: ReadableSpan): Promise<void>;
@@ -125,6 +144,7 @@ declare class AISpanProcessor extends EnrichingSpanProcessor {
     };
     onTraceComplete(rootSpan: ReadableSpan): Promise<void>;
     enrichSpan(span: ReadableSpan): Promise<ReadableSpan>;
+    protected addPromptKeys(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateCost(span: ReadableSpan): Promise<ReadableSpan>;
     protected updateUsage(span: ReadableSpan): Promise<ReadableSpan>;
     protected evaluatePrompt(span: ReadableSpan): Promise<ReadableSpan>;
@@ -151,11 +171,6 @@ declare namespace AISpanAttributes {
         output: string;
         parsedOutput?: any;
     };
-    type Chain = {
-        chainKey: string;
-        chainType: string;
-        variables: Record<string, any>;
-    };
     type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = {
         model: string;
         cost?: number;
@@ -178,12 +193,13 @@ declare namespace ProcessedAISpanAttributes {
         evaluatorError?: string;
         totalUsage?: Usage;
         totalCost?: Cost;
+        parentPromptKey?: string;
+        rootPromptKey?: string;
     };
-    type Chain = AISpanAttributes.Chain & {
-        totalUsage?: Usage;
-        totalCost?: Cost;
+    type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K> & {
+        parentPromptKey?: string;
+        rootPromptKey?: string;
     };
-    type ChatCompletion<K extends keyof ChatCompletionRequestPayloads = keyof ChatCompletionRequestPayloads> = AISpanAttributes.ChatCompletion<K>;
 }
 
 /**
@@ -208,19 +224,6 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
 
-declare function createFunctionChain<I extends ZodObject<ZodRawShape>, R extends NotAsyncGenerator<any>>(chain: {
-    key: string;
-    run: (variables: z.infer<I>, context: RenderContext) => R;
-    outputSchema?: ZodTypeAny;
-    schema: I;
-}): FunctionChain<z.infer<I>, R>;
-declare function createStreamChain<I extends ZodObject<ZodRawShape>, M extends ZodTypeAny, R extends AsyncGenerator<any, any, any>>(chain: {
-    key: string;
-    run: (variables: z.infer<I>, context: RenderContext) => R;
-    schema: I;
-    messageSchema?: M;
-}): StreamChain<z.infer<I>, R>;
-
 declare class ParseVariablesError extends Error {
 }
 declare class PromptInvalidOutputError extends Error {
@@ -299,4 +302,4 @@ type GoogleChatCompletionProps = {
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 
-export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatMessage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, FunctionChain, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, NotAsyncGenerator, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, StreamChain, SystemMessage, type TokenizerFn, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, anthropicTokenizer, computeUsage, createFunctionChain, createPrompt, createRenderContext, createStreamChain, evaluatePrompt, openaiTokenizer, tracing };
+export { AIComponent, AINode, AISpanAttributes, AISpanProcessor, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, AssistantMessage, type ChatCompletionClientAndProvider, ChatCompletionError, type ChatCompletionRequestPayloads, ChatMessage, Context, type CostFn, DebugMessage, DefaultMaxRetriesContext, EnrichingSpanProcessor, EvaluatorFn, EvaluatorResult, Fallback, GoogleChatCompletion, type GoogleChatCompletionRequest, GoogleClientContext, LogChatCompletionRequest, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, ParseVariablesError, ProcessedAISpanAttributes, type Prompt, PromptInvalidOutputError, PromptParsed, ReadableSpan, RenderContext, Retry, RetryCountContext, SpanAttributes, SpanExporter, SpanProcessor, SystemMessage, type TokenizerFn, Trace, Tracer, UserMessage, type ValidAnthropicChatModel, type ValidGoogleChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, anthropicTokenizer, computeUsage, createPrompt, createRenderContext, evaluatePrompt, openaiTokenizer, tracing };

package/dist/index.js

@@ -63,10 +63,8 @@ __export(src_exports, {
   computeUsage: () => computeUsage,
   createAIElement: () => createAIElement,
   createContext: () => createContext,
-  createFunctionChain: () => createFunctionChain,
   createPrompt: () => createPrompt,
   createRenderContext: () => createRenderContext,
-  createStreamChain: () => createStreamChain,
   evaluatePrompt: () => evaluatePrompt,
   openaiTokenizer: () => openaiTokenizer,
   toDebugMessage: () => toDebugMessage,
@@ -1326,7 +1324,6 @@ var StreamRenderContext = class _StreamRenderContext {
     this.logger = new BoundLogger(logImpl, this);
     this.render = this.render.bind(this);
     this.renderElement = async function* (renderable, opts = {}) {
-      const span = self.tracer.getActiveSpan();
       const preserveTags = opts.preserveTags ?? false;
       const renderedProps = opts.renderedProps || {};
       const renderEscaped = (val) => {
@@ -1386,64 +1383,63 @@ var StreamRenderContext = class _StreamRenderContext {
   renderElement;
   logger;
   // Implementation of the overloaded function
-  render(arg1, arg2, arg3) {
-    switch (true) {
-      case (isPromptParsed(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.prompt",
-          {
-            prompt: arg1,
-            promptKey: arg1.key,
-            variables: arg2
-          },
-          () => this.renderPromptParsed(arg1, arg2, arg3 || {})
-        );
-      }
-      case (isPrompt(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.prompt",
-          {
-            prompt: arg1,
-            promptKey: arg1.key,
-            variables: arg2
-          },
-          () => this.renderPrompt(arg1, arg2)
-        );
-      }
-      case (isFunctionChain(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.chain",
-          { chainKey: arg1.key, chainType: arg1.chainType, variables: arg2 },
-          () => this.runChain(arg1, arg2)
-        );
-      }
-      case (isStreamChain(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.chain",
-          { chainKey: arg1.key, chainType: arg1.chainType, variables: arg2 },
-          () => this.runChain(arg1, arg2)
-        );
-      }
-      default: {
-        const currentSpan = this.tracer.getActiveSpan();
-        const stream = this.renderElement(
-          arg1,
-          arg2 || { preserveTags: false }
-        );
-        if (currentSpan) {
-          return new GeneratorRenderResult(stream);
+  render(toRender, options) {
+    if (isPrompt(toRender)) {
+      return this.tracer.trace(
+        "ai.prompt",
+        {
+          prompt: toRender,
+          promptKey: toRender.key,
+          variables: options
+        },
+        () => this.renderPrompt(toRender, options)
+      );
+    }
+    const currentSpan = this.tracer.getActiveSpan();
+    const stream = this.renderElement(
+      toRender,
+      options || { preserveTags: false }
+    );
+    if (currentSpan) {
+      return new GeneratorRenderResult(stream);
+    }
+    return this.tracer.trace(
+      "ai.component",
+      {},
+      (span) => new AccumulatedRenderResult(stream, (output) => {
+        span.setAttributes({
+          output
+        });
+      })
+    );
+  }
+  async renderPromptParsed(prompt, variables, options = { validateOutput: true }) {
+    return this.tracer.trace(
+      "ai.prompt",
+      {
+        prompt,
+        promptKey: prompt.key,
+        variables
+      },
+      async (span) => {
+        const output = await this.renderPrompt(prompt, variables);
+        const parsedOutput = prompt.parse(output);
+        span?.setAttributes({
+          output,
+          parsedOutput
+        });
+        if (options.validateOutput) {
+          try {
+            prompt.outputSchema.parse(parsedOutput);
+          } catch (e) {
+            const err = e;
+            const errors = JSON.stringify(err.flatten());
+            throw new PromptInvalidOutputError("Invalid output: " + errors);
+          }
         }
-        return this.tracer.trace(
-          "ai.component",
-          {},
-          (span) => new AccumulatedRenderResult(stream, (output) => {
-            span.setAttributes({
-              output
-            });
-          })
-        );
+        return parsedOutput;
       }
-    }
+    );
   }
   renderPrompt(prompt, variables) {
     const { schema, component: Component } = prompt;
@@ -1458,54 +1454,6 @@ var StreamRenderContext = class _StreamRenderContext {
       });
     });
   }
-  async renderPromptParsed(prompt, variables, options) {
-    const span = this.tracer.getActiveSpan();
-    const { validateOutput } = options;
-    const { schema, component: Component } = prompt;
-    const { error, parsedVariables } = parseVariables(schema, variables);
-    if (error) {
-      throw error;
-    }
-    const stream = this.renderElement(/* @__PURE__ */ jsx(Component, { ...parsedVariables }));
-    const output = await accumResults(stream);
-    const parsedOutput = prompt.parse(output);
-    span?.setAttributes({
-      output,
-      parsedOutput
-    });
-    if (validateOutput) {
-      try {
-        prompt.outputSchema.parse(parsedOutput);
-      } catch (e) {
-        const err = e;
-        const errors = JSON.stringify(err.flatten());
-        throw new PromptInvalidOutputError("Invalid output: " + errors);
-      }
-    }
-    return parsedOutput;
-  }
-  runChain(chain, variables) {
-    const { error, parsedVariables } = parseVariables(chain.schema, variables);
-    if (error) {
-      throw error;
-    }
-    if (chain.chainType === "function") {
-      const span = this.tracer.getActiveSpan();
-      const onOutput = (output) => {
-        span?.setAttributes({ output });
-        return output;
-      };
-      const result = chain.run(parsedVariables, this);
-      if (result && typeof result === "object" && "then" in result) {
-        return result.then(onOutput);
-      }
-      return onOutput(result);
-    }
-    if (chain.chainType === "stream") {
-      return chain.run(parsedVariables, this);
-    }
-    throw new Error("Invalid chain type");
-  }
   getContext = (context) => {
     return this.contextValues[context.key] ?? context.defaultValue;
   };
@@ -1568,19 +1516,6 @@ function attachedContextValues(element) {
 function isPrompt(value) {
   return Boolean(value && typeof value === "object" && "component" in value);
 }
-function isPromptParsed(value) {
-  return Boolean(isPrompt(value) && "parse" in value);
-}
-function isStreamChain(value) {
-  return Boolean(
-    value && typeof value === "object" && "run" in value && "chainType" in value && value.chainType === "stream"
-  );
-}
-function isFunctionChain(value) {
-  return Boolean(
-    value && typeof value === "object" && "run" in value && "chainType" in value && value.chainType === "function"
-  );
-}
 function renderOpenTag(element, renderedProps) {
   const propsToRender = Object.entries(element.props).reduce(
     // create an array of escaped + json serialized key="{value}"s for attributes
@@ -1648,6 +1583,99 @@ async function* Fallback({ shouldFallback = () => true, fallback, children }, ct
   }
 }
 
+// src/tracing/SpanTree.ts
+var SpanTree = class {
+  roots = [];
+  findSpan;
+  addSpan(span) {
+    const parentId = span.parentSpanId;
+    if (!parentId) {
+      this.roots.push(
+        new SpanTreeNode(
+          span.spanContext.spanId,
+          span.name,
+          null,
+          [],
+          span.attributes
+        )
+      );
+      return true;
+    }
+    const parent = this.findNode(parentId);
+    if (!parent) {
+      return false;
+    }
+    parent.addChild(
+      new SpanTreeNode(
+        span.spanContext.spanId,
+        span.name,
+        parent,
+        [],
+        span.attributes
+      )
+    );
+    return true;
+  }
+  findNode(id) {
+    for (const root of this.roots) {
+      const found = findSpanNode(root, id);
+      if (found) {
+        return found;
+      }
+    }
+    return null;
+  }
+};
+function findSpanNode(root, id) {
+  if (root.id === id) {
+    return root;
+  }
+  for (const child of root.children) {
+    const found = findSpanNode(child, id);
+    if (found) {
+      return found;
+    }
+  }
+  return null;
+}
+var SpanTreeNode = class {
+  constructor(id, name, parent, children, attrs) {
+    this.id = id;
+    this.name = name;
+    this.parent = parent;
+    this.children = children;
+    this.attrs = attrs;
+  }
+  addChild(child) {
+    this.children.push(child);
+  }
+  getNearestAttribute(key) {
+    return getNearestAttribute(this.parent, key);
+  }
+  getRootAttribute(key) {
+    return getFarthestAttribute(this, key);
+  }
+};
+var getNearestAttribute = (node, key) => {
+  while (node) {
+    if (key in node.attrs) {
+      return node.attrs[key];
+    }
+    node = node.parent;
+  }
+  return null;
+};
+var getFarthestAttribute = (node, key) => {
+  let found = null;
+  while (node) {
+    if (key in node.attrs) {
+      found = node.attrs[key];
+    }
+    node = node.parent;
+  }
+  return found;
+};
+
 // src/prompt/evaluatePrompt.ts
 async function evaluatePrompt(prompt, variables, result) {
   const { error, parsedVariables } = parseVariables(prompt.schema, variables);
@@ -1672,7 +1700,9 @@ var EnrichingSpanProcessor = class {
   finalSpans = [];
   onAllDonePromise = null;
   onAllDonePromiseResolve = null;
+  spanTree = new SpanTree();
   async onStart(span) {
+    this.spanTree.addSpan(span);
     this.finalSpans.push({
       status: "running",
       span
@@ -1717,7 +1747,29 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
     const result1 = await this.evaluatePrompt(span);
     const result2 = await this.updateCost(result1);
     const result3 = await this.updateUsage(result2);
-    return result3;
+    const result4 = await this.addPromptKeys(result3);
+    return result4;
+  }
+  async addPromptKeys(span) {
+    if (!isChatCompletionSpan(span) && !isPromptSpan(span)) {
+      return span;
+    }
+    const node = this.spanTree.findNode(span.spanContext.spanId);
+    if (!node) {
+      return span;
+    }
+    const extraAttributes = {
+      parentPromptKey: node.getNearestAttribute("promptKey"),
+      rootPromptKey: node.getRootAttribute("promptKey")
+    };
+    const final = {
+      ...span,
+      attributes: {
+        ...span.attributes,
+        ...extraAttributes
+      }
+    };
+    return final;
   }
   async updateCost(span) {
     if (!isChatCompletionSpan(span)) {
@@ -1743,15 +1795,20 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
     return span;
   }
   async evaluatePrompt(span) {
-    const { prompt, variables, output } = span.attributes;
-    if (!isPrompt2(prompt)) {
+    if (!isPrompt2(span.attributes.prompt)) {
       return span;
     }
+    const { prompt, variables, output, parsedOutput } = span.attributes;
     delete span.attributes["prompt"];
+    const outputToEvaluate = isPromptParsed(prompt) ? parsedOutput : output;
     let evaluatorResults = {};
     let extraAttributes = {};
     try {
-      const evaluators = await evaluatePrompt(prompt, variables, output);
+      const evaluators = await evaluatePrompt(
+        prompt,
+        variables,
+        outputToEvaluate
+      );
       evaluatorResults = evaluators.reduce(
         (accum, result) => {
           accum[result.key] = result;
@@ -1783,11 +1840,19 @@ var isChatCompletionSpan = (value) => {
     value && typeof value == "object" && "name" in value && value.name === "ai.chatCompletion"
   );
 };
+var isPromptSpan = (value) => {
+  return Boolean(
+    value && typeof value == "object" && "name" in value && value.name === "ai.prompt"
+  );
+};
 var isPrompt2 = (value) => {
   return Boolean(
     value && typeof value == "object" && "schema" in value && "evaluators" in value
   );
 };
+function isPromptParsed(value) {
+  return Boolean(isPrompt2(value) && "parse" in value);
+}
 
 // src/tracing/Trace.tsx
 var Trace = ({ name, attributes, children }, { tracer, render }) => {
@@ -1814,7 +1879,6 @@ function createPrompt(config) {
       component: component2,
       parse: outputParser.parse,
       outputSchema: outputParser.schema,
-      messageSchema: null,
       schema: schema2,
       metadata: metadata2,
       evaluators: evaluators2
@@ -1827,37 +1891,10 @@ function createPrompt(config) {
     schema,
     metadata,
     evaluators,
-    messageSchema: import_zod.z.string(),
     outputSchema: import_zod.z.string()
   };
 }
 
-// src/prompt/createChain.ts
-var import_zod2 = require("zod");
-function createFunctionChain(chain) {
-  const { key, run, schema, outputSchema = import_zod2.z.any() } = chain;
-  return {
-    chainType: "function",
-    key,
-    schema,
-    messageSchema: null,
-    outputSchema,
-    // always make it async so RenderContext doesnt have a to guess
-    run
-  };
-}
-function createStreamChain(chain) {
-  const { key, run, messageSchema = import_zod2.z.any(), schema } = chain;
-  return {
-    chainType: "stream",
-    key,
-    schema,
-    run,
-    outputSchema: null,
-    messageSchema
-  };
-}
-
 // src/lib/openai/OpenAI.tsx
 var import_openai2 = require("openai");
 
@@ -2860,10 +2897,8 @@ var import_vertexai2 = require("@google-cloud/vertexai");
   computeUsage,
   createAIElement,
   createContext,
-  createFunctionChain,
   createPrompt,
   createRenderContext,
-  createStreamChain,
   evaluatePrompt,
   openaiTokenizer,
   toDebugMessage,

package/dist/index.mjs

@@ -1225,7 +1225,6 @@ var StreamRenderContext = class _StreamRenderContext {
     this.logger = new BoundLogger(logImpl, this);
     this.render = this.render.bind(this);
     this.renderElement = async function* (renderable, opts = {}) {
-      const span = self.tracer.getActiveSpan();
       const preserveTags = opts.preserveTags ?? false;
       const renderedProps = opts.renderedProps || {};
       const renderEscaped = (val) => {
@@ -1285,64 +1284,63 @@ var StreamRenderContext = class _StreamRenderContext {
   renderElement;
   logger;
   // Implementation of the overloaded function
-  render(arg1, arg2, arg3) {
-    switch (true) {
-      case (isPromptParsed(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.prompt",
-          {
-            prompt: arg1,
-            promptKey: arg1.key,
-            variables: arg2
-          },
-          () => this.renderPromptParsed(arg1, arg2, arg3 || {})
-        );
-      }
-      case (isPrompt(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.prompt",
-          {
-            prompt: arg1,
-            promptKey: arg1.key,
-            variables: arg2
-          },
-          () => this.renderPrompt(arg1, arg2)
-        );
-      }
-      case (isFunctionChain(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.chain",
-          { chainKey: arg1.key, chainType: arg1.chainType, variables: arg2 },
-          () => this.runChain(arg1, arg2)
-        );
-      }
-      case (isStreamChain(arg1) && !!arg2): {
-        return this.tracer.trace(
-          "ai.chain",
-          { chainKey: arg1.key, chainType: arg1.chainType, variables: arg2 },
-          () => this.runChain(arg1, arg2)
-        );
-      }
-      default: {
-        const currentSpan = this.tracer.getActiveSpan();
-        const stream = this.renderElement(
-          arg1,
-          arg2 || { preserveTags: false }
-        );
-        if (currentSpan) {
-          return new GeneratorRenderResult(stream);
+  render(toRender, options) {
+    if (isPrompt(toRender)) {
+      return this.tracer.trace(
+        "ai.prompt",
+        {
+          prompt: toRender,
+          promptKey: toRender.key,
+          variables: options
+        },
+        () => this.renderPrompt(toRender, options)
+      );
+    }
+    const currentSpan = this.tracer.getActiveSpan();
+    const stream = this.renderElement(
+      toRender,
+      options || { preserveTags: false }
+    );
+    if (currentSpan) {
+      return new GeneratorRenderResult(stream);
+    }
+    return this.tracer.trace(
+      "ai.component",
+      {},
+      (span) => new AccumulatedRenderResult(stream, (output) => {
+        span.setAttributes({
+          output
+        });
+      })
+    );
+  }
+  async renderPromptParsed(prompt, variables, options = { validateOutput: true }) {
+    return this.tracer.trace(
+      "ai.prompt",
+      {
+        prompt,
+        promptKey: prompt.key,
+        variables
+      },
+      async (span) => {
+        const output = await this.renderPrompt(prompt, variables);
+        const parsedOutput = prompt.parse(output);
+        span?.setAttributes({
+          output,
+          parsedOutput
+        });
+        if (options.validateOutput) {
+          try {
+            prompt.outputSchema.parse(parsedOutput);
+          } catch (e) {
+            const err = e;
+            const errors = JSON.stringify(err.flatten());
+            throw new PromptInvalidOutputError("Invalid output: " + errors);
+          }
         }
-        return this.tracer.trace(
-          "ai.component",
-          {},
-          (span) => new AccumulatedRenderResult(stream, (output) => {
-            span.setAttributes({
-              output
-            });
-          })
-        );
+        return parsedOutput;
       }
-    }
+    );
   }
   renderPrompt(prompt, variables) {
     const { schema, component: Component } = prompt;
@@ -1357,54 +1355,6 @@ var StreamRenderContext = class _StreamRenderContext {
       });
     });
   }
-  async renderPromptParsed(prompt, variables, options) {
-    const span = this.tracer.getActiveSpan();
-    const { validateOutput } = options;
-    const { schema, component: Component } = prompt;
-    const { error, parsedVariables } = parseVariables(schema, variables);
-    if (error) {
-      throw error;
-    }
-    const stream = this.renderElement(/* @__PURE__ */ jsx(Component, { ...parsedVariables }));
-    const output = await accumResults(stream);
-    const parsedOutput = prompt.parse(output);
-    span?.setAttributes({
-      output,
-      parsedOutput
-    });
-    if (validateOutput) {
-      try {
-        prompt.outputSchema.parse(parsedOutput);
-      } catch (e) {
-        const err = e;
-        const errors = JSON.stringify(err.flatten());
-        throw new PromptInvalidOutputError("Invalid output: " + errors);
-      }
-    }
-    return parsedOutput;
-  }
-  runChain(chain, variables) {
-    const { error, parsedVariables } = parseVariables(chain.schema, variables);
-    if (error) {
-      throw error;
-    }
-    if (chain.chainType === "function") {
-      const span = this.tracer.getActiveSpan();
-      const onOutput = (output) => {
-        span?.setAttributes({ output });
-        return output;
-      };
-      const result = chain.run(parsedVariables, this);
-      if (result && typeof result === "object" && "then" in result) {
-        return result.then(onOutput);
-      }
-      return onOutput(result);
-    }
-    if (chain.chainType === "stream") {
-      return chain.run(parsedVariables, this);
-    }
-    throw new Error("Invalid chain type");
-  }
   getContext = (context) => {
     return this.contextValues[context.key] ?? context.defaultValue;
   };
@@ -1467,19 +1417,6 @@ function attachedContextValues(element) {
 function isPrompt(value) {
   return Boolean(value && typeof value === "object" && "component" in value);
 }
-function isPromptParsed(value) {
-  return Boolean(isPrompt(value) && "parse" in value);
-}
-function isStreamChain(value) {
-  return Boolean(
-    value && typeof value === "object" && "run" in value && "chainType" in value && value.chainType === "stream"
-  );
-}
-function isFunctionChain(value) {
-  return Boolean(
-    value && typeof value === "object" && "run" in value && "chainType" in value && value.chainType === "function"
-  );
-}
 function renderOpenTag(element, renderedProps) {
   const propsToRender = Object.entries(element.props).reduce(
     // create an array of escaped + json serialized key="{value}"s for attributes
@@ -1547,6 +1484,99 @@ async function* Fallback({ shouldFallback = () => true, fallback, children }, ct
   }
 }
 
+// src/tracing/SpanTree.ts
+var SpanTree = class {
+  roots = [];
+  findSpan;
+  addSpan(span) {
+    const parentId = span.parentSpanId;
+    if (!parentId) {
+      this.roots.push(
+        new SpanTreeNode(
+          span.spanContext.spanId,
+          span.name,
+          null,
+          [],
+          span.attributes
+        )
+      );
+      return true;
+    }
+    const parent = this.findNode(parentId);
+    if (!parent) {
+      return false;
+    }
+    parent.addChild(
+      new SpanTreeNode(
+        span.spanContext.spanId,
+        span.name,
+        parent,
+        [],
+        span.attributes
+      )
+    );
+    return true;
+  }
+  findNode(id) {
+    for (const root of this.roots) {
+      const found = findSpanNode(root, id);
+      if (found) {
+        return found;
+      }
+    }
+    return null;
+  }
+};
+function findSpanNode(root, id) {
+  if (root.id === id) {
+    return root;
+  }
+  for (const child of root.children) {
+    const found = findSpanNode(child, id);
+    if (found) {
+      return found;
+    }
+  }
+  return null;
+}
+var SpanTreeNode = class {
+  constructor(id, name, parent, children, attrs) {
+    this.id = id;
+    this.name = name;
+    this.parent = parent;
+    this.children = children;
+    this.attrs = attrs;
+  }
+  addChild(child) {
+    this.children.push(child);
+  }
+  getNearestAttribute(key) {
+    return getNearestAttribute(this.parent, key);
+  }
+  getRootAttribute(key) {
+    return getFarthestAttribute(this, key);
+  }
+};
+var getNearestAttribute = (node, key) => {
+  while (node) {
+    if (key in node.attrs) {
+      return node.attrs[key];
+    }
+    node = node.parent;
+  }
+  return null;
+};
+var getFarthestAttribute = (node, key) => {
+  let found = null;
+  while (node) {
+    if (key in node.attrs) {
+      found = node.attrs[key];
+    }
+    node = node.parent;
+  }
+  return found;
+};
+
 // src/prompt/evaluatePrompt.ts
 async function evaluatePrompt(prompt, variables, result) {
   const { error, parsedVariables } = parseVariables(prompt.schema, variables);
@@ -1571,7 +1601,9 @@ var EnrichingSpanProcessor = class {
   finalSpans = [];
   onAllDonePromise = null;
   onAllDonePromiseResolve = null;
+  spanTree = new SpanTree();
   async onStart(span) {
+    this.spanTree.addSpan(span);
     this.finalSpans.push({
       status: "running",
       span
@@ -1616,7 +1648,29 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
     const result1 = await this.evaluatePrompt(span);
     const result2 = await this.updateCost(result1);
     const result3 = await this.updateUsage(result2);
-    return result3;
+    const result4 = await this.addPromptKeys(result3);
+    return result4;
+  }
+  async addPromptKeys(span) {
+    if (!isChatCompletionSpan(span) && !isPromptSpan(span)) {
+      return span;
+    }
+    const node = this.spanTree.findNode(span.spanContext.spanId);
+    if (!node) {
+      return span;
+    }
+    const extraAttributes = {
+      parentPromptKey: node.getNearestAttribute("promptKey"),
+      rootPromptKey: node.getRootAttribute("promptKey")
+    };
+    const final = {
+      ...span,
+      attributes: {
+        ...span.attributes,
+        ...extraAttributes
+      }
+    };
+    return final;
   }
   async updateCost(span) {
     if (!isChatCompletionSpan(span)) {
@@ -1642,15 +1696,20 @@ var AISpanProcessor = class extends EnrichingSpanProcessor {
     return span;
   }
   async evaluatePrompt(span) {
-    const { prompt, variables, output } = span.attributes;
-    if (!isPrompt2(prompt)) {
+    if (!isPrompt2(span.attributes.prompt)) {
       return span;
     }
+    const { prompt, variables, output, parsedOutput } = span.attributes;
     delete span.attributes["prompt"];
+    const outputToEvaluate = isPromptParsed(prompt) ? parsedOutput : output;
     let evaluatorResults = {};
     let extraAttributes = {};
     try {
-      const evaluators = await evaluatePrompt(prompt, variables, output);
+      const evaluators = await evaluatePrompt(
+        prompt,
+        variables,
+        outputToEvaluate
+      );
       evaluatorResults = evaluators.reduce(
         (accum, result) => {
           accum[result.key] = result;
@@ -1682,11 +1741,19 @@ var isChatCompletionSpan = (value) => {
     value && typeof value == "object" && "name" in value && value.name === "ai.chatCompletion"
   );
 };
+var isPromptSpan = (value) => {
+  return Boolean(
+    value && typeof value == "object" && "name" in value && value.name === "ai.prompt"
+  );
+};
 var isPrompt2 = (value) => {
   return Boolean(
     value && typeof value == "object" && "schema" in value && "evaluators" in value
   );
 };
+function isPromptParsed(value) {
+  return Boolean(isPrompt2(value) && "parse" in value);
+}
 
 // src/tracing/Trace.tsx
 var Trace = ({ name, attributes, children }, { tracer, render }) => {
@@ -1713,7 +1780,6 @@ function createPrompt(config) {
       component: component2,
       parse: outputParser.parse,
       outputSchema: outputParser.schema,
-      messageSchema: null,
       schema: schema2,
       metadata: metadata2,
       evaluators: evaluators2
@@ -1726,37 +1792,10 @@ function createPrompt(config) {
     schema,
     metadata,
     evaluators,
-    messageSchema: z.string(),
     outputSchema: z.string()
   };
 }
 
-// src/prompt/createChain.ts
-import { z as z2 } from "zod";
-function createFunctionChain(chain) {
-  const { key, run, schema, outputSchema = z2.any() } = chain;
-  return {
-    chainType: "function",
-    key,
-    schema,
-    messageSchema: null,
-    outputSchema,
-    // always make it async so RenderContext doesnt have a to guess
-    run
-  };
-}
-function createStreamChain(chain) {
-  const { key, run, messageSchema = z2.any(), schema } = chain;
-  return {
-    chainType: "stream",
-    key,
-    schema,
-    run,
-    outputSchema: null,
-    messageSchema
-  };
-}
-
 // src/lib/openai/OpenAI.tsx
 import { OpenAI as OpenAIClient2 } from "openai";
 
@@ -2763,10 +2802,8 @@ export {
   computeUsage,
   createAIElement,
   createContext,
-  createFunctionChain,
   createPrompt,
   createRenderContext,
-  createStreamChain,
   evaluatePrompt,
   openaiTokenizer,
   toDebugMessage,

package/dist/{jsx-dev-runtime-uCZBuaDe.d.mts → jsx-dev-runtime-vXV-PExh.d.mts}

@@ -103,33 +103,13 @@ interface Prompt<V extends Record<string, any> = Record<string, any>> {
     component: AIComponent<V>;
     schema: ZodObject<ZodRawShape>;
     evaluators: EvaluatorFn<V>[];
-    messageSchema: ZodTypeAny | null;
     outputSchema: ZodTypeAny;
     metadata: Record<string, any>;
 }
 interface PromptParsed<V extends Record<string, any> = Record<string, any>, O = any> extends Prompt<V> {
     evaluators: EvaluatorFn<V, O>[];
-    messageSchema: null;
     parse: (result: string) => O;
 }
-interface FunctionChain<V extends Record<string, any> = Record<string, any>, R extends NotAsyncGenerator<any> = any> {
-    key: string;
-    chainType: 'function';
-    run: (vars: V, context: RenderContext) => R;
-    schema: ZodObject<ZodRawShape>;
-    messageSchema: null;
-    outputSchema: ZodTypeAny;
-}
-interface StreamChain<V extends Record<string, any> = Record<string, any>, R extends AsyncGenerator<any, any, any> = AsyncGenerator<any, any, any>> {
-    key: string;
-    chainType: 'stream';
-    run: (vars: V, context: RenderContext) => R;
-    schema: ZodObject<ZodRawShape>;
-    messageSchema: ZodTypeAny;
-    outputSchema: null;
-}
-type IsAsyncGenerator<T> = T extends AsyncGenerator<any, any, any> ? true : false;
-type NotAsyncGenerator<T> = IsAsyncGenerator<T> extends true ? never : T;
 
 type SpanContext = {
     traceId: string;
@@ -254,10 +234,8 @@ interface RenderContext {
     logger: Logger;
     getContext<T>(context: Context<T>): T;
     render(renderable: Renderable, opts?: RenderOptions): RenderResult;
-    render<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, options?: RenderPromptOptions): Promise<O>;
     render<V extends Record<string, any>>(prompt: Prompt<V>, variables: V): RenderResult;
-    render<V extends Record<string, any>, O extends AsyncGenerator<any>>(chain: StreamChain<V, O>, variables: V): AsyncGenerator<O, void>;
-    render<V extends Record<string, any>, O>(chain: FunctionChain<V, O>, variables: V): O;
+    renderPromptParsed<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, options?: RenderPromptOptions): Promise<O>;
 }
 type RenderPromptOptions = {
     validateOutput?: boolean;
@@ -376,4 +354,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { jsxs as $, type AINode as A, BoundLogger as B, type ChatMessage as C, type DebugMessage as D, type EvaluatorResult as E, type FunctionChain as F, type AIElement as G, type Renderable as H, ImagePart as I, JSX as J, type PropsOfAIComponent as K, type LogChatCompletionRequest as L, type SpanContext as M, type NotAsyncGenerator as N, type SpanStatus as O, type Prompt as P, type Span as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type SpanEvent as U, type TracingContextKey as V, type TracingContext as W, type TracingContextManager as X, type OutputParser as Y, jsx as Z, jsxDEV as _, LogImplementation as a, Fragment as a0, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanExporter as e, type AIComponent as f, type SpanAttributes as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, type StreamChain as k, createAIElement as l, AIFragment as m, createContext 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, NoopLogImplementation as u, ConsoleLogger as v, CombinedLogger as w, type Literal as x, type RenderResult as y, attachedContextSymbol as z };
+export { type AINode as A, BoundLogger as B, type ChatMessage as C, type DebugMessage as D, type EvaluatorResult as E, type PropsOfAIComponent as F, type SpanContext as G, type SpanStatus as H, ImagePart as I, JSX as J, type Span as K, type LogChatCompletionRequest as L, type SpanEvent as M, NoopLogImplementation as N, type TracingContextKey as O, type Prompt as P, type TracingContext as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContextManager as U, type OutputParser as V, jsx as W, jsxDEV as X, jsxs as Y, Fragment as Z, LogImplementation as a, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanExporter as e, type AIComponent as f, type SpanAttributes as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, createAIElement as k, AIFragment as l, createContext as m, type ChatRole as n, type ImagePartProps as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, toDebugMessage as t, CombinedLogger as u, type Literal as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable as z };

package/dist/{jsx-dev-runtime-uCZBuaDe.d.ts → jsx-dev-runtime-vXV-PExh.d.ts}

@@ -103,33 +103,13 @@ interface Prompt<V extends Record<string, any> = Record<string, any>> {
     component: AIComponent<V>;
     schema: ZodObject<ZodRawShape>;
     evaluators: EvaluatorFn<V>[];
-    messageSchema: ZodTypeAny | null;
     outputSchema: ZodTypeAny;
     metadata: Record<string, any>;
 }
 interface PromptParsed<V extends Record<string, any> = Record<string, any>, O = any> extends Prompt<V> {
     evaluators: EvaluatorFn<V, O>[];
-    messageSchema: null;
     parse: (result: string) => O;
 }
-interface FunctionChain<V extends Record<string, any> = Record<string, any>, R extends NotAsyncGenerator<any> = any> {
-    key: string;
-    chainType: 'function';
-    run: (vars: V, context: RenderContext) => R;
-    schema: ZodObject<ZodRawShape>;
-    messageSchema: null;
-    outputSchema: ZodTypeAny;
-}
-interface StreamChain<V extends Record<string, any> = Record<string, any>, R extends AsyncGenerator<any, any, any> = AsyncGenerator<any, any, any>> {
-    key: string;
-    chainType: 'stream';
-    run: (vars: V, context: RenderContext) => R;
-    schema: ZodObject<ZodRawShape>;
-    messageSchema: ZodTypeAny;
-    outputSchema: null;
-}
-type IsAsyncGenerator<T> = T extends AsyncGenerator<any, any, any> ? true : false;
-type NotAsyncGenerator<T> = IsAsyncGenerator<T> extends true ? never : T;
 
 type SpanContext = {
     traceId: string;
@@ -254,10 +234,8 @@ interface RenderContext {
     logger: Logger;
     getContext<T>(context: Context<T>): T;
     render(renderable: Renderable, opts?: RenderOptions): RenderResult;
-    render<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, options?: RenderPromptOptions): Promise<O>;
     render<V extends Record<string, any>>(prompt: Prompt<V>, variables: V): RenderResult;
-    render<V extends Record<string, any>, O extends AsyncGenerator<any>>(chain: StreamChain<V, O>, variables: V): AsyncGenerator<O, void>;
-    render<V extends Record<string, any>, O>(chain: FunctionChain<V, O>, variables: V): O;
+    renderPromptParsed<V extends Record<string, any>, O>(prompt: PromptParsed<V, O>, variables: V, options?: RenderPromptOptions): Promise<O>;
 }
 type RenderPromptOptions = {
     validateOutput?: boolean;
@@ -376,4 +354,4 @@ declare const jsxs: typeof jsx;
 /** @hidden */
 declare const Fragment: typeof AIFragment;
 
-export { jsxs as $, type AINode as A, BoundLogger as B, type ChatMessage as C, type DebugMessage as D, type EvaluatorResult as E, type FunctionChain as F, type AIElement as G, type Renderable as H, ImagePart as I, JSX as J, type PropsOfAIComponent as K, type LogChatCompletionRequest as L, type SpanContext as M, type NotAsyncGenerator as N, type SpanStatus as O, type Prompt as P, type Span as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type SpanEvent as U, type TracingContextKey as V, type TracingContext as W, type TracingContextManager as X, type OutputParser as Y, jsx as Z, jsxDEV as _, LogImplementation as a, Fragment as a0, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanExporter as e, type AIComponent as f, type SpanAttributes as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, type StreamChain as k, createAIElement as l, AIFragment as m, createContext 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, NoopLogImplementation as u, ConsoleLogger as v, CombinedLogger as w, type Literal as x, type RenderResult as y, attachedContextSymbol as z };
+export { type AINode as A, BoundLogger as B, type ChatMessage as C, type DebugMessage as D, type EvaluatorResult as E, type PropsOfAIComponent as F, type SpanContext as G, type SpanStatus as H, ImagePart as I, JSX as J, type Span as K, type LogChatCompletionRequest as L, type SpanEvent as M, NoopLogImplementation as N, type TracingContextKey as O, type Prompt as P, type TracingContext as Q, type RenderContext as R, type SpanProcessor as S, type Tracer as T, type TracingContextManager as U, type OutputParser as V, jsx as W, jsxDEV as X, jsxs as Y, Fragment as Z, LogImplementation as a, type ContextValues as b, type Context as c, type ReadableSpan as d, type SpanExporter as e, type AIComponent as f, type SpanAttributes as g, type ChatCompletionRequestPayloads as h, type EvaluatorFn as i, type PromptParsed as j, createAIElement as k, AIFragment as l, createContext as m, type ChatRole as n, type ImagePartProps as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, toDebugMessage as t, CombinedLogger as u, type Literal as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable as z };

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

@@ -1,2 +1,2 @@
-export { a0 as Fragment, J as JSX, Z as jsx, _ as jsxDEV, $ as jsxs } from './jsx-dev-runtime-uCZBuaDe.mjs';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-vXV-PExh.mjs';
 import 'zod';

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

@@ -1,2 +1,2 @@
-export { a0 as Fragment, J as JSX, Z as jsx, _ as jsxDEV, $ as jsxs } from './jsx-dev-runtime-uCZBuaDe.js';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-vXV-PExh.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,2 +1,2 @@
-export { a0 as Fragment, J as JSX, Z as jsx, _ as jsxDEV, $ as jsxs } from './jsx-dev-runtime-uCZBuaDe.mjs';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-vXV-PExh.mjs';
 import 'zod';

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-export { a0 as Fragment, J as JSX, Z as jsx, _ as jsxDEV, $ as jsxs } from './jsx-dev-runtime-uCZBuaDe.js';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-vXV-PExh.js';
 import 'zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.9.3-dev.2024-05-31",
+  "version": "0.10.0-dev.2024-06-04",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",