@gammatech/aijsx 0.10.0-dev.2024-06-04.2 → 0.10.2-dev.2024-06-11

package/dist/index.d.mts

@@ -6,8 +6,8 @@ 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 { PromptFeedback, GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
-export { VertexAI } from '@google-cloud/vertexai';
+import { PromptFeedback, GenerateContentRequest, VertexAI, HarmCategory, HarmBlockThreshold } from '@google-cloud/vertexai';
+export { HarmBlockThreshold as GoogleHarmBlockThreshold, HarmCategory as GoogleHarmCategory, VertexAI } from '@google-cloud/vertexai';
 
 declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
@@ -87,7 +87,6 @@ declare const tracing: AITraceAPI;
 
 declare class SpanTree {
     roots: SpanTreeNode[];
-    findSpan: any;
     addSpan(span: ReadableSpan): boolean;
     findNode(id: string): SpanTreeNode | null;
 }
@@ -300,6 +299,10 @@ type GoogleChatCompletionProps = {
     stop?: string | string[];
     maxRetries?: number;
     children: AINode;
+    safetySettings?: {
+        category: HarmCategory;
+        threshold: HarmBlockThreshold;
+    }[];
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 

package/dist/index.d.ts

@@ -6,8 +6,8 @@ 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 { PromptFeedback, GenerateContentRequest, VertexAI } from '@google-cloud/vertexai';
-export { VertexAI } from '@google-cloud/vertexai';
+import { PromptFeedback, GenerateContentRequest, VertexAI, HarmCategory, HarmBlockThreshold } from '@google-cloud/vertexai';
+export { HarmBlockThreshold as GoogleHarmBlockThreshold, HarmCategory as GoogleHarmCategory, VertexAI } from '@google-cloud/vertexai';
 
 declare class ChatCompletionError extends Error {
     readonly chatCompletionRequest: LogChatCompletionRequest;
@@ -87,7 +87,6 @@ declare const tracing: AITraceAPI;
 
 declare class SpanTree {
     roots: SpanTreeNode[];
-    findSpan: any;
     addSpan(span: ReadableSpan): boolean;
     findNode(id: string): SpanTreeNode | null;
 }
@@ -300,6 +299,10 @@ type GoogleChatCompletionProps = {
     stop?: string | string[];
     maxRetries?: number;
     children: AINode;
+    safetySettings?: {
+        category: HarmCategory;
+        threshold: HarmBlockThreshold;
+    }[];
 };
 declare function GoogleChatCompletion(props: GoogleChatCompletionProps, ctx: RenderContext): JSX.Element;
 

package/dist/index.js

@@ -44,6 +44,8 @@ __export(src_exports, {
   Fallback: () => Fallback,
   GoogleChatCompletion: () => GoogleChatCompletion,
   GoogleClientContext: () => GoogleClientContext,
+  GoogleHarmBlockThreshold: () => import_vertexai2.HarmBlockThreshold,
+  GoogleHarmCategory: () => import_vertexai2.HarmCategory,
   ImagePart: () => ImagePart,
   LogImplementation: () => LogImplementation,
   NoopLogImplementation: () => NoopLogImplementation,
@@ -1587,7 +1589,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) {
@@ -2574,7 +2575,34 @@ var import_sdk2 = __toESM(require("@anthropic-ai/sdk"));
 
 // src/lib/google/Google.tsx
 var import_vertexai = require("@google-cloud/vertexai");
-var SAFETY_SETTINGS = [
+
+// 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 DEFAULT_SAFETY_SETTINGS = [
   {
     category: import_vertexai.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
     threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
@@ -2728,26 +2756,13 @@ async function* GoogleChatCompletionInner(props, ctx) {
   });
   const model = client.getGenerativeModel({
     model: props.model,
-    safetySettings: SAFETY_SETTINGS
+    safetySettings: props.safetySettings || DEFAULT_SAFETY_SETTINGS
   });
   let response;
   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;
@@ -2793,20 +2808,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",
@@ -2882,6 +2884,8 @@ var import_vertexai2 = require("@google-cloud/vertexai");
   Fallback,
   GoogleChatCompletion,
   GoogleClientContext,
+  GoogleHarmBlockThreshold,
+  GoogleHarmCategory,
   ImagePart,
   LogImplementation,
   NoopLogImplementation,

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) {
@@ -2474,12 +2473,38 @@ import AnthropicClient2 from "@anthropic-ai/sdk";
 
 // src/lib/google/Google.tsx
 import {
-  VertexAI,
-  GoogleGenerativeAIError,
+  HarmBlockThreshold,
   HarmCategory,
-  HarmBlockThreshold
+  VertexAI
 } from "@google-cloud/vertexai";
-var SAFETY_SETTINGS = [
+
+// 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 DEFAULT_SAFETY_SETTINGS = [
   {
     category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
     threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
@@ -2633,26 +2658,13 @@ async function* GoogleChatCompletionInner(props, ctx) {
   });
   const model = client.getGenerativeModel({
     model: props.model,
-    safetySettings: SAFETY_SETTINGS
+    safetySettings: props.safetySettings || DEFAULT_SAFETY_SETTINGS
   });
   let response;
   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;
@@ -2698,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",
@@ -2769,7 +2768,11 @@ function cleanChatCompletionRequest3(chatCompletionRequest) {
 }
 
 // src/lib/google/index.ts
-import { VertexAI as VertexAI2 } from "@google-cloud/vertexai";
+import {
+  VertexAI as VertexAI2,
+  HarmBlockThreshold as HarmBlockThreshold2,
+  HarmCategory as HarmCategory2
+} from "@google-cloud/vertexai";
 export {
   AIFragment,
   AISpanProcessor,
@@ -2786,6 +2789,8 @@ export {
   Fallback,
   GoogleChatCompletion,
   GoogleClientContext,
+  HarmBlockThreshold2 as GoogleHarmBlockThreshold,
+  HarmCategory2 as GoogleHarmCategory,
   ImagePart,
   LogImplementation,
   NoopLogImplementation,

package/package.json

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