@gammatech/aijsx 0.9.2-dev.2024-05-30 → 0.10.0-dev.2024-06-04

package/dist/index.d.mts

@@ -1,12 +1,12 @@
-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';
 import { ChatCompletionSystemMessageParam, ChatCompletionUserMessageParam, ChatCompletionAssistantMessageParam, ChatCompletionCreateParams } from 'openai/resources';
 import AnthropicClient from '@anthropic-ai/sdk';
 export { default as AnthropicClient } from '@anthropic-ai/sdk';
-import { GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
+import { PromptFeedback, GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
 export { VertexAI } from '@google-cloud/vertexai';
 
 declare class ChatCompletionError extends Error {
@@ -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;
@@ -168,6 +183,7 @@ declare namespace AISpanAttributes {
         finishReason: string | null;
         output: string;
         tokensUsed: Usage;
+        [key: string]: any;
     };
 }
 declare namespace ProcessedAISpanAttributes {
@@ -177,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>;
 }
 
 /**
@@ -207,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 {
@@ -280,6 +284,11 @@ declare module '@gammatech/aijsx' {
     interface ChatCompletionRequestPayloads {
         google: GoogleChatCompletionRequest;
     }
+    interface ChatCompletionResponseFields {
+        google: {
+            promptFeedback?: PromptFeedback;
+        };
+    }
 }
 type ValidGoogleChatModel = 'gemini-1.5-pro' | 'gemini-1.5-flash';
 declare const GoogleClientContext: Context<() => ChatCompletionClientAndProvider<VertexAI>>;
@@ -293,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,12 +1,12 @@
-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';
 import { ChatCompletionSystemMessageParam, ChatCompletionUserMessageParam, ChatCompletionAssistantMessageParam, ChatCompletionCreateParams } from 'openai/resources';
 import AnthropicClient from '@anthropic-ai/sdk';
 export { default as AnthropicClient } from '@anthropic-ai/sdk';
-import { GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
+import { PromptFeedback, GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
 export { VertexAI } from '@google-cloud/vertexai';
 
 declare class ChatCompletionError extends Error {
@@ -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;
@@ -168,6 +183,7 @@ declare namespace AISpanAttributes {
         finishReason: string | null;
         output: string;
         tokensUsed: Usage;
+        [key: string]: any;
     };
 }
 declare namespace ProcessedAISpanAttributes {
@@ -177,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>;
 }
 
 /**
@@ -207,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 {
@@ -280,6 +284,11 @@ declare module '@gammatech/aijsx' {
     interface ChatCompletionRequestPayloads {
         google: GoogleChatCompletionRequest;
     }
+    interface ChatCompletionResponseFields {
+        google: {
+            promptFeedback?: PromptFeedback;
+        };
+    }
 }
 type ValidGoogleChatModel = 'gemini-1.5-pro' | 'gemini-1.5-flash';
 declare const GoogleClientContext: Context<() => ChatCompletionClientAndProvider<VertexAI>>;
@@ -293,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 };