@gammatech/aijsx 0.10.0-dev.2024-06-04 → 0.10.1-dev.2024-06-07

package/dist/index.d.mts

@@ -87,7 +87,6 @@ declare const tracing: AITraceAPI;
 
 declare class SpanTree {
     roots: SpanTreeNode[];
-    findSpan: any;
     addSpan(span: ReadableSpan): boolean;
     findNode(id: string): SpanTreeNode | null;
 }
@@ -223,6 +222,7 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     evaluators?: EvaluatorFn<z.infer<I>, string>[];
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
+declare function isPromptParsed<V extends Record<string, any>>(prompt: Prompt<V>): prompt is PromptParsed<any, any>;
 
 declare class ParseVariablesError extends Error {
 }
@@ -302,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, 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 };
+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, isPromptParsed, openaiTokenizer, tracing };

package/dist/index.d.ts

@@ -87,7 +87,6 @@ declare const tracing: AITraceAPI;
 
 declare class SpanTree {
     roots: SpanTreeNode[];
-    findSpan: any;
     addSpan(span: ReadableSpan): boolean;
     findNode(id: string): SpanTreeNode | null;
 }
@@ -223,6 +222,7 @@ declare function createPrompt<K extends string, I extends ZodObject<ZodRawShape>
     evaluators?: EvaluatorFn<z.infer<I>, string>[];
     metadata?: Record<string, any>;
 }): Prompt<z.infer<I>>;
+declare function isPromptParsed<V extends Record<string, any>>(prompt: Prompt<V>): prompt is PromptParsed<any, any>;
 
 declare class ParseVariablesError extends Error {
 }
@@ -302,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, 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 };
+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, isPromptParsed, openaiTokenizer, tracing };

package/dist/index.js

@@ -66,6 +66,7 @@ __export(src_exports, {
   createPrompt: () => createPrompt,
   createRenderContext: () => createRenderContext,
   evaluatePrompt: () => evaluatePrompt,
+  isPromptParsed: () => isPromptParsed2,
   openaiTokenizer: () => openaiTokenizer,
   toDebugMessage: () => toDebugMessage,
   tracing: () => tracing
@@ -1586,7 +1587,6 @@ 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) {
@@ -1894,6 +1894,9 @@ function createPrompt(config) {
     outputSchema: import_zod.z.string()
   };
 }
+function isPromptParsed2(prompt) {
+  return "parse" in prompt;
+}
 
 // src/lib/openai/OpenAI.tsx
 var import_openai2 = require("openai");
@@ -2570,6 +2573,33 @@ var import_sdk2 = __toESM(require("@anthropic-ai/sdk"));
 
 // src/lib/google/Google.tsx
 var import_vertexai = require("@google-cloud/vertexai");
+
+// src/lib/google/errors.ts
+var extractStatusFromMessage = (message) => {
+  const RE_STATUS = /status: (\d{3})/;
+  const matchStatus = message.match(RE_STATUS);
+  if (matchStatus !== null) {
+    return parseInt(matchStatus[1]);
+  }
+  const RE_GOOGLE_GENERATIVE_AI_ERROR = /\[VertexAI.GoogleGenerativeAIError\]/;
+  const matchErrorName = message.match(RE_GOOGLE_GENERATIVE_AI_ERROR);
+  if (matchErrorName !== null) {
+    return 500;
+  }
+  return 500;
+};
+var errorToChatCompletionError = (error, requestData) => {
+  const status = extractStatusFromMessage(error.message);
+  const shouldRetry4 = status !== 400;
+  return new ChatCompletionError(
+    error.message,
+    requestData,
+    status,
+    shouldRetry4
+  );
+};
+
+// src/lib/google/Google.tsx
 var SAFETY_SETTINGS = [
   {
     category: import_vertexai.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
@@ -2730,20 +2760,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     response = await model.generateContentStream(googleCompletionRequest);
   } catch (err) {
-    if (err instanceof import_vertexai.GoogleGenerativeAIError) {
-      throw new ChatCompletionError(
-        err.message,
-        logRequestData,
-        void 0,
-        // always retry on GoogleGenerativeAIError errors, they represent non 4xx error cases
-        true
-      );
-    } else if (err instanceof Error) {
-      const status = void 0;
-      const retry = false;
-      throw new ChatCompletionError(err.message, logRequestData, status, retry);
-    }
-    throw err;
+    throw errorToChatCompletionError(err, logRequestData);
   }
   let content = "";
   let outputUsage = 0;
@@ -2789,20 +2806,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
       }
     }
   } catch (err) {
-    if (err instanceof import_vertexai.GoogleGenerativeAIError) {
-      throw new ChatCompletionError(
-        err.message,
-        logRequestData,
-        void 0,
-        // always retry these errors they represent non 4xx error cases
-        true
-      );
-    } else if (err instanceof Error) {
-      const status = void 0;
-      const retry = false;
-      throw new ChatCompletionError(err.message, logRequestData, status, retry);
-    }
-    throw err;
+    throw errorToChatCompletionError(err, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2900,6 +2904,7 @@ var import_vertexai2 = require("@google-cloud/vertexai");
   createPrompt,
   createRenderContext,
   evaluatePrompt,
+  isPromptParsed,
   openaiTokenizer,
   toDebugMessage,
   tracing

package/dist/index.mjs

@@ -1487,7 +1487,6 @@ 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) {
@@ -1795,6 +1794,9 @@ function createPrompt(config) {
     outputSchema: z.string()
   };
 }
+function isPromptParsed2(prompt) {
+  return "parse" in prompt;
+}
 
 // src/lib/openai/OpenAI.tsx
 import { OpenAI as OpenAIClient2 } from "openai";
@@ -2472,10 +2474,36 @@ import AnthropicClient2 from "@anthropic-ai/sdk";
 // src/lib/google/Google.tsx
 import {
   VertexAI,
-  GoogleGenerativeAIError,
   HarmCategory,
   HarmBlockThreshold
 } from "@google-cloud/vertexai";
+
+// src/lib/google/errors.ts
+var extractStatusFromMessage = (message) => {
+  const RE_STATUS = /status: (\d{3})/;
+  const matchStatus = message.match(RE_STATUS);
+  if (matchStatus !== null) {
+    return parseInt(matchStatus[1]);
+  }
+  const RE_GOOGLE_GENERATIVE_AI_ERROR = /\[VertexAI.GoogleGenerativeAIError\]/;
+  const matchErrorName = message.match(RE_GOOGLE_GENERATIVE_AI_ERROR);
+  if (matchErrorName !== null) {
+    return 500;
+  }
+  return 500;
+};
+var errorToChatCompletionError = (error, requestData) => {
+  const status = extractStatusFromMessage(error.message);
+  const shouldRetry4 = status !== 400;
+  return new ChatCompletionError(
+    error.message,
+    requestData,
+    status,
+    shouldRetry4
+  );
+};
+
+// src/lib/google/Google.tsx
 var SAFETY_SETTINGS = [
   {
     category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
@@ -2636,20 +2664,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     response = await model.generateContentStream(googleCompletionRequest);
   } catch (err) {
-    if (err instanceof GoogleGenerativeAIError) {
-      throw new ChatCompletionError(
-        err.message,
-        logRequestData,
-        void 0,
-        // always retry on GoogleGenerativeAIError errors, they represent non 4xx error cases
-        true
-      );
-    } else if (err instanceof Error) {
-      const status = void 0;
-      const retry = false;
-      throw new ChatCompletionError(err.message, logRequestData, status, retry);
-    }
-    throw err;
+    throw errorToChatCompletionError(err, logRequestData);
   }
   let content = "";
   let outputUsage = 0;
@@ -2695,20 +2710,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
       }
     }
   } catch (err) {
-    if (err instanceof GoogleGenerativeAIError) {
-      throw new ChatCompletionError(
-        err.message,
-        logRequestData,
-        void 0,
-        // always retry these errors they represent non 4xx error cases
-        true
-      );
-    } else if (err instanceof Error) {
-      const status = void 0;
-      const retry = false;
-      throw new ChatCompletionError(err.message, logRequestData, status, retry);
-    }
-    throw err;
+    throw errorToChatCompletionError(err, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2805,6 +2807,7 @@ export {
   createPrompt,
   createRenderContext,
   evaluatePrompt,
+  isPromptParsed2 as isPromptParsed,
   openaiTokenizer,
   toDebugMessage,
   tracing

package/package.json

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