@gammatech/aijsx 0.11.0-dev.2024-06-17 → 0.11.1-dev.2024-06-23

package/dist/index.d.mts

@@ -13,8 +13,9 @@ declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
     readonly status: number | undefined;
     readonly shouldRetry: boolean;
+    readonly originalError?: Error | undefined;
     readonly name = "ChatCompletionError";
-    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean);
+    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean, originalError?: Error | undefined);
 }
 
 declare const SystemMessage: (props: {
@@ -279,7 +280,7 @@ declare module '@gammatech/aijsx' {
  * The set of valid Claude models.
  * @see https://docs.anthropic.com/claude/reference/selecting-a-model
  */
-type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229' | 'claude-3-haiku-20240307';
+type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229' | 'claude-3-haiku-20240307' | 'claude-3-5-sonnet-20240620';
 declare const AnthropicClientContext: Context<GetChatCompletionClientAndProvider<ValidAnthropicChatModel, AnthropicClient>>;
 type AnthropicChatCompletionProps = {
     model: ValidAnthropicChatModel;

package/dist/index.d.ts

@@ -13,8 +13,9 @@ declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
     readonly status: number | undefined;
     readonly shouldRetry: boolean;
+    readonly originalError?: Error | undefined;
     readonly name = "ChatCompletionError";
-    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean);
+    constructor(message: string, chatCompletionRequest: LogChatCompletionRequest, status: number | undefined, shouldRetry?: boolean, originalError?: Error | undefined);
 }
 
 declare const SystemMessage: (props: {
@@ -279,7 +280,7 @@ declare module '@gammatech/aijsx' {
  * The set of valid Claude models.
  * @see https://docs.anthropic.com/claude/reference/selecting-a-model
  */
-type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229' | 'claude-3-haiku-20240307';
+type ValidAnthropicChatModel = 'claude-instant-1.2' | 'claude-2.1' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229' | 'claude-3-haiku-20240307' | 'claude-3-5-sonnet-20240620';
 declare const AnthropicClientContext: Context<GetChatCompletionClientAndProvider<ValidAnthropicChatModel, AnthropicClient>>;
 type AnthropicChatCompletionProps = {
     model: ValidAnthropicChatModel;

package/dist/index.js

@@ -78,11 +78,12 @@ module.exports = __toCommonJS(src_exports);
 
 // src/chat/errors.ts
 var ChatCompletionError = class extends Error {
-  constructor(message, chatCompletionRequest, status, shouldRetry4 = false) {
+  constructor(message, chatCompletionRequest, status, shouldRetry4 = false, originalError) {
     super(message);
     this.chatCompletionRequest = chatCompletionRequest;
     this.status = status;
     this.shouldRetry = shouldRetry4;
+    this.originalError = originalError;
   }
   name = "ChatCompletionError";
 };
@@ -1538,6 +1539,31 @@ function renderCloseTag(element) {
   return `</${element.tag.name}>`;
 }
 
+// src/utils.ts
+function getEnvVar(name, shouldThrow = true) {
+  let env = globalThis.process?.env ?? void 0;
+  if (env === void 0) {
+    try {
+      env = process.env;
+    } catch {
+    }
+  }
+  const result = env?.[name];
+  if (result === void 0 && shouldThrow) {
+    throw new Error(`Please specify env var '${name}'`);
+  }
+  return result;
+}
+var castToError = (e) => {
+  if (e instanceof Error) {
+    return e;
+  }
+  if (typeof e === "string") {
+    return new Error(e);
+  }
+  return new Error("Unknown error");
+};
+
 // src/retry.tsx
 var RetryCountContext = createContext({
   retryCount: 0,
@@ -1583,15 +1609,6 @@ var backoff = (retries) => {
   const waitTime = BASE_BACKOFF * Math.pow(4, retries);
   return new Promise((resolve) => setTimeout(resolve, waitTime));
 };
-var castToError = (e) => {
-  if (e instanceof Error) {
-    return e;
-  }
-  if (typeof e === "string") {
-    return new Error(e);
-  }
-  return new Error("Unknown error");
-};
 
 // src/fallback.tsx
 async function* Fallback({ shouldFallback = () => true, fallback, children }, ctx) {
@@ -1928,25 +1945,6 @@ function isPromptParsed2(prompt) {
 // src/lib/openai/OpenAI.tsx
 var import_openai2 = require("openai");
 
-// src/lib/openai/shouldRetryOpenAI.ts
-var import_openai = require("openai");
-var shouldRetryOpenAI = (error) => {
-  if (error instanceof import_openai.OpenAI.APIConnectionError) {
-    return true;
-  }
-  if (error instanceof import_openai.OpenAI.APIError) {
-    if ("status" in error && typeof error.status === "number") {
-      if (error.status === 409)
-        return true;
-      if (error.status === 429)
-        return true;
-      if (error.status >= 500)
-        return true;
-    }
-  }
-  return false;
-};
-
 // src/lib/openai/tokenizer.ts
 var import_js_tiktoken = require("js-tiktoken");
 var cl100kTokenizer = (0, import_js_tiktoken.getEncoding)("cl100k_base");
@@ -2058,21 +2056,35 @@ async function buildChatMessages(ctx, children, opts) {
   });
 }
 
-// src/utils.ts
-function getEnvVar(name, shouldThrow = true) {
-  let env = globalThis.process?.env ?? void 0;
-  if (env === void 0) {
-    try {
-      env = process.env;
-    } catch {
-    }
+// src/lib/openai/errors.ts
+var import_openai = require("openai");
+var extractStatusFromError = (error) => {
+  if (error instanceof import_openai.OpenAI.APIError) {
+    return error.status;
+  } else if (error instanceof import_openai.OpenAI.APIConnectionError) {
+    return void 0;
+  } else {
+    return void 0;
   }
-  const result = env?.[name];
-  if (result === void 0 && shouldThrow) {
-    throw new Error(`Please specify env var '${name}'`);
+};
+var errorToChatCompletionError = (error, requestData) => {
+  const castError = castToError(error);
+  const status = extractStatusFromError(castError);
+  let messagePrefix = "";
+  if (error instanceof import_openai.OpenAI.APIError) {
+    messagePrefix = "OpenAIClient.APIError: ";
+  } else if (error instanceof import_openai.OpenAI.APIConnectionError) {
+    messagePrefix = "OpenAIClient.APIConnectionError: ";
   }
-  return result;
-}
+  const shouldRetry4 = status !== 400;
+  return new ChatCompletionError(
+    `${messagePrefix}${castError.message}`,
+    requestData,
+    status,
+    shouldRetry4,
+    error instanceof Error ? error : void 0
+  );
+};
 
 // src/lib/openai/OpenAI.tsx
 var defaultClient = null;
@@ -2202,38 +2214,32 @@ async function* OpenAIChatCompletionInner(props, ctx) {
   try {
     chatResponse = await client.chat.completions.create(chatCompletionRequest);
   } catch (ex) {
-    const retry = shouldRetryOpenAI(ex);
-    if (ex instanceof import_openai2.OpenAI.APIError) {
-      throw new ChatCompletionError(
-        `OpenAIClient.APIError: ${ex.message}`,
-        logRequestData,
-        ex.status,
-        retry
-      );
-    } else if (ex instanceof Error) {
-      throw new ChatCompletionError(
-        ex.message,
-        logRequestData,
-        void 0,
-        retry
-      );
-    }
-    throw ex;
+    throw errorToChatCompletionError(ex, logRequestData);
   }
   let finishReason = void 0;
   let content = "";
-  for await (const message of chatResponse) {
-    if (!message.choices || !message.choices[0]) {
-      continue;
-    }
-    const delta = message.choices[0].delta;
-    if (message.choices[0].finish_reason) {
-      finishReason = message.choices[0].finish_reason;
-    }
-    if (delta.content) {
-      content += delta.content;
-      yield delta.content;
+  try {
+    for await (const message of chatResponse) {
+      if (!message.choices || !message.choices[0]) {
+        continue;
+      }
+      const delta = message.choices[0].delta;
+      if (message.choices[0].finish_reason) {
+        finishReason = message.choices[0].finish_reason;
+        span.setAttributes({
+          finishReason
+        });
+      }
+      if (delta.content) {
+        content += delta.content;
+        yield delta.content;
+      }
     }
+  } catch (e) {
+    span.setAttributes({
+      output: content
+    });
+    throw errorToChatCompletionError(e, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2406,7 +2412,7 @@ var shouldRetry2 = (error) => {
 var shouldRetryFromStatus = (status) => Boolean(status && [424, 429, 500].includes(status));
 var RE_INTERNAL_SERVER_MESSASGE = /The system encountered an unexpected error during processing/i;
 var RE_RATE_LIMIT_MESSAGE = /Too many requests, please wait before trying again/;
-var extractStatusFromError = (error) => {
+var extractStatusFromError2 = (error) => {
   if (typeof error !== "object" || !(error instanceof Error)) {
     return;
   }
@@ -2505,7 +2511,7 @@ async function* AnthropicChatCompletionInner(props, ctx) {
     response = client.messages.stream(anthropicCompletionRequest);
   } catch (err) {
     if (err instanceof import_sdk.default.APIError) {
-      const status = extractStatusFromError(err);
+      const status = extractStatusFromError2(err);
       const retry = shouldRetryFromStatus(status);
       throw new ChatCompletionError(
         `AnthropicClient.APIError: ${err.message}`,
@@ -2514,7 +2520,7 @@ async function* AnthropicChatCompletionInner(props, ctx) {
         retry
       );
     } else if (err instanceof Error) {
-      const status = extractStatusFromError(err);
+      const status = extractStatusFromError2(err);
       const retry = shouldRetryFromStatus(status);
       throw new ChatCompletionError(err.message, logRequestData, status, retry);
     }
@@ -2537,10 +2543,16 @@ async function* AnthropicChatCompletionInner(props, ctx) {
       if (event.type === "message_delta") {
         finishReason = event.delta.stop_reason;
         outputUsage = event.usage?.output_tokens;
+        span.setAttributes({
+          finishReason
+        });
       }
     }
   } catch (e) {
-    const status = extractStatusFromError(e);
+    span.setAttributes({
+      output: content
+    });
+    const status = extractStatusFromError2(e);
     const retry = shouldRetryFromStatus(status);
     throw new ChatCompletionError(e.message, logRequestData, status, retry);
   }
@@ -2627,14 +2639,15 @@ var extractStatusFromMessage = (message) => {
   }
   return 500;
 };
-var errorToChatCompletionError = (error, requestData) => {
+var errorToChatCompletionError2 = (error, requestData) => {
   const status = extractStatusFromMessage(error.message);
   const shouldRetry4 = status !== 400;
   return new ChatCompletionError(
     error.message,
     requestData,
     status,
-    shouldRetry4
+    shouldRetry4,
+    error
   );
 };
 
@@ -2806,7 +2819,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     response = await model.generateContentStream(googleCompletionRequest);
   } catch (err) {
-    throw errorToChatCompletionError(err, logRequestData);
+    throw errorToChatCompletionError2(err, logRequestData);
   }
   let content = "";
   let outputUsage = 0;
@@ -2817,6 +2830,9 @@ async function* GoogleChatCompletionInner(props, ctx) {
       if (event.candidates) {
         if (event.candidates[0]?.finishReason) {
           finishReason = event.candidates[0].finishReason;
+          span.setAttributes({
+            finishReason
+          });
         }
         if (event.usageMetadata) {
           if (event.usageMetadata.promptTokenCount) {
@@ -2852,7 +2868,10 @@ async function* GoogleChatCompletionInner(props, ctx) {
       }
     }
   } catch (err) {
-    throw errorToChatCompletionError(err, logRequestData);
+    span.setAttributes({
+      output: content
+    });
+    throw errorToChatCompletionError2(err, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2876,8 +2895,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   span.setAttributes({
     tokensUsed,
     output: content,
-    cost,
-    finishReason
+    cost
   });
 }
 function cleanChatCompletionRequest3(chatCompletionRequest) {

package/dist/index.mjs

@@ -8,11 +8,12 @@ import {
 
 // src/chat/errors.ts
 var ChatCompletionError = class extends Error {
-  constructor(message, chatCompletionRequest, status, shouldRetry4 = false) {
+  constructor(message, chatCompletionRequest, status, shouldRetry4 = false, originalError) {
     super(message);
     this.chatCompletionRequest = chatCompletionRequest;
     this.status = status;
     this.shouldRetry = shouldRetry4;
+    this.originalError = originalError;
   }
   name = "ChatCompletionError";
 };
@@ -1435,6 +1436,31 @@ function renderCloseTag(element) {
   return `</${element.tag.name}>`;
 }
 
+// src/utils.ts
+function getEnvVar(name, shouldThrow = true) {
+  let env = globalThis.process?.env ?? void 0;
+  if (env === void 0) {
+    try {
+      env = process.env;
+    } catch {
+    }
+  }
+  const result = env?.[name];
+  if (result === void 0 && shouldThrow) {
+    throw new Error(`Please specify env var '${name}'`);
+  }
+  return result;
+}
+var castToError = (e) => {
+  if (e instanceof Error) {
+    return e;
+  }
+  if (typeof e === "string") {
+    return new Error(e);
+  }
+  return new Error("Unknown error");
+};
+
 // src/retry.tsx
 var RetryCountContext = createContext({
   retryCount: 0,
@@ -1480,15 +1506,6 @@ var backoff = (retries) => {
   const waitTime = BASE_BACKOFF * Math.pow(4, retries);
   return new Promise((resolve) => setTimeout(resolve, waitTime));
 };
-var castToError = (e) => {
-  if (e instanceof Error) {
-    return e;
-  }
-  if (typeof e === "string") {
-    return new Error(e);
-  }
-  return new Error("Unknown error");
-};
 
 // src/fallback.tsx
 async function* Fallback({ shouldFallback = () => true, fallback, children }, ctx) {
@@ -1825,25 +1842,6 @@ function isPromptParsed2(prompt) {
 // src/lib/openai/OpenAI.tsx
 import { OpenAI as OpenAIClient2 } from "openai";
 
-// src/lib/openai/shouldRetryOpenAI.ts
-import { OpenAI as OpenAIClient } from "openai";
-var shouldRetryOpenAI = (error) => {
-  if (error instanceof OpenAIClient.APIConnectionError) {
-    return true;
-  }
-  if (error instanceof OpenAIClient.APIError) {
-    if ("status" in error && typeof error.status === "number") {
-      if (error.status === 409)
-        return true;
-      if (error.status === 429)
-        return true;
-      if (error.status >= 500)
-        return true;
-    }
-  }
-  return false;
-};
-
 // src/lib/openai/tokenizer.ts
 import { getEncoding } from "js-tiktoken";
 var cl100kTokenizer = getEncoding("cl100k_base");
@@ -1955,21 +1953,35 @@ async function buildChatMessages(ctx, children, opts) {
   });
 }
 
-// src/utils.ts
-function getEnvVar(name, shouldThrow = true) {
-  let env = globalThis.process?.env ?? void 0;
-  if (env === void 0) {
-    try {
-      env = process.env;
-    } catch {
-    }
+// src/lib/openai/errors.ts
+import { OpenAI as OpenAIClient } from "openai";
+var extractStatusFromError = (error) => {
+  if (error instanceof OpenAIClient.APIError) {
+    return error.status;
+  } else if (error instanceof OpenAIClient.APIConnectionError) {
+    return void 0;
+  } else {
+    return void 0;
   }
-  const result = env?.[name];
-  if (result === void 0 && shouldThrow) {
-    throw new Error(`Please specify env var '${name}'`);
+};
+var errorToChatCompletionError = (error, requestData) => {
+  const castError = castToError(error);
+  const status = extractStatusFromError(castError);
+  let messagePrefix = "";
+  if (error instanceof OpenAIClient.APIError) {
+    messagePrefix = "OpenAIClient.APIError: ";
+  } else if (error instanceof OpenAIClient.APIConnectionError) {
+    messagePrefix = "OpenAIClient.APIConnectionError: ";
   }
-  return result;
-}
+  const shouldRetry4 = status !== 400;
+  return new ChatCompletionError(
+    `${messagePrefix}${castError.message}`,
+    requestData,
+    status,
+    shouldRetry4,
+    error instanceof Error ? error : void 0
+  );
+};
 
 // src/lib/openai/OpenAI.tsx
 var defaultClient = null;
@@ -2099,38 +2111,32 @@ async function* OpenAIChatCompletionInner(props, ctx) {
   try {
     chatResponse = await client.chat.completions.create(chatCompletionRequest);
   } catch (ex) {
-    const retry = shouldRetryOpenAI(ex);
-    if (ex instanceof OpenAIClient2.APIError) {
-      throw new ChatCompletionError(
-        `OpenAIClient.APIError: ${ex.message}`,
-        logRequestData,
-        ex.status,
-        retry
-      );
-    } else if (ex instanceof Error) {
-      throw new ChatCompletionError(
-        ex.message,
-        logRequestData,
-        void 0,
-        retry
-      );
-    }
-    throw ex;
+    throw errorToChatCompletionError(ex, logRequestData);
   }
   let finishReason = void 0;
   let content = "";
-  for await (const message of chatResponse) {
-    if (!message.choices || !message.choices[0]) {
-      continue;
-    }
-    const delta = message.choices[0].delta;
-    if (message.choices[0].finish_reason) {
-      finishReason = message.choices[0].finish_reason;
-    }
-    if (delta.content) {
-      content += delta.content;
-      yield delta.content;
+  try {
+    for await (const message of chatResponse) {
+      if (!message.choices || !message.choices[0]) {
+        continue;
+      }
+      const delta = message.choices[0].delta;
+      if (message.choices[0].finish_reason) {
+        finishReason = message.choices[0].finish_reason;
+        span.setAttributes({
+          finishReason
+        });
+      }
+      if (delta.content) {
+        content += delta.content;
+        yield delta.content;
+      }
     }
+  } catch (e) {
+    span.setAttributes({
+      output: content
+    });
+    throw errorToChatCompletionError(e, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2303,7 +2309,7 @@ var shouldRetry2 = (error) => {
 var shouldRetryFromStatus = (status) => Boolean(status && [424, 429, 500].includes(status));
 var RE_INTERNAL_SERVER_MESSASGE = /The system encountered an unexpected error during processing/i;
 var RE_RATE_LIMIT_MESSAGE = /Too many requests, please wait before trying again/;
-var extractStatusFromError = (error) => {
+var extractStatusFromError2 = (error) => {
   if (typeof error !== "object" || !(error instanceof Error)) {
     return;
   }
@@ -2402,7 +2408,7 @@ async function* AnthropicChatCompletionInner(props, ctx) {
     response = client.messages.stream(anthropicCompletionRequest);
   } catch (err) {
     if (err instanceof AnthropicClient.APIError) {
-      const status = extractStatusFromError(err);
+      const status = extractStatusFromError2(err);
       const retry = shouldRetryFromStatus(status);
       throw new ChatCompletionError(
         `AnthropicClient.APIError: ${err.message}`,
@@ -2411,7 +2417,7 @@ async function* AnthropicChatCompletionInner(props, ctx) {
         retry
       );
     } else if (err instanceof Error) {
-      const status = extractStatusFromError(err);
+      const status = extractStatusFromError2(err);
       const retry = shouldRetryFromStatus(status);
       throw new ChatCompletionError(err.message, logRequestData, status, retry);
     }
@@ -2434,10 +2440,16 @@ async function* AnthropicChatCompletionInner(props, ctx) {
       if (event.type === "message_delta") {
         finishReason = event.delta.stop_reason;
         outputUsage = event.usage?.output_tokens;
+        span.setAttributes({
+          finishReason
+        });
       }
     }
   } catch (e) {
-    const status = extractStatusFromError(e);
+    span.setAttributes({
+      output: content
+    });
+    const status = extractStatusFromError2(e);
     const retry = shouldRetryFromStatus(status);
     throw new ChatCompletionError(e.message, logRequestData, status, retry);
   }
@@ -2528,14 +2540,15 @@ var extractStatusFromMessage = (message) => {
   }
   return 500;
 };
-var errorToChatCompletionError = (error, requestData) => {
+var errorToChatCompletionError2 = (error, requestData) => {
   const status = extractStatusFromMessage(error.message);
   const shouldRetry4 = status !== 400;
   return new ChatCompletionError(
     error.message,
     requestData,
     status,
-    shouldRetry4
+    shouldRetry4,
+    error
   );
 };
 
@@ -2707,7 +2720,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     response = await model.generateContentStream(googleCompletionRequest);
   } catch (err) {
-    throw errorToChatCompletionError(err, logRequestData);
+    throw errorToChatCompletionError2(err, logRequestData);
   }
   let content = "";
   let outputUsage = 0;
@@ -2718,6 +2731,9 @@ async function* GoogleChatCompletionInner(props, ctx) {
       if (event.candidates) {
         if (event.candidates[0]?.finishReason) {
           finishReason = event.candidates[0].finishReason;
+          span.setAttributes({
+            finishReason
+          });
         }
         if (event.usageMetadata) {
           if (event.usageMetadata.promptTokenCount) {
@@ -2753,7 +2769,10 @@ async function* GoogleChatCompletionInner(props, ctx) {
       }
     }
   } catch (err) {
-    throw errorToChatCompletionError(err, logRequestData);
+    span.setAttributes({
+      output: content
+    });
+    throw errorToChatCompletionError2(err, logRequestData);
   }
   const outputMessage = {
     role: "assistant",
@@ -2777,8 +2796,7 @@ async function* GoogleChatCompletionInner(props, ctx) {
   span.setAttributes({
     tokensUsed,
     output: content,
-    cost,
-    finishReason
+    cost
   });
 }
 function cleanChatCompletionRequest3(chatCompletionRequest) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.11.0-dev.2024-06-17",
+  "version": "0.11.1-dev.2024-06-23",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",