v4.0.0-beta.7

openai · Jul 29, 2023 · 347a227 · 347a227
1 parent 96e5b7f
commit 347a227
Show file tree

Hide file tree

Showing 20 changed files with 353 additions and 203 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ import OpenAI from 'openai';
 const openai = new OpenAI();
 
 async function main() {
-  const completion = await openai.chat.completions.create({
+  const stream = await openai.chat.completions.create({
     model: 'gpt-4',
     messages: [{ role: 'user', content: 'Say this is a test' }],
     stream: true,

diff --git a/api.md b/api.md
@@ -17,6 +17,7 @@ Types:
 
 - <code><a href="./src/resources/chat/completions.ts">ChatCompletion</a></code>
 - <code><a href="./src/resources/chat/completions.ts">ChatCompletionChunk</a></code>
+- <code><a href="./src/resources/chat/completions.ts">CreateChatCompletionRequestMessage</a></code>
 
 Methods:
 

diff --git a/ecosystem-tests/cli.ts b/ecosystem-tests/cli.ts
@@ -125,6 +125,16 @@ function parseArgs() {
         default: false,
         description: 'Push projects to live servers',
       },
+      jobs: {
+        type: 'number',
+        default: 1,
+        description: 'number of parallel jobs to run',
+      },
+      parallel: {
+        type: 'boolean',
+        default: false,
+        description: 'run all projects in parallel (jobs = # projects)',
+      },
     })
     .help().argv;
 }
@@ -157,26 +167,97 @@ async function main() {
 
   const failed: typeof projectNames = [];
 
-  for (const project of projectsToRun) {
-    const fn = projects[project];
-
-    await withChdir(path.join(rootDir, 'ecosystem-tests', project), async () => {
-      console.error('\n');
-      console.error(banner(project));
-      console.error('\n');
-
-      try {
-        await fn();
-        console.error(`✅ - Successfully ran ${project}`);
-      } catch (err) {
-        if (err && (err as any).shortMessage) {
-          console.error((err as any).shortMessage);
-        } else {
-          console.error(err);
-        }
-        failed.push(project);
+  let { jobs } = args;
+  if (args.parallel) jobs = projectsToRun.length;
+  if (jobs > 1) {
+    const queue = [...projectsToRun];
+    const runningProjects = new Set();
+
+    const cursorLeft = '\x1B[G';
+    const eraseLine = '\x1B[2K';
+
+    let progressDisplayed = false;
+    function clearProgress() {
+      if (progressDisplayed) {
+        process.stderr.write(cursorLeft + eraseLine);
+        progressDisplayed = false;
       }
-    });
+    }
+    const spinner = ['|', '/', '-', '\\'];
+
+    function showProgress() {
+      clearProgress();
+      progressDisplayed = true;
+      const spin = spinner[Math.floor(Date.now() / 500) % spinner.length];
+      process.stderr.write(
+        `${spin} Running ${[...runningProjects].join(', ')}`.substring(0, process.stdout.columns - 3) + '...',
+      );
+    }
+
+    const progressInterval = setInterval(showProgress, process.stdout.isTTY ? 500 : 5000);
+    showProgress();
+
+    await Promise.all(
+      [...Array(jobs).keys()].map(async () => {
+        while (queue.length) {
+          const project = queue.shift();
+          if (!project) break;
+          let stdout, stderr;
+          try {
+            runningProjects.add(project);
+            const result = await execa(
+              'yarn',
+              [
+                'tsn',
+                __filename,
+                project,
+                '--skip-pack',
+                ...(args.live ? ['--live'] : []),
+                ...(args.verbose ? ['--verbose'] : []),
+                ...(args.deploy ? ['--deploy'] : []),
+                ...(args.fromNpm ? ['--from-npm'] : []),
+              ],
+              { stdio: 'pipe', encoding: 'utf8', maxBuffer: 100 * 1024 * 1024 },
+            );
+            ({ stdout, stderr } = result);
+          } catch (error) {
+            ({ stdout, stderr } = error as any);
+            failed.push(project);
+          } finally {
+            runningProjects.delete(project);
+          }
+
+          if (stdout) process.stdout.write(stdout);
+          if (stderr) process.stderr.write(stderr);
+        }
+      }),
+    );
+
+    clearInterval(progressInterval);
+    clearProgress();
+  } else {
+    for (const project of projectsToRun) {
+      const fn = projects[project];
+
+      await withChdir(path.join(rootDir, 'ecosystem-tests', project), async () => {
+        console.error('\n');
+        console.error(banner(project));
+        console.error('\n');
+
+        try {
+          await fn();
+          console.error(`✅ - Successfully ran ${project}`);
+        } catch (err) {
+          if (err && (err as any).shortMessage) {
+            console.error('❌', (err as any).shortMessage);
+          } else {
+            console.error('❌', err);
+          }
+          failed.push(project);
+        }
+        console.error('\n');
+      });
+    }
   }
 
   if (failed.length) {

diff --git a/ecosystem-tests/cloudflare-worker/src/worker.ts b/ecosystem-tests/cloudflare-worker/src/worker.ts
@@ -1,6 +1,4 @@
-import OpenAI from 'openai';
-import { uploadWebApiTestCases } from './uploadWebApiTestCases.js';
-import { distance } from 'fastest-levenshtein'
+import { distance } from 'fastest-levenshtein';
 
 /**
  * Welcome to Cloudflare Workers! This is your first worker.
@@ -35,54 +33,68 @@ type Test = { description: string; handler: () => Promise<void> };
 
 export default {
 	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
-		const client = new OpenAI({ apiKey: env.OPENAI_API_KEY });
+		try {
+			console.error('importing openai');
+			const { default: OpenAI } = await import('openai');
+			console.error('importing test cases');
+			const { uploadWebApiTestCases } = await import('./uploadWebApiTestCases.js');
+			console.error('creating client');
+			const client = new OpenAI({ apiKey: env.OPENAI_API_KEY });
+			console.error('created client');
 
-		const tests: Test[] = [];
-		function it(description: string, handler: () => Promise<void>) {
-			tests.push({ description, handler });
-		}
-		function expectEqual(a: any, b: any) {
-			if (!Object.is(a, b)) {
-				throw new Error(`expected values to be equal: ${JSON.stringify({ a, b })}`);
+			const tests: Test[] = [];
+			function it(description: string, handler: () => Promise<void>) {
+				tests.push({ description, handler });
 			}
-		}
-		function expectSimilar(received: string, expected: string, maxDistance: number) {
-			const receivedDistance = distance(received, expected);
-			if (receivedDistance < maxDistance) {
-				return;
+			function expectEqual(a: any, b: any) {
+				if (!Object.is(a, b)) {
+					throw new Error(`expected values to be equal: ${JSON.stringify({ a, b })}`);
+				}
 			}
+			function expectSimilar(received: string, expected: string, maxDistance: number) {
+				const receivedDistance = distance(received, expected);
+				if (receivedDistance < maxDistance) {
+					return;
+				}
 
-			const message = [
-				`Received: ${JSON.stringify(received)}`,
-				`Expected: ${JSON.stringify(expected)}`,
-				`Max distance: ${maxDistance}`,
-				`Received distance: ${receivedDistance}`,
-			].join('\n');
+				const message = [
+					`Received: ${JSON.stringify(received)}`,
+					`Expected: ${JSON.stringify(expected)}`,
+					`Max distance: ${maxDistance}`,
+					`Received distance: ${receivedDistance}`,
+				].join('\n');
 
-			throw new Error(message);
-		}
+				throw new Error(message);
+			}
 
-		uploadWebApiTestCases({
-			client: client as any,
-			it,
-			expectEqual,
-			expectSimilar,
-		});
+			uploadWebApiTestCases({
+				client: client as any,
+				it,
+				expectEqual,
+				expectSimilar,
+			});
 
-		let allPassed = true;
-		const results = [];
+			let allPassed = true;
+			const results = [];
 
-		for (const { description, handler } of tests) {
-			let result;
-			try {
-				result = await handler();
-			} catch (error) {
-				allPassed = false;
-				result = error instanceof Error ? error.stack : String(error);
+			for (const { description, handler } of tests) {
+				console.error('running', description);
+				let result;
+				try {
+					result = await handler();
+					console.error('passed ', description);
+				} catch (error) {
+					console.error('failed ', description, error);
+					allPassed = false;
+					result = error instanceof Error ? error.stack : String(error);
+				}
+				results.push(`${description}\n\n${String(result)}`);
 			}
-			results.push(`${description}\n\n${String(result)}`);
-		}
 
-		return new Response(allPassed ? 'Passed!' : results.join('\n\n'));
+			return new Response(allPassed ? 'Passed!' : results.join('\n\n'));
+		} catch (error) {
+			console.error(error instanceof Error ? error.stack : String(error));
+			return new Response(error instanceof Error ? error.stack : String(error), { status: 500 });
+		}
 	},
 };
diff --git a/ecosystem-tests/cloudflare-worker/tests/test.js b/ecosystem-tests/cloudflare-worker/tests/test.js
@@ -1,5 +1,9 @@
 import fetch from 'node-fetch';
 
-it('works', async () => {
-	expect(await (await fetch('http://localhost:8787')).text()).toEqual('Passed!');
-}, 30000);
+it(
+	'works',
+	async () => {
+		expect(await (await fetch('http://localhost:8787')).text()).toEqual('Passed!');
+	},
+	3 * 60000
+);
diff --git a/ecosystem-tests/deno/main_test.ts b/ecosystem-tests/deno/main_test.ts
@@ -1,6 +1,6 @@
 import { assertEquals, AssertionError } from 'https://deno.land/[email protected]/testing/asserts.ts';
 import OpenAI, { toFile } from 'npm:[email protected]';
-import { distance } from 'https://deno.land/x/fastest_levenshtein/mod.ts'
+import { distance } from 'https://deno.land/x/fastest_levenshtein/mod.ts';
 
 const url = 'https://audio-samples.github.io/samples/mp3/blizzard_biased/sample-1.mp3';
 const filename = 'sample-1.mp3';

diff --git a/ecosystem-tests/node-ts-cjs-dom/jest.config.cjs b/ecosystem-tests/node-ts-cjs-dom/jest.config.cjs
@@ -5,5 +5,5 @@ module.exports = {
   testMatch: ['<rootDir>/tests/*.ts'],
   watchPathIgnorePatterns: ['<rootDir>/node_modules/'],
   verbose: false,
-  testTimeout: 15000,
+  testTimeout: 60000,
 };
diff --git a/ecosystem-tests/node-ts-cjs/jest.config.cjs b/ecosystem-tests/node-ts-cjs/jest.config.cjs
@@ -5,5 +5,5 @@ module.exports = {
   testMatch: ['<rootDir>/tests/*.ts'],
   watchPathIgnorePatterns: ['<rootDir>/node_modules/'],
   verbose: false,
-  testTimeout: 15000,
+  testTimeout: 60000,
 };
diff --git a/ecosystem-tests/node-ts-esm-dom/jest.config.cjs b/ecosystem-tests/node-ts-esm-dom/jest.config.cjs
@@ -19,5 +19,5 @@ module.exports = {
   testMatch: ['<rootDir>/tests/*.ts'],
   watchPathIgnorePatterns: ['<rootDir>/node_modules/'],
   verbose: false,
-  testTimeout: 15000,
+  testTimeout: 60000,
 };
diff --git a/ecosystem-tests/node-ts-esm/jest.config.cjs b/ecosystem-tests/node-ts-esm/jest.config.cjs
@@ -19,5 +19,5 @@ module.exports = {
   testMatch: ['<rootDir>/tests/*.ts'],
   watchPathIgnorePatterns: ['<rootDir>/node_modules/'],
   verbose: false,
-  testTimeout: 15000,
+  testTimeout: 60000,
 };
diff --git a/ecosystem-tests/ts-browser-webpack/src/index.ts b/ecosystem-tests/ts-browser-webpack/src/index.ts
@@ -55,7 +55,7 @@ function describe(description: string, handler: () => void) {
   }
 }
 
-function it(description: string, run: () => any, timeout = 15000) {
+function it(description: string, run: () => any, timeout = 60000) {
   tests.push({ path: [...testPath, description], run, timeout });
 }