@gammatech/aijsx 0.3.0-beta.7 → 0.3.0-beta.9

package/dist/{createElement-t8vKixcE.d.mts → createElement-eXTBmWMH.d.mts}

@@ -31,6 +31,14 @@ type AINode = Literal | AIElement<any> | AINode[];
 type Renderable = AINode | PromiseLike<Renderable> | RenderableStream;
 type PropsOfAIComponent<T extends AIComponent<any>> = T extends AIComponent<infer P> ? P : never;
 
+type JSONPrimitive = string | number | boolean | null;
+type JSONArray = JSONSerializable[];
+type JSONObject = {
+    [key: string]: JSONSerializable;
+} & {
+    then?: never;
+};
+type JSONSerializable = JSONPrimitive | JSONArray | JSONObject;
 type EvaluatorPrimitive = string | number | boolean;
 type EvaluatorResult = {
     key: string;
@@ -51,17 +59,32 @@ interface Prompt<V extends Record<string, any> = Record<string, any>> {
     key: string;
     component: AIComponent<V>;
     schema: ZodObject<ZodRawShape>;
-    evaluators: EvaluatorFn[];
-    metadata?: Record<string, any>;
+    evaluators: EvaluatorFn<V>[];
+    messageSchema: ZodTypeAny | null;
+    outputSchema: ZodTypeAny;
+    metadata: Record<string, any>;
+}
+interface PromptParsed<V extends Record<string, any> = Record<string, any>, O extends JSONSerializable = any> extends Prompt<V> {
+    evaluators: EvaluatorFn<V, O>[];
+    messageSchema: null;
+    parse: (result: string) => O;
 }
-interface PromptParsed<V extends Record<string, any> = Record<string, any>, O = any> extends Prompt<V> {
-    outputParser: OutputParser<O>;
+interface FunctionChain<V extends Record<string, any> = Record<string, any>, R extends JSONSerializable = any> {
+    key: string;
+    type: 'function';
+    run: (vars: V, context: RenderContext) => Promise<R>;
+    schema: ZodObject<ZodRawShape>;
+    messageSchema: null;
+    outputSchema: ZodTypeAny;
 }
-type Chain<V extends Record<string, any> = Record<string, any>, R = any> = {
+interface StreamChain<V extends Record<string, any> = Record<string, any>, R extends JSONSerializable = any> {
     key: string;
-    run: (vars: V, context: RenderContext) => R;
+    type: 'stream';
+    run: (vars: V, context: RenderContext) => AsyncGenerator<R, void>;
     schema: ZodObject<ZodRawShape>;
-};
+    messageSchema: ZodTypeAny;
+    outputSchema: null;
+}
 
 declare const LoggerContext: Context<LogImplementation>;
 type ContextValues = Record<symbol, any>;
@@ -80,9 +103,12 @@ 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>, O extends JSONSerializable>(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>(chain: Chain<V, O>, variables: V): O;
+    render<V extends Record<string, any>, O extends JSONSerializable>(chain: StreamChain<V, O>, variables: V): AsyncGenerator<O, void>;
+    render<V extends Record<string, any>, O extends JSONSerializable>(chain: FunctionChain<V, O>, variables: V): Promise<O>;
+    runChain<V extends Record<string, any>, R extends JSONSerializable>(chain: FunctionChain<V, R>, variables: V): Promise<R>;
+    runChain<V extends Record<string, any>, R extends JSONSerializable>(chain: StreamChain<V, R>, variables: V): AsyncGenerator<R, void>;
 }
 type RenderPromptOptions = {
     validateOutput?: boolean;
@@ -200,4 +226,4 @@ declare function AIFragment({ children }: {
     children: AINode;
 }): Renderable;
 
-export { type AIComponent as A, BoundLogger as B, type ContextValues as C, type PropsOfAIComponent as D, type EvaluatorFn as E, type EvaluatorResult as F, type PromptRenderResult as G, LogImplementation as L, NoopLogImplementation as N, type OutputParser as O, type PromptParsed as P, type RenderContext as R, SystemMessage as S, UserMessage as U, type Prompt as a, type Chain as b, type Context as c, type AINode as d, createAIElement as e, AIFragment as f, LoggerContext as g, createContext as h, type ChatCompletionRole as i, AssistantMessage as j, type RenderedConversationMessage as k, computeUsage as l, ChatCompletionError as m, type ChatCompletionRequestPayloads as n, type LogChatCompletionRequest as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, CombinedLogger as t, type Literal as u, type RenderableStream as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable as z };
+export { type AIComponent as A, BoundLogger as B, type ContextValues as C, type PropsOfAIComponent as D, type EvaluatorFn as E, type FunctionChain as F, type EvaluatorResult as G, type PromptRenderResult as H, type JSONSerializable as J, LogImplementation as L, NoopLogImplementation as N, type OutputParser as O, type PromptParsed as P, type RenderContext as R, type StreamChain as S, UserMessage as U, 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 ChatCompletionRole as h, SystemMessage as i, AssistantMessage as j, type RenderedConversationMessage as k, computeUsage as l, ChatCompletionError as m, type ChatCompletionRequestPayloads as n, type LogChatCompletionRequest as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, CombinedLogger as t, type Literal as u, type RenderableStream as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable as z };

package/dist/{createElement-t8vKixcE.d.ts → createElement-eXTBmWMH.d.ts}

@@ -31,6 +31,14 @@ type AINode = Literal | AIElement<any> | AINode[];
 type Renderable = AINode | PromiseLike<Renderable> | RenderableStream;
 type PropsOfAIComponent<T extends AIComponent<any>> = T extends AIComponent<infer P> ? P : never;
 
+type JSONPrimitive = string | number | boolean | null;
+type JSONArray = JSONSerializable[];
+type JSONObject = {
+    [key: string]: JSONSerializable;
+} & {
+    then?: never;
+};
+type JSONSerializable = JSONPrimitive | JSONArray | JSONObject;
 type EvaluatorPrimitive = string | number | boolean;
 type EvaluatorResult = {
     key: string;
@@ -51,17 +59,32 @@ interface Prompt<V extends Record<string, any> = Record<string, any>> {
     key: string;
     component: AIComponent<V>;
     schema: ZodObject<ZodRawShape>;
-    evaluators: EvaluatorFn[];
-    metadata?: Record<string, any>;
+    evaluators: EvaluatorFn<V>[];
+    messageSchema: ZodTypeAny | null;
+    outputSchema: ZodTypeAny;
+    metadata: Record<string, any>;
+}
+interface PromptParsed<V extends Record<string, any> = Record<string, any>, O extends JSONSerializable = any> extends Prompt<V> {
+    evaluators: EvaluatorFn<V, O>[];
+    messageSchema: null;
+    parse: (result: string) => O;
 }
-interface PromptParsed<V extends Record<string, any> = Record<string, any>, O = any> extends Prompt<V> {
-    outputParser: OutputParser<O>;
+interface FunctionChain<V extends Record<string, any> = Record<string, any>, R extends JSONSerializable = any> {
+    key: string;
+    type: 'function';
+    run: (vars: V, context: RenderContext) => Promise<R>;
+    schema: ZodObject<ZodRawShape>;
+    messageSchema: null;
+    outputSchema: ZodTypeAny;
 }
-type Chain<V extends Record<string, any> = Record<string, any>, R = any> = {
+interface StreamChain<V extends Record<string, any> = Record<string, any>, R extends JSONSerializable = any> {
     key: string;
-    run: (vars: V, context: RenderContext) => R;
+    type: 'stream';
+    run: (vars: V, context: RenderContext) => AsyncGenerator<R, void>;
     schema: ZodObject<ZodRawShape>;
-};
+    messageSchema: ZodTypeAny;
+    outputSchema: null;
+}
 
 declare const LoggerContext: Context<LogImplementation>;
 type ContextValues = Record<symbol, any>;
@@ -80,9 +103,12 @@ 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>, O extends JSONSerializable>(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>(chain: Chain<V, O>, variables: V): O;
+    render<V extends Record<string, any>, O extends JSONSerializable>(chain: StreamChain<V, O>, variables: V): AsyncGenerator<O, void>;
+    render<V extends Record<string, any>, O extends JSONSerializable>(chain: FunctionChain<V, O>, variables: V): Promise<O>;
+    runChain<V extends Record<string, any>, R extends JSONSerializable>(chain: FunctionChain<V, R>, variables: V): Promise<R>;
+    runChain<V extends Record<string, any>, R extends JSONSerializable>(chain: StreamChain<V, R>, variables: V): AsyncGenerator<R, void>;
 }
 type RenderPromptOptions = {
     validateOutput?: boolean;
@@ -200,4 +226,4 @@ declare function AIFragment({ children }: {
     children: AINode;
 }): Renderable;
 
-export { type AIComponent as A, BoundLogger as B, type ContextValues as C, type PropsOfAIComponent as D, type EvaluatorFn as E, type EvaluatorResult as F, type PromptRenderResult as G, LogImplementation as L, NoopLogImplementation as N, type OutputParser as O, type PromptParsed as P, type RenderContext as R, SystemMessage as S, UserMessage as U, type Prompt as a, type Chain as b, type Context as c, type AINode as d, createAIElement as e, AIFragment as f, LoggerContext as g, createContext as h, type ChatCompletionRole as i, AssistantMessage as j, type RenderedConversationMessage as k, computeUsage as l, ChatCompletionError as m, type ChatCompletionRequestPayloads as n, type LogChatCompletionRequest as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, CombinedLogger as t, type Literal as u, type RenderableStream as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable as z };
+export { type AIComponent as A, BoundLogger as B, type ContextValues as C, type PropsOfAIComponent as D, type EvaluatorFn as E, type FunctionChain as F, type EvaluatorResult as G, type PromptRenderResult as H, type JSONSerializable as J, LogImplementation as L, NoopLogImplementation as N, type OutputParser as O, type PromptParsed as P, type RenderContext as R, type StreamChain as S, UserMessage as U, 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 ChatCompletionRole as h, SystemMessage as i, AssistantMessage as j, type RenderedConversationMessage as k, computeUsage as l, ChatCompletionError as m, type ChatCompletionRequestPayloads as n, type LogChatCompletionRequest as o, type LogChatCompletionResponse as p, type LogLevel as q, type Logger as r, ConsoleLogger as s, CombinedLogger as t, type Literal as u, type RenderableStream as v, type RenderResult as w, attachedContextSymbol as x, type AIElement as y, type Renderable 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, b as Chain, c as Context, d as AINode } from './createElement-t8vKixcE.mjs';
-export { y as AIElement, f as AIFragment, j as AssistantMessage, B as BoundLogger, m as ChatCompletionError, n as ChatCompletionRequestPayloads, i as ChatCompletionRole, t as CombinedLogger, s as ConsoleLogger, F as EvaluatorResult, u as Literal, o as LogChatCompletionRequest, p as LogChatCompletionResponse, q as LogLevel, r as Logger, g as LoggerContext, N as NoopLogImplementation, O as OutputParser, G as PromptRenderResult, D as PropsOfAIComponent, w as RenderResult, z as Renderable, v as RenderableStream, k as RenderedConversationMessage, S as SystemMessage, U as UserMessage, x as attachedContextSymbol, l as computeUsage, e as createAIElement, h as createContext } from './createElement-t8vKixcE.mjs';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, J as JSONSerializable, F as FunctionChain, S as StreamChain, b as Context, c as AINode } from './createElement-eXTBmWMH.mjs';
+export { y as AIElement, e as AIFragment, j as AssistantMessage, B as BoundLogger, m as ChatCompletionError, n as ChatCompletionRequestPayloads, h as ChatCompletionRole, t as CombinedLogger, s as ConsoleLogger, G as EvaluatorResult, u as Literal, o as LogChatCompletionRequest, p as LogChatCompletionResponse, q as LogLevel, r as Logger, f as LoggerContext, N as NoopLogImplementation, O as OutputParser, H as PromptRenderResult, D as PropsOfAIComponent, w as RenderResult, z as Renderable, v as RenderableStream, k as RenderedConversationMessage, i as SystemMessage, U as UserMessage, x as attachedContextSymbol, l as computeUsage, d as createAIElement, g as createContext } from './createElement-eXTBmWMH.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -37,11 +37,19 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
 
-declare function createChain<I extends ZodObject<ZodRawShape>, R>(chain: {
+type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
+declare function createFunctionChain<I extends ZodObject<ZodRawShape>, R extends JSONSerializable | PromiseLike<JSONSerializable>>(chain: {
     key: string;
     run: (variables: z.infer<I>, context: RenderContext) => R;
+    outputSchema?: ZodTypeAny;
     schema: I;
-}): Chain<z.infer<I>, R>;
+}): FunctionChain<z.infer<I>, Awaited<R>>;
+declare function createStreamChain<I extends ZodObject<ZodRawShape>, M extends ZodTypeAny, R extends JSONSerializable = z.infer<M>>(chain: {
+    key: string;
+    run: (variables: z.infer<I>, context: RenderContext) => AsyncGenerator<R>;
+    schema: I;
+    messageSchema?: M;
+}): StreamChain<z.infer<I>, R>;
 
 declare class PromptParseVariablesError extends Error {
 }
@@ -130,4 +138,4 @@ type AnthropicChatCompletionProps = {
  */
 declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, { render, logger, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
-export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, Chain, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createChain, createPrompt, createRenderContext, defaultMaxTokens, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };
+export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, FunctionChain, JSONSerializable, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, 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, b as Chain, c as Context, d as AINode } from './createElement-t8vKixcE.js';
-export { y as AIElement, f as AIFragment, j as AssistantMessage, B as BoundLogger, m as ChatCompletionError, n as ChatCompletionRequestPayloads, i as ChatCompletionRole, t as CombinedLogger, s as ConsoleLogger, F as EvaluatorResult, u as Literal, o as LogChatCompletionRequest, p as LogChatCompletionResponse, q as LogLevel, r as Logger, g as LoggerContext, N as NoopLogImplementation, O as OutputParser, G as PromptRenderResult, D as PropsOfAIComponent, w as RenderResult, z as Renderable, v as RenderableStream, k as RenderedConversationMessage, S as SystemMessage, U as UserMessage, x as attachedContextSymbol, l as computeUsage, e as createAIElement, h as createContext } from './createElement-t8vKixcE.js';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, J as JSONSerializable, F as FunctionChain, S as StreamChain, b as Context, c as AINode } from './createElement-eXTBmWMH.js';
+export { y as AIElement, e as AIFragment, j as AssistantMessage, B as BoundLogger, m as ChatCompletionError, n as ChatCompletionRequestPayloads, h as ChatCompletionRole, t as CombinedLogger, s as ConsoleLogger, G as EvaluatorResult, u as Literal, o as LogChatCompletionRequest, p as LogChatCompletionResponse, q as LogLevel, r as Logger, f as LoggerContext, N as NoopLogImplementation, O as OutputParser, H as PromptRenderResult, D as PropsOfAIComponent, w as RenderResult, z as Renderable, v as RenderableStream, k as RenderedConversationMessage, i as SystemMessage, U as UserMessage, x as attachedContextSymbol, l as computeUsage, d as createAIElement, g as createContext } from './createElement-eXTBmWMH.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';
@@ -37,11 +37,19 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
 
-declare function createChain<I extends ZodObject<ZodRawShape>, R>(chain: {
+type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
+declare function createFunctionChain<I extends ZodObject<ZodRawShape>, R extends JSONSerializable | PromiseLike<JSONSerializable>>(chain: {
     key: string;
     run: (variables: z.infer<I>, context: RenderContext) => R;
+    outputSchema?: ZodTypeAny;
     schema: I;
-}): Chain<z.infer<I>, R>;
+}): FunctionChain<z.infer<I>, Awaited<R>>;
+declare function createStreamChain<I extends ZodObject<ZodRawShape>, M extends ZodTypeAny, R extends JSONSerializable = z.infer<M>>(chain: {
+    key: string;
+    run: (variables: z.infer<I>, context: RenderContext) => AsyncGenerator<R>;
+    schema: I;
+    messageSchema?: M;
+}): StreamChain<z.infer<I>, R>;
 
 declare class PromptParseVariablesError extends Error {
 }
@@ -130,4 +138,4 @@ type AnthropicChatCompletionProps = {
  */
 declare function AnthropicChatCompletion(props: AnthropicChatCompletionProps, { render, logger, getContext }: RenderContext): AsyncGenerator<string, void, unknown>;
 
-export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, Chain, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createChain, createPrompt, createRenderContext, defaultMaxTokens, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };
+export { AIComponent, AINode, AnthropicChatCompletion, type AnthropicChatCompletionRequest, AnthropicClientContext, ChainParseVariablesError, ContentTypeImage, Context, EvaluatorFn, FunctionChain, JSONSerializable, LogImplementation, OpenAIChatCompletion, type OpenAIChatCompletionRequest, type OpenAIChatMessage, OpenAIClientContext, OpenAIVisionChatCompletion, Prompt, PromptInvalidOutputError, PromptParseVariablesError, PromptParsed, RenderContext, StreamChain, type ValidAnthropicChatModel, type ValidOpenAIChatModel, type ValidOpenAIVisionModel, createFunctionChain, createPrompt, createRenderContext, createStreamChain, defaultMaxTokens, tokenCountForOpenAIMessage, tokenCountForOpenAIVisionMessage, tokenLimitForChatModel, tokenizer };

package/dist/index.js

@@ -55,10 +55,11 @@ __export(src_exports, {
   computeUsage: () => computeUsage,
   countAnthropicTokens: () => import_tokenizer4.countTokens,
   createAIElement: () => createAIElement,
-  createChain: () => createChain,
   createContext: () => createContext,
+  createFunctionChain: () => createFunctionChain,
   createPrompt: () => createPrompt,
   createRenderContext: () => createRenderContext,
+  createStreamChain: () => createStreamChain,
   defaultMaxTokens: () => defaultMaxTokens,
   tokenCountForOpenAIMessage: () => tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage: () => tokenCountForOpenAIVisionMessage,
@@ -652,13 +653,17 @@ var StreamRenderContext = class _StreamRenderContext {
   // Implementation of the overloaded function
   render(arg1, arg2, arg3) {
     if (arg1 && typeof arg1 === "object" && "component" in arg1 && arg2) {
-      if ("outputParser" in arg1) {
+      if ("parse" in arg1) {
         const result = this.renderPromptParsed(arg1, arg2, arg3 || {});
         return result;
       }
       return this.renderPrompt(arg1, arg2);
     } else if (arg1 && typeof arg1 === "object" && "run" in arg1 && arg2) {
-      return this.runChain(arg1, arg2);
+      if (arg1.type === "function") {
+        return this.runChain(arg1, arg2);
+      } else {
+        return this.runChain(arg1, arg2);
+      }
     } else {
       const generator = this.renderStream(
         arg1,
@@ -695,11 +700,10 @@ var StreamRenderContext = class _StreamRenderContext {
       throw new PromptParseVariablesError("Invalid input variables: " + errors);
     }
     const output = await this.render(/* @__PURE__ */ jsx(Component, { ...parsedVariables }));
-    const outputParser = prompt.outputParser;
-    const parsedOutput = outputParser.parse(output);
+    const parsedOutput = prompt.parse(output);
     if (validateOutput) {
       try {
-        outputParser.schema.parse(parsedOutput);
+        prompt.outputSchema.parse(parsedOutput);
       } catch (e) {
         const err = e;
         const errors = JSON.stringify(err.flatten());
@@ -718,7 +722,13 @@ var StreamRenderContext = class _StreamRenderContext {
       const errors = JSON.stringify(err.flatten());
       throw new ChainParseVariablesError("Invalid input variables: " + errors);
     }
-    return chain.run(parsedVariables, this);
+    if (chain.type === "function") {
+      return chain.run(parsedVariables, this);
+    }
+    if (chain.type === "stream") {
+      return chain.run(parsedVariables, this);
+    }
+    throw new Error("Invalid chain type");
   }
   getContext = (context) => {
     return this.contextValues[context.key] ?? context.defaultValue;
@@ -782,6 +792,7 @@ function attachedContextValues(element) {
 }
 
 // src/prompt/createPrompt.tsx
+var import_zod = require("zod");
 function createPrompt(config) {
   if (config.outputParser) {
     const {
@@ -795,7 +806,9 @@ function createPrompt(config) {
     return {
       key: key2,
       component: component2,
-      outputParser,
+      parse: outputParser.parse,
+      outputSchema: outputParser.schema,
+      messageSchema: null,
       schema: schema2,
       metadata: metadata2,
       evaluators: evaluators2
@@ -807,13 +820,39 @@ function createPrompt(config) {
     component,
     schema,
     metadata,
-    evaluators
+    evaluators,
+    messageSchema: import_zod.z.string(),
+    outputSchema: import_zod.z.string()
   };
 }
 
 // src/prompt/createChain.ts
-function createChain(chain) {
-  return chain;
+var import_zod2 = require("zod");
+function createFunctionChain(chain) {
+  const { key, run, schema, outputSchema = import_zod2.z.any() } = chain;
+  const asyncRun = async (vars, context) => {
+    return run(vars, context);
+  };
+  return {
+    type: "function",
+    key,
+    schema,
+    messageSchema: null,
+    outputSchema,
+    // always make it async so RenderContext doesnt have a to guess
+    run: asyncRun
+  };
+}
+function createStreamChain(chain) {
+  const { key, run, messageSchema = import_zod2.z.any(), schema } = chain;
+  return {
+    type: "stream",
+    key,
+    schema,
+    run,
+    outputSchema: null,
+    messageSchema
+  };
 }
 
 // src/lib/openai/OpenAI.tsx
@@ -1392,10 +1431,11 @@ var import_tokenizer4 = require("@anthropic-ai/tokenizer");
   computeUsage,
   countAnthropicTokens,
   createAIElement,
-  createChain,
   createContext,
+  createFunctionChain,
   createPrompt,
   createRenderContext,
+  createStreamChain,
   defaultMaxTokens,
   tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage,

package/dist/index.mjs

@@ -558,13 +558,17 @@ var StreamRenderContext = class _StreamRenderContext {
   // Implementation of the overloaded function
   render(arg1, arg2, arg3) {
     if (arg1 && typeof arg1 === "object" && "component" in arg1 && arg2) {
-      if ("outputParser" in arg1) {
+      if ("parse" in arg1) {
         const result = this.renderPromptParsed(arg1, arg2, arg3 || {});
         return result;
       }
       return this.renderPrompt(arg1, arg2);
     } else if (arg1 && typeof arg1 === "object" && "run" in arg1 && arg2) {
-      return this.runChain(arg1, arg2);
+      if (arg1.type === "function") {
+        return this.runChain(arg1, arg2);
+      } else {
+        return this.runChain(arg1, arg2);
+      }
     } else {
       const generator = this.renderStream(
         arg1,
@@ -601,11 +605,10 @@ var StreamRenderContext = class _StreamRenderContext {
       throw new PromptParseVariablesError("Invalid input variables: " + errors);
     }
     const output = await this.render(/* @__PURE__ */ jsx(Component, { ...parsedVariables }));
-    const outputParser = prompt.outputParser;
-    const parsedOutput = outputParser.parse(output);
+    const parsedOutput = prompt.parse(output);
     if (validateOutput) {
       try {
-        outputParser.schema.parse(parsedOutput);
+        prompt.outputSchema.parse(parsedOutput);
       } catch (e) {
         const err = e;
         const errors = JSON.stringify(err.flatten());
@@ -624,7 +627,13 @@ var StreamRenderContext = class _StreamRenderContext {
       const errors = JSON.stringify(err.flatten());
       throw new ChainParseVariablesError("Invalid input variables: " + errors);
     }
-    return chain.run(parsedVariables, this);
+    if (chain.type === "function") {
+      return chain.run(parsedVariables, this);
+    }
+    if (chain.type === "stream") {
+      return chain.run(parsedVariables, this);
+    }
+    throw new Error("Invalid chain type");
   }
   getContext = (context) => {
     return this.contextValues[context.key] ?? context.defaultValue;
@@ -688,6 +697,7 @@ function attachedContextValues(element) {
 }
 
 // src/prompt/createPrompt.tsx
+import { z } from "zod";
 function createPrompt(config) {
   if (config.outputParser) {
     const {
@@ -701,7 +711,9 @@ function createPrompt(config) {
     return {
       key: key2,
       component: component2,
-      outputParser,
+      parse: outputParser.parse,
+      outputSchema: outputParser.schema,
+      messageSchema: null,
       schema: schema2,
       metadata: metadata2,
       evaluators: evaluators2
@@ -713,13 +725,39 @@ function createPrompt(config) {
     component,
     schema,
     metadata,
-    evaluators
+    evaluators,
+    messageSchema: z.string(),
+    outputSchema: z.string()
   };
 }
 
 // src/prompt/createChain.ts
-function createChain(chain) {
-  return chain;
+import { z as z2 } from "zod";
+function createFunctionChain(chain) {
+  const { key, run, schema, outputSchema = z2.any() } = chain;
+  const asyncRun = async (vars, context) => {
+    return run(vars, context);
+  };
+  return {
+    type: "function",
+    key,
+    schema,
+    messageSchema: null,
+    outputSchema,
+    // always make it async so RenderContext doesnt have a to guess
+    run: asyncRun
+  };
+}
+function createStreamChain(chain) {
+  const { key, run, messageSchema = z2.any(), schema } = chain;
+  return {
+    type: "stream",
+    key,
+    schema,
+    run,
+    outputSchema: null,
+    messageSchema
+  };
 }
 
 // src/lib/openai/OpenAI.tsx
@@ -1297,10 +1335,11 @@ export {
   computeUsage,
   countAnthropicTokens,
   createAIElement,
-  createChain,
   createContext,
+  createFunctionChain,
   createPrompt,
   createRenderContext,
+  createStreamChain,
   defaultMaxTokens,
   tokenCountForOpenAIMessage,
   tokenCountForOpenAIVisionMessage,

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

@@ -1,3 +1,3 @@
 export { Fragment, JSX, jsx, jsxDEV, jsxs } from './jsx-runtime.mjs';
-import './createElement-t8vKixcE.mjs';
+import './createElement-eXTBmWMH.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-t8vKixcE.js';
+import './createElement-eXTBmWMH.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,4 +1,4 @@
-import { A as AIComponent, y as AIElement, f as AIFragment } from './createElement-t8vKixcE.mjs';
+import { A as AIComponent, y as AIElement, e as AIFragment } from './createElement-eXTBmWMH.mjs';
 import 'zod';
 
 /**

package/dist/jsx-runtime.d.ts

@@ -1,4 +1,4 @@
-import { A as AIComponent, y as AIElement, f as AIFragment } from './createElement-t8vKixcE.js';
+import { A as AIComponent, y as AIElement, e as AIFragment } from './createElement-eXTBmWMH.js';
 import 'zod';
 
 /**

package/package.json

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