Better Test Cleanup. Use Dotenv.

Author: metaskills

Diff for: bin/cleanup

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+node test/bin/cleanup.js

Diff for: jest.config.mjs

@@ -7,7 +7,7 @@ export default {
   globalTeardown: "./test/globalTeardown.js",
   slowTestThreshold: 30,
   cacheDirectory: "./tmp",
-  setupFiles: [],
+  setupFiles: ["<rootDir>/test/env.js"],
   setupFilesAfterEnv: [],
   slowTestThreshold: 30,
   automock: false,

Diff for: package-lock.json

@@ -12,7 +12,8 @@
   },
   "scripts": {
     "setup": "./bin/setup",
-    "test": "./bin/test"
+    "test": "./bin/test",
+    "cleanup": "./bin/cleanup"
   },
   "author": "Ken COllins",
   "license": "MIT",
@@ -21,6 +22,7 @@
     "@opensearch-project/opensearch": "^2.7.0",
     "axios": "^1.6.8",
     "babel-jest": "^29.7.0",
+    "dotenv": "^16.4.5",
     "ejs": "^3.1.10",
     "file-type": "^19.0.0",
     "jest": "^29.7.0",
@@ -33,6 +35,6 @@
   },
   "dependencies": {
     "eventemitter2": "^6.4.9",
-    "openai": "^4.52.0"
+    "openai": "^4.55.0"
   }
 }

Diff for: package.json

@@ -0,0 +1,9 @@
+import {
+  helperDeleteAllAssistants,
+  helperDeleteAllVectorStores,
+  helperDeleteAllFiles,
+} from "../../test/helpers.js";
+
+await helperDeleteAllAssistants();
+await helperDeleteAllVectorStores();
+await helperDeleteAllFiles();

Diff for: test/bin/cleanup.js

@@ -0,0 +1,6 @@
+import dotenv from "dotenv";
+import { fileURLToPath } from "url";
+import { dirname, resolve } from "path";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+dotenv.config({ path: resolve(__dirname, "../.env.local"), override: true });

Diff for: test/env.js

@@ -3,9 +3,11 @@ process.env.NODE_ENV = "test";
 import {
   helperDeleteAllAssistants,
   helperDeleteAllVectorStores,
+  helperDeleteAllFiles,
 } from "./helpers.js";
 
 export default async function () {
   await helperDeleteAllAssistants();
   await helperDeleteAllVectorStores();
+  await helperDeleteAllFiles();
 }

Diff for: test/globalSetup.js

@@ -1,9 +1,11 @@
 import {
   helperDeleteAllAssistants,
   helperDeleteAllVectorStores,
+  helperDeleteAllFiles,
 } from "./helpers.js";
 
 export default async function () {
   await helperDeleteAllAssistants();
   await helperDeleteAllVectorStores();
+  await helperDeleteAllFiles();
 }

Diff for: test/globalTeardown.js

@@ -1,3 +1,4 @@
+import "./env.js";
 import fs from "fs";
 import ejs from "ejs";
 import url from "url";
@@ -37,7 +38,7 @@ const helperThreadID = async () => {
 
 const helperFindAllAssistants = async () => {
   const assistants = await openai.beta.assistants.list({ limit: 100 });
-  return assistants.data.filter((a) => a.name?.startsWith("Experts.js"));
+  return assistants.data;
 };
 
 const helperDeleteAllAssistants = async () => {
@@ -65,7 +66,7 @@ const helperDeleteAssistant = async (name) => {
 
 const helperFindAllVectorStores = async () => {
   const vectorStores = await openai.beta.vectorStores.list({ limit: 100 });
-  return vectorStores.data.filter((a) => a.name?.startsWith("Experts.js"));
+  return vectorStores.data;
 };
 
 const helperDeleteAllVectorStores = async () => {
@@ -79,6 +80,22 @@ const helperDeleteAllVectorStores = async () => {
   }
 };
 
+const helperFindAllFiles = async () => {
+  const files = await openai.files.list({ limit: 100 });
+  return files.data;
+};
+
+const helperDeleteAllFiles = async () => {
+  const files = await helperFindAllFiles();
+  for (const file of files) {
+    try {
+      await openai.files.del(file.id);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+};
+
 export {
   helperName,
   helperPath,
@@ -88,4 +105,6 @@ export {
   helperDeleteAllAssistants,
   helperFindAssistant,
   helperDeleteAllVectorStores,
+  helperFindAllFiles,
+  helperDeleteAllFiles,
 };