@gammatech/aijsx 0.9.1-dev.2024-05-28 → 0.9.3-dev.2024-05-31

package/dist/index.d.mts

@@ -6,7 +6,7 @@ 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 {
@@ -168,6 +168,7 @@ declare namespace AISpanAttributes {
         finishReason: string | null;
         output: string;
         tokensUsed: Usage;
+        [key: string]: any;
     };
 }
 declare namespace ProcessedAISpanAttributes {
@@ -280,6 +281,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>>;

package/dist/index.d.ts

@@ -6,7 +6,7 @@ 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 {
@@ -168,6 +168,7 @@ declare namespace AISpanAttributes {
         finishReason: string | null;
         output: string;
         tokensUsed: Usage;
+        [key: string]: any;
     };
 }
 declare namespace ProcessedAISpanAttributes {
@@ -280,6 +281,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>>;

package/dist/index.js

@@ -2533,6 +2533,28 @@ var import_sdk2 = __toESM(require("@anthropic-ai/sdk"));
 
 // src/lib/google/Google.tsx
 var import_vertexai = require("@google-cloud/vertexai");
+var SAFETY_SETTINGS = [
+  {
+    category: import_vertexai.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+    threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: import_vertexai.HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+    threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: import_vertexai.HarmCategory.HARM_CATEGORY_HARASSMENT,
+    threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: import_vertexai.HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+    threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: import_vertexai.HarmCategory.HARM_CATEGORY_UNSPECIFIED,
+    threshold: import_vertexai.HarmBlockThreshold.BLOCK_ONLY_HIGH
+  }
+];
 var GoogleClientContext = createContext(() => {
   if (defaultClient3) {
     return defaultClient3;
@@ -2546,10 +2568,10 @@ var GoogleClientContext = createContext(() => {
   return defaultClient3;
 });
 var defaultClient3 = null;
-var buildGoogleMessages = (chatMesssages) => {
+var buildGoogleMessages = (chatMessages) => {
   let systemInstruction;
   const messages = [];
-  chatMesssages.forEach(({ role, content }) => {
+  chatMessages.forEach(({ role, content }) => {
     if (role === "system") {
       systemInstruction = content;
       return;
@@ -2663,7 +2685,10 @@ async function* GoogleChatCompletionInner(props, ctx) {
     inputMessages,
     retryCount
   });
-  const model = client.getGenerativeModel({ model: props.model });
+  const model = client.getGenerativeModel({
+    model: props.model,
+    safetySettings: SAFETY_SETTINGS
+  });
   let response;
   try {
     response = await model.generateContentStream(googleCompletionRequest);
@@ -2690,7 +2715,6 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     for await (const event of response.stream) {
       if (event.candidates) {
-        const chunk = event.candidates[0].content;
         if (event.candidates[0]?.finishReason) {
           finishReason = event.candidates[0].finishReason;
         }
@@ -2702,6 +2726,23 @@ async function* GoogleChatCompletionInner(props, ctx) {
             outputUsage = event.usageMetadata.candidatesTokenCount;
           }
         }
+        const chunk = event.candidates[0].content;
+        const noChunk = !chunk || !chunk.parts;
+        if (event.promptFeedback) {
+          span.setAttributes({
+            promptFeedback: event.promptFeedback
+          });
+        }
+        if (noChunk) {
+          if (event.promptFeedback) {
+            const blockReason = event.promptFeedback.blockReason;
+            logger.error(
+              `Could not finish chat completion, blockReason: ${blockReason}`,
+              event.promptFeedback
+            );
+          }
+          continue;
+        }
         for (const block of chunk.parts) {
           if (block.text) {
             content += block.text;

package/dist/index.mjs

@@ -2433,8 +2433,32 @@ import AnthropicClient2 from "@anthropic-ai/sdk";
 // src/lib/google/Google.tsx
 import {
   VertexAI,
-  GoogleGenerativeAIError
+  GoogleGenerativeAIError,
+  HarmCategory,
+  HarmBlockThreshold
 } from "@google-cloud/vertexai";
+var SAFETY_SETTINGS = [
+  {
+    category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+    threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+    threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: HarmCategory.HARM_CATEGORY_HARASSMENT,
+    threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+    threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
+  },
+  {
+    category: HarmCategory.HARM_CATEGORY_UNSPECIFIED,
+    threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH
+  }
+];
 var GoogleClientContext = createContext(() => {
   if (defaultClient3) {
     return defaultClient3;
@@ -2448,10 +2472,10 @@ var GoogleClientContext = createContext(() => {
   return defaultClient3;
 });
 var defaultClient3 = null;
-var buildGoogleMessages = (chatMesssages) => {
+var buildGoogleMessages = (chatMessages) => {
   let systemInstruction;
   const messages = [];
-  chatMesssages.forEach(({ role, content }) => {
+  chatMessages.forEach(({ role, content }) => {
     if (role === "system") {
       systemInstruction = content;
       return;
@@ -2565,7 +2589,10 @@ async function* GoogleChatCompletionInner(props, ctx) {
     inputMessages,
     retryCount
   });
-  const model = client.getGenerativeModel({ model: props.model });
+  const model = client.getGenerativeModel({
+    model: props.model,
+    safetySettings: SAFETY_SETTINGS
+  });
   let response;
   try {
     response = await model.generateContentStream(googleCompletionRequest);
@@ -2592,7 +2619,6 @@ async function* GoogleChatCompletionInner(props, ctx) {
   try {
     for await (const event of response.stream) {
       if (event.candidates) {
-        const chunk = event.candidates[0].content;
         if (event.candidates[0]?.finishReason) {
           finishReason = event.candidates[0].finishReason;
         }
@@ -2604,6 +2630,23 @@ async function* GoogleChatCompletionInner(props, ctx) {
             outputUsage = event.usageMetadata.candidatesTokenCount;
           }
         }
+        const chunk = event.candidates[0].content;
+        const noChunk = !chunk || !chunk.parts;
+        if (event.promptFeedback) {
+          span.setAttributes({
+            promptFeedback: event.promptFeedback
+          });
+        }
+        if (noChunk) {
+          if (event.promptFeedback) {
+            const blockReason = event.promptFeedback.blockReason;
+            logger.error(
+              `Could not finish chat completion, blockReason: ${blockReason}`,
+              event.promptFeedback
+            );
+          }
+          continue;
+        }
         for (const block of chunk.parts) {
           if (block.text) {
             content += block.text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.9.1-dev.2024-05-28",
+  "version": "0.9.3-dev.2024-05-31",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",