Merge branch 'main' into chromadb-python-sdk

.github/workflows/javascript-tests.yaml

@@ -9,12 +9,20 @@ on:
     types:
       - opened
       - labeled
+      - synchronize
 
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'okay-to-test') || (github.event_name == 'push')
+    # We'll run if one of the following is met:
+    # 1. The 'okay-to-test' labeled has just been added to the PR.
+    # 2. A member or collaborator opens a PR or pushes new commits to it.
+    # 3. This is a push to the main branch.
+    if: |
+      (contains(github.event.pull_request.labels.*.name, 'okay-to-test') && github.event.action == 'labeled') ||
+      contains(fromJson('["MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) ||
+      github.event_name == 'push'
 
     steps:
       # https://github.com/actions/checkout/issues/518

.github/workflows/python-tests.yaml

@@ -9,11 +9,19 @@ on:
     types:
       - opened
       - labeled
+      - synchronize
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'okay-to-test') || (github.event_name == 'push')
+    # We'll run if one of the following is met:
+    # 1. The 'okay-to-test' labeled has just been added to the PR.
+    # 2. A member or collaborator opens a PR or pushes new commits to it.
+    # 3. This is a push to the main branch.
+    if: |
+      (contains(github.event.pull_request.labels.*.name, 'okay-to-test') && github.event.action == 'labeled') ||
+      contains(fromJson('["MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) ||
+      github.event_name == 'push'
 
     steps:
       # https://github.com/actions/checkout/issues/518

javascript-sdk/src/sdk.ts

@@ -9,7 +9,6 @@ import crypto from "crypto";
 import { SdkConfig } from "./config";
 import initVectorStore from "./lib/vectordb";
 import getOpenAIInstance from "./lib/openai";
-import { OpenAIApi } from "openai";
 import { VectorStore } from "langchain/vectorstores/base";
 import { Document } from "langchain/document";
 import Strategy from "./lib/Strategy";
@@ -28,38 +27,45 @@ export default class RebuffSdk implements Rebuff {
   private strategies: Record<string, Strategy> | undefined;
   private defaultStrategy: string;
 
-  private openai: {
-    conn: OpenAIApi;
-    model: string;
-  };
-
+  /**
+   * @deprecated Use `RebuffSdk.init` instead.
+   */
   constructor(config: SdkConfig) {
+    // We're keeping this constructor for backwards compatibility. In the future, we can make it private and
+    // simplify this class quite a bit.
+
     this.sdkConfig = config;
-    this.openai = {
-      conn: getOpenAIInstance(config.openai.apikey),
-      model: config.openai.model || "gpt-3.5-turbo",
-    };
     this.defaultStrategy = "standard";
   }
 
+  public static async init(config: SdkConfig): Promise<RebuffSdk> {
+    const sdk = new RebuffSdk(config);
+    sdk.vectorStore = await initVectorStore(config);
+    sdk.strategies = await sdk.getStrategies();
+    return sdk;
+  }
+
   private async getStrategies(): Promise<Record<string, Strategy>> {
     if (this.strategies) {
       return this.strategies;
     }
+    const openai = {
+      conn: getOpenAIInstance(this.sdkConfig.openai.apikey),
+      model: this.sdkConfig.openai.model || "gpt-3.5-turbo",
+    };
     const heuristicScoreThreshold = 0.75;
     const vectorScoreThreshold = 0.9;
     const openaiScoreThreshold = 0.9;
-    const strategies: Record<string, Strategy> = {
+    this.strategies = {
       // For now, this is the only strategy.
       "standard": {
         tactics: [
           new Heuristic(heuristicScoreThreshold),
           new Vector(vectorScoreThreshold, await this.getVectorStore()),
-          new OpenAI(openaiScoreThreshold, this.openai.model, this.openai.conn),
+          new OpenAI(openaiScoreThreshold, openai.model, openai.conn),
         ]
       },
     };
-    this.strategies = strategies;
     return this.strategies;
   }
 

javascript-sdk/tests/index.test.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 import { describe } from "mocha";
 import { expect } from "chai";
-import { DetectRequest, DetectResponse, TacticName, TacticResult } from "../src/interface";
+import { DetectRequest, DetectResponse, TacticName } from "../src/interface";
 import RebuffSDK from "../src/sdk";
 import { getEnvironmentVariable } from "./helpers";
 
 // Initialize the Rebuff SDK with a real API token and URL
-const rb = new RebuffSDK({
+const rb = await RebuffSDK.init({
   openai: {
     apikey: getEnvironmentVariable("OPENAI_API_KEY"),
     model: "gpt-3.5-turbo",
@@ -19,7 +19,7 @@ const rb = new RebuffSDK({
     }
   }
 });
-const rb_chroma = new RebuffSDK({
+const rb_chroma = await RebuffSDK.init({
   openai: {
     apikey: getEnvironmentVariable("OPENAI_API_KEY"),
     model: "gpt-3.5-turbo",

javascript-sdk/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2015",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "module": "esnext",
     "strict": true,